Skip to content

Commit

Permalink
Merge pull request #19 from ptulp/master
Browse files Browse the repository at this point in the history
Small Fixes
  • Loading branch information
delatbabel committed Apr 2, 2015
2 parents 0b14f90 + 208f799 commit b053c49
Show file tree
Hide file tree
Showing 119 changed files with 2,722 additions and 931 deletions.
3 changes: 2 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

# define minimum cmake version
CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2)
cmake_policy(SET CMP0012 NEW)

PROJECT(logbookkonni_pi)

Expand All @@ -14,7 +15,7 @@ SET(VERBOSE_NAME Logbookkonni)
SET(TITLE_NAME LOGBOOKKONNI)
SET(CPACK_PACKAGE_CONTACT "Del Elson")

SET(BUNDLE_DATA FALSE)
SET(BUNDLE_DATA TRUE)

INCLUDE( VERSION.cmake )
SET(PLUGIN_VERSION "${PLUGIN_VERSION_MAJOR}.${PLUGIN_VERSION_MINOR}.${PLUGIN_VERSION_PATCH}" )
Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
1,239 changes: 1,230 additions & 9 deletions buildosx/InstallOSX/logbookkonni_pi.pkgproj.in

Large diffs are not rendered by default.

1,409 changes: 800 additions & 609 deletions data/Help.html

Large diffs are not rendered by default.

Binary file modified data/Images/Abbreviations.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/Images/Behavior.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed data/Images/Behavoir.PNG
Binary file not shown.
Binary file modified data/Images/Capacity.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/Images/Misc-KML.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/Images/Misc-NMEA.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/Images/Misc-Sails-Check.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/Images/Misc-Sails.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/Images/Paths.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/Images/StatusbarGlobal.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/Images/bt.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/Images/buy.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/Images/crMain.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/Images/logMotor1.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/Images/logMotor1_1.PNG
Binary file modified data/Images/logWeather1.PNG
Binary file modified data/Images/lognav1.PNG
Binary file added data/Images/lognav2.PNG
Binary file modified data/Images/maint.PNG
Binary file modified data/Images/oview.PNG
Binary file modified data/Images/rep.PNG
5 changes: 3 additions & 2 deletions makezip.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ rm -f build/LogbookKonni_Languages.zip
#
rm -f build/LogbookKonni_Layouts.zip
(
cd data
zip -r ../build/LogbookKonni_Layouts.zip HTMLLayouts ODTLayouts Help.html Clouds Images
cd Layouts
zip -r ../build/LogbookKonni_Layouts.zip HTMLLayouts ODTLayouts Clouds

)
30 changes: 24 additions & 6 deletions po/ca.po
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: opencpn\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-02-21 17:50+0100\n"
"POT-Creation-Date: 2015-03-13 21:26+0100\n"
"PO-Revision-Date: 2014-12-02 08:45-0500\n"
"Last-Translator: nohal <[email protected]>\n"
"Language-Team: Catalan\n"
Expand Down Expand Up @@ -392,8 +392,9 @@ msgstr "Data"
msgid "Date + Days"
msgstr ""
#
msgid "Date + Month"
msgstr ""
#, fuzzy
msgid "Date + Months"
msgstr "Data de naixement"
#
msgid "Date + Weeks"
msgstr ""
Expand Down Expand Up @@ -1424,9 +1425,6 @@ msgstr ""
msgid "Shutdown Logbook"
msgstr ""
#
msgid "Sign"
msgstr "Signe"
#
msgid "Sorry, Logbook has no lines"
msgstr ""
#
Expand Down Expand Up @@ -1480,6 +1478,9 @@ msgstr ""
msgid "Startvalue"
msgstr "Valor inicial"
#
msgid "Status"
msgstr ""
#
msgid "Staysail"
msgstr ""
#
Expand Down Expand Up @@ -2016,17 +2017,34 @@ msgid "yellow"
msgstr ""
#
#
#
#
#
#~ msgid "Select zipped Languages-Files"
#~ msgstr "Seleccionar arxius comprimits d'idiomes"
#
#
#
#~ msgid "Sign"
#~ msgstr "Signe"
#
#
#
#
#
#~ msgid "W/Strength"
#~ msgstr "Força del vent"
#
#
#
#
#
#~ msgid "Wind"
#~ msgstr "Vent"
#
#
#
#
#
#~ msgid "Winddirection Avg."
#~ msgstr "Direcció mitj. del vent"
40 changes: 35 additions & 5 deletions po/cs.po
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: opencpn\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-02-21 17:50+0100\n"
"POT-Creation-Date: 2015-03-13 21:26+0100\n"
"PO-Revision-Date: 2014-12-02 10:38-0500\n"
"Last-Translator: nohal <[email protected]>\n"
"Language-Team: Czech\n"
Expand Down Expand Up @@ -406,7 +406,8 @@ msgstr "Datum"
msgid "Date + Days"
msgstr "Datum + dny"
#
msgid "Date + Month"
#, fuzzy
msgid "Date + Months"
msgstr "Datum + měsíce"
#
msgid "Date + Weeks"
Expand Down Expand Up @@ -1495,9 +1496,6 @@ msgstr ""
msgid "Shutdown Logbook"
msgstr "Zobraz ikonu deníku"
#
msgid "Sign"
msgstr "Značka"
#
msgid "Sorry, Logbook has no lines"
msgstr "Promiň, deník nemá žádné záznamy"
#
Expand Down Expand Up @@ -1551,6 +1549,9 @@ msgstr ""
msgid "Startvalue"
msgstr "Počáteční hodnota"
#
msgid "Status"
msgstr ""
#
msgid "Staysail"
msgstr ""
#
Expand Down Expand Up @@ -2115,14 +2116,23 @@ msgid "yellow"
msgstr ""
#
#
#
#
#
#~ msgid "Install Languages"
#~ msgstr "Instalovat jazyky"
#
#
#
#
#
#~ msgid "Install OpenCPN_Logbook_Languages.zip"
#~ msgstr "Nainstalovat OpenCPN_Logbook_Languages.zip"
#
#
#
#
#
#~ msgid ""
#~ "Languages installed at\n"
#~ "\n"
Expand All @@ -2133,21 +2143,41 @@ msgstr ""
#~ "%s"
#
#
#
#
#
#~ msgid "Please fill in one character in Degrees, Minuts and Seconds"
#~ msgstr "Prosím, vyplň jeden znak do stupňů, minut a sekund"
#
#
#
#
#
#~ msgid "Select zipped Languages-Files"
#~ msgstr "Vyber zabalené soubory s překlady"
#
#
#
#~ msgid "Sign"
#~ msgstr "Značka"
#
#
#
#
#
#~ msgid "W/Strength"
#~ msgstr "V/Síla"
#
#
#
#
#
#~ msgid "Wind"
#~ msgstr "Vítr"
#
#
#
#
#
#~ msgid "Winddirection Avg."
#~ msgstr "Prům. směr větru"
40 changes: 35 additions & 5 deletions po/da.po
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: opencpn\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-02-21 17:50+0100\n"
"POT-Creation-Date: 2015-03-13 21:26+0100\n"
"PO-Revision-Date: 2014-12-02 10:38-0500\n"
"Last-Translator: nohal <[email protected]>\n"
"Language-Team: Danish\n"
Expand Down Expand Up @@ -410,7 +410,8 @@ msgstr "Dato"
msgid "Date + Days"
msgstr "Dato + Dage"
#
msgid "Date + Month"
#, fuzzy
msgid "Date + Months"
msgstr "Dato + Måned"
#
msgid "Date + Weeks"
Expand Down Expand Up @@ -1501,9 +1502,6 @@ msgstr ""
msgid "Shutdown Logbook"
msgstr "Vis logbogs Ikon"
#
msgid "Sign"
msgstr "Aktivitet"
#
msgid "Sorry, Logbook has no lines"
msgstr "Beklager, logbog indeholder ingen linjer"
#
Expand Down Expand Up @@ -1557,6 +1555,9 @@ msgstr ""
msgid "Startvalue"
msgstr "Startværdi"
#
msgid "Status"
msgstr ""
#
msgid "Staysail"
msgstr ""
#
Expand Down Expand Up @@ -2122,14 +2123,23 @@ msgid "yellow"
msgstr ""
#
#
#
#
#
#~ msgid "Install Languages"
#~ msgstr "Installer sprog"
#
#
#
#
#
#~ msgid "Install OpenCPN_Logbook_Languages.zip"
#~ msgstr "Installer OpenCPN_Logbook_Languages.zip"
#
#
#
#
#
#~ msgid ""
#~ "Languages installed at\n"
#~ "\n"
Expand All @@ -2140,21 +2150,41 @@ msgstr ""
#~ "%s"
#
#
#
#
#
#~ msgid "Please fill in one character in Degrees, Minuts and Seconds"
#~ msgstr "Anfør én karakter i Grader, Minutter og Sekunder"
#
#
#
#
#
#~ msgid "Select zipped Languages-Files"
#~ msgstr "Vælg zip pakket Sprog filer"
#
#
#
#~ msgid "Sign"
#~ msgstr "Aktivitet"
#
#
#
#
#
#~ msgid "W/Strength"
#~ msgstr "Vindstyrke"
#
#
#
#
#
#~ msgid "Wind"
#~ msgstr "Vind"
#
#
#
#
#
#~ msgid "Winddirection Avg."
#~ msgstr "Gennemsnitlig vind retning"
Loading

0 comments on commit b053c49

Please sign in to comment.