Menu
▾
▴
ggc-cvs
|
From: <and...@us...> - 2009-04-04 21:11:12
|
Revision: 733
http://ggc.svn.sourceforge.net/ggc/?rev=733&view=rev
Author: andyrozman
Date: 2009-04-04 21:11:01 +0000 (Sat, 04 Apr 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/ggc-cgm/build/build.xml
trunk/ggc-cgm/src/ggc/cgm/util/DataAccessCGM.java
trunk/ggc-core/build/GGCBuild.properties
trunk/ggc-core/build/build.xml
trunk/ggc-desktop/.classpath
trunk/ggc-desktop/build/GGC_Desktop_Version.properties
trunk/ggc-desktop/build/build.xml
trunk/ggc-desktop/data/update/GGC_Update.properties
trunk/ggc-desktop/src/ggc/gui/MainFrame.java
trunk/ggc-desktop/src/ggc/gui/dialogs/PrintingDialog.java
trunk/ggc-meter/build/build.xml
trunk/ggc-meter/src/ggc/meter/util/DataAccessMeter.java
trunk/ggc-pump/build/build.xml
trunk/ggc-pump/src/ggc/pump/data/db/PumpProfile.java
trunk/ggc-pump/src/ggc/pump/manager/company/AbstractPumpDeviceCompany.java
trunk/ggc-pump/src/ggc/pump/manager/company/GenericPumpDevice.java
trunk/ggc-pump/src/ggc/pump/manager/company/Insulet.java
trunk/ggc-pump/src/ggc/pump/test/PumpConsoleTester.java
trunk/ggc-pump/src/ggc/pump/util/DataAccessPump.java
Added Paths:
-----------
trunk/ggc-desktop/build/manifest_ggc.mf
trunk/ggc-desktop/build/manifest_ggc_little.mf
Property Changed:
----------------
trunk/ggc-desktop/data/
Modified: trunk/ggc-cgm/build/build.xml
===================================================================
--- trunk/ggc-cgm/build/build.xml 2009-04-04 20:50:06 UTC (rev 732)
+++ trunk/ggc-cgm/build/build.xml 2009-04-04 21:11:01 UTC (rev 733)
@@ -5,6 +5,8 @@
</description>
<!-- Environment properties read from a file ...-->
+ <property file="../../build/AtechTools.properties"/>
+ <property file="../../ggc-core/build/GGC_Core_Version.properties"/>
<property file="../../ggc-plugin_base/build/GGCPlugInBaseBuild.properties"/>
<property file="../../ggc-plugin_base/build/GGCPlugInBaseVersion.properties"/>
<property file="./GGCCGMSToolVersion.properties"/>
@@ -70,6 +72,7 @@
<classpath>
<pathelement path="${classpath.full}" />
<pathelement path="../../build/deploy_files/ggc-plugin_base-${ggc-plugin-base.version}.jar" />
+ <pathelement path="../../build/deploy_files/ggc-core-${ggc-core.version}.jar" />
</classpath>
</javac>
</target>
Modified: trunk/ggc-cgm/src/ggc/cgm/util/DataAccessCGM.java
===================================================================
--- trunk/ggc-cgm/src/ggc/cgm/util/DataAccessCGM.java 2009-04-04 20:50:06 UTC (rev 732)
+++ trunk/ggc-cgm/src/ggc/cgm/util/DataAccessCGM.java 2009-04-04 21:11:01 UTC (rev 733)
@@ -337,11 +337,13 @@
}
+ /**
+ * Load PlugIns
+ */
@Override
public void loadPlugIns()
{
// TODO Auto-generated method stub
-
}
Modified: trunk/ggc-core/build/GGCBuild.properties
===================================================================
--- trunk/ggc-core/build/GGCBuild.properties 2009-04-04 20:50:06 UTC (rev 732)
+++ trunk/ggc-core/build/GGCBuild.properties 2009-04-04 21:11:01 UTC (rev 733)
@@ -83,6 +83,12 @@
jfreechart.api=${jfreechart.path}/jcommon-1.0.13.jar;${jfreechart.path}/jcommon-xml-1.0.13.jar;${jfreechart.path}/jfreechart-1.0.10.jar
#
+# iText 2.0.7
+#
+iText.api=${utils_path}/iText-2.0.7.jar
+
+
+#
# This is tempory class path entry which is used for developers, which are trying out new apis. If api is
# apporoved it will be added under static_apis_cpath
#
@@ -95,7 +101,7 @@
#
# utils cpath
-utils_cpath=${utils_path}/iText-2.0.7.jar;${utils_path}/skinlf-6.7.jar;
+utils_cpath=${iText.api};${utils_path}/skinlf-6.7.jar;
# hibernate cpath
hibernate_cpath=${hibernate_path}/asm.jar;${hibernate_path}/asm-attrs.jar;${hibernate_path}/c3p0-0.9.0.jar;${hibernate_path}/cglib-2.1.3.jar;${hibernate_path}/commons-collections-2.1.1.jar;${hibernate_path}/commons-logging-1.0.4.jar;${hibernate_path}/dom4j-1.6.1.jar;${hibernate_path}/hibernate3.jar;${hibernate_path}/jdbc2_0-stdext.jar;${hibernate_path}/jta.jar;${hibernate_path}/log4j-1.2.11.jar;${hibernate_path}/ehcache-1.1.jar;${hibernate_path}/commons-lang-2.0.jar;${hibernate_path}/antlr-2.7.6rc1.jar
Modified: trunk/ggc-core/build/build.xml
===================================================================
--- trunk/ggc-core/build/build.xml 2009-04-04 20:50:06 UTC (rev 732)
+++ trunk/ggc-core/build/build.xml 2009-04-04 21:11:01 UTC (rev 733)
@@ -92,6 +92,7 @@
<fileset dir="${build.dir}">
<include name="ggc/core/**"/>
+ <include name="ggc/shared/**"/>
<include name="*.hbm.xml"/>
<exclude name="ggc/gui/**"/>
</fileset>
Modified: trunk/ggc-desktop/.classpath
===================================================================
--- trunk/ggc-desktop/.classpath 2009-04-04 20:50:06 UTC (rev 732)
+++ trunk/ggc-desktop/.classpath 2009-04-04 21:11:01 UTC (rev 733)
@@ -17,5 +17,6 @@
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/ggc-web"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jfreechart-1.0.10"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/GGC Nutrition Tool"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: trunk/ggc-desktop/build/GGC_Desktop_Version.properties
===================================================================
--- trunk/ggc-desktop/build/GGC_Desktop_Version.properties 2009-04-04 20:50:06 UTC (rev 732)
+++ trunk/ggc-desktop/build/GGC_Desktop_Version.properties 2009-04-04 21:11:01 UTC (rev 733)
@@ -7,7 +7,7 @@
#
# Main GUI Version (this version is same as Core always)
#
-ggc-main.version=0.4.3
+ggc-main.version=0.4.4.2
#
Modified: trunk/ggc-desktop/build/build.xml
===================================================================
--- trunk/ggc-desktop/build/build.xml 2009-04-04 20:50:06 UTC (rev 732)
+++ trunk/ggc-desktop/build/build.xml 2009-04-04 21:11:01 UTC (rev 733)
@@ -180,17 +180,5 @@
</target>
- <target name="hbm2java" description="Generate .java from .hbm files." >
- <taskdef name="hbm2java"
- classname="net.sf.hibernate.tool.hbm2java.Hbm2JavaTask"
- classpath="${hibernate.all.classpath.dir}"/>
- <hbm2java output="${source.dir}/hib_new/" >
- <fileset dir="${source.dir}">
- <include name="**/*.hbm.xml"/>
- </fileset>
- </hbm2java>
- </target>
-
-
</project>
Added: trunk/ggc-desktop/build/manifest_ggc.mf
===================================================================
--- trunk/ggc-desktop/build/manifest_ggc.mf (rev 0)
+++ trunk/ggc-desktop/build/manifest_ggc.mf 2009-04-04 21:11:01 UTC (rev 733)
@@ -0,0 +1 @@
+Main-Class: ggc.GGC
Added: trunk/ggc-desktop/build/manifest_ggc_little.mf
===================================================================
--- trunk/ggc-desktop/build/manifest_ggc_little.mf (rev 0)
+++ trunk/ggc-desktop/build/manifest_ggc_little.mf 2009-04-04 21:11:01 UTC (rev 733)
@@ -0,0 +1 @@
+Main-Class: ggc.gui.little.GGCLittle
Property changes on: trunk/ggc-desktop/data
___________________________________________________________________
Modified: svn:ignore
- db
log
temp
import
db2
export
nutrition
+ db
log
temp
import
db2
export
nutrition
print
Modified: trunk/ggc-desktop/data/update/GGC_Update.properties
===================================================================
--- trunk/ggc-desktop/data/update/GGC_Update.properties 2009-04-04 20:50:06 UTC (rev 732)
+++ trunk/ggc-desktop/data/update/GGC_Update.properties 2009-04-04 21:11:01 UTC (rev 733)
@@ -56,7 +56,7 @@
#
# Components
#
-LAST_COMPONENT=19
+LAST_COMPONENT=20
#
@@ -73,17 +73,17 @@
COMPONENT_1_GROUP=1
COMPONENT_1_NAME=GGC Main
-COMPONENT_1_VERSION=0.4.3
-COMPONENT_1_VERSION_NUM=3
+COMPONENT_1_VERSION=0.4.4.2
+COMPONENT_1_VERSION_NUM=4
COMPONENT_1_ROOT_DIR=/lib/ggc
-COMPONENT_1_FILES=%ROOT%/ggc-main-0.4.3.jar
+COMPONENT_1_FILES=%ROOT%/ggc-main-0.4.4.2.jar
COMPONENT_2_GROUP=1
COMPONENT_2_NAME=GGC Core
-COMPONENT_2_VERSION=0.4.3
-COMPONENT_2_VERSION_NUM=3
+COMPONENT_2_VERSION=0.4.4.1
+COMPONENT_2_VERSION_NUM=4
COMPONENT_2_ROOT_DIR=/lib/ggc
-COMPONENT_2_FILES=%ROOT%/ggc-core-0.4.3.jar
+COMPONENT_2_FILES=%ROOT%/ggc-core-0.4.4.1.jar
COMPONENT_3_GROUP=1
COMPONENT_3_NAME=GGC Little
@@ -95,34 +95,41 @@
COMPONENT_4_GROUP=1
COMPONENT_4_NAME=GGC Lang
-COMPONENT_4_VERSION=0.3.1
-COMPONENT_4_VERSION_NUM=2
+COMPONENT_4_VERSION=0.3.4
+COMPONENT_4_VERSION_NUM=3
COMPONENT_4_ROOT_DIR=/lib/ggc
-COMPONENT_4_FILES=%ROOT%/ggc-lang-0.3.1.jar
+COMPONENT_4_FILES=%ROOT%/ggc-lang-0.3.4.jar
COMPONENT_5_GROUP=2
COMPONENT_5_NAME=GGC Plugin Base
-COMPONENT_5_VERSION=0.2.7
-COMPONENT_5_VERSION_NUM=2
+COMPONENT_5_VERSION=0.3.1
+COMPONENT_5_VERSION_NUM=3
COMPONENT_5_ROOT_DIR=/lib/ggc
-COMPONENT_5_FILES=%ROOT%/ggc-plugin_base-0.2.7.jar
+COMPONENT_5_FILES=%ROOT%/ggc-plugin_base-0.3.1.jar
+COMPONENT_20_GROUP=2
+COMPONENT_20_NAME=Nutrition Tool
+COMPONENT_6_VERSION=1.1.1
+COMPONENT_6_VERSION_NUM=1
+COMPONENT_6_ROOT_DIR=/lib/ggc
+COMPONENT_6_FILES=%ROOT%/ggc-nutri_tool-1.1.1.jar
+
COMPONENT_6_GROUP=2
COMPONENT_6_NAME=Meter Tool
-COMPONENT_6_VERSION=1.0.7
-COMPONENT_6_VERSION_NUM=2
+COMPONENT_6_VERSION=1.0.8
+COMPONENT_6_VERSION_NUM=3
COMPONENT_6_ROOT_DIR=/lib/ggc
-COMPONENT_6_FILES=%ROOT%/ggc-meter_tool-1.0.7.jar
+COMPONENT_6_FILES=%ROOT%/ggc-meter_tool-1.0.8.jar
COMPONENT_7_GROUP=2
COMPONENT_7_NAME=Pump Tool
-COMPONENT_7_VERSION=0.2.1
-COMPONENT_7_VERSION_NUM=1
+COMPONENT_7_VERSION=0.4.1
+COMPONENT_7_VERSION_NUM=2
COMPONENT_7_ROOT_DIR=/lib/ggc
-COMPONENT_7_FILES=%ROOT%/ggc-pump_tool-0.2.1.jar
+COMPONENT_7_FILES=%ROOT%/ggc-pump_tool-0.4.1.jar
COMPONENT_8_GROUP=2
@@ -151,10 +158,10 @@
COMPONENT_11_GROUP=3
COMPONENT_11_NAME=Atech Tools
-COMPONENT_11_VERSION=0.3.5
-COMPONENT_11_VERSION_NUM=4
+COMPONENT_11_VERSION=0.3.6
+COMPONENT_11_VERSION_NUM=5
COMPONENT_11_ROOT_DIR=/lib/utils
-COMPONENT_11_FILES=%ROOT%/atech-tools-0.3.5.jar
+COMPONENT_11_FILES=%ROOT%/atech-tools-0.3.6.jar
COMPONENT_12_GROUP=3
COMPONENT_12_NAME=iText Pdf Library
Modified: trunk/ggc-desktop/src/ggc/gui/MainFrame.java
===================================================================
--- trunk/ggc-desktop/src/ggc/gui/MainFrame.java 2009-04-04 20:50:06 UTC (rev 732)
+++ trunk/ggc-desktop/src/ggc/gui/MainFrame.java 2009-04-04 21:11:01 UTC (rev 733)
@@ -110,7 +110,7 @@
// private JLabel lblTest = new JLabel();
- private JMenu menu_file, menu_bgs, menu_food, menu_doctor, menu_printing, menu_tools, menu_help, menu_meters, menu_pumps, menu_data_graphs, menu_cgms /* , menu_misc */;
+ private JMenu menu_file, menu_bgs, /*menu_food,*/ menu_doctor, menu_printing, menu_tools, menu_help, menu_meters, menu_pumps, menu_data_graphs, menu_cgms /* , menu_misc */;
private Hashtable<String, GGCAction> actions = null;
private Hashtable<String, GGCAction> toolbar_items = null;
@@ -432,6 +432,21 @@
{
this.menuBar.add(pic.getPlugInMainMenu());
}
+
+ if (pic.getPlugInPrintMenus()!=null)
+ {
+ System.out.println("Menus found: ");
+ JMenu[] menus = pic.getPlugInPrintMenus();
+
+ for(int i=0; i<menus.length; i++)
+ {
+ this.menu_printing.add(menus[i]);
+ }
+
+ }
+ else
+ System.out.println("Menus NOT found: ");
+
}
//System.out.println("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
@@ -1231,6 +1246,9 @@
return "MainFrame";
}
+ /**
+ * Update
+ */
public void update(Observable obj, Object arg)
{
if (arg instanceof Integer)
@@ -1244,7 +1262,7 @@
}
- public void refreshMenus()
+ private void refreshMenus()
{
System.out.println("Refresh Menus: ");
this.menuBar.removeAll();
@@ -1266,8 +1284,52 @@
this.menuBar.add(this.menu_doctor);
// reports menu
+
+
+ for(Enumeration<String> en= m_da.getPlugins().keys(); en.hasMoreElements(); )
+ {
+ String key = en.nextElement();
+ //System.out.println("Key=" + key);
+
+ PlugInClient pic = m_da.getPlugIn(key);
+
+ if (pic.getPlugInPrintMenus()!=null)
+ {
+ //System.out.println("Menus found: ");
+ JMenu[] menus = pic.getPlugInPrintMenus();
+
+ for(int i=0; i<menus.length; i++)
+ {
+ this.menu_printing.add(menus[i]);
+ }
+
+ }
+ //else
+ // System.out.println("Menus NOT found: ");
+
+ }
+
+
this.menuBar.add(this.menu_printing);
+
+ for(Enumeration<String> en= m_da.getPlugins().keys(); en.hasMoreElements(); )
+ {
+ String key = en.nextElement();
+
+ if (key.equals(DataAccess.PLUGIN_NUTRITION))
+ continue;
+
+ PlugInClient pic = m_da.getPlugIn(key);
+
+ if (pic.getPlugInMainMenu()!=null)
+ {
+ this.menuBar.add(pic.getPlugInMainMenu());
+ }
+ }
+
+
+
this.menuBar.add(this.menu_meters);
this.menuBar.add(this.menu_pumps);
this.menuBar.add(this.menu_cgms);
@@ -1294,19 +1356,14 @@
}
}*/
- System.out.println("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+ //System.out.println("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
}
- public JMenu getPlugInMenu(String name)
+ private JMenu getPlugInMenu(String name)
{
PlugInClient pic = m_da.getPlugIn(name);
-
- System.out.println("PIC: " + pic + " = " + pic.getPlugInMainMenu());
-
-
-
return pic.getPlugInMainMenu();
}
Modified: trunk/ggc-desktop/src/ggc/gui/dialogs/PrintingDialog.java
===================================================================
--- trunk/ggc-desktop/src/ggc/gui/dialogs/PrintingDialog.java 2009-04-04 20:50:06 UTC (rev 732)
+++ trunk/ggc-desktop/src/ggc/gui/dialogs/PrintingDialog.java 2009-04-04 21:11:01 UTC (rev 733)
@@ -252,6 +252,8 @@
}
+
+ @SuppressWarnings("unused")
private void initRange() // throws Exception
{
Modified: trunk/ggc-meter/build/build.xml
===================================================================
--- trunk/ggc-meter/build/build.xml 2009-04-04 20:50:06 UTC (rev 732)
+++ trunk/ggc-meter/build/build.xml 2009-04-04 21:11:01 UTC (rev 733)
@@ -5,10 +5,13 @@
</description>
<!-- Environment properties read from a file ...-->
+ <property file="../../build/AtechTools.properties"/>
+ <property file="../../ggc-core/build/GGC_Core_Version.properties"/>
<property file="../../ggc-plugin_base/build/GGCPlugInBaseBuild.properties"/>
<property file="../../ggc-plugin_base/build/GGCPlugInBaseVersion.properties"/>
<property file="./GGCMeterToolVersion.properties"/>
+
<!-- These should *not* be modified on the command line! -->
<property name="build.dir" value="${outdir.dir}/classes"/>
<property name="deploy.dir" value="${outdir.dir}/deploy"/>
@@ -70,6 +73,7 @@
<classpath>
<pathelement path="${classpath.full}" />
<pathelement path="../../build/deploy_files/ggc-plugin_base-${ggc-plugin-base.version}.jar" />
+ <pathelement path="../../build/deploy_files/ggc-core-${ggc-core.version}.jar" />
</classpath>
</javac>
</target>
Modified: trunk/ggc-meter/src/ggc/meter/util/DataAccessMeter.java
===================================================================
--- trunk/ggc-meter/src/ggc/meter/util/DataAccessMeter.java 2009-04-04 20:50:06 UTC (rev 732)
+++ trunk/ggc-meter/src/ggc/meter/util/DataAccessMeter.java 2009-04-04 21:11:01 UTC (rev 733)
@@ -414,11 +414,13 @@
}
+ /**
+ * Load PlugIns
+ */
@Override
public void loadPlugIns()
{
// TODO Auto-generated method stub
-
}
Modified: trunk/ggc-pump/build/build.xml
===================================================================
--- trunk/ggc-pump/build/build.xml 2009-04-04 20:50:06 UTC (rev 732)
+++ trunk/ggc-pump/build/build.xml 2009-04-04 21:11:01 UTC (rev 733)
@@ -5,6 +5,8 @@
</description>
<!-- Environment properties read from a file ...-->
+ <property file="../../build/AtechTools.properties"/>
+ <property file="../../ggc-core/build/GGC_Core_Version.properties"/>
<property file="../../ggc-plugin_base/build/GGCPlugInBaseBuild.properties"/>
<property file="../../ggc-plugin_base/build/GGCPlugInBaseVersion.properties"/>
<property file="./GGCPumpToolVersion.properties"/>
@@ -69,6 +71,7 @@
<classpath>
<pathelement path="${classpath.full}" />
<pathelement path="../../build/deploy_files/ggc-plugin_base-${ggc-plugin-base.version}.jar" />
+ <pathelement path="../../build/deploy_files/ggc-core-${ggc-core.version}.jar" />
</classpath>
</javac>
</target>
Modified: trunk/ggc-pump/src/ggc/pump/data/db/PumpProfile.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/data/db/PumpProfile.java 2009-04-04 20:50:06 UTC (rev 732)
+++ trunk/ggc-pump/src/ggc/pump/data/db/PumpProfile.java 2009-04-04 21:11:01 UTC (rev 733)
@@ -16,6 +16,7 @@
import com.atech.i18n.I18nControlAbstract;
import com.atech.utils.ATechDate;
+// TODO: Auto-generated Javadoc
/**
* Application: GGC - GNU Gluco Control
*
@@ -51,7 +52,15 @@
private static final long serialVersionUID = 4355479385042532802L;
private boolean selected = false;
+
+ /**
+ * The ic.
+ */
I18nControl ic = null; // (I18nControl)DataAccess.getInstance().getI18nControlInstance();
+
+ /**
+ * The backup_mode.
+ */
boolean backup_mode = false;
/**
@@ -528,12 +537,18 @@
+ /**
+ * Get Column Count
+ */
public int getColumnCount()
{
return 3;
}
+ /**
+ * Get Column Name
+ */
public String getColumnName(int num)
{
switch (num)
@@ -551,6 +566,9 @@
}
+ /**
+ * getColumnValue
+ */
public String getColumnValue(int num)
{
switch (num)
@@ -571,6 +589,9 @@
}
+ /**
+ * getColumnValueObject
+ */
public Object getColumnValueObject(int num)
{
switch (num)
@@ -591,6 +612,9 @@
}
+ /**
+ * getColumnWidth
+ */
public int getColumnWidth(int num, int width)
{
switch (num)
@@ -606,12 +630,18 @@
}
+ /**
+ * getItemId
+ */
public long getItemId()
{
return this.getId();
}
+ /**
+ * getShortDescription
+ */
public String getShortDescription()
{
// TODO Auto-generated method stub
@@ -619,18 +649,27 @@
}
+ /**
+ * isFound
+ */
public boolean isFound(String text)
{
return true;
}
+ /**
+ * isFound
+ */
public boolean isFound(int value)
{
return true;
}
+ /**
+ * isFound
+ */
public boolean isFound(int from, int till, int state)
{
switch(state)
@@ -651,6 +690,9 @@
+ /**
+ * setSearchContext
+ */
public void setSearchContext()
{
// TODO Auto-generated method stub
Modified: trunk/ggc-pump/src/ggc/pump/manager/company/AbstractPumpDeviceCompany.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/manager/company/AbstractPumpDeviceCompany.java 2009-04-04 20:50:06 UTC (rev 732)
+++ trunk/ggc-pump/src/ggc/pump/manager/company/AbstractPumpDeviceCompany.java 2009-04-04 21:11:01 UTC (rev 733)
@@ -5,18 +5,36 @@
import com.atech.i18n.I18nControlAbstract;
+// TODO: Auto-generated Javadoc
+/**
+ * The Class AbstractPumpDeviceCompany.
+ */
public abstract class AbstractPumpDeviceCompany extends AbstractDeviceCompany
{
+ /**
+ * The profile_names
+ */
protected String[] profile_names;
+ /**
+ * Instantiates a new abstract pump device company
+ *
+ * @param ic the ic
+ * @param value the value
+ */
public AbstractPumpDeviceCompany(I18nControlAbstract ic, boolean value)
{
super(ic, value);
}
+ /**
+ * Gets the profile names
+ *
+ * @return the profile names
+ */
public String[] getProfileNames()
{
return this.profile_names;
Modified: trunk/ggc-pump/src/ggc/pump/manager/company/GenericPumpDevice.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/manager/company/GenericPumpDevice.java 2009-04-04 20:50:06 UTC (rev 732)
+++ trunk/ggc-pump/src/ggc/pump/manager/company/GenericPumpDevice.java 2009-04-04 21:11:01 UTC (rev 733)
@@ -8,10 +8,49 @@
import ggc.plugin.protocol.ConnectionProtocols;
import ggc.pump.device.AbstractPump;
+// TODO: Auto-generated Javadoc
+/**
+ * Application: GGC - GNU Gluco Control
+ * Plug-in: Pump Tool (support for Pump devices)
+ *
+ * See AUTHORS for copyright information.
+ *
+ * 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
+ *
+ * Filename: Generic Pump Device
+ * Description: Generic Pump Device used for getting profile names for specified
+ * pump company.
+ *
+ * Author: Andy {an...@at...}
+ */
+
+
+
public class GenericPumpDevice extends AbstractPump
{
+
+ /**
+ * The apdc.
+ */
AbstractPumpDeviceCompany apdc;
+ /**
+ * Instantiates a new generic pump device.
+ *
+ * @param apdc the apdc
+ */
public GenericPumpDevice(AbstractPumpDeviceCompany apdc)
{
this.apdc = apdc;
@@ -75,6 +114,9 @@
+ /**
+ * getProfileNames
+ */
public String[] getProfileNames()
{
return this.apdc.getProfileNames();
@@ -82,6 +124,9 @@
+ /**
+ * close
+ */
public void close() throws PlugInBaseException
{
// TODO Auto-generated method stub
@@ -89,6 +134,9 @@
}
+ /**
+ * getAlarmMappings
+ */
public Hashtable<String, Integer> getAlarmMappings()
{
// TODO Auto-generated method stub
@@ -96,6 +144,9 @@
}
+ /**
+ * getBolusMappings
+ */
public Hashtable<String, Integer> getBolusMappings()
{
// TODO Auto-generated method stub
@@ -103,6 +154,9 @@
}
+ /**
+ * getDeviceInfo
+ */
public DeviceIdentification getDeviceInfo()
{
// TODO Auto-generated method stub
@@ -110,6 +164,9 @@
}
+ /**
+ * getErrorMappings
+ */
public Hashtable<String, Integer> getErrorMappings()
{
// TODO Auto-generated method stub
@@ -117,6 +174,9 @@
}
+ /**
+ * getEventMappings
+ */
public Hashtable<String, Integer> getEventMappings()
{
// TODO Auto-generated method stub
@@ -124,6 +184,9 @@
}
+ /**
+ * getMaxMemoryRecords
+ */
public int getMaxMemoryRecords()
{
// TODO Auto-generated method stub
@@ -131,6 +194,9 @@
}
+ /**
+ * getReportMappings
+ */
public Hashtable<String, Integer> getReportMappings()
{
// TODO Auto-generated method stub
@@ -138,6 +204,9 @@
}
+ /**
+ * loadPumpSpecificValues
+ */
public void loadPumpSpecificValues()
{
// TODO Auto-generated method stub
@@ -145,6 +214,9 @@
}
+ /**
+ * open
+ */
public boolean open() throws PlugInBaseException
{
// TODO Auto-generated method stub
@@ -152,6 +224,9 @@
}
+ /**
+ * dispose
+ */
public void dispose()
{
// TODO Auto-generated method stub
@@ -159,6 +234,9 @@
}
+ /**
+ * getComment
+ */
public String getComment()
{
// TODO Auto-generated method stub
@@ -166,6 +244,9 @@
}
+ /**
+ * getDeviceClassName
+ */
public String getDeviceClassName()
{
// TODO Auto-generated method stub
@@ -173,6 +254,9 @@
}
+ /**
+ * getDeviceId
+ */
public int getDeviceId()
{
// TODO Auto-generated method stub
@@ -180,6 +264,9 @@
}
+ /**
+ * getDeviceSpecialComment
+ */
public String getDeviceSpecialComment()
{
// TODO Auto-generated method stub
@@ -187,6 +274,9 @@
}
+ /**
+ * getIconName
+ */
public String getIconName()
{
// TODO Auto-generated method stub
@@ -194,6 +284,9 @@
}
+ /**
+ * getImplementationStatus
+ */
public int getImplementationStatus()
{
// TODO Auto-generated method stub
@@ -201,6 +294,9 @@
}
+ /**
+ * getInstructions
+ */
public String getInstructions()
{
// TODO Auto-generated method stub
@@ -208,6 +304,9 @@
}
+ /**
+ * hasSpecialProgressStatus
+ */
public boolean hasSpecialProgressStatus()
{
// TODO Auto-generated method stub
@@ -215,6 +314,9 @@
}
+ /**
+ * isDeviceCommunicating
+ */
public boolean isDeviceCommunicating()
{
// TODO Auto-generated method stub
@@ -222,6 +324,9 @@
}
+ /**
+ * readConfiguration
+ */
public void readConfiguration() throws PlugInBaseException
{
// TODO Auto-generated method stub
@@ -229,6 +334,9 @@
}
+ /**
+ * readDeviceDataFull
+ */
public void readDeviceDataFull() throws PlugInBaseException
{
// TODO Auto-generated method stub
@@ -236,6 +344,9 @@
}
+ /**
+ * readDeviceDataPartitial
+ */
public void readDeviceDataPartitial() throws PlugInBaseException
{
// TODO Auto-generated method stub
@@ -243,6 +354,9 @@
}
+ /**
+ * readInfo
+ */
public void readInfo() throws PlugInBaseException
{
// TODO Auto-generated method stub
Modified: trunk/ggc-pump/src/ggc/pump/manager/company/Insulet.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/manager/company/Insulet.java 2009-04-04 20:50:06 UTC (rev 732)
+++ trunk/ggc-pump/src/ggc/pump/manager/company/Insulet.java 2009-04-04 21:11:01 UTC (rev 733)
@@ -1,35 +1,5 @@
-/*
- * GGC - GNU Gluco Control
- *
- * A pure java app to help you manage your diabetes.
- *
- * See AUTHORS for copyright information.
- *
- * 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
- *
- * Filename: MeterManager.java
- * Purpose: This class contains all definitions for Meters. This includes:
- * meter names, classes that handle meter and all other relevant data.
- *
- * Author: andyrozman
- */
-
-
package ggc.pump.manager.company;
-import ggc.plugin.manager.company.AbstractDeviceCompany;
import ggc.pump.manager.PumpManager;
import ggc.pump.util.I18nControl;
Modified: trunk/ggc-pump/src/ggc/pump/test/PumpConsoleTester.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/test/PumpConsoleTester.java 2009-04-04 20:50:06 UTC (rev 732)
+++ trunk/ggc-pump/src/ggc/pump/test/PumpConsoleTester.java 2009-04-04 21:11:01 UTC (rev 733)
@@ -11,6 +11,7 @@
import com.atech.utils.TimeZoneUtil;
import com.atech.utils.TimerThread;
+// TODO: Auto-generated Javadoc
/**
* Application: GGC - GNU Gluco Control
* Plug-in: Pump Tool (support for Pump devices)
@@ -42,6 +43,9 @@
{
+ /**
+ * The thread.
+ */
TimerThread thread;
/**
@@ -126,10 +130,13 @@
}
+ /**
+ * Something.
+ */
public static void something()
{
- String input = "0-400=0.2";
- String[] ss = input.split("[-=]");
+ //String input = "0-400=0.2";
+ //String[] ss = input.split("[-=]");
Modified: trunk/ggc-pump/src/ggc/pump/util/DataAccessPump.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/util/DataAccessPump.java 2009-04-04 20:50:06 UTC (rev 732)
+++ trunk/ggc-pump/src/ggc/pump/util/DataAccessPump.java 2009-04-04 21:11:01 UTC (rev 733)
@@ -27,6 +27,7 @@
import com.atech.graphics.components.about.LibraryInfoEntry;
import com.atech.i18n.I18nControlAbstract;
+// TODO: Auto-generated Javadoc
/**
* Application: GGC - GNU Gluco Control
* Plug-in: Pump Tool (support for Pump devices)
@@ -67,16 +68,50 @@
private PumpManager m_pumpManager = null;
+ /**
+ * The m_pump_base_type.
+ */
PumpBaseType m_pump_base_type = null;
+
+ /**
+ * The m_pump_bolus_type.
+ */
PumpBolusType m_pump_bolus_type = null;
+
+ /**
+ * The m_pump_basal_type.
+ */
PumpBasalSubType m_pump_basal_type = null;
+
+ /**
+ * The m_pump_report.
+ */
PumpReport m_pump_report = null;
+
+ /**
+ * The m_pump_add_type.
+ */
PumpAdditionalDataType m_pump_add_type = null;
+
+ /**
+ * The m_pump_alarms.
+ */
PumpAlarms m_pump_alarms = null;
+
+ /**
+ * The m_pump_events.
+ */
PumpEvents m_pump_events = null;
+
+ /**
+ * The m_pump_errors.
+ */
PumpErrors m_pump_errors = null;
// GGCPumpDb m_db = null;
+ /**
+ * The selected_person_id.
+ */
long selected_person_id = 0;
// ********************************************************
@@ -510,7 +545,14 @@
// ****** Db *****
// ********************************************************
+ /**
+ * The m_db.
+ */
GGCPumpDb m_db;
+
+ /**
+ * The hdb.
+ */
HibernateDb hdb;
/**
@@ -641,6 +683,9 @@
}
+ /**
+ * Load PlugIns
+ */
@Override
public void loadPlugIns()
{
@@ -665,11 +710,21 @@
// configuration settings
+ /**
+ * Gets the max basal value.
+ *
+ * @return the max basal value
+ */
public float getMaxBasalValue()
{
return 8.0f;
}
+ /**
+ * Gets the basal step.
+ *
+ * @return the basal step
+ */
public float getBasalStep()
{
return 0.1f;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2009-04-06 07:51:53
|
Revision: 739
http://ggc.svn.sourceforge.net/ggc/?rev=739&view=rev
Author: andyrozman
Date: 2009-04-06 07:51:48 +0000 (Mon, 06 Apr 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/ggc-core/src/GGC_en.properties
trunk/ggc-core/src/ggc/core/db/tool/transfer/ExportNutritionDb.java
trunk/ggc-core/src/ggc/core/db/tool/transfer/GGCBackupRestoreRunner.java
trunk/ggc-core/src/ggc/core/db/tool/transfer/GGCExporter.java
trunk/ggc-core/src/ggc/core/util/DataAccess.java
trunk/ggc-nutri/src/ggc/nutri/plugin/NutriPlugInServer.java
trunk/ggc-pump/build/GGCPumpToolVersion.properties
trunk/ggc-pump/docs/Changelog
trunk/ggc-pump/src/GGCPumpTool_en.properties
trunk/ggc-pump/src/ggc/pump/data/bre/BREData.java
trunk/ggc-pump/src/ggc/pump/gui/manual/PumpDataTypeComponent.java
trunk/ggc-pump/src/ggc/pump/gui/profile/ProfileSelector.java
trunk/ggc-pump/src/ggc/pump/gui/profile/ProfileSelectorPump.java
trunk/ggc-pump/src/ggc/pump/plugin/PumpPlugInServer.java
trunk/ggc-pump/src/ggc/pump/util/DataAccessPump.java
trunk/ggc-support/lib/utils/atech-tools-0.3.6.jar
Added Paths:
-----------
trunk/ggc-nutri/src/ggc/nutri/plugin/BackupRestoreNutriHandler.java
trunk/ggc-pump/src/ggc/pump/db/
trunk/ggc-pump/src/ggc/pump/db/PumpData.java
trunk/ggc-pump/src/ggc/pump/db/PumpDataExtended.java
trunk/ggc-pump/src/ggc/pump/db/PumpProfile.java
trunk/ggc-pump/src/ggc/pump/plugin/BackupRestorePumpHandler.java
Removed Paths:
-------------
trunk/ggc-core/src/ggc/core/db/datalayer/PumpData.java
trunk/ggc-core/src/ggc/core/db/datalayer/PumpDataExtended.java
trunk/ggc-core/src/ggc/core/db/datalayer/PumpProfile.java
Modified: trunk/ggc-core/src/GGC_en.properties
===================================================================
--- trunk/ggc-core/src/GGC_en.properties 2009-04-04 22:49:23 UTC (rev 738)
+++ trunk/ggc-core/src/GGC_en.properties 2009-04-06 07:51:48 UTC (rev 739)
@@ -893,10 +893,3 @@
DEVICES_USED=Devices Used (Configured)
PLUGINS=Plug-ins
-#
-# Pump Plugin
-#
-PUMP_TOOL=Pump Tool
-PUMP_DATA=Pump Data
-PUMP_DATA_EXTENDED=Pump Data Extended
-PUMP_PROFILE=Pump Profile
\ No newline at end of file
Deleted: trunk/ggc-core/src/ggc/core/db/datalayer/PumpData.java
===================================================================
--- trunk/ggc-core/src/ggc/core/db/datalayer/PumpData.java 2009-04-04 22:49:23 UTC (rev 738)
+++ trunk/ggc-core/src/ggc/core/db/datalayer/PumpData.java 2009-04-06 07:51:48 UTC (rev 739)
@@ -1,498 +0,0 @@
-package ggc.core.db.datalayer;
-
-import ggc.core.db.hibernate.pump.PumpDataH;
-import ggc.core.util.DataAccess;
-import ggc.core.util.I18nControl;
-
-import java.util.ArrayList;
-
-import org.hibernate.Session;
-import org.hibernate.Transaction;
-
-import com.atech.db.hibernate.DatabaseObjectHibernate;
-import com.atech.db.hibernate.transfer.BackupRestoreObject;
-import com.atech.graphics.components.tree.CheckBoxTreeNodeInterface;
-import com.atech.i18n.I18nControlAbstract;
-
-/**
- * Application: GGC - GNU Gluco Control
- *
- * See AUTHORS for copyright information.
- *
- * 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
- *
- * Filename: FoodDescription
- * Description: This is DataLayer file (data file, with methods to work with database or in
- * this case Hibernate). This one is used for FoodDescriptionH and FoodUserDescriptionH.
- * This one is also BackupRestoreObject.
- * File is not YET DataLayer File at least not active
- *
- * Author: andyrozman {an...@at...}
- */
-
-// TODO: DL
-
-public class PumpData extends PumpDataH implements BackupRestoreObject, DatabaseObjectHibernate
-{
-
- private static final long serialVersionUID = -2783864807987398195L;
- private boolean selected = false;
- I18nControl ic = null; // (I18nControl)DataAccess.getInstance().getI18nControlInstance();
-
-
- /**
- * Constructor
- */
- public PumpData()
- {
- }
-
-
- /**
- * Constructor
- *
- * @param ch
- */
- public PumpData(PumpDataH ch)
- {
- this.setId(ch.getId());
- this.setDt_info(ch.getDt_info());
- this.setBase_type(ch.getBase_type());
- this.setSub_type(ch.getSub_type());
- this.setValue(ch.getValue());
- this.setExtended(ch.getExtended());
- this.setPerson_id(ch.getPerson_id());
- this.setComment(ch.getComment());
- this.setChanged(ch.getChanged());
- }
-
-
- /**
- * Constructor
- *
- * @param ic
- */
- public PumpData(I18nControlAbstract ic)
- {
- this.ic = (I18nControl)ic;
- }
-
-
- //---
- //--- BackupRestoreObject
- //---
-
-
-
- /**
- * Get Target Name
- *
- * @see com.atech.db.hibernate.transfer.BackupRestoreBase#getTargetName()
- */
- public String getTargetName()
- {
- return ic.getMessage("PUMP_DATA");
- }
-
- /**
- * Get Name
- * @return
- */
- public String getName()
- {
- return this.getTargetName();
- }
-
- /**
- * getBackupClassName - name of class which will be updated/restored
- *
- * @return
- */
- public String getClassName()
- {
- return "ggc.core.db.hibernate.pump.PumpDataH";
- }
-
-
- /**
- * To String
- *
- * @see java.lang.Object#toString()
- */
- public String toString()
- {
- return this.getTargetName();
- }
-
-
- /**
- * getChildren
- */
- public ArrayList<CheckBoxTreeNodeInterface> getNodeChildren()
- {
- return null;
- }
-
- /**
- * isSelected
- */
- public boolean isSelected()
- {
- return selected;
- }
-
- /**
- * setSelected
- */
- public void setSelected(boolean newValue)
- {
- this.selected = newValue;
- }
-
- /**
- * Is Object Collection
- *
- * @return true if it has children
- */
- public boolean isCollection()
- {
- return false;
- }
-
-
- /**
- * Has Children
- */
- public boolean hasNodeChildren()
- {
- return false;
- }
-
-
- /**
- * DbAdd - Add this object to database
- *
- * @param sess Hibernate Session object
- * @throws Exception (HibernateException) with error
- * @return id in type of String
- */
- public String DbAdd(Session sess) throws Exception
- {
- Transaction tx = sess.beginTransaction();
-
- PumpDataH ch = new PumpDataH();
-
- ch.setId(this.getId());
- ch.setDt_info(this.getDt_info());
- ch.setBase_type(this.getBase_type());
- ch.setSub_type(this.getSub_type());
- ch.setValue(this.getValue());
- ch.setExtended(this.getExtended());
- ch.setPerson_id(this.getPerson_id());
- ch.setComment(this.getComment());
- ch.setChanged(System.currentTimeMillis());
-
- Long id = (Long) sess.save(ch);
- tx.commit();
- ch.setId(id.longValue());
-
- return "" + id.longValue();
- }
-
-
- /**
- * DbDelete - Delete this object in database
- *
- * @param sess Hibernate Session object
- * @throws Exception (HibernateException) with error
- * @return true if action done or Exception if not
- */
- public boolean DbDelete(Session sess) throws Exception
- {
- Transaction tx = sess.beginTransaction();
-
- PumpDataH ch = (PumpDataH) sess.get(PumpDataH.class, new Long(this.getId()));
-
- sess.delete(ch);
- tx.commit();
-
- return true;
- }
-
-
- /**
- * DbEdit - Edit this object in database
- *
- * @param sess Hibernate Session object
- * @throws Exception (HibernateException) with error
- * @return true if action done or Exception if not
- */
- public boolean DbEdit(Session sess) throws Exception
- {
- Transaction tx = sess.beginTransaction();
-
- PumpDataH ch = (PumpDataH) sess.get(PumpDataH.class, new Long(this.getId()));
-
- ch.setId(this.getId());
- ch.setDt_info(this.getDt_info());
- ch.setBase_type(this.getBase_type());
- ch.setSub_type(this.getSub_type());
- ch.setValue(this.getValue());
- ch.setExtended(this.getExtended());
- ch.setPerson_id(this.getPerson_id());
- ch.setComment(this.getComment());
- ch.setChanged(System.currentTimeMillis());
-
- sess.update(ch);
- tx.commit();
-
- return true;
- }
-
-
- /**
- * DbGet - Loads this object. Id must be set.
- *
- * @param sess Hibernate Session object
- * @throws Exception (HibernateException) with error
- * @return true if action done or Exception if not
- */
- public boolean DbGet(Session sess) throws Exception
- {
- PumpDataH ch = (PumpDataH) sess.get(PumpDataH.class, new Long(this.getId()));
-
- this.setId(ch.getId());
- this.setDt_info(ch.getDt_info());
- this.setBase_type(ch.getBase_type());
- this.setSub_type(ch.getSub_type());
- this.setValue(ch.getValue());
- this.setExtended(ch.getExtended());
- this.setPerson_id(ch.getPerson_id());
- this.setComment(ch.getComment());
- this.setChanged(ch.getChanged());
-
- return true;
- }
-
-
- /**
- * DbHasChildren - Shows if this entry has any children object, this is needed for delete
- *
- * @param sess Hibernate Session object
- * @throws Exception (HibernateException) with error
- * @return true if action done or Exception if not
- */
- public boolean DbHasChildren(Session sess) throws Exception
- {
- return false;
- }
-
- /**
- * getAction
- */
- public int getAction()
- {
- return 0;
- }
-
- /**
- * Table Version
- */
- public int TABLE_VERSION = 1;
-
-
- /**
- * Get Table Version - returns version of table
- *
- * @return version information
- */
- public int getTableVersion()
- {
- return this.TABLE_VERSION;
- }
-
-
- /**
- * dbExport - returns export String, for current version
- *
- * @return line that will be exported
- * @throws Exception if export for table is not supported
- */
- public String dbExport(int table_version) throws Exception
- {
- // version is ignored for now
-
- StringBuffer sb = new StringBuffer();
-
- sb.append(this.getId());
- sb.append("|");
- sb.append(this.getDt_info());
- sb.append("|");
- sb.append(this.getBase_type());
- sb.append("|");
- sb.append(this.getSub_type());
- sb.append("|");
- sb.append(this.getValue());
- sb.append("|");
- sb.append(this.getExtended());
- sb.append("|");
- sb.append(this.getPerson_id());
- sb.append("|");
- sb.append(this.getComment());
- sb.append("|");
- sb.append(this.getChanged());
-
- return sb.toString();
- }
-
-
- /**
- * dbExport - returns export String, for current version
- *
- * @return line that will be exported
- * @throws Exception if export for table is not supported
- */
- public String dbExport() throws Exception
- {
- return dbExport(this.TABLE_VERSION);
- }
-
-
- /**
- * dbExportHeader - header for export file
- *
- * @param table_version
- * @return
- */
- public String dbExportHeader(int table_version)
- {
- return "; Columns: id|dt_info|base_type|sub_type|value|extended|person_id|comment|changed\n" +
- "; Table version: " + getTableVersion() + "\n";
- }
-
-
- /**
- * dbExportHeader - header for export file
- *
- * @return
- */
- public String dbExportHeader()
- {
- return this.dbExportHeader(this.TABLE_VERSION);
- }
-
-
- /**
- * dbImport - processes input entry to right fields
- *
- * @param table_version version of table
- * @param value_entry whole import line
- * @throws Exception if import for selected table version is not supported or it fails
- */
- public void dbImport(int table_version, String value_entry) throws Exception
- {
- dbImport(table_version, value_entry, null);
- }
-
-
- /**
- * dbImport - processes input entry to right fields
- *
- * @param table_version version of table
- * @param value_entry whole import line
- * @param parameters parameters
- * @throws Exception if import for selected table version is not supported or it fails
- */
- public void dbImport(int table_version, String value_entry, Object[] parameters) throws Exception
- {
- DataAccess da = DataAccess.getInstance();
-
- value_entry = DataAccess.getInstance().replaceExpression(value_entry, "||", "| |");
- String[] arr = da.splitString(value_entry, "|");
-
- this.setId(da.getLongValueFromString(arr[0]));
- this.setDt_info(da.getLongValueFromString(arr[1]));
- this.setBase_type(da.getIntValueFromString(arr[2]));
- this.setSub_type(da.getIntValueFromString(arr[3]));
- this.setValue(arr[4]);
- this.setExtended(arr[5]);
- this.setPerson_id(da.getIntValueFromString(arr[6]));
- this.setComment(arr[7]);
- this.setChanged(da.getLongValueFromString(arr[8]));
-
- }
-
-
-
- /**
- * getBackupFile - name of backup file (base part)
- *
- * @return
- */
- public String getBackupFile()
- {
- return "PumpDataH";
- }
-
- /**
- * getBackupClassName - name of class which will be updated/restored
- *
- * @return
- */
- public String getBackupClassName()
- {
- return "ggc.core.db.hibernate.pump.PumpDataH";
- }
-
-
- /**
- * getObjectName
- */
- public String getObjectName()
- {
- return "PumpData";
- }
-
- /**
- * isDebugMode
- */
- public boolean isDebugMode()
- {
- return false;
- }
-
-
-
- /**
- * getObjectUniqueId - get id of object
- * @return unique object id
- */
- public String getObjectUniqueId()
- {
- return "";
- }
-
- /**
- * Has To Be Clean - if table needs to be cleaned before import
- *
- * @return true if we need to clean
- */
- public boolean hasToBeCleaned()
- {
- return false;
- }
-
-
-}
\ No newline at end of file
Deleted: trunk/ggc-core/src/ggc/core/db/datalayer/PumpDataExtended.java
===================================================================
--- trunk/ggc-core/src/ggc/core/db/datalayer/PumpDataExtended.java 2009-04-04 22:49:23 UTC (rev 738)
+++ trunk/ggc-core/src/ggc/core/db/datalayer/PumpDataExtended.java 2009-04-06 07:51:48 UTC (rev 739)
@@ -1,494 +0,0 @@
-package ggc.core.db.datalayer;
-
-import ggc.core.db.hibernate.pump.PumpDataExtendedH;
-import ggc.core.util.DataAccess;
-import ggc.core.util.I18nControl;
-
-import java.util.ArrayList;
-
-import org.hibernate.Session;
-import org.hibernate.Transaction;
-
-import com.atech.db.hibernate.DatabaseObjectHibernate;
-import com.atech.db.hibernate.transfer.BackupRestoreObject;
-import com.atech.graphics.components.tree.CheckBoxTreeNodeInterface;
-import com.atech.i18n.I18nControlAbstract;
-
-/**
- * Application: GGC - GNU Gluco Control
- *
- * See AUTHORS for copyright information.
- *
- * 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
- *
- * Filename: FoodDescription
- * Description: This is DataLayer file (data file, with methods to work with database or in
- * this case Hibernate). This one is used for FoodDescriptionH and FoodUserDescriptionH.
- * This one is also BackupRestoreObject.
- * File is not YET DataLayer File at least not active
- *
- * Author: andyrozman {an...@at...}
- */
-
-// TODO: DL
-
-public class PumpDataExtended extends PumpDataExtendedH implements BackupRestoreObject, DatabaseObjectHibernate
-{
-
- private static final long serialVersionUID = 5635575801093325353L;
- private boolean selected = false;
- I18nControl ic = null; // (I18nControl)DataAccess.getInstance().getI18nControlInstance();
-
-
- /**
- * Constructor
- */
- public PumpDataExtended()
- {
- }
-
-
- /**
- * Constructor
- *
- * @param ch
- */
- public PumpDataExtended(PumpDataExtendedH ch)
- {
- this.setId(ch.getId());
- this.setDt_info(ch.getDt_info());
- this.setType(ch.getType());
- this.setValue(ch.getValue());
- this.setExtended(ch.getExtended());
- this.setPerson_id(ch.getPerson_id());
- this.setComment(ch.getComment());
- this.setChanged(ch.getChanged());
- }
-
-
- /**
- * Constructor
- *
- * @param ic
- */
- public PumpDataExtended(I18nControlAbstract ic)
- {
- this.ic = (I18nControl)ic;
- }
-
-
- //---
- //--- BackupRestoreObject
- //---
-
-
-
- /**
- * Get Target Name
- *
- * @see com.atech.db.hibernate.transfer.BackupRestoreBase#getTargetName()
- */
- public String getTargetName()
- {
- return ic.getMessage("PUMP_DATA_EXTENDED");
- }
-
- /**
- * Get Name
- * @return
- */
- public String getName()
- {
- return this.getTargetName();
- }
-
- /**
- * getBackupClassName - name of class which will be updated/restored
- *
- * @return
- */
- public String getClassName()
- {
- return "ggc.core.db.hibernate.pump.PumpDataExtendedH";
- }
-
-
- /**
- * To String
- *
- * @see java.lang.Object#toString()
- */
- public String toString()
- {
- return this.getTargetName();
- }
-
-
- /**
- * getChildren
- */
- public ArrayList<CheckBoxTreeNodeInterface> getNodeChildren()
- {
- return null;
- }
-
- /**
- * isSelected
- */
- public boolean isSelected()
- {
- return selected;
- }
-
- /**
- * setSelected
- */
- public void setSelected(boolean newValue)
- {
- this.selected = newValue;
- }
-
- /**
- * Is Object Collection
- *
- * @return true if it has children
- */
- public boolean isCollection()
- {
- return false;
- }
-
-
- /**
- * Has Children
- */
- public boolean hasNodeChildren()
- {
- return false;
- }
-
-
- /**
- * DbAdd - Add this object to database
- *
- * @param sess Hibernate Session object
- * @throws Exception (HibernateException) with error
- * @return id in type of String
- */
- public String DbAdd(Session sess) throws Exception
- {
- Transaction tx = sess.beginTransaction();
-
- PumpDataExtendedH ch = new PumpDataExtendedH();
-
- ch.setId(this.getId());
- ch.setDt_info(this.getDt_info());
- ch.setType(this.getType());
- ch.setValue(this.getValue());
- ch.setExtended(this.getExtended());
- ch.setPerson_id(this.getPerson_id());
- ch.setComment(this.getComment());
- ch.setChanged(System.currentTimeMillis());
-
- Long id = (Long) sess.save(ch);
- tx.commit();
- ch.setId(id.longValue());
-
- return "" + id.longValue();
- }
-
-
- /**
- * DbDelete - Delete this object in database
- *
- * @param sess Hibernate Session object
- * @throws Exception (HibernateException) with error
- * @return true if action done or Exception if not
- */
- public boolean DbDelete(Session sess) throws Exception
- {
- Transaction tx = sess.beginTransaction();
-
- PumpDataExtendedH ch = (PumpDataExtendedH) sess.get(PumpDataExtendedH.class, new Long(this.getId()));
-
- sess.delete(ch);
- tx.commit();
-
- return true;
- }
-
-
- /**
- * DbEdit - Edit this object in database
- *
- * @param sess Hibernate Session object
- * @throws Exception (HibernateException) with error
- * @return true if action done or Exception if not
- */
- public boolean DbEdit(Session sess) throws Exception
- {
-
- Transaction tx = sess.beginTransaction();
-
- PumpDataExtendedH ch = (PumpDataExtendedH) sess.get(PumpDataExtendedH.class, new Long(this.getId()));
-
- ch.setId(this.getId());
- ch.setDt_info(this.getDt_info());
- ch.setType(this.getType());
- ch.setValue(this.getValue());
- ch.setExtended(this.getExtended());
- ch.setPerson_id(this.getPerson_id());
- ch.setComment(this.getComment());
- ch.setChanged(System.currentTimeMillis());
-
- sess.update(ch);
- tx.commit();
-
- return true;
-
- }
-
-
- /**
- * DbGet - Loads this object. Id must be set.
- *
- * @param sess Hibernate Session object
- * @throws Exception (HibernateException) with error
- * @return true if action done or Exception if not
- */
- public boolean DbGet(Session sess) throws Exception
- {
- PumpDataExtendedH ch = (PumpDataExtendedH) sess.get(PumpDataExtendedH.class, new Long(this.getId()));
-
- this.setId(ch.getId());
- this.setDt_info(ch.getDt_info());
- this.setType(ch.getType());
- this.setValue(ch.getValue());
- this.setExtended(ch.getExtended());
- this.setPerson_id(ch.getPerson_id());
- this.setComment(ch.getComment());
- this.setChanged(ch.getChanged());
-
- return true;
- }
-
-
- /**
- * DbHasChildren - Shows if this entry has any children object, this is needed for delete
- *
- * @param sess Hibernate Session object
- * @throws Exception (HibernateException) with error
- * @return true if action done or Exception if not
- */
- public boolean DbHasChildren(Session sess) throws Exception
- {
- return false;
- }
-
- /**
- * getAction
- */
- public int getAction()
- {
- return 0;
- }
-
- /**
- * Table Version
- */
- public int TABLE_VERSION = 1;
-
-
- /**
- * Get Table Version - returns version of table
- *
- * @return version information
- */
- public int getTableVersion()
- {
- return this.TABLE_VERSION;
- }
-
-
- /**
- * dbExport - returns export String, for current version
- *
- * @return line that will be exported
- * @throws Exception if export for table is not supported
- */
- public String dbExport(int table_version) throws Exception
- {
- // version is ignored for now
-
- StringBuffer sb = new StringBuffer();
-
- sb.append(this.getId());
- sb.append("|");
- sb.append(this.getDt_info());
- sb.append("|");
- sb.append(this.getType());
- sb.append("|");
- sb.append(this.getValue());
- sb.append("|");
- sb.append(this.getExtended());
- sb.append("|");
- sb.append(this.getPerson_id());
- sb.append("|");
- sb.append(this.getComment());
- sb.append("|");
- sb.append(this.getChanged());
-
- return sb.toString();
- }
-
-
- /**
- * dbExport - returns export String, for current version
- *
- * @return line that will be exported
- * @throws Exception if export for table is not supported
- */
- public String dbExport() throws Exception
- {
- return dbExport(this.TABLE_VERSION);
- }
-
-
- /**
- * dbExportHeader - header for export file
- *
- * @param table_version
- * @return
- */
- public String dbExportHeader(int table_version)
- {
- return "; Columns: id|dt_info|type|value|extended|person_id|comment|changed\n" +
- "; Table version: " + getTableVersion() + "\n";
- }
-
-
- /**
- * dbExportHeader - header for export file
- *
- * @return
- */
- public String dbExportHeader()
- {
- return this.dbExportHeader(this.TABLE_VERSION);
- }
-
-
- /**
- * dbImport - processes input entry to right fields
- *
- * @param table_version version of table
- * @param value_entry whole import line
- * @throws Exception if import for selected table version is not supported or it fails
- */
- public void dbImport(int table_version, String value_entry) throws Exception
- {
- dbImport(table_version, value_entry, null);
- }
-
-
- /**
- * dbImport - processes input entry to right fields
- *
- * @param table_version version of table
- * @param value_entry whole import line
- * @param parameters parameters
- * @throws Exception if import for selected table version is not supported or it fails
- */
- public void dbImport(int table_version, String value_entry, Object[] parameters) throws Exception
- {
- DataAccess da = DataAccess.getInstance();
-
- value_entry = DataAccess.getInstance().replaceExpression(value_entry, "||", "| |");
- String[] arr = da.splitString(value_entry, "|");
-
- this.setId(da.getLongValueFromString(arr[0]));
- this.setDt_info(da.getLongValueFromString(arr[1]));
- this.setType(da.getIntValueFromString(arr[2]));
- this.setValue(arr[3]);
- this.setExtended(arr[4]);
- this.setPerson_id(da.getIntValueFromString(arr[5]));
- this.setComment(arr[6]);
- this.setChanged(da.getLongValueFromString(arr[7]));
- }
-
-
-
- /**
- * getBackupFile - name of backup file (base part)
- *
- * @return
- */
- public String getBackupFile()
- {
- return "PumpDataExtendedH";
- }
-
- /**
- * getBackupClassName - name of class which will be updated/restored
- *
- * @return
- */
- public String getBackupClassName()
- {
- return "ggc.core.db.hibernate.pump.PumpDataExtendedH";
- }
-
-
-
-
- /**
- * getObjectName
- */
- public String getObjectName()
- {
- return "PumpDataExtended";
- }
-
- /**
- * isDebugMode
- */
- public boolean isDebugMode()
- {
- return false;
- }
-
-
-
- /**
- * getObjectUniqueId - get id of object
- * @return unique object id
- */
- public String getObjectUniqueId()
- {
- return "";
- }
-
- /**
- * Has To Be Clean - if table needs to be cleaned before import
- *
- * @return true if we need to clean
- */
- public boolean hasToBeCleaned()
- {
- return false;
- }
-
-
-}
\ No newline at end of file
Deleted: trunk/ggc-core/src/ggc/core/db/datalayer/PumpProfile.java
===================================================================
--- trunk/ggc-core/src/ggc/core/db/datalayer/PumpProfile.java 2009-04-04 22:49:23 UTC (rev 738)
+++ trunk/ggc-core/src/ggc/core/db/datalayer/PumpProfile.java 2009-04-06 07:51:48 UTC (rev 739)
@@ -1,511 +0,0 @@
-package ggc.core.db.datalayer;
-
-import ggc.core.db.hibernate.pump.PumpProfileH;
-import ggc.core.util.DataAccess;
-import ggc.core.util.I18nControl;
-
-import java.util.ArrayList;
-
-import org.hibernate.Session;
-import org.hibernate.Transaction;
-
-import com.atech.db.hibernate.DatabaseObjectHibernate;
-import com.atech.db.hibernate.transfer.BackupRestoreObject;
-import com.atech.graphics.components.tree.CheckBoxTreeNodeInterface;
-import com.atech.i18n.I18nControlAbstract;
-
-/**
- * Application: GGC - GNU Gluco Control
- *
- * See AUTHORS for copyright information.
- *
- * 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
- *
- * Filename: FoodDescription
- * Description: This is DataLayer file (data file, with methods to work with database or in
- * this case Hibernate). This one is used for FoodDescriptionH and FoodUserDescriptionH.
- * This one is also BackupRestoreObject.
- * File is not YET DataLayer File at least not active
- *
- * Author: andyrozman {an...@at...}
- */
-
-// TODO: DL
-
-public class PumpProfile extends PumpProfileH implements BackupRestoreObject, DatabaseObjectHibernate
-{
-
- private static final long serialVersionUID = 4355479385042532802L;
- private boolean selected = false;
- I18nControl ic = null; // (I18nControl)DataAccess.getInstance().getI18nControlInstance();
-
-
- /**
- * Constructor
- */
- public PumpProfile()
- {
- }
-
-
- /**
- * Constructor
- *
- * @param ch
- */
- public PumpProfile(PumpProfileH ch)
- {
- this.setId(ch.getId());
- this.setName(ch.getName());
- this.setBasal_base(ch.getBasal_base());
- this.setBasal_diffs(ch.getBasal_diffs());
- this.setActive_from(ch.getActive_from());
- this.setActive_till(ch.getActive_till());
- this.setExtended(ch.getExtended());
- this.setPerson_id(ch.getPerson_id());
- this.setComment(ch.getComment());
- this.setChanged(ch.getChanged());
- }
-
-
- /**
- * Constructor
- *
- * @param ic
- */
- public PumpProfile(I18nControlAbstract ic)
- {
- this.ic = (I18nControl)ic;
- }
-
-
- //---
- //--- BackupRestoreObject
- //---
-
-
-
- /**
- * Get Target Name
- *
- * @see com.atech.db.hibernate.transfer.BackupRestoreBase#getTargetName()
- */
- public String getTargetName()
- {
- return ic.getMessage("PUMP_PROFILE");
- }
-
- /**
- * Get Name
- * @return
- */
- public String getName()
- {
- return this.getTargetName();
- }
-
- /**
- * getBackupClassName - name of class which will be updated/restored
- *
- * @return
- */
- public String getClassName()
- {
- return "ggc.core.db.hibernate.pump.PumpProfileH";
- }
-
-
- /**
- * To String
- *
- * @see java.lang.Object#toString()
- */
- public String toString()
- {
- return this.getTargetName();
- }
-
-
- /**
- * getChildren
- */
- public ArrayList<CheckBoxTreeNodeInterface> getNodeChildren()
- {
- return null;
- }
-
- /**
- * isSelected
- */
- public boolean isSelected()
- {
- return selected;
- }
-
- /**
- * setSelected
- */
- public void setSelected(boolean newValue)
- {
- this.selected = newValue;
- }
-
- /**
- * Is Object Collection
- *
- * @return true if it has children
- */
- public boolean isCollection()
- {
- return false;
- }
-
-
- /**
- * Has Children
- */
- public boolean hasNodeChildren()
- {
- return false;
- }
-
-
- /**
- * DbAdd - Add this object to database
- *
- * @param sess Hibernate Session object
- * @throws Exception (HibernateException) with error
- * @return id in type of String
- */
- public String DbAdd(Session sess) throws Exception
- {
- Transaction tx = sess.beginTransaction();
-
- PumpProfileH ch = new PumpProfileH();
-
- ch.setId(this.getId());
- ch.setName(this.getName());
- ch.setBasal_base(this.getBasal_base());
- ch.setBasal_diffs(this.getBasal_diffs());
- ch.setActive_from(this.getActive_from());
- ch.setActive_till(this.getActive_till());
- ch.setExtended(this.getExtended());
- ch.setPerson_id(this.getPerson_id());
- ch.setComment(this.getComment());
- ch.setChanged(System.currentTimeMillis());
-
- Long id = (Long) sess.save(ch);
- tx.commit();
- ch.setId(id.longValue());
-
- return "" + id.longValue();
- }
-
-
- /**
- * DbDelete - Delete this object in database
- *
- * @param sess Hibernate Session object
- * @throws Exception (HibernateException) with error
- * @return true if action done or Exception if not
- */
- public boolean DbDelete(Session sess) throws Exception
- {
- Transaction tx = sess.beginTransaction();
-
- PumpProfileH ch = (PumpProfileH) sess.get(PumpProfileH.class, new Long(this.getId()));
-
- sess.delete(ch);
- tx.commit();
-
- return true;
- }
-
-
- /**
- * DbEdit - Edit this object in database
- *
- * @param sess Hibernate Session object
- * @throws Exception (HibernateException) with error
- * @return true if action done or Exception if not
- */
- public boolean DbEdit(Session sess) throws Exception
- {
-
- Transaction tx = sess.beginTransaction();
-
- PumpProfileH ch = (PumpProfileH) sess.get(PumpProfileH.class, new Long(this.getId()));
-
- ch.setId(this.getId());
- ch.setName(this.getName());
- ch.setBasal_base(this.getBasal_base());
- ch.setBasal_diffs(this.getBasal_diffs());
- ch.setActive_from(this.getActive_from());
- ch.setActive_till(this.getActive_till());
- ch.setExtended(this.getExtended());
- ch.setPerson_id(this.getPerson_id());
- ch.setComment(this.getComment());
- ch.setChanged(System.currentTimeMillis());
-
- sess.update(ch);
- tx.commit();
-
- return true;
- }
-
-
- /**
- * DbGet - Loads this object. Id must be set.
- *
- * @param sess Hibernate Session object
- * @throws Exception (HibernateException) with error
- * @return true if action done or Exception if not
- */
- public boolean DbGet(Session sess) throws Exception
- {
- PumpProfileH ch = (PumpProfileH) sess.get(PumpProfileH.class, new Long(this.getId()));
-
- this.setId(ch.getId());
- this.setName(ch.getName());
- this.setBasal_base(ch.getBasal_base());
- this.setBasal_diffs(ch.getBasal_diffs());
- this.setActive_from(ch.getActive_from());
- this.setActive_till(ch.getActive_till());
- this.setExtended(ch.getExtended());
- this.setPerson_id(ch.getPerson_id());
- this.setComment(ch.getComment());
- this.setChanged(ch.getChanged());
-
- return true;
- }
-
-
- /**
- * DbHasChildren - Shows if this entry has any children object, this is needed for delete
- *
- * @param sess Hibernate Session object
- * @throws Exception (HibernateException) with error
- * @return true if action done or Exception if not
- */
- public boolean DbHasChildren(Session sess) throws Exception
- {
- return false;
- }
-
- /**
- * getAction
- */
- public int getAction()
- {
- return 0;
- }
-
- /**
- * Table Version
- */
- public int TABLE_VERSION = 1;
-
-
- /**
- * Get Table Version - returns version of table
- *
- * @return version information
- */
- public int getTableVersion()
- {
- return this.TABLE_VERSION;
- }
-
-
- /**
- * dbExport - returns export String, for current version
- *
- * @return line that will be exported
- * @throws Exception if export for table is not supported
- */
- public String dbExport(int table_version) throws Exception
- {
- // version is ignored for now
-
- StringBuffer sb = new StringBuffer();
-
- sb.append(this.getId());
- sb.append("|");
- sb.append(this.getName());
- sb.append("|");
- sb.append(this.getBasal_base());
- sb.append("|");
- sb.append(this.getBasal_diffs());
- sb.append("|");
- sb.append(this.getActive_from());
- sb.append("|");
- sb.append(this.getActive_till());
- sb.append("|");
- sb.append(this.getExtended());
- sb.append("|");
- sb.append(this.getPerson_id());
- sb.append("|");
- sb.append(this.getComment());
- sb.append("|");
- sb.append(this.getChanged());
-
- return sb.toString();
- }
-
-
- /**
- * dbExport - returns export String, for current version
- *
- * @return line that will be exported
- * @throws Exception if export for table is not supported
- */
- public String dbExport() throws Exception
- {
- return dbExport(this.TABLE_VERSION);
- }
-
-
- /**
- * dbExportHeader - header for export file
- *
- * @param table_version
- * @return
- */
- public String dbExportHeader(int table_version)
- {
- return "; Columns: id|name|basal_base|basal_diffs|active_from|active_till|extended|person_id|comment|changed\n" +
- "; Table version: " + getTableVersion() + "\n";
- }
-
-
-
-
-
- /**
- * dbExportHeader - header for export file
- *
- * @return
- */
- public String dbExportHeader()
- {
- return this.dbExportHeader(this.TABLE_VERSION);
- }
-
-
- /**
- * dbImport - processes input entry to right fields
- *
- * @param table_version version of table
- * @param value_entry whole import line
- * @throws Exception if import for selected table version is not supported or it fails
- */
- public void dbImport(int table_version, String value_entry) throws Exception
- {
- dbImport(table_version, value_entry, null);
- }
-
-
- /**
- * dbImport - processes input entry to right fields
- *
- * @param table_version version of table
- * @param value_entry whole import line
- * @param parameters parameters
- * @throws Exception if import for selected table version is not supported or it fails
- */
- public void dbImport(int table_version, String value_entry, Object[] parameters) throws Exception
- {
- DataAccess da = DataAccess.getInstance();
-
- value_entry = DataAccess.getInstance().replaceExpression(value_entry, "||", "| |");
- String[] arr = da.splitString(value_entry, "|");
-
- this.setId(da.getLongValueFromString(arr[0]));
- this.setName(arr[1]);
- this.setBasal_base(da.getFloatValue(arr[2]));
- this.setBasal_diffs(arr[3]);
- this.setActive_from(da.getLongValueFromString(arr[4]));
- this.setActive_till(da.getLongValueFromString(arr[5]));
- this.setExtended(arr[6]);
- this.setPerson_id(da.getIntValueFromString(arr[7]));
- this.setComment(arr[8]);
- this.setChanged(da.getLongValueFromString(arr[9]));
- }
-
-
-
- /**
- * getBackupFile - name of backup file (base part)
- *
- * @return
- */
- public String getBackupFile()
- {
- return "PumpProfileH";
- }
-
- /**
- * getBackupClassName - name of class which will be updated/restored
- *
- * @return
- */
- public String getBackupClassName()
- {
- // TODO
- return "";
- }
-
-
-
-
- /**
- * getObjectName
- */
- public String getObjectName()
- {
- return "PumpProfile";
- }
-
- /**
- * isDebugMode
- */
- public boolean isDebugMode()
- {
- return false;
- }
-
-
-
- /**
- * getObjectUniqueId - get id of object
- * @return unique object id
- */
- public String getObjectUniqueId()
- {
- return "";
- }
-
- /**
- * Has To Be Clean - if table needs to be cleaned before import
- *
- * @return true if we need to clean
- */
- public boolean hasToBeCleaned()
- {
- return false;
- }
-
-
-}
\ No newline at end of file
Modified: trunk/ggc-core/src/ggc/core/db/tool/transfer/ExportNutritionDb.java
===================================================================
--- trunk/ggc-core/src/ggc/core/db/tool/transfer/ExportNutritionDb.java 2009-04-04 22:49:23 UTC (rev 738)
+++ trunk/ggc-core/src/ggc/core/db/tool/transfer/ExportNutritionDb.java 2009-04-06 07:51:48 UTC (rev 739)
@@ -208,10 +208,21 @@
{
FoodUserDescriptionH eh = (FoodUserDescriptionH) it.next();
+ String nutr = eh.getNutritions();
+ if (nutr==null)
+ {
+ nutr = "";
+ }
+ else
+ {
+ nutr = nutr.replace(",", ".");
+ }
+
+
this.writeToFile(eh.getId() + "|" + eh.getName() + "|"
+ eh.getName_i18n() + "|" + eh.getGroup_id() + "|"
+ eh.getRefuse() + "|" + eh.getDescription() + "|"
- + eh.getHome_weights() + "|" + eh.getNutritions().replace(",", ".") + "|"
+ + eh.getHome_weights() + "|" + nutr + "|"
+ eh.getChanged() + "\n");
count++;
Modified: trunk/ggc-core/src/ggc/core/db/tool/transfer/GGCBackupRestoreRunner.java
===================================================================
--- trunk/ggc-core/src/ggc/core/db/tool/transfer/GGCBackupRestoreRunner.java 2009-04-04 22:49:23 UTC (rev 738)
+++ trunk/ggc-core/src/ggc/core/db/tool/transfer/GGCBackupRestoreRunner.java 2009-04-06 07:51:48 UTC (rev 739)
@@ -3,14 +3,18 @@
import ggc.core.util.DataAccess;
import java.io.File;
+import java.util.Enumeration;
import java.util.GregorianCalendar;
import java.util.Hashtable;
+import javax.swing.JMenu;
+
import com.atech.db.hibernate.transfer.BackupRestoreObject;
import com.atech.db.hibernate.transfer.BackupRestoreRunner;
import com.atech.db.hibernate.transfer.BackupRestoreWorkGiver;
import com.atech.db.hibernate.transfer.RestoreFileInfo;
import com.atech.i18n.I18nControlAbstract;
+import com.atech.plugin.PlugInClient;
import com.atech.utils.file.PackFiles;
/**
@@ -121,6 +125,23 @@
}
+ for(Enumeration<String> en= da.getPlugins().keys(); en.hasMoreElements(); )
+ {
+ String key = en.nextElement();
+ PlugInClient pic = da.getPlugIn(key);
+
+ if (pic.isBackupRestoreEnabled())
+ {
+ pic.getBackupRestoreHandler().doBackup(this);
+ }
+ }
+
+
+
+// DataAccess.getInstance().getPlugIn(DataAccess.PLUGIN_NUTRITION).getBackupRestoreHandler().doBackup(this);
+
+ /*
+
if (isAnyNutritionBackupObjectSelected())
{
ExportNutritionDb end = new ExportNutritionDb(this);
@@ -161,7 +182,7 @@
// this.done_backup_elements++;
// System.out.println("Meals YES");
}
- }
+ }*/
zipAndRemoveBackupFiles();
@@ -261,7 +282,7 @@
if (this.isRestoreObjectSelected("ggc.core.db.hibernate.ColorSchemeH"))
{
- System.out.println("in color scheme");
+ //System.out.println("in color scheme");
this.setTask(ic.getMessage("COLOR_SCHEMES"));
GGCImporter ge = new GGCImporter(this, this.getRestoreObject("ggc.core.db.hibernate.ColorSchemeH"));
ge.importData("ggc.core.db.hibernate.ColorSchemeH");
@@ -270,9 +291,29 @@
}
- //if (isAnyNutritionRestoreObjectSelected())
+// DataAccess.getInstance().getPlugIn(DataAccess.PLUGIN_NUTRITION).getBackupRestoreHandler().doRestore(this);
+
+
+ for(Enumeration<String> en= da.getPlugins().keys(); en.hasMoreElements(); )
{
+ String key = en.nextElement();
+ PlugInClient pic = da.getPlugIn(key);
+ if (pic.isBackupRestoreEnabled())
+ {
+ pic.getBackupRestoreHandler().doRestore(this);
+ }
+ }
+
+
+
+// m_da.getPlugIn(DataAccess.PLUGIN_NUTRITION).getBackupRestoreHandler().doRestore(this);
+
+
+
+ //if (isAnyNutritionRestoreObjectSelected())
+/* {
+
if (this.isRestoreObjectSelected("ggc.core.db.hibernate.FoodUserGroupH"))
{
this.setStatus(0);
@@ -317,7 +358,7 @@
// this.done_backup_elements++;
}
- }
+ }*/
}
Modified: trunk/ggc-core/src/ggc/core/db/tool/transfer/GGCExporter.java
===================================================================
--- trunk/ggc-core/src/ggc/core/db/tool/transfer/GGCExporter.java 2009-04-04 22:49:23 UTC (rev 738)
+++ trunk/ggc-core/src/ggc/core/db/tool/transfer/GGCExporter.java 2009-04-06 07:51:48 UTC (rev 739)
@@ -8,8 +8,11 @@
import ggc.core.util.DataAccess;
import java.io.File;
+import java.util.Enumeration;
import java.util.Iterator;
+import javax.swing.JMenu;
+
import org.hibernate.Query;
import org.hibernate.Session;
@@ -17,6 +20,7 @@
import com.atech.db.hibernate.transfer.BackupRestoreObject;
import com.atech.db.hibernate.transfer.BackupRestoreWorkGiver;
import com.atech.db.hibernate.transfer.ExportTool;
+import com.atech.plugin.PlugInClient;
/**
* Application: GGC - GNU Gluco Control
@@ -48,6 +52,8 @@
public class GGCExporter extends ExportTool implements Runnable
{
+ DataAccess da = DataAccess.getInstance();
+
/**
* Constructor
*
@@ -150,19 +156,31 @@
private BackupRestoreObject getBackupRestoreObject(String class_name)
{
+ // core
if (class_name.equals("ggc.core.db.hibernate.DayValueH"))
{
- //return new DailyValue();
- return null;
+ return new DailyValue();
+ //return null;
}
else if (class_name.equals("ggc.core.db.hibernate.ColorSchemeH"))
{
return new SettingsColorScheme();
}
- else
- return null;
-
+
+
+ for(Enumeration<String> en= da.getPlugins().keys(); en.hasMoreElements(); )
+ {
+ String key = en.nextElement();
+ PlugInClient pic = da.getPlugIn(key);
+ if (pic.getBackupRestoreHandler().doesContainBackupRestoreObject(class_name))
+ {
+ return pic.getBackupRestoreHandler().getBackupRestoreObject(class_name);
+ }
+ }
+
+ return null;
+
}
@@ -178,10 +196,21 @@
ColorSchemeH eh = (ColorSchemeH)obj;
return new SettingsColorScheme(eh);
}
- else
- return null;
-
+
+
+ for(Enumeration<String> en= da.getPlugins().keys(); en.hasMoreElements(); )
+ {
+ String key = en.nextElement();
+ PlugInClient pic = da.getPlugIn(key);
+ if (pic.getBackupRestoreHandler().doesContainBackupRestoreObject(bro.getBackupClassName()))
+ {
+ return pic.getBackupRestoreHandler().getBackupRestoreObject(obj, bro);
+ }
+ }
+
+ return null;
+
}
@@ -204,7 +233,9 @@
*/
public void exportData(BackupRestoreObject bro)
{
- System.out.println("export: first");
+ //System.out.println("export: first");
+
+ System.out.println("BRO: " + bro);
openFile(this.getRootPath() + bro.getBackupFile() + this.getFileLastPart() + ".dbe");
@@ -223,7 +254,7 @@
while (it.hasNext())
{
- System.out.println("export: next");
+ //System.out.println("export: next");
BackupRestoreObject bt = getBackupRestoreObject(it.next(), bro);
//DayValueH eh = (DayValueH) it.next();
Modified: trunk/ggc-core/src/ggc/core/util/DataAccess.java
===================================================================
--- trunk/ggc-core/src/ggc/core/util/DataAccess.java 2009-04-04 22:49:23 UTC (rev 738)
+++ trunk/ggc-core/src/ggc/core/util/DataAccess.java 2009-04-06 07:51:48 UTC (rev 739)
@@ -544,6 +544,43 @@
this.backup_restore_collection = brc_full;
}
+
+ public BackupRestoreCollection getBackupRestoreCollection()
+ {
+ BackupRestoreCollection brc_full = new BackupRestoreCollection("GGC_BACKUP", this.m_i18n);
+ brc_full.addNodeChild(new DailyValue(this.m_i18n));
+
+
+ BackupRestoreCollection brc1 = new BackupRestoreCollection("CONFIGURATION", this.m_i18n);
+ brc1.addNodeChild(new Settings(this.m_i18n));
+ brc1.addNodeChild(new SettingsColorScheme(this.m_i18n));
+ brc_full.addNodeChild(brc1);
+
+
+ //for(int i=0; i<)
+
+ for(Enumeration<String> en = this.plugins.keys(); en.hasMoreElements(); )
+ {
+ PlugInClient pic = this.plugins.get(en.nextElement());
+
+ if (pic.isBackupRestoreEnabled())
+ brc_full.addNodeChild(pic.getBackupObjects());
+
+/* BackupRestoreCollection brc = pic.getBackupObjects();
+
+ if (brc!=null)
+ brc_full.addNodeChild(brc); */
+ }
+
+
+ return brc_full;
+
+
+// return null;
+ }
+
+
+
/**
* Load Graph Config Properties
*/
Added: trunk/ggc-nutri/src/ggc/nutri/plugin/BackupRestoreNutriHandler.java
===================================================================
--- trunk/ggc-nutri/src/ggc/nutri/plugin/BackupRestoreNutriHandler.java (rev 0)
+++ trunk/ggc-nutri/src/ggc/nutri/plugin/BackupRestoreNutriHandler.java 2009-04-06 07:51:48 UTC (rev 739)
@@ -0,0 +1,240 @@
+package ggc.nutri.plugin;
+
+import ggc.core.db.datalayer.DailyValue;
+import ggc.core.db.hibernate.DayValueH;
+import ggc.core.db.tool.transfer.ExportNutritionDb;
+import ggc.core.db.tool.transfer.ImportNutrition;
+import ggc.nutri.util.DataAccessNutri;
+
+import com.atech.db.hibernate.transfer.BackupRestoreObject;
+import com.atech.db.hibernate.transfer.BackupRestoreRunner;
+import com.atech.i18n.I18nControlAbstract;
+import com.atech.plugin.BackupRestorePlugin;
+
+/**
+ * Application: GGC - GNU Gluco Control
+ * Plug-in: GGC PlugIn Base (base class for all plugins)
+ *
+ * See AUTHORS for copyright information.
+ *
+ * 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
+ *
+ * Filename: PluginDb
+ * Description: This is master class for using Db instance within plug-in. In most cases, we
+ * would want data to be handled by outside authority (GGC), but in some cases
+ * we wouldn't want that.
+ *
+ * Author: Andy {an...@at...}
+ */
+
+
+public class BackupRestoreNutriHandler extends BackupRestorePlugin
+{
+
+ I18nControlAbstract ic = DataAccessNutri.getInstance().getI18nControlInstance();
+ //Hashtable<String, Backup>ht_restore_objects
+
+ /**
+ * Constructor
+ */
+ public BackupRestoreNutriHandler()
+ {
+ }
+
+
+ /**
+ * Do Backup
+ */
+ public void doBackup(BackupRestoreRunner brr)
+ {
+ if (isAnyNutritionBackupObjectSelected(brr))
+ {
+ ExportNutritionDb end = new ExportNutritionDb(brr);
+
+ //System.out.println(brr.isBackupObjectSelected(ic.getMessage("USER_FOOD_GROUPS")));
+ //System.out.println(brr.isBackupObjectSelected(ic.getMessage("FOODS")) + ic.getMessage("FOODS"));
+ //System.out.println(brr.isBackupObjectSelected(ic.getMessage("MEAL_GROUPS")));
+ //System.out.println(brr.isBackupObjectSelected(ic.getMessage("MEALS")));
+
+ if (brr.isBackupObjectSelected(ic.getMessage("USER_FOOD_GROUPS")))
+ {
+ brr.setStatus(0);
+ brr.setTask(ic.getMessage("USER_FOOD_GROUPS"));
+ end.export_UserFoodGroups();
+ brr.setStatus(100);
+ // this.done_backup_elements++;
+ }
+
+ if (brr.isBackupObjectSelected(ic.getMessage("FOODS")))
+ {
+ brr.setStatus(0);
+ brr.setTask(ic.getMessage("FOODS"));
+ end.export_UserFoods();
+ brr.setStatus(100);
+ // this.done_backup_elements++;
+ }
+
+ if (brr.isBackupObjectSelected(ic.getMessage("MEAL_GROUPS")))
+ {
+ brr.setStatus(0);
+ brr.setTask(ic.getMessage("MEAL_GROUPS"));
+ end.export_MealGroups();
+ brr.setStatus(100);
+ // this.done_backup_elements++;
+ }
+
+ if (brr.isBackupObjectSelected(ic.getMessage("MEALS")))
+ {
+ brr.setStatus(0);
+ brr.setTask(ic.getMessage("MEALS"));
+ end.export_Meals();
+ brr.setStatus(100);
+ // this.done_backup_elements++;
+ // System.out.println("Meals YES");
+ }
+ }
+
+ }
+
+
+ private boolean isAnyNutritionBackupObjectSelected(BackupRestoreRunner brr)
+ {
+ if ((brr.isBackupObjectSelected(ic.getMessage("USER_FOOD_GROUPS"))) ||
+ (brr.isBackupObjectSelected(ic.getMessage("FOODS"))) ||
+ (brr.isBackupObjectSelected(ic.getMessage("MEAL_GROUPS"))) ||
+ (brr.isBackupObjectSelected(ic.getMessage("MEALS"))))
+ return true;
+ else
+ return false;
+ }
+
+
+
+ /**
+ * Do Restore
+ */
+ public void doRestore(BackupRestoreRunner brr)
+ {
+
+ if (brr.isRestoreObjectSelected("ggc.core.db.hibernate.FoodUserGroupH"))
+ {
+ brr.setStatus(0);
+ brr.setTask(ic.getMessage("USER_FOOD_GROUPS"));
+ ImportNutrition edv = new ImportNutrition(brr, brr.getRestoreObject("ggc.core.db.hibernate.FoodUserGroupH"));
+ edv.run();
+ //end.export_UserFoodGroups();
+ brr.setStatus(100);
+ // this.done_backup_elements++;
+ }
+
+ if (brr.isRestoreObjectSelected("ggc.core.db.hibernate.FoodUserDescriptionH"))
+ {
+ brr.setStatus(0);
+ brr.setTask(ic.getMessage("FOODS"));
+ ImportNutrition edv = new ImportNutrition(brr, brr.getRestoreObject("ggc.core.db.hibernate.FoodUserDescriptionH"));
+ edv.run();
+// end.export_UserFoods();
+ brr.setStatus(100);
+ // this.done_backup_elements++;
+ }
+
+ if (brr.isRestoreObjectSelected("ggc.core.db.hibernate.MealGroupH"))
+ {
+ brr.setStatus(0);
+ brr.setTask(ic.getMessage("MEAL_GROUPS"));
+ ImportNutrition edv = new ImportNutrition(brr, brr.getRestoreObject("ggc.core.db.hibernate.MealGroupH"));
+ edv.run();
+// end.export_MealGroups();
+ brr.setStatus(100);
+ // this.done_backup_elements++;
+ }
+
+ if (brr.isRestoreObjectSelected("ggc.core.db.hibernate.MealH"))
+ {
+ brr.setStatus(0);
+ brr.setTask(ic.getMessage("MEALS"));
+ ImportNutrition edv = new ImportNutrition(brr, brr.getRestoreObject("ggc.core.db.hibernate.MealH"));
+ edv.run();
+// end.export_Meals();
+ brr.setStatus(100);
+ // this.done_backup_elements++;
+ }
+
+
+
+// System.out.println("BackupRestoreNutriHandler::doRestore()");
+ }
+
+
+
+ /**
+ * Get Backup Restore Object
+ */
+ @Override
+ public BackupRestoreObject getBackupRestoreObject(String class_name)
+ {
+ if (class_name.equals("ggc.core.db.hibernate.DayValueH"))
+ {
+ return new DailyValue();
+ }
+
+ return null;
+
+ }
+
+
+ /**
+ * Get Backup Restore Object
+ */
+ @Override
+ public BackupRestoreObject getBackupRestoreObject(Object obj, BackupRestoreObject bro)
+ {
+ if (bro.getBackupClassName().equals("ggc.core.db.hibernate.DayValueH"))
+ {
+ DayValueH eh = (DayValueH)obj;
+ return new DailyValue(eh);
+ }
+
+ return null;
+
+ }
+
+
+ /**
+ * Does Contain Backup Restore Object
+ */
+ @Override
+ public boolean doesContainBackupRestoreObject(String bro_name)
+ {
+ return false;
+ }
+
+
+
+
+ /*
+ public RestoreFileInfo getRestoreObject(String key)
+ {
+ if (this.ht_restore_objects==null)
+ return null;
+
+ if (this.ht_restore_objects.containsKey(key))
+ return this.ht_restore_objects.get(key);
+ else
+ return null;
+ }*/
+
+
+}
\ No newline at end of file
Modified: trunk/ggc-nutri/src/ggc/nutri/plugin/NutriPlugInServer.java
===================================================================
--- trunk/ggc-nutri/src/ggc/nutri/plugin/NutriPlugInServer.java 2009-04-04 22:49:23 UTC (rev 738)
+++ trunk/ggc-nutri/src/ggc/nutri/plugin/NutriPlugInServer.java 2009-04-06 07:51:48 UTC (rev 739)
@@ -20,6 +20,8 @@
import javax.swing.JMenu;
import com.atech.db.hibernate.transfer.BackupRestoreCollection;
+import com.atech.i18n.I18nControlAbstract;
+import com.atech.plugin.BackupRestorePlugin;
import com.atech.plugin.PlugInServer;
import com.atech.utils.ATDataAccessAbst...
[truncated message content] |
|
From: <and...@us...> - 2009-04-14 15:26:24
|
Revision: 754
http://ggc.svn.sourceforge.net/ggc/?rev=754&view=rev
Author: andyrozman
Date: 2009-04-14 15:26:20 +0000 (Tue, 14 Apr 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/build/AtechTools.properties
trunk/build/build.xml
trunk/ggc-core/src/ggc/core/data/DailyValuesRow.java
trunk/ggc-core/src/ggc/core/util/DataAccess.java
trunk/ggc-desktop/data/update/GGC_Update.properties
trunk/ggc-desktop/src/ggc/GGC.java
trunk/ggc-nutri/src/ggc/nutri/print/PrintFoodMenuAbstract.java
trunk/ggc-nutri/src/ggc/nutri/print/PrintFoodMenuBase.java
trunk/ggc-nutri/src/ggc/nutri/print/PrintFoodMenuExt1.java
trunk/ggc-nutri/src/ggc/nutri/print/PrintFoodMenuExt2.java
trunk/ggc-nutri/src/ggc/nutri/print/PrintFoodMenuExt3.java
trunk/ggc-pump/src/ggc/pump/data/PumpDailyStatistics.java
trunk/ggc-pump/src/ggc/pump/device/AbstractPump.java
trunk/ggc-pump/src/ggc/pump/device/AbstractXmlPump.java
trunk/ggc-pump/src/ggc/pump/device/PumpInterface.java
trunk/ggc-support/lib/utils/atech-tools-0.3.6.jar
Added Paths:
-----------
trunk/ggc-plugin_base/src/ggc/plugin/device/DownloadSupportType.java
trunk/ggc-pump/src/ggc/pump/device/accuchek/AccuChekCombo.java
trunk/ggc-pump/src/ggc/pump/device/animas/AnimasIR1200.java
trunk/ggc-pump/src/ggc/pump/device/animas/AnimasIR1250.java
trunk/ggc-pump/src/ggc/pump/device/animas/AnimasIR2020.java
trunk/ggc-pump/src/ggc/pump/device/animas/AnimasPing.java
trunk/ggc-pump/src/ggc/pump/device/dana/DanaDiabecare_II.java
trunk/ggc-pump/src/ggc/pump/device/dana/DanaDiabecare_IIS.java
trunk/ggc-pump/src/ggc/pump/device/deltec/
trunk/ggc-pump/src/ggc/pump/device/deltec/DeltecCosmo1800.java
trunk/ggc-pump/src/ggc/pump/device/insulet/
trunk/ggc-pump/src/ggc/pump/device/insulet/InsuletOmniPod.java
trunk/ggc-pump/src/ggc/pump/device/minimed/Minimed508.java
trunk/ggc-pump/src/ggc/pump/device/minimed/Minimed512.java
trunk/ggc-pump/src/ggc/pump/device/minimed/Minimed522.java
Modified: trunk/build/AtechTools.properties
===================================================================
--- trunk/build/AtechTools.properties 2009-04-12 12:14:27 UTC (rev 753)
+++ trunk/build/AtechTools.properties 2009-04-14 15:26:20 UTC (rev 754)
@@ -1 +1 @@
-atech-tools.api=../../ggc-support/lib/utils/atech-tools-0.3.6.jar
+atech-tools.api=../../ggc-support/lib/utils/atech-tools-0.3.7.jar
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2009-04-12 12:14:27 UTC (rev 753)
+++ trunk/build/build.xml 2009-04-14 15:26:20 UTC (rev 754)
@@ -52,7 +52,7 @@
</target>
- <target name="all_noclean" depends="ggc_desktop" description="whole GGC">
+ <target name="all_noclean" depends="ggc_core, ggc_desktop, plugins" description="whole GGC">
</target>
Modified: trunk/ggc-core/src/ggc/core/data/DailyValuesRow.java
===================================================================
--- trunk/ggc-core/src/ggc/core/data/DailyValuesRow.java 2009-04-12 12:14:27 UTC (rev 753)
+++ trunk/ggc-core/src/ggc/core/data/DailyValuesRow.java 2009-04-14 15:26:20 UTC (rev 754)
@@ -112,11 +112,11 @@
Float float_instance = new Float(0.0);
- private static final int EXTENDED_ACTIVITY = 1;
- private static final int EXTENDED_URINE = 2;
- private static final int EXTENDED_FOOD_DESCRIPTION = 3;
- private static final int EXTENDED_FOOD_CH = 4;
- private static final int EXTENDED_DECIMAL_PART = 5;
+ public static final int EXTENDED_ACTIVITY = 1;
+ public static final int EXTENDED_URINE = 2;
+ public static final int EXTENDED_FOOD_DESCRIPTION = 3;
+ public static final int EXTENDED_FOOD_CH = 4;
+ public static final int EXTENDED_DECIMAL_PART = 5;
private static final int EXTENDED_MAX = 5;
Modified: trunk/ggc-core/src/ggc/core/util/DataAccess.java
===================================================================
--- trunk/ggc-core/src/ggc/core/util/DataAccess.java 2009-04-12 12:14:27 UTC (rev 753)
+++ trunk/ggc-core/src/ggc/core/util/DataAccess.java 2009-04-14 15:26:20 UTC (rev 754)
@@ -545,6 +545,9 @@
}
+ /**
+ * Get BackupRestoreCollection
+ */
public BackupRestoreCollection getBackupRestoreCollection()
{
BackupRestoreCollection brc_full = new BackupRestoreCollection("GGC_BACKUP", this.m_i18n);
Modified: trunk/ggc-desktop/data/update/GGC_Update.properties
===================================================================
--- trunk/ggc-desktop/data/update/GGC_Update.properties 2009-04-12 12:14:27 UTC (rev 753)
+++ trunk/ggc-desktop/data/update/GGC_Update.properties 2009-04-14 15:26:20 UTC (rev 754)
@@ -80,10 +80,10 @@
COMPONENT_2_GROUP=1
COMPONENT_2_NAME=GGC Core
-COMPONENT_2_VERSION=0.4.4.1
+COMPONENT_2_VERSION=0.4.6.1
COMPONENT_2_VERSION_NUM=4
COMPONENT_2_ROOT_DIR=/lib/ggc
-COMPONENT_2_FILES=%ROOT%/ggc-core-0.4.4.1.jar
+COMPONENT_2_FILES=%ROOT%/ggc-core-0.4.6.1.jar
COMPONENT_3_GROUP=1
COMPONENT_3_NAME=GGC Little
@@ -103,18 +103,18 @@
COMPONENT_5_GROUP=2
COMPONENT_5_NAME=GGC Plugin Base
-COMPONENT_5_VERSION=0.3.1
+COMPONENT_5_VERSION=0.3.2
COMPONENT_5_VERSION_NUM=3
COMPONENT_5_ROOT_DIR=/lib/ggc
-COMPONENT_5_FILES=%ROOT%/ggc-plugin_base-0.3.1.jar
+COMPONENT_5_FILES=%ROOT%/ggc-plugin_base-0.3.2.jar
COMPONENT_20_GROUP=2
COMPONENT_20_NAME=Nutrition Tool
-COMPONENT_20_VERSION=1.1.1
+COMPONENT_20_VERSION=1.1.2
COMPONENT_20_VERSION_NUM=1
COMPONENT_20_ROOT_DIR=/lib/ggc
-COMPONENT_20_FILES=%ROOT%/ggc-nutri_tool-1.1.1.jar
+COMPONENT_20_FILES=%ROOT%/ggc-nutri_tool-1.1.2.jar
COMPONENT_6_GROUP=2
@@ -129,7 +129,7 @@
COMPONENT_7_VERSION=0.4.2
COMPONENT_7_VERSION_NUM=2
COMPONENT_7_ROOT_DIR=/lib/ggc
-COMPONENT_7_FILES=%ROOT%/ggc-pump_tool-0.4.2.jar
+COMPONENT_7_FILES=%ROOT%/ggc-pump_tool-0.4.5.jar
COMPONENT_8_GROUP=2
@@ -158,10 +158,10 @@
COMPONENT_11_GROUP=3
COMPONENT_11_NAME=Atech Tools
-COMPONENT_11_VERSION=0.3.6
+COMPONENT_11_VERSION=0.3.7
COMPONENT_11_VERSION_NUM=5
COMPONENT_11_ROOT_DIR=/lib/utils
-COMPONENT_11_FILES=%ROOT%/atech-tools-0.3.6.jar
+COMPONENT_11_FILES=%ROOT%/atech-tools-0.3.7.jar
COMPONENT_12_GROUP=3
COMPONENT_12_NAME=iText Pdf Library
Modified: trunk/ggc-desktop/src/ggc/GGC.java
===================================================================
--- trunk/ggc-desktop/src/ggc/GGC.java 2009-04-12 12:14:27 UTC (rev 753)
+++ trunk/ggc-desktop/src/ggc/GGC.java 2009-04-14 15:26:20 UTC (rev 754)
@@ -48,7 +48,7 @@
/**
* Version of application
*/
- public static String s_version = "0.4.5.1"; //3.16";
+ public static String s_version = "0.4.6.1"; //3.16";
/**
Modified: trunk/ggc-nutri/src/ggc/nutri/print/PrintFoodMenuAbstract.java
===================================================================
--- trunk/ggc-nutri/src/ggc/nutri/print/PrintFoodMenuAbstract.java 2009-04-12 12:14:27 UTC (rev 753)
+++ trunk/ggc-nutri/src/ggc/nutri/print/PrintFoodMenuAbstract.java 2009-04-14 15:26:20 UTC (rev 754)
@@ -158,113 +158,53 @@
int active_day_entry = 0;
-/* if (dv.getRowCount() == 0)
+ for (int i = 0; i < dv.getRowCount(); i++)
{
-// this.writeEmptyColumnData(datatable);
- }
- else */
- {
- for (int i = 0; i < dv.getRowCount(); i++)
- {
+ DailyValuesRow rw = (DailyValuesRow) dv.getRow(i);
- DailyValuesRow rw = (DailyValuesRow) dv.getRow(i);
+ if ( (!m_da.isValueSet(rw.getMealsIds())) && (!m_da.isValueSet(rw.getExtendedValue(DailyValuesRow.EXTENDED_FOOD_DESCRIPTION))))
+ continue;
- if ((rw.getMealsIds() == null) || (rw.getMealsIds().length() == 0))
- continue;
+ if (active_day_entry > 0)
+ {
+ datatable.addCell(new Phrase("", f));
+ }
- if (active_day_entry > 0)
- {
- datatable.addCell(new Phrase("", f));
- }
+ active_day_entry++;
- active_day_entry++;
+ datatable.addCell(new Phrase(rw.getTimeAsString(), f));
- datatable.addCell(new Phrase(rw.getTimeAsString(), f));
+
+ if (m_da.isValueSet(rw.getMealsIds()))
+ {
DailyFoodEntries mpts = new DailyFoodEntries(rw.getMealsIds(), true);
-
writeTogetherData(datatable, rw);
-
- /*
- datatable.addCell(new Phrase(ic.getMessage("TOGETHER"), this.text_italic));
- datatable.addCell(new Phrase("", f));
- datatable.addCell(new Phrase("", f));
-
- datatable.addCell(new Phrase(DataAccess.Decimal2Format.format(rw.getCH()), this.text_italic));
- datatable.addCell(new Phrase(rw.getIns1AsString(), this.text_italic));
- datatable.addCell(new Phrase(rw.getBGAsString(), this.text_italic));
- */
-
+
+
for (int j = 0; j < mpts.getElementsCount(); j++)
{
-
DailyFoodEntry mp = mpts.getElement(j);
-
this.writeColumnData(datatable, mp);
-
- /*
- datatable.addCell(new Phrase("", f));
- datatable.addCell(new Phrase("", f));
-
- datatable.addCell(new Phrase(mp.getName(), f));
-
-
- float value = 0.0f;
-
- if (mp.amount_type==DailyFoodEntry.WEIGHT_TYPE_AMOUNT)
- {
- datatable.addCell(new Phrase(ic.getMessage("AMOUNT_LBL"), f));
- //value = mp.getNutrientValue(205);
- value = mp.getMealCH();
-
- }
- else if (mp.amount_type==DailyFoodEntry.WEIGHT_TYPE_WEIGHT)
- {
- datatable.addCell(new Phrase(ic.getMessage("WEIGHT_LBL2"), f));
- //value = mp.getNutrientValue(205);
- value = mp.getNutrientValue(205) * (mp.amount / 100.0f);
- }
- else
- {
- datatable.addCell(new Phrase(mp.getHomeWeightDescription() + " (" + DataAccess.Decimal0Format.format(mp.getHomeWeightMultiplier() * 100) + " g)", f));
- value = mp.getNutrientValue(205) * mp.getHomeWeightMultiplier();
- }
-
-
-
- datatable.addCell(new Phrase(mp.getAmountSingleDecimalString(), f));
- datatable.addCell(new Phrase(DataAccess.Decimal2Format.format(value), f)); // ch
-
- datatable.addCell(new Phrase("", f));
- datatable.addCell(new Phrase("", f));
- */
-
- // System.out.println(" " + rw.getTimeAsString() +
- // " " + mp);
}
-
}
-
- if (active_day_entry==0)
+
+ if (m_da.isValueSet(rw.getExtendedValue(DailyValuesRow.EXTENDED_FOOD_DESCRIPTION)))
{
- this.writeEmptyColumnData(datatable);
+ //System.out.println("writeFoodDescData: " + rw);
+ writeFoodDescData(datatable, rw);
}
- /*
- after together code this part is obsolete
- if (active_day_entry==0)
- {
- datatable.addCell(new Phrase("", f));
- datatable.addCell(new Phrase("", f));
- datatable.addCell(new Phrase("", f));
- datatable.addCell(new Phrase("", f));
- datatable.addCell(new Phrase("", f));
- }
- */
+ } // for
- count++;
+ if (active_day_entry==0)
+ {
+ this.writeEmptyColumnData(datatable);
}
+
+ count++;
+
}
document.add(datatable);
@@ -273,6 +213,10 @@
}
+
+
+
+
/**
* Returns data part of filename for printing job, showing which data is being printed
*
@@ -331,7 +275,18 @@
*/
public abstract void writeColumnData(PdfPTable table, DailyFoodEntry mp) throws Exception;
+
/**
+ * Write Food Description Data
+ *
+ * @param table
+ * @param mp
+ * @throws Exception
+ */
+ public abstract void writeFoodDescData(PdfPTable table, DailyValuesRow mp) throws Exception;
+
+
+ /**
* Write empty column data. If there is no data, this is used, to fill empty places.
*
* @param table
Modified: trunk/ggc-nutri/src/ggc/nutri/print/PrintFoodMenuBase.java
===================================================================
--- trunk/ggc-nutri/src/ggc/nutri/print/PrintFoodMenuBase.java 2009-04-12 12:14:27 UTC (rev 753)
+++ trunk/ggc-nutri/src/ggc/nutri/print/PrintFoodMenuBase.java 2009-04-14 15:26:20 UTC (rev 754)
@@ -623,6 +623,27 @@
/**
+ * Write Food Description Data
+ *
+ * @param table
+ * @param dvr
+ * @throws Exception
+ */
+ public void writeFoodDescData(PdfPTable table, DailyValuesRow dvr) throws Exception
+ {
+
+ table.addCell(new Phrase(dvr.getExtendedValue(DailyValuesRow.EXTENDED_FOOD_DESCRIPTION), this.text_normal));
+ table.addCell(new Phrase(ic.getMessage("DESCRIPTION"), this.text_normal));
+ table.addCell(new Phrase("", this.text_normal));
+
+ table.addCell(new Phrase(dvr.getExtendedValue(DailyValuesRow.EXTENDED_FOOD_CH), this.text_italic));
+
+
+ //writeEmptyColumnData(table);
+ }
+
+
+ /**
* Returns base filename for printing job, this is just part of end filename (starting part)
*/
@Override
Modified: trunk/ggc-nutri/src/ggc/nutri/print/PrintFoodMenuExt1.java
===================================================================
--- trunk/ggc-nutri/src/ggc/nutri/print/PrintFoodMenuExt1.java 2009-04-12 12:14:27 UTC (rev 753)
+++ trunk/ggc-nutri/src/ggc/nutri/print/PrintFoodMenuExt1.java 2009-04-14 15:26:20 UTC (rev 754)
@@ -218,7 +218,26 @@
}
+
+ /**
+ * Write Food Description Data
+ *
+ * @param table
+ * @param dvr
+ * @throws Exception
+ */
+ public void writeFoodDescData(PdfPTable table, DailyValuesRow dvr) throws Exception
+ {
+ table.addCell(new Phrase(dvr.getExtendedValue(DailyValuesRow.EXTENDED_FOOD_DESCRIPTION), this.text_normal));
+ table.addCell(new Phrase(ic.getMessage("DESCRIPTION"), this.text_normal));
+ table.addCell(new Phrase("", this.text_normal));
+ table.addCell(new Phrase(dvr.getExtendedValue(DailyValuesRow.EXTENDED_FOOD_CH), this.text_italic));
+ table.addCell(new Phrase(dvr.getIns1AsString(), this.text_italic));
+ }
+
+
+
/**
* Returns base filename for printing job, this is just part of end filename (starting part)
*/
Modified: trunk/ggc-nutri/src/ggc/nutri/print/PrintFoodMenuExt2.java
===================================================================
--- trunk/ggc-nutri/src/ggc/nutri/print/PrintFoodMenuExt2.java 2009-04-12 12:14:27 UTC (rev 753)
+++ trunk/ggc-nutri/src/ggc/nutri/print/PrintFoodMenuExt2.java 2009-04-14 15:26:20 UTC (rev 754)
@@ -392,7 +392,25 @@
}
+ /**
+ * Write Food Description Data
+ *
+ * @param table
+ * @param dvr
+ * @throws Exception
+ */
+ public void writeFoodDescData(PdfPTable table, DailyValuesRow dvr) throws Exception
+ {
+ table.addCell(new Phrase(dvr.getExtendedValue(DailyValuesRow.EXTENDED_FOOD_DESCRIPTION), this.text_normal));
+ table.addCell(new Phrase(ic.getMessage("DESCRIPTION"), this.text_normal));
+ table.addCell(new Phrase("", this.text_normal));
+ table.addCell(new Phrase(dvr.getExtendedValue(DailyValuesRow.EXTENDED_FOOD_CH), this.text_italic));
+ table.addCell(new Phrase(dvr.getIns1AsString(), this.text_italic));
+ table.addCell(new Phrase(dvr.getBGAsString(), this.text_italic));
+ }
+
+
/**
* Returns base filename for printing job, this is just part of end filename (starting part)
*/
Modified: trunk/ggc-nutri/src/ggc/nutri/print/PrintFoodMenuExt3.java
===================================================================
--- trunk/ggc-nutri/src/ggc/nutri/print/PrintFoodMenuExt3.java 2009-04-12 12:14:27 UTC (rev 753)
+++ trunk/ggc-nutri/src/ggc/nutri/print/PrintFoodMenuExt3.java 2009-04-14 15:26:20 UTC (rev 754)
@@ -398,6 +398,19 @@
}
+ /**
+ * Write Food Description Data
+ *
+ * @param table
+ * @param mp
+ * @throws Exception
+ */
+ public void writeFoodDescData(PdfPTable table, DailyValuesRow mp) throws Exception
+ {
+ writeEmptyColumnData(table);
+ }
+
+
/**
* Returns base filename for printing job, this is just part of end filename (starting part)
Added: trunk/ggc-plugin_base/src/ggc/plugin/device/DownloadSupportType.java
===================================================================
--- trunk/ggc-plugin_base/src/ggc/plugin/device/DownloadSupportType.java (rev 0)
+++ trunk/ggc-plugin_base/src/ggc/plugin/device/DownloadSupportType.java 2009-04-14 15:26:20 UTC (rev 754)
@@ -0,0 +1,11 @@
+package ggc.plugin.device;
+
+public class DownloadSupportType
+{
+
+ public static final int DOWNLOAD_YES = 0;
+
+ public static final int DOWNLOAD_SUPPORT_NO = 1;
+
+ public static final int DOWNLOAD_SUPPORT_NA_DEVICE = 2;
+}
Modified: trunk/ggc-pump/src/ggc/pump/data/PumpDailyStatistics.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/data/PumpDailyStatistics.java 2009-04-12 12:14:27 UTC (rev 753)
+++ trunk/ggc-pump/src/ggc/pump/data/PumpDailyStatistics.java 2009-04-14 15:26:20 UTC (rev 754)
@@ -109,13 +109,13 @@
{
PumpValuesEntry pve2 = lst.get(i+1);
- // System.out.println("Hour: " + pve2.getDateTimeObject().hour_of_day + ", hour2=" + pve.getDateTimeObject().hour_of_day);
+ System.out.println("Hour: " + pve2.getDateTimeObject().hour_of_day + ", hour2=" + pve.getDateTimeObject().hour_of_day);
int s = pve2.getDateTimeObject().hour_of_day - pve.getDateTimeObject().hour_of_day;
- float val = m_da.getFloatValueFromString(pve.getValue());
+ float val = da_pump.getFloatValueFromString(pve.getValue());
sum += s * val;
- // System.out.println("Time diff: " + s + ", val=" + val);
+ System.out.println("Time diff: " + s + ", val=" + val);
}
}
Modified: trunk/ggc-pump/src/ggc/pump/device/AbstractPump.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/device/AbstractPump.java 2009-04-12 12:14:27 UTC (rev 753)
+++ trunk/ggc-pump/src/ggc/pump/device/AbstractPump.java 2009-04-14 15:26:20 UTC (rev 754)
@@ -1,5 +1,6 @@
package ggc.pump.device;
+import ggc.plugin.device.DownloadSupportType;
import ggc.plugin.manager.company.AbstractDeviceCompany;
import ggc.plugin.output.OutputWriter;
import ggc.pump.data.PumpValuesEntry;
@@ -387,6 +388,21 @@
{
return this.profile_names;
}
+
+ public int getDownloadSupportType()
+ {
+ return DownloadSupportType.DOWNLOAD_SUPPORT_NO;
+ }
+
+
+ public String getTemporaryBasalTypeDefinition()
+ {
+ return "TYPE=Unit;STEP=0.1";
+ }
+
+
+
+
}
Modified: trunk/ggc-pump/src/ggc/pump/device/AbstractXmlPump.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/device/AbstractXmlPump.java 2009-04-12 12:14:27 UTC (rev 753)
+++ trunk/ggc-pump/src/ggc/pump/device/AbstractXmlPump.java 2009-04-14 15:26:20 UTC (rev 754)
@@ -1,6 +1,7 @@
package ggc.pump.device;
import ggc.plugin.device.DeviceIdentification;
+import ggc.plugin.device.DownloadSupportType;
import ggc.plugin.manager.company.AbstractDeviceCompany;
import ggc.plugin.output.OutputWriter;
import ggc.plugin.protocol.XmlProtocol;
@@ -490,4 +491,16 @@
}
+ public int getDownloadSupportType()
+ {
+ return DownloadSupportType.DOWNLOAD_SUPPORT_NO;
+ }
+
+
+ public String getTemporaryBasalTypeDefinition()
+ {
+ return "TYPE=Unit;STEP=0.1";
+ }
+
+
}
Modified: trunk/ggc-pump/src/ggc/pump/device/PumpInterface.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/device/PumpInterface.java 2009-04-12 12:14:27 UTC (rev 753)
+++ trunk/ggc-pump/src/ggc/pump/device/PumpInterface.java 2009-04-14 15:26:20 UTC (rev 754)
@@ -131,5 +131,11 @@
public DeviceIdentification getDeviceInfo();
+
+ public int getDownloadSupportType();
+
+
+ public String getTemporaryBasalTypeDefinition();
+
}
Added: trunk/ggc-pump/src/ggc/pump/device/accuchek/AccuChekCombo.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/device/accuchek/AccuChekCombo.java (rev 0)
+++ trunk/ggc-pump/src/ggc/pump/device/accuchek/AccuChekCombo.java 2009-04-14 15:26:20 UTC (rev 754)
@@ -0,0 +1,182 @@
+package ggc.pump.device.accuchek;
+
+import ggc.plugin.device.PlugInBaseException;
+import ggc.plugin.manager.DeviceImplementationStatus;
+import ggc.plugin.output.OutputWriter;
+
+/**
+ * Application: GGC - GNU Gluco Control
+ * Plug-in: Pump Tool (support for Pump devices)
+ *
+ * See AUTHORS for copyright information.
+ *
+ * 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
+ *
+ * Filename: AccuChekSpirit
+ * Description: Accu Chek Spirit Pump Implementation
+ *
+ * Author: Andy {an...@at...}
+ */
+
+
+// FIXME
+
+public class AccuChekCombo extends AccuChekSmartPixPump
+{
+
+ /**
+ * Constructor
+ */
+ public AccuChekCombo()
+ {
+ super();
+ }
+
+
+ /**
+ * Constructor
+ *
+ * @param drive_letter
+ * @param writer
+ */
+ public AccuChekCombo(String drive_letter, OutputWriter writer)
+ {
+ super(drive_letter, writer);
+ }
+
+
+ //************************************************
+ //*** Meter Identification Methods ***
+ //************************************************
+
+
+ /**
+ * getName - Get Name of meter.
+ *
+ * @return name of meter
+ */
+ public String getName()
+ {
+ return "Comfort";
+ }
+
+
+
+ /**
+ * getIconName - Get Icon of meter
+ *
+ * @return icon name
+ */
+ public String getIconName()
+ {
+ return "ac_comfort.jpg";
+ }
+
+
+ /**
+ * getDeviceId - Get Device Id, within MgrCompany class
+ * Should be implemented by device class.
+ *
+ * @return id of device within company
+ */
+ public int getDeviceId()
+ {
+ return AccuChekSmartPixPump.PUMP_ACCUCHEK_SPIRIT;
+ }
+
+
+ /**
+ * getInstructions - get instructions for device
+ * Should be implemented by meter class.
+ *
+ * @return instructions for reading data
+ */
+ public String getInstructions()
+ {
+ return "INSTRUCTIONS_ACCUCHEK_COMFORT";
+ }
+
+ /**
+ * getComment - Get Comment for device
+ *
+ * @return comment or null
+ */
+ public String getComment()
+ {
+ return null;
+ }
+
+
+ /**
+ * getImplementationStatus - Get Implementation Status
+ *
+ * @return implementation status as number
+ * @see ggc.plugin.manager.DeviceImplementationStatus
+ */
+ public int getImplementationStatus()
+ {
+ return DeviceImplementationStatus.IMPLEMENTATION_IN_PROGRESS;
+ }
+
+
+ /**
+ * getMaxMemoryRecords - Get Maximum entries that can be stored in devices memory
+ *
+ * @return number
+ */
+ public int getMaxMemoryRecords()
+ {
+ return 100;
+ }
+
+
+ /**
+ * getNrOfElementsFor1s - How many elements are read in 1s (which is our refresh time)
+ * @return number of elements
+ */
+ public int getNrOfElementsFor1s()
+ {
+ return 10;
+ }
+
+
+ /**
+ * getDeviceClassName - Get Class name of device implementation, used by Reflection at later time
+ *
+ * @return class name as string
+ */
+ public String getDeviceClassName()
+ {
+ return "ggc.meter.device.accuchek.AccuChekComfort";
+ }
+
+
+ /**
+ * Open
+ */
+ public boolean open() throws PlugInBaseException
+ {
+ return true;
+ }
+
+
+ /**
+ * Close
+ */
+ public void close() throws PlugInBaseException
+ {
+ }
+
+}
\ No newline at end of file
Added: trunk/ggc-pump/src/ggc/pump/device/animas/AnimasIR1200.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/device/animas/AnimasIR1200.java (rev 0)
+++ trunk/ggc-pump/src/ggc/pump/device/animas/AnimasIR1200.java 2009-04-14 15:26:20 UTC (rev 754)
@@ -0,0 +1 @@
+
Added: trunk/ggc-pump/src/ggc/pump/device/animas/AnimasIR1250.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/device/animas/AnimasIR1250.java (rev 0)
+++ trunk/ggc-pump/src/ggc/pump/device/animas/AnimasIR1250.java 2009-04-14 15:26:20 UTC (rev 754)
@@ -0,0 +1 @@
+
Added: trunk/ggc-pump/src/ggc/pump/device/animas/AnimasIR2020.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/device/animas/AnimasIR2020.java (rev 0)
+++ trunk/ggc-pump/src/ggc/pump/device/animas/AnimasIR2020.java 2009-04-14 15:26:20 UTC (rev 754)
@@ -0,0 +1 @@
+
Added: trunk/ggc-pump/src/ggc/pump/device/animas/AnimasPing.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/device/animas/AnimasPing.java (rev 0)
+++ trunk/ggc-pump/src/ggc/pump/device/animas/AnimasPing.java 2009-04-14 15:26:20 UTC (rev 754)
@@ -0,0 +1 @@
+
Added: trunk/ggc-pump/src/ggc/pump/device/dana/DanaDiabecare_II.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/device/dana/DanaDiabecare_II.java (rev 0)
+++ trunk/ggc-pump/src/ggc/pump/device/dana/DanaDiabecare_II.java 2009-04-14 15:26:20 UTC (rev 754)
@@ -0,0 +1,8 @@
+package ggc.pump.device.dana;
+
+
+public class DanaDiabecare_II
+{
+ // FIXME: Implement basics
+}
+
Added: trunk/ggc-pump/src/ggc/pump/device/dana/DanaDiabecare_IIS.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/device/dana/DanaDiabecare_IIS.java (rev 0)
+++ trunk/ggc-pump/src/ggc/pump/device/dana/DanaDiabecare_IIS.java 2009-04-14 15:26:20 UTC (rev 754)
@@ -0,0 +1,20 @@
+package ggc.pump.device.dana;
+
+import ggc.plugin.protocol.SerialProtocol;
+import gnu.io.SerialPort;
+import gnu.io.SerialPortEvent;
+
+import java.util.GregorianCalendar;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+// TODO: Auto-generated Javadoc
+/**
+ * The Class DanaDiabecare_III_R.
+ */
+public class DanaDiabecare_IIS extends DanaDiabecare_II
+{
+
+}
+
Added: trunk/ggc-pump/src/ggc/pump/device/deltec/DeltecCosmo1800.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/device/deltec/DeltecCosmo1800.java (rev 0)
+++ trunk/ggc-pump/src/ggc/pump/device/deltec/DeltecCosmo1800.java 2009-04-14 15:26:20 UTC (rev 754)
@@ -0,0 +1 @@
+
Added: trunk/ggc-pump/src/ggc/pump/device/insulet/InsuletOmniPod.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/device/insulet/InsuletOmniPod.java (rev 0)
+++ trunk/ggc-pump/src/ggc/pump/device/insulet/InsuletOmniPod.java 2009-04-14 15:26:20 UTC (rev 754)
@@ -0,0 +1 @@
+
Added: trunk/ggc-pump/src/ggc/pump/device/minimed/Minimed508.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/device/minimed/Minimed508.java (rev 0)
+++ trunk/ggc-pump/src/ggc/pump/device/minimed/Minimed508.java 2009-04-14 15:26:20 UTC (rev 754)
@@ -0,0 +1 @@
+
Added: trunk/ggc-pump/src/ggc/pump/device/minimed/Minimed512.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/device/minimed/Minimed512.java (rev 0)
+++ trunk/ggc-pump/src/ggc/pump/device/minimed/Minimed512.java 2009-04-14 15:26:20 UTC (rev 754)
@@ -0,0 +1 @@
+
Added: trunk/ggc-pump/src/ggc/pump/device/minimed/Minimed522.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/device/minimed/Minimed522.java (rev 0)
+++ trunk/ggc-pump/src/ggc/pump/device/minimed/Minimed522.java 2009-04-14 15:26:20 UTC (rev 754)
@@ -0,0 +1 @@
+
Modified: trunk/ggc-support/lib/utils/atech-tools-0.3.6.jar
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2009-05-27 15:11:21
|
Revision: 769
http://ggc.svn.sourceforge.net/ggc/?rev=769&view=rev
Author: andyrozman
Date: 2009-05-27 15:10:51 +0000 (Wed, 27 May 2009)
Log Message:
-----------
Added Paths:
-----------
trunk/ggc-ppc/
trunk/ggc-ppc/GGC-PocketPC.sln
trunk/ggc-ppc/GGC-PocketPC.suo
trunk/ggc-ppc/GGCMobileNET/
trunk/ggc-ppc/GGCMobileNET/App.config
trunk/ggc-ppc/GGCMobileNET/GGCMobileNET.csproj
trunk/ggc-ppc/GGCMobileNET/GGCMobileNET.csproj.user
trunk/ggc-ppc/GGCMobileNET/GUI/
trunk/ggc-ppc/GGCMobileNET/GUI/AboutWindow.Designer.cs
trunk/ggc-ppc/GGCMobileNET/GUI/AboutWindow.cs
trunk/ggc-ppc/GGCMobileNET/GUI/Config/
trunk/ggc-ppc/GGCMobileNET/GUI/Config/ConfigurationWindow.Designer.cs
trunk/ggc-ppc/GGCMobileNET/GUI/Config/ConfigurationWindow.cs
trunk/ggc-ppc/GGCMobileNET/GUI/Config/ConfigurationWindow.resx
trunk/ggc-ppc/GGCMobileNET/GUI/DailyData/
trunk/ggc-ppc/GGCMobileNET/GUI/DailyData/BolusWizardWindow.Designer.cs
trunk/ggc-ppc/GGCMobileNET/GUI/DailyData/BolusWizardWindow.cs
trunk/ggc-ppc/GGCMobileNET/GUI/DailyData/BolusWizardWindow.resx
trunk/ggc-ppc/GGCMobileNET/GUI/DailyData/DailyDataItemWindow.Designer.cs
trunk/ggc-ppc/GGCMobileNET/GUI/DailyData/DailyDataItemWindow.cs
trunk/ggc-ppc/GGCMobileNET/GUI/DailyData/DailyDataItemWindow.resx
trunk/ggc-ppc/GGCMobileNET/GUI/DailyData/DailyDataWindow.Designer.cs
trunk/ggc-ppc/GGCMobileNET/GUI/DailyData/DailyDataWindow.cs
trunk/ggc-ppc/GGCMobileNET/GUI/DailyData/DailyDataWindow.resx
trunk/ggc-ppc/GGCMobileNET/GUI/DailyData/FoodSelectorWindow.Designer.cs
trunk/ggc-ppc/GGCMobileNET/GUI/DailyData/FoodSelectorWindow.cs
trunk/ggc-ppc/GGCMobileNET/GUI/DailyData/FoodSelectorWindow.resx
trunk/ggc-ppc/GGCMobileNET/GUI/Data/
trunk/ggc-ppc/GGCMobileNET/GUI/Data/DataWindow.Designer.cs
trunk/ggc-ppc/GGCMobileNET/GUI/Data/DataWindow.cs
trunk/ggc-ppc/GGCMobileNET/GUI/Data/DataWindow.resx
trunk/ggc-ppc/GGCMobileNET/GUI/Food/
trunk/ggc-ppc/GGCMobileNET/GUI/Food/FoodSearchWindow.Designer.cs
trunk/ggc-ppc/GGCMobileNET/GUI/Food/FoodSearchWindow.cs
trunk/ggc-ppc/GGCMobileNET/GUI/Food/FoodSearchWindow.resx
trunk/ggc-ppc/GGCMobileNET/GUI/Food/FoodWindow.Designer.cs
trunk/ggc-ppc/GGCMobileNET/GUI/Food/FoodWindow.cs
trunk/ggc-ppc/GGCMobileNET/GUI/Food/FoodWindow.resx
trunk/ggc-ppc/GGCMobileNET/GUI/StatisticsWindow.Designer.cs
trunk/ggc-ppc/GGCMobileNET/GUI/StatisticsWindow.cs
trunk/ggc-ppc/GGCMobileNET/GUI/StatisticsWindow.resx
trunk/ggc-ppc/GGCMobileNET/Program.cs
trunk/ggc-ppc/GGCMobileNET/Properties/
trunk/ggc-ppc/GGCMobileNET/Properties/AssemblyInfo.cs
trunk/ggc-ppc/GGCMobileNET/Properties/Resources.Designer.cs
trunk/ggc-ppc/GGCMobileNET/Properties/Resources.resx
trunk/ggc-ppc/GGCMobileNET/StartScreen.Designer.cs
trunk/ggc-ppc/GGCMobileNET/StartScreen.cs
trunk/ggc-ppc/GGCMobileNET/StartScreen.resx
trunk/ggc-ppc/GGCMobileNET.Data/
trunk/ggc-ppc/GGCMobileNET.Data/Data/
trunk/ggc-ppc/GGCMobileNET.Data/Data/DailyValues.cs
trunk/ggc-ppc/GGCMobileNET.Data/Data/DailyValuesRow.cs
trunk/ggc-ppc/GGCMobileNET.Data/Db/
trunk/ggc-ppc/GGCMobileNET.Data/Db/GGCDbMobile.cs
trunk/ggc-ppc/GGCMobileNET.Data/Db/MobileDbInit.cs
trunk/ggc-ppc/GGCMobileNET.Data/Db/Objects/
trunk/ggc-ppc/GGCMobileNET.Data/Db/Objects/DayValueDAO.cs
trunk/ggc-ppc/GGCMobileNET.Data/Db/Objects/FoodDescriptionDAO.cs
trunk/ggc-ppc/GGCMobileNET.Data/Db/Objects/FoodGroupDAO.cs
trunk/ggc-ppc/GGCMobileNET.Data/Db/Objects/FoodUserDescriptionDAO.cs
trunk/ggc-ppc/GGCMobileNET.Data/Db/Objects/FoodUserGroupDAO.cs
trunk/ggc-ppc/GGCMobileNET.Data/Db/Objects/MealDAO.cs
trunk/ggc-ppc/GGCMobileNET.Data/Db/Objects/MealGroupDAO.cs
trunk/ggc-ppc/GGCMobileNET.Data/Db/Objects/NutritionDefinitionDAO.cs
trunk/ggc-ppc/GGCMobileNET.Data/Db/Objects/NutritionHomeWeightTypeDAO.cs
trunk/ggc-ppc/GGCMobileNET.Data/Db/Tools/
trunk/ggc-ppc/GGCMobileNET.Data/Db/Tools/GGCImporter.cs
trunk/ggc-ppc/GGCMobileNET.Data/Db/Tools/ImportDailyValues.cs
trunk/ggc-ppc/GGCMobileNET.Data/GGCMobileNET.Data.csproj
trunk/ggc-ppc/GGCMobileNET.Data/GGCMobileNET.Data.csproj.user
trunk/ggc-ppc/GGCMobileNET.Data/Properties/
trunk/ggc-ppc/GGCMobileNET.Data/Properties/AssemblyInfo.cs
trunk/ggc-ppc/GGCMobileNET.Data/Tools/
trunk/ggc-ppc/GGCMobileNET.Data/Tools/BackupRestoreWorkGiver.cs
trunk/ggc-ppc/GGCMobileNET.Data/Tools/DatabaseAccessObject.cs
trunk/ggc-ppc/GGCMobileNET.Data/Tools/DummyDAO.cs
trunk/ggc-ppc/GGCMobileNET.Data/Tools/ExportTool.cs
trunk/ggc-ppc/GGCMobileNET.Data/Tools/ImportExportAbstract.cs
trunk/ggc-ppc/GGCMobileNET.Data/Tools/ImportTool.cs
trunk/ggc-ppc/GGCMobileNET.Data/Tools/RestoreFileInfo.cs
trunk/ggc-ppc/GGCMobileNET.Data/Utils/
trunk/ggc-ppc/GGCMobileNET.Data/Utils/DataAccessMobile.cs
trunk/ggc-ppc/libs/
trunk/ggc-ppc/libs/log4net.dll
trunk/ggc-ppc/libs/log4net.xml
trunk/ggc-ppc/libs/pics/
trunk/ggc-ppc/libs/pics/coffee.png
trunk/ggc-ppc/libs/pics/document.png
trunk/ggc-ppc/libs/pics/exit.png
trunk/ggc-ppc/libs/pics/info.png
trunk/ggc-ppc/libs/pics/meal.png
trunk/ggc-ppc/libs/pics/meal_info.png
trunk/ggc-ppc/libs/pics/newspaper.png
trunk/ggc-ppc/libs/pics/newspaper_add.png
trunk/ggc-ppc/libs/pics/newspaper_delete.png
trunk/ggc-ppc/libs/pics/save.png
trunk/ggc-ppc/libs/pics/stats.png
Added: trunk/ggc-ppc/GGC-PocketPC.sln
===================================================================
--- trunk/ggc-ppc/GGC-PocketPC.sln (rev 0)
+++ trunk/ggc-ppc/GGC-PocketPC.sln 2009-05-27 15:10:51 UTC (rev 769)
@@ -0,0 +1,31 @@
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GGCMobileNET", "GGCMobileNET\GGCMobileNET.csproj", "{BD3B69D2-8A03-405C-AD98-9646F0BB1EF8}"
+ ProjectSection(ProjectDependencies) = postProject
+ {224A6F49-EAAB-41F8-8B2D-7A1DB8BE8753} = {224A6F49-EAAB-41F8-8B2D-7A1DB8BE8753}
+ EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GGCMobileNET.Data", "GGCMobileNET.Data\GGCMobileNET.Data.csproj", "{224A6F49-EAAB-41F8-8B2D-7A1DB8BE8753}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {BD3B69D2-8A03-405C-AD98-9646F0BB1EF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {BD3B69D2-8A03-405C-AD98-9646F0BB1EF8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {BD3B69D2-8A03-405C-AD98-9646F0BB1EF8}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+ {BD3B69D2-8A03-405C-AD98-9646F0BB1EF8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {BD3B69D2-8A03-405C-AD98-9646F0BB1EF8}.Release|Any CPU.Build.0 = Release|Any CPU
+ {BD3B69D2-8A03-405C-AD98-9646F0BB1EF8}.Release|Any CPU.Deploy.0 = Release|Any CPU
+ {224A6F49-EAAB-41F8-8B2D-7A1DB8BE8753}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {224A6F49-EAAB-41F8-8B2D-7A1DB8BE8753}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {224A6F49-EAAB-41F8-8B2D-7A1DB8BE8753}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {224A6F49-EAAB-41F8-8B2D-7A1DB8BE8753}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
Added: trunk/ggc-ppc/GGC-PocketPC.suo
===================================================================
(Binary files differ)
Property changes on: trunk/ggc-ppc/GGC-PocketPC.suo
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: trunk/ggc-ppc/GGCMobileNET
___________________________________________________________________
Added: svn:ignore
+ bin
obj
Added: trunk/ggc-ppc/GGCMobileNET/App.config
===================================================================
--- trunk/ggc-ppc/GGCMobileNET/App.config (rev 0)
+++ trunk/ggc-ppc/GGCMobileNET/App.config 2009-05-27 15:10:51 UTC (rev 769)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+ <configSections>
+ <section name="log4net"
+ type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
+ </configSections>
+ <log4net>
+ <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
+ <param name="File" value="GGCNetConfig.log" />
+ <param name="AppendToFile" value="true" />
+ <layout type="log4net.Layout.PatternLayout">
+ <param name="Header" value="[Header]\r\n" />
+ <param name="Footer" value="[Footer]\r\n" />
+ <param name="ConversionPattern" value="%d [%t] %-5p %c %m%n" />
+ </layout>
+ </appender>
+
+ <root>
+ <level value="DEBUG" />
+ <appender-ref ref="LogFileAppender" />
+ </root>
+ </log4net>
+</configuration>
\ No newline at end of file
Added: trunk/ggc-ppc/GGCMobileNET/GGCMobileNET.csproj
===================================================================
--- trunk/ggc-ppc/GGCMobileNET/GGCMobileNET.csproj (rev 0)
+++ trunk/ggc-ppc/GGCMobileNET/GGCMobileNET.csproj 2009-05-27 15:10:51 UTC (rev 769)
@@ -0,0 +1,204 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.30729</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{BD3B69D2-8A03-405C-AD98-9646F0BB1EF8}</ProjectGuid>
+ <OutputType>WinExe</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>GGCMobileNET</RootNamespace>
+ <AssemblyName>GGCMobileNET</AssemblyName>
+ <ProjectTypeGuids>{4D628B5B-2FBC-4AA6-8C16-197242AEB884};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+ <PlatformFamilyName>PocketPC</PlatformFamilyName>
+ <PlatformID>4118C335-430C-497f-BE48-11C3316B135E</PlatformID>
+ <OSVersion>5.1</OSVersion>
+ <DeployDirSuffix>GGCMobileNET</DeployDirSuffix>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <NativePlatformName>Windows Mobile 5.0 Pocket PC SDK</NativePlatformName>
+ <FormFactorID>
+ </FormFactorID>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE;$(PlatformFamilyName)</DefineConstants>
+ <NoStdLib>true</NoStdLib>
+ <NoConfig>true</NoConfig>
+ <ErrorReport>prompt</ErrorReport>
+ <FileAlignment>512</FileAlignment>
+ <WarningLevel>4</WarningLevel>
+ <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <DefineConstants>TRACE;$(PlatformFamilyName)</DefineConstants>
+ <NoStdLib>true</NoStdLib>
+ <NoConfig>true</NoConfig>
+ <ErrorReport>prompt</ErrorReport>
+ <FileAlignment>512</FileAlignment>
+ <WarningLevel>4</WarningLevel>
+ <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\libs\log4net.dll</HintPath>
+ </Reference>
+ <Reference Include="mscorlib" />
+ <Reference Include="System" />
+ <Reference Include="System.Core" />
+ <Reference Include="System.Data.DataSetExtensions" />
+ <Reference Include="System.Data" />
+ <Reference Include="System.Drawing" />
+ <Reference Include="System.Windows.Forms" />
+ <Reference Include="System.Xml" />
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="StartScreen.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="StartScreen.Designer.cs">
+ <DependentUpon>StartScreen.cs</DependentUpon>
+ </Compile>
+ <Compile Include="GUI\AboutWindow.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="GUI\AboutWindow.Designer.cs">
+ <DependentUpon>AboutWindow.cs</DependentUpon>
+ </Compile>
+ <Compile Include="GUI\Config\ConfigurationWindow.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="GUI\Config\ConfigurationWindow.Designer.cs">
+ <DependentUpon>ConfigurationWindow.cs</DependentUpon>
+ </Compile>
+ <Compile Include="GUI\DailyData\BolusWizardWindow.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="GUI\DailyData\BolusWizardWindow.Designer.cs">
+ <DependentUpon>BolusWizardWindow.cs</DependentUpon>
+ </Compile>
+ <Compile Include="GUI\DailyData\DailyDataItemWindow.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="GUI\DailyData\DailyDataItemWindow.Designer.cs">
+ <DependentUpon>DailyDataItemWindow.cs</DependentUpon>
+ </Compile>
+ <Compile Include="GUI\DailyData\DailyDataWindow.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="GUI\DailyData\DailyDataWindow.Designer.cs">
+ <DependentUpon>DailyDataWindow.cs</DependentUpon>
+ </Compile>
+ <Compile Include="GUI\DailyData\FoodSelectorWindow.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="GUI\DailyData\FoodSelectorWindow.Designer.cs">
+ <DependentUpon>FoodSelectorWindow.cs</DependentUpon>
+ </Compile>
+ <Compile Include="GUI\Data\DataWindow.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="GUI\Data\DataWindow.Designer.cs">
+ <DependentUpon>DataWindow.cs</DependentUpon>
+ </Compile>
+ <Compile Include="GUI\Food\FoodSearchWindow.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="GUI\Food\FoodSearchWindow.Designer.cs">
+ <DependentUpon>FoodSearchWindow.cs</DependentUpon>
+ </Compile>
+ <Compile Include="GUI\Food\FoodWindow.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="GUI\Food\FoodWindow.Designer.cs">
+ <DependentUpon>FoodWindow.cs</DependentUpon>
+ </Compile>
+ <Compile Include="GUI\StatisticsWindow.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="GUI\StatisticsWindow.Designer.cs">
+ <DependentUpon>StatisticsWindow.cs</DependentUpon>
+ </Compile>
+ <Compile Include="Program.cs" />
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ <EmbeddedResource Include="StartScreen.resx">
+ <DependentUpon>StartScreen.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="GUI\Config\ConfigurationWindow.resx">
+ <DependentUpon>ConfigurationWindow.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="GUI\DailyData\BolusWizardWindow.resx">
+ <DependentUpon>BolusWizardWindow.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="GUI\DailyData\DailyDataItemWindow.resx">
+ <DependentUpon>DailyDataItemWindow.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="GUI\DailyData\DailyDataWindow.resx">
+ <DependentUpon>DailyDataWindow.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="GUI\DailyData\FoodSelectorWindow.resx">
+ <DependentUpon>FoodSelectorWindow.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="GUI\Data\DataWindow.resx">
+ <DependentUpon>DataWindow.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="GUI\Food\FoodSearchWindow.resx">
+ <DependentUpon>FoodSearchWindow.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="GUI\Food\FoodWindow.resx">
+ <DependentUpon>FoodWindow.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="GUI\StatisticsWindow.resx">
+ <DependentUpon>StatisticsWindow.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Properties\Resources.resx">
+ <Generator>ResXFileCodeGenerator</Generator>
+ <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <Compile Include="Properties\Resources.Designer.cs">
+ <AutoGen>True</AutoGen>
+ <DependentUpon>Resources.resx</DependentUpon>
+ </Compile>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\GGCMobileNET.Data\GGCMobileNET.Data.csproj">
+ <Project>{224A6F49-EAAB-41F8-8B2D-7A1DB8BE8753}</Project>
+ <Name>GGCMobileNET.Data</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="App.config" />
+ </ItemGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
+ <ProjectExtensions>
+ <VisualStudio>
+ <FlavorProperties GUID="{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}">
+ <HostingProcess disable="1" />
+ </FlavorProperties>
+ </VisualStudio>
+ </ProjectExtensions>
+ <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+ Other similar extension points exist, see Microsoft.Common.targets.
+ <Target Name="BeforeBuild">
+ </Target>
+ <Target Name="AfterBuild">
+ </Target>
+ -->
+</Project>
\ No newline at end of file
Added: trunk/ggc-ppc/GGCMobileNET/GGCMobileNET.csproj.user
===================================================================
--- trunk/ggc-ppc/GGCMobileNET/GGCMobileNET.csproj.user (rev 0)
+++ trunk/ggc-ppc/GGCMobileNET/GGCMobileNET.csproj.user 2009-05-27 15:10:51 UTC (rev 769)
@@ -0,0 +1,5 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <DeployDeviceID>4118C335-430C-497f-BE48-11C3316B135E84C861BE-14F9-4bfe-85D1-158180C89455</DeployDeviceID>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
Added: trunk/ggc-ppc/GGCMobileNET/GUI/AboutWindow.Designer.cs
===================================================================
--- trunk/ggc-ppc/GGCMobileNET/GUI/AboutWindow.Designer.cs (rev 0)
+++ trunk/ggc-ppc/GGCMobileNET/GUI/AboutWindow.Designer.cs 2009-05-27 15:10:51 UTC (rev 769)
@@ -0,0 +1,42 @@
+namespace GGCMobileNET.GUI
+{
+ partial class AboutWindow
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+ private System.Windows.Forms.MainMenu mainMenu1;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.components = new System.ComponentModel.Container();
+ this.mainMenu1 = new System.Windows.Forms.MainMenu();
+ this.Menu = this.mainMenu1;
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+ this.Text = "AboutWindow";
+ this.AutoScroll = true;
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file
Added: trunk/ggc-ppc/GGCMobileNET/GUI/AboutWindow.cs
===================================================================
--- trunk/ggc-ppc/GGCMobileNET/GUI/AboutWindow.cs (rev 0)
+++ trunk/ggc-ppc/GGCMobileNET/GUI/AboutWindow.cs 2009-05-27 15:10:51 UTC (rev 769)
@@ -0,0 +1,19 @@
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+
+namespace GGCMobileNET.GUI
+{
+ public partial class AboutWindow : Form
+ {
+ public AboutWindow()
+ {
+ InitializeComponent();
+ }
+ }
+}
\ No newline at end of file
Added: trunk/ggc-ppc/GGCMobileNET/GUI/Config/ConfigurationWindow.Designer.cs
===================================================================
--- trunk/ggc-ppc/GGCMobileNET/GUI/Config/ConfigurationWindow.Designer.cs (rev 0)
+++ trunk/ggc-ppc/GGCMobileNET/GUI/Config/ConfigurationWindow.Designer.cs 2009-05-27 15:10:51 UTC (rev 769)
@@ -0,0 +1,61 @@
+namespace GGCMobileNET.GUI
+{
+ partial class ConfigurationWindow
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+ private System.Windows.Forms.MainMenu mainMenu1;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.mainMenu1 = new System.Windows.Forms.MainMenu();
+ this.label1 = new System.Windows.Forms.Label();
+ this.SuspendLayout();
+ //
+ // label1
+ //
+ this.label1.Location = new System.Drawing.Point(76, 24);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(100, 20);
+ this.label1.Text = "Configuration";
+ //
+ // ConfigurationWindow
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+ this.AutoScroll = true;
+ this.ClientSize = new System.Drawing.Size(240, 268);
+ this.Controls.Add(this.label1);
+ this.Menu = this.mainMenu1;
+ this.Name = "ConfigurationWindow";
+ this.Text = "ConfigurationWindow";
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.Label label1;
+ }
+}
\ No newline at end of file
Added: trunk/ggc-ppc/GGCMobileNET/GUI/Config/ConfigurationWindow.cs
===================================================================
--- trunk/ggc-ppc/GGCMobileNET/GUI/Config/ConfigurationWindow.cs (rev 0)
+++ trunk/ggc-ppc/GGCMobileNET/GUI/Config/ConfigurationWindow.cs 2009-05-27 15:10:51 UTC (rev 769)
@@ -0,0 +1,19 @@
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+
+namespace GGCMobileNET.GUI
+{
+ public partial class ConfigurationWindow : Form
+ {
+ public ConfigurationWindow()
+ {
+ InitializeComponent();
+ }
+ }
+}
\ No newline at end of file
Added: trunk/ggc-ppc/GGCMobileNET/GUI/Config/ConfigurationWindow.resx
===================================================================
--- trunk/ggc-ppc/GGCMobileNET/GUI/Config/ConfigurationWindow.resx (rev 0)
+++ trunk/ggc-ppc/GGCMobileNET/GUI/Config/ConfigurationWindow.resx 2009-05-27 15:10:51 UTC (rev 769)
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <metadata name="mainMenu1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
+ <metadata name="$this.FormFactorShadowProperty" xml:space="preserve">
+ <value>Pocket_PC</value>
+ </metadata>
+ <metadata name="$this.Skin" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+</root>
\ No newline at end of file
Added: trunk/ggc-ppc/GGCMobileNET/GUI/DailyData/BolusWizardWindow.Designer.cs
===================================================================
--- trunk/ggc-ppc/GGCMobileNET/GUI/DailyData/BolusWizardWindow.Designer.cs (rev 0)
+++ trunk/ggc-ppc/GGCMobileNET/GUI/DailyData/BolusWizardWindow.Designer.cs 2009-05-27 15:10:51 UTC (rev 769)
@@ -0,0 +1,61 @@
+namespace GGCMobileNET.GUI.DailyData
+{
+ partial class BolusWizardWindow
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+ private System.Windows.Forms.MainMenu mainMenu1;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.mainMenu1 = new System.Windows.Forms.MainMenu();
+ this.label1 = new System.Windows.Forms.Label();
+ this.SuspendLayout();
+ //
+ // label1
+ //
+ this.label1.Location = new System.Drawing.Point(72, 23);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(100, 20);
+ this.label1.Text = "Bolus Wizard";
+ //
+ // BolusWizardWindow
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+ this.AutoScroll = true;
+ this.ClientSize = new System.Drawing.Size(240, 268);
+ this.Controls.Add(this.label1);
+ this.Menu = this.mainMenu1;
+ this.Name = "BolusWizardWindow";
+ this.Text = "Bolus Wizard";
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.Label label1;
+ }
+}
\ No newline at end of file
Added: trunk/ggc-ppc/GGCMobileNET/GUI/DailyData/BolusWizardWindow.cs
===================================================================
--- trunk/ggc-ppc/GGCMobileNET/GUI/DailyData/BolusWizardWindow.cs (rev 0)
+++ trunk/ggc-ppc/GGCMobileNET/GUI/DailyData/BolusWizardWindow.cs 2009-05-27 15:10:51 UTC (rev 769)
@@ -0,0 +1,19 @@
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+
+namespace GGCMobileNET.GUI.DailyData
+{
+ public partial class BolusWizardWindow : Form
+ {
+ public BolusWizardWindow()
+ {
+ InitializeComponent();
+ }
+ }
+}
\ No newline at end of file
Added: trunk/ggc-ppc/GGCMobileNET/GUI/DailyData/BolusWizardWindow.resx
===================================================================
--- trunk/ggc-ppc/GGCMobileNET/GUI/DailyData/BolusWizardWindow.resx (rev 0)
+++ trunk/ggc-ppc/GGCMobileNET/GUI/DailyData/BolusWizardWindow.resx 2009-05-27 15:10:51 UTC (rev 769)
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <metadata name="mainMenu1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
+ <metadata name="$this.FormFactorShadowProperty" xml:space="preserve">
+ <value>Pocket_PC</value>
+ </metadata>
+ <metadata name="$this.Skin" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+</root>
\ No newline at end of file
Added: trunk/ggc-ppc/GGCMobileNET/GUI/DailyData/DailyDataItemWindow.Designer.cs
===================================================================
--- trunk/ggc-ppc/GGCMobileNET/GUI/DailyData/DailyDataItemWindow.Designer.cs (rev 0)
+++ trunk/ggc-ppc/GGCMobileNET/GUI/DailyData/DailyDataItemWindow.Designer.cs 2009-05-27 15:10:51 UTC (rev 769)
@@ -0,0 +1,367 @@
+namespace GGCMobileNET.GUI.DailyData
+{
+ partial class DailyDataItemWindow
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+ private System.Windows.Forms.MainMenu mainMenu1;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.mainMenu1 = new System.Windows.Forms.MainMenu();
+ this.tabControl1 = new System.Windows.Forms.TabControl();
+ this.tabPage1 = new System.Windows.Forms.TabPage();
+ this.button5 = new System.Windows.Forms.Button();
+ this.button4 = new System.Windows.Forms.Button();
+ this.label5 = new System.Windows.Forms.Label();
+ this.button3 = new System.Windows.Forms.Button();
+ this.checkBox1 = new System.Windows.Forms.CheckBox();
+ this.textBox4 = new System.Windows.Forms.TextBox();
+ this.label4 = new System.Windows.Forms.Label();
+ this.button2 = new System.Windows.Forms.Button();
+ this.button1 = new System.Windows.Forms.Button();
+ this.textBox3 = new System.Windows.Forms.TextBox();
+ this.textBox2 = new System.Windows.Forms.TextBox();
+ this.label3 = new System.Windows.Forms.Label();
+ this.label2 = new System.Windows.Forms.Label();
+ this.label1 = new System.Windows.Forms.Label();
+ this.textBox1 = new System.Windows.Forms.TextBox();
+ this.comboBox1 = new System.Windows.Forms.ComboBox();
+ this.dateTimePicker2 = new System.Windows.Forms.DateTimePicker();
+ this.dateTimePicker1 = new System.Windows.Forms.DateTimePicker();
+ this.tabPage2 = new System.Windows.Forms.TabPage();
+ this.button7 = new System.Windows.Forms.Button();
+ this.button6 = new System.Windows.Forms.Button();
+ this.textBox7 = new System.Windows.Forms.TextBox();
+ this.textBox6 = new System.Windows.Forms.TextBox();
+ this.textBox5 = new System.Windows.Forms.TextBox();
+ this.label8 = new System.Windows.Forms.Label();
+ this.label7 = new System.Windows.Forms.Label();
+ this.label6 = new System.Windows.Forms.Label();
+ this.tabControl1.SuspendLayout();
+ this.tabPage1.SuspendLayout();
+ this.tabPage2.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // tabControl1
+ //
+ this.tabControl1.Controls.Add(this.tabPage1);
+ this.tabControl1.Controls.Add(this.tabPage2);
+ this.tabControl1.Location = new System.Drawing.Point(0, 0);
+ this.tabControl1.Name = "tabControl1";
+ this.tabControl1.SelectedIndex = 0;
+ this.tabControl1.Size = new System.Drawing.Size(240, 268);
+ this.tabControl1.TabIndex = 0;
+ //
+ // tabPage1
+ //
+ this.tabPage1.Controls.Add(this.button5);
+ this.tabPage1.Controls.Add(this.button4);
+ this.tabPage1.Controls.Add(this.label5);
+ this.tabPage1.Controls.Add(this.button3);
+ this.tabPage1.Controls.Add(this.checkBox1);
+ this.tabPage1.Controls.Add(this.textBox4);
+ this.tabPage1.Controls.Add(this.label4);
+ this.tabPage1.Controls.Add(this.button2);
+ this.tabPage1.Controls.Add(this.button1);
+ this.tabPage1.Controls.Add(this.textBox3);
+ this.tabPage1.Controls.Add(this.textBox2);
+ this.tabPage1.Controls.Add(this.label3);
+ this.tabPage1.Controls.Add(this.label2);
+ this.tabPage1.Controls.Add(this.label1);
+ this.tabPage1.Controls.Add(this.textBox1);
+ this.tabPage1.Controls.Add(this.comboBox1);
+ this.tabPage1.Controls.Add(this.dateTimePicker2);
+ this.tabPage1.Controls.Add(this.dateTimePicker1);
+ this.tabPage1.Location = new System.Drawing.Point(0, 0);
+ this.tabPage1.Name = "tabPage1";
+ this.tabPage1.Size = new System.Drawing.Size(240, 245);
+ this.tabPage1.Text = "Basic";
+ //
+ // button5
+ //
+ this.button5.Location = new System.Drawing.Point(115, 220);
+ this.button5.Name = "button5";
+ this.button5.Size = new System.Drawing.Size(72, 20);
+ this.button5.TabIndex = 17;
+ this.button5.Text = "button5";
+ this.button5.Click += new System.EventHandler(this.button5_Click);
+ //
+ // button4
+ //
+ this.button4.Location = new System.Drawing.Point(37, 220);
+ this.button4.Name = "button4";
+ this.button4.Size = new System.Drawing.Size(72, 20);
+ this.button4.TabIndex = 16;
+ this.button4.Text = "button4";
+ this.button4.Click += new System.EventHandler(this.button4_Click);
+ //
+ // label5
+ //
+ this.label5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.label5.Location = new System.Drawing.Point(14, 19);
+ this.label5.Name = "label5";
+ this.label5.Size = new System.Drawing.Size(56, 20);
+ this.label5.Text = "Date:";
+ //
+ // button3
+ //
+ this.button3.Location = new System.Drawing.Point(124, 166);
+ this.button3.Name = "button3";
+ this.button3.Size = new System.Drawing.Size(97, 20);
+ this.button3.TabIndex = 14;
+ this.button3.Text = "Foods";
+ this.button3.Click += new System.EventHandler(this.button3_Click);
+ //
+ // checkBox1
+ //
+ this.checkBox1.Location = new System.Drawing.Point(87, 192);
+ this.checkBox1.Name = "checkBox1";
+ this.checkBox1.Size = new System.Drawing.Size(100, 20);
+ this.checkBox1.TabIndex = 13;
+ this.checkBox1.Text = "Food Set";
+ //
+ // textBox4
+ //
+ this.textBox4.Location = new System.Drawing.Point(77, 166);
+ this.textBox4.Name = "textBox4";
+ this.textBox4.Size = new System.Drawing.Size(41, 21);
+ this.textBox4.TabIndex = 12;
+ //
+ // label4
+ //
+ this.label4.Location = new System.Drawing.Point(14, 167);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(47, 20);
+ this.label4.Text = "CH:";
+ //
+ // button2
+ //
+ this.button2.Location = new System.Drawing.Point(124, 138);
+ this.button2.Name = "button2";
+ this.button2.Size = new System.Drawing.Size(97, 20);
+ this.button2.TabIndex = 10;
+ this.button2.Text = "Refresh CH";
+ this.button2.Click += new System.EventHandler(this.button2_Click);
+ //
+ // button1
+ //
+ this.button1.Location = new System.Drawing.Point(124, 112);
+ this.button1.Name = "button1";
+ this.button1.Size = new System.Drawing.Size(97, 20);
+ this.button1.TabIndex = 9;
+ this.button1.Text = "Bolus Wizard";
+ this.button1.Click += new System.EventHandler(this.button1_Click);
+ //
+ // textBox3
+ //
+ this.textBox3.Location = new System.Drawing.Point(76, 138);
+ this.textBox3.Name = "textBox3";
+ this.textBox3.Size = new System.Drawing.Size(42, 21);
+ this.textBox3.TabIndex = 8;
+ //
+ // textBox2
+ //
+ this.textBox2.Location = new System.Drawing.Point(76, 111);
+ this.textBox2.Name = "textBox2";
+ this.textBox2.Size = new System.Drawing.Size(42, 21);
+ this.textBox2.TabIndex = 7;
+ //
+ // label3
+ //
+ this.label3.Location = new System.Drawing.Point(14, 139);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(47, 20);
+ this.label3.Text = "Ins 2:";
+ //
+ // label2
+ //
+ this.label2.Location = new System.Drawing.Point(14, 112);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(47, 20);
+ this.label2.Text = "Ins 1:";
+ //
+ // label1
+ //
+ this.label1.Location = new System.Drawing.Point(14, 74);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(47, 20);
+ this.label1.Text = "BG:";
+ //
+ // textBox1
+ //
+ this.textBox1.Location = new System.Drawing.Point(144, 72);
+ this.textBox1.Name = "textBox1";
+ this.textBox1.Size = new System.Drawing.Size(63, 21);
+ this.textBox1.TabIndex = 3;
+ //
+ // comboBox1
+ //
+ this.comboBox1.Items.Add("mmol/L");
+ this.comboBox1.Items.Add("mg/dL");
+ this.comboBox1.Location = new System.Drawing.Point(75, 72);
+ this.comboBox1.Name = "comboBox1";
+ this.comboBox1.Size = new System.Drawing.Size(54, 22);
+ this.comboBox1.TabIndex = 2;
+ //
+ // dateTimePicker2
+ //
+ this.dateTimePicker2.Format = System.Windows.Forms.DateTimePickerFormat.Time;
+ this.dateTimePicker2.Location = new System.Drawing.Point(75, 44);
+ this.dateTimePicker2.Name = "dateTimePicker2";
+ this.dateTimePicker2.Size = new System.Drawing.Size(86, 22);
+ this.dateTimePicker2.TabIndex = 1;
+ //
+ // dateTimePicker1
+ //
+ this.dateTimePicker1.Location = new System.Drawing.Point(75, 16);
+ this.dateTimePicker1.Name = "dateTimePicker1";
+ this.dateTimePicker1.Size = new System.Drawing.Size(142, 22);
+ this.dateTimePicker1.TabIndex = 0;
+ //
+ // tabPage2
+ //
+ this.tabPage2.Controls.Add(this.button7);
+ this.tabPage2.Controls.Add(this.button6);
+ this.tabPage2.Controls.Add(this.textBox7);
+ this.tabPage2.Controls.Add(this.textBox6);
+ this.tabPage2.Controls.Add(this.textBox5);
+ this.tabPage2.Controls.Add(this.label8);
+ this.tabPage2.Controls.Add(this.label7);
+ this.tabPage2.Controls.Add(this.label6);
+ this.tabPage2.Location = new System.Drawing.Point(0, 0);
+ this.tabPage2.Name = "tabPage2";
+ this.tabPage2.Size = new System.Drawing.Size(240, 245);
+ this.tabPage2.Text = "Extended";
+ //
+ // button7
+ //
+ this.button7.Location = new System.Drawing.Point(120, 214);
+ this.button7.Name = "button7";
+ this.button7.Size = new System.Drawing.Size(72, 20);
+ this.button7.TabIndex = 7;
+ this.button7.Text = "Cancel";
+ this.button7.Click += new System.EventHandler(this.button7_Click);
+ //
+ // button6
+ //
+ this.button6.Location = new System.Drawing.Point(42, 214);
+ this.button6.Name = "button6";
+ this.button6.Size = new System.Drawing.Size(72, 20);
+ this.button6.TabIndex = 6;
+ this.button6.Text = "OK";
+ this.button6.Click += new System.EventHandler(this.button6_Click);
+ //
+ // textBox7
+ //
+ this.textBox7.Location = new System.Drawing.Point(28, 167);
+ this.textBox7.Name = "textBox7";
+ this.textBox7.Size = new System.Drawing.Size(153, 21);
+ this.textBox7.TabIndex = 5;
+ //
+ // textBox6
+ //
+ this.textBox6.Location = new System.Drawing.Point(28, 107);
+ this.textBox6.Name = "textBox6";
+ this.textBox6.Size = new System.Drawing.Size(153, 21);
+ this.textBox6.TabIndex = 4;
+ //
+ // textBox5
+ //
+ this.textBox5.Location = new System.Drawing.Point(28, 46);
+ this.textBox5.Name = "textBox5";
+ this.textBox5.Size = new System.Drawing.Size(153, 21);
+ this.textBox5.TabIndex = 3;
+ //
+ // label8
+ //
+ this.label8.Location = new System.Drawing.Point(28, 147);
+ this.label8.Name = "label8";
+ this.label8.Size = new System.Drawing.Size(100, 20);
+ this.label8.Text = "Comment:";
+ //
+ // label7
+ //
+ this.label7.Location = new System.Drawing.Point(28, 87);
+ this.label7.Name = "label7";
+ this.label7.Size = new System.Drawing.Size(100, 20);
+ this.label7.Text = "Activity:";
+ //
+ // label6
+ //
+ this.label6.Location = new System.Drawing.Point(28, 26);
+ this.label6.Name = "label6";
+ this.label6.Size = new System.Drawing.Size(100, 20);
+ this.label6.Text = "Urine:";
+ //
+ // DailyDataItemWindow
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+ this.AutoScroll = true;
+ this.ClientSize = new System.Drawing.Size(240, 268);
+ this.Controls.Add(this.tabControl1);
+ this.Menu = this.mainMenu1;
+ this.Name = "DailyDataItemWindow";
+ this.Text = "Add/Edit Entry";
+ this.tabControl1.ResumeLayout(false);
+ this.tabPage1.ResumeLayout(false);
+ this.tabPage2.ResumeLayout(false);
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.TabControl tabControl1;
+ private System.Windows.Forms.TabPage tabPage1;
+ private System.Windows.Forms.TabPage tabPage2;
+ private System.Windows.Forms.DateTimePicker dateTimePicker2;
+ private System.Windows.Forms.DateTimePicker dateTimePicker1;
+ private System.Windows.Forms.ComboBox comboBox1;
+ private System.Windows.Forms.TextBox textBox4;
+ private System.Windows.Forms.Label label4;
+ private System.Windows.Forms.Button button2;
+ private System.Windows.Forms.Button button1;
+ private System.Windows.Forms.TextBox textBox3;
+ private System.Windows.Forms.TextBox textBox2;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.TextBox textBox1;
+ private System.Windows.Forms.CheckBox checkBox1;
+ private System.Windows.Forms.Label label5;
+ private System.Windows.Forms.Button button3;
+ private System.Windows.Forms.Button button5;
+ private System.Windows.Forms.Button button4;
+ private System.Windows.Forms.Button button7;
+ private System.Windows.Forms.Button button6;
+ private System.Windows.Forms.TextBox textBox7;
+ private System.Windows.Forms.TextBox textBox6;
+ private System.Windows.Forms.TextBox textBox5;
+ private System.Windows.Forms.Label label8;
+ private System.Windows.Forms.Label label7;
+ private System.Windows.Forms.Label label6;
+ }
+}
\ No newline at end of file
Added: trunk/ggc-ppc/GGCMobileNET/GUI/DailyData/DailyDataItemWindow.cs
===================================================================
--- trunk/ggc-ppc/GGCMobileNET/GUI/DailyData/DailyDataItemWindow.cs (rev 0)
+++ trunk/ggc-ppc/GGCMobileNET/GUI/DailyData/DailyDataItemWindow.cs 2009-05-27 15:10:51 UTC (rev 769)
@@ -0,0 +1,139 @@
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using GGCMobileNET.Data.Db.Objects;
+using GGCMobileNET.Data.Utils;
+using GGCMobileNET.Data;
+
+namespace GGCMobileNET.GUI.DailyData
+{
+ public partial class DailyDataItemWindow : Form
+ {
+ private bool new_item = false;
+ private DailyValuesRow data_object;
+
+ public DailyDataItemWindow()
+ {
+ InitializeComponent();
+ this.new_item = true;
+ }
+
+ public DailyDataItemWindow(DailyValuesRow dobject)
+ {
+ this.data_object = dobject;
+ }
+
+
+
+
+ private void button7_Click(object sender, EventArgs e)
+ {
+ // cancel
+ this.cmdCanel();
+ }
+
+ private void button6_Click(object sender, EventArgs e)
+ {
+ // ok
+ cmdOK();
+ }
+
+ private void button4_Click(object sender, EventArgs e)
+ {
+ // ok
+ cmdOK();
+ }
+
+ private void button5_Click(object sender, EventArgs e)
+ {
+ // cancel
+ this.cmdCanel();
+ }
+
+ private void cmdOK()
+ {
+ int type = 0;
+
+ if (this.comboBox1.SelectedIndex == 0)
+ type = DataAccessMobile.BG_MMOL;
+ else
+ type = DataAccessMobile.BG_MGDL;
+
+ if (this.new_item)
+ {
+ this.data_object = new DailyValuesRow();
+ this.data_object.SetDateTime(this.dateTimePicker1.Value, this.dateTimePicker2.Value);
+ this.data_object.setBG(type, this.textBox1.Text);
+ this.data_object.setIns1(this.textBox2.Text);
+
+ this.data_object.setIns2(this.textBox3.Text);
+ this.data_object.setCH(this.textBox4.Text);
+ this.data_object.setUrine(this.textBox5.Text);
+ this.data_object.setActivity(this.textBox6.Text);
+ this.data_obje...
[truncated message content] |
|
From: <and...@us...> - 2010-02-20 13:28:00
|
Revision: 980
http://ggc.svn.sourceforge.net/ggc/?rev=980&view=rev
Author: andyrozman
Date: 2010-02-20 13:27:53 +0000 (Sat, 20 Feb 2010)
Log Message:
-----------
Modified Paths:
--------------
trunk/build/AtechTools.properties
trunk/ggc-plugin_base/build/GGCPlugInBaseBuild.properties
Added Paths:
-----------
trunk/ggc-language_tool/
trunk/ggc-language_tool/.project
trunk/ggc-language_tool/base_pack/
trunk/ggc-language_tool/doc/
trunk/ggc-language_tool/lang_packs/
trunk/ggc-language_tool/tool/
Modified: trunk/build/AtechTools.properties
===================================================================
--- trunk/build/AtechTools.properties 2010-02-19 22:04:35 UTC (rev 979)
+++ trunk/build/AtechTools.properties 2010-02-20 13:27:53 UTC (rev 980)
@@ -1 +1 @@
-atech-tools.api=../../ggc-support/lib/utils/atech-tools-0.3.7.jar
+atech-tools.api=../../ggc-support/lib/utils/atech-tools-0.4.1.jar
Added: trunk/ggc-language_tool/.project
===================================================================
--- trunk/ggc-language_tool/.project (rev 0)
+++ trunk/ggc-language_tool/.project 2010-02-20 13:27:53 UTC (rev 980)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>GGC Language Translations</name>
+ <comment></comment>
+ <projects>
+ <project>Atech-Tools</project>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.jem.beaninfo.BeanInfoNature</nature>
+ </natures>
+</projectDescription>
Modified: trunk/ggc-plugin_base/build/GGCPlugInBaseBuild.properties
===================================================================
--- trunk/ggc-plugin_base/build/GGCPlugInBaseBuild.properties 2010-02-19 22:04:35 UTC (rev 979)
+++ trunk/ggc-plugin_base/build/GGCPlugInBaseBuild.properties 2010-02-20 13:27:53 UTC (rev 980)
@@ -80,12 +80,17 @@
iText.api=${utils_path}/iText-2.0.7.jar
+#
+# Java Communication API from IBM
+#
+java_comm_ibm.api=${utils_path}/IBMCommWin.jar
+
#
### STOP EDITING HERE
#
-utils_cpath=${iText.api};${comunication.api};${atech-tools.api};${jna.api};${jfreechart.api}
+utils_cpath=${iText.api};${comunication.api};${atech-tools.api};${jna.api};${jfreechart.api};${java_comm_ibm.api}
hibernate_cpath=${hibernate_path}/asm.jar;${hibernate_path}/asm-attrs.jar;${hibernate_path}/c3p0-0.9.0.jar;${hibernate_path}/cglib-2.1.3.jar;${hibernate_path}/commons-collections-2.1.1.jar;${hibernate_path}/commons-logging-1.0.4.jar;${hibernate_path}/dom4j-1.6.1.jar;${hibernate_path}/hibernate3.jar;${hibernate_path}/jdbc2_0-stdext.jar;${hibernate_path}/jta.jar;${hibernate_path}/log4j-1.2.11.jar;${hibernate_path}/ehcache-1.1.jar;${hibernate_path}/commons-lang-2.0.jar;${hibernate_path}/antlr-2.7.6rc1.jar
jdbc_cpath=${jdbc_path}/hsqldb.jar;${additional.jdbc.driver}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ru...@us...> - 2010-08-10 17:50:00
|
Revision: 1105
http://ggc.svn.sourceforge.net/ggc/?rev=1105&view=rev
Author: rumbi
Date: 2010-08-10 17:49:54 +0000 (Tue, 10 Aug 2010)
Log Message:
-----------
RR:
- removing outdated lib from ggc-support
- spelling
Modified Paths:
--------------
trunk/ggc-desktop/doc/How_Can_I_Help.txt
trunk/ggc-desktop/doc/translation/How_To_Translate_GGC.txt
Removed Paths:
-------------
trunk/ggc-support/lib/utils/atech-tools-0.3.2.jar
Property Changed:
----------------
trunk/ggc-support/eclipse/
Modified: trunk/ggc-desktop/doc/How_Can_I_Help.txt
===================================================================
--- trunk/ggc-desktop/doc/How_Can_I_Help.txt 2010-08-07 09:11:13 UTC (rev 1104)
+++ trunk/ggc-desktop/doc/How_Can_I_Help.txt 2010-08-10 17:49:54 UTC (rev 1105)
@@ -231,7 +231,7 @@
6.) Run GGC
- Go to GGC Gluco Control/src/ggc-desktop/GGC.java (Right click on it, select Run As...->Java application
+ Go to GGC Desktop/src/ggc/GGC.java (Right click on it, select Run As...->Java application
Copy files from ggc-support/data
@@ -276,7 +276,7 @@
target to 1.5 is not enough.
Javadoc. We are trying to start writing documentation and Javadoc is first step towards that.
- Old code will be commented with time, mostly be people who created code. All new code needs
+ Old code will be commented with time, mostly by the people who created the code. All new code needs
to have comments (javadoc and othwerwise). Eclipse will help you with making empty javadoc
comments, and then just fill all the data (upper javadoc wont check if arguments are filled,
but they should be, since after some time we will enable that function, but for now we haven't
@@ -288,7 +288,7 @@
8.) If you wish to test GGC Meter Tool, GGC Pump tool you will also need to set binaries for rxtx library. If
- your development OS is either windows, linux, macos, sparc you are in luck.
+ your development OS is either windows, linux, MacOS or sparc you are in luck.
Go to rxtx entry, right click on it, select Build Path -> Configure Build path
Set Native Library Location
Modified: trunk/ggc-desktop/doc/translation/How_To_Translate_GGC.txt
===================================================================
--- trunk/ggc-desktop/doc/translation/How_To_Translate_GGC.txt 2010-08-07 09:11:13 UTC (rev 1104)
+++ trunk/ggc-desktop/doc/translation/How_To_Translate_GGC.txt 2010-08-10 17:49:54 UTC (rev 1105)
@@ -12,7 +12,7 @@
1.) How does Java handle translations? And how does GGC?
--------------------------------------------------------
-In Java translations are written in separate files, each ending with ceratain endings. Usually this
+In Java translations are written in separate files, each ending with certain endings. Usually this
is done like this: en_US, which means that language is English, and subset is American. We simplified
things here in GGC, so that we have just en, which means English translation.
@@ -28,8 +28,8 @@
Easier way to translate will be probably to write in your native characters and then later convert file to
plain ASCII. How to do that we will see later.
-
+
2.) How to start?
-----------------
@@ -56,7 +56,7 @@
At first you will need to decide how you wish to help us translate. There are two ways.
a.) Offline mode
-In this "mode" you will receive your files to translate and you will send them back regullary (we can determine
+In this "mode" you will receive your files to translate and you will send them back regularly (we can determine
how often later). In addition to that, you will receive each month another package, with "new" translation files.
This will be english files, which you will need to compare to your translations (with tool 1) and add all new
keywords, there were added.
@@ -64,7 +64,7 @@
b.) Online mode
In online mode, you will need to get SVN tree of all sources and you will need to check files regulary, but you
-will get your changed files (EN) directly from SVN tree. If you plan to help with development this is preffered
+will get your changed files (EN) directly from SVN tree. If you plan to help with development this is the preferred
way. For working in this mode, you will need to either install development environment (see document
How_Can_I_Help.txt, section D) or SVN application for managing source files. If you don't plan to help with
development you should go with second option. We need to know this to know how to add you (as developers or
@@ -179,7 +179,7 @@
# Untranslated: # # # # (untranslated words)
# Same: # # # # (words that are same in your and english language)
#
-# Procents translated: # % (how many procents need to be translated)
+# Percent translated: # % (how many percent need to be translated)
Following two values need to set:
Property changes on: trunk/ggc-support/eclipse
___________________________________________________________________
Modified: svn:ignore
- commons-collections-2.1.1
commons-lang-2.4
commons-logging-1.0.4
dom4j-1.6.1
h2-1.0.69
hibernate-3.1
iText-2.0.7
javahelp-2.0.5
log4j-1.2.15
postgresql-8.2
rxtx-2.1.7
servlet-development-tc-5.5
skinlf-6.7
xpp3-1.1.4c
pygmy-0.2
rxtx-2.1-7-bins-r2
+ commons-collections-2.1.1
commons-lang-2.4
commons-logging-1.0.4
dom4j-1.6.1
h2-1.0.69
hibernate-3.1
iText-2.0.7
javahelp-2.0.5
log4j-1.2.15
postgresql-8.2
rxtx-2.1.7
servlet-development-tc-5.5
skinlf-6.7
xpp3-1.1.4c
pygmy-0.2
rxtx-2.1-7-bins-r2
ggc-web
IBMComm
rxtx-2.2
Deleted: trunk/ggc-support/lib/utils/atech-tools-0.3.2.jar
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ru...@us...> - 2011-07-03 07:07:10
|
Revision: 1182
http://ggc.svn.sourceforge.net/ggc/?rev=1182&view=rev
Author: rumbi
Date: 2011-07-03 07:07:02 +0000 (Sun, 03 Jul 2011)
Log Message:
-----------
RR: quick & dirty fix to prevent Exception in case of error - should be handled properly sometime
Modified Paths:
--------------
trunk/ggc-desktop/src/ggc/gui/panels/prefs/PrefMedicalDataPane.java
Added Paths:
-----------
trunk/ggc-core/src/GGC_de.properties
Removed Paths:
-------------
trunk/ggc-core/src/GGC_de.properties
Deleted: trunk/ggc-core/src/GGC_de.properties
===================================================================
--- trunk/ggc-core/src/GGC_de.properties 2011-07-02 08:53:05 UTC (rev 1181)
+++ trunk/ggc-core/src/GGC_de.properties 2011-07-03 07:07:02 UTC (rev 1182)
@@ -1,817 +0,0 @@
-#
-# ######################################################################
-# ### GNU Glucose Control ###
-# ######################################################################
-# ### Language: German ###
-# ### Created by: Reinhold Rumberger (ru...@us...)###
-# ### Version: 0.4.17 ###
-# ### Last change: 21.8.2010 7:7:45 ###
-# ######################################################################
-#
-#
-# Translation status:
-# Words/expressions: 624
-# Not translated: 585 (93 %)
-# Need to be checked: 36 (5 %)
-#
-# Translated: 3 (0 %)
-#
-#
-#
-## GGC Core#
-# Collation Rules - In unicode we can create special rules for sorting where we specify
-# sorting order of special characters. This will be used by tree's and special tables.
-# For english this is left empty. For all other (that have non-standard, non english
-# charcters) we need to set this if we want sorting to be done correctly.
-#
-COLLATION_RULES=< 0 < 1 < 2 < 3 < 4 < 5 < 6 < 7 < 8 < 9 < a,A,\u00E4,\u00C4,\u00E1,\u00E0,\u00C1,\u00C0,\u00E2,\u00C2 < b,B < c,C < d,D < e,E,\u00E9,\u00E8,\u00EA,\u00C9,\u00C8,\u00CA < f,F < g,G < h,H < i,I < j,J < k,K < l,L < m,M < n,N < o,O,\u00F6,\u00D6 < p,P < q,Q < r,R < s,S,\u00DF < t,T < u,U,\u00FC,\u00DC < v,V < w,W < x,X < y,Y < z,Z
-
-#
-# GGC - Globally used [1]
-#
-DELETE=L\u00F6schen
-ADD=Hinzuf\u00FCgen
-EDIT=Bearbeiten
-NEW=Neu
-EDIT_DEL_SHORT=Bearb./L\u00F6schen
-FEATURE=Feature
-IMPLEMENTED_VERSION=wird in Version %s implementiert
-OR=oder
-INFORMATION=Information
-QUESTION=Frage
-YES=Ja
-NO=Nein
-COMMING_IN_VERSION=Kommt in Version %s
-NOT_WORKING_100PRO=Funktioniert noch nicht 100%
-NOT_TESTED_100PRO=Noch nicht 100% getestet
-NOT_USED=Nicht verwendet
-
-#
-# ggc.datamodels [1]
-#
-NO_NAME=Kein Name
-TIME=Zeit
-BG=BZ
-INS_1=Ins1
-INS_2=Ins2
-INS_3=Ins3
-INSULIN_1=Insulin 1
-INSULIN_2=Insulin 2
-INSULIN_3=Insulin 3
-BU=KH
-ACT=Ac.
-COMMENT=Kommentar
-DATE_MUST_BE_IN_FORMAT=Datum muss folgendes Format haben
-TIME_MUST_BE_IN_FORMAT=Zeit muss folgendes Format haben
-ERROR_PARSING_DATE=Fehler beim Parsen des Datums
-DATETIME=Datum/Zeit
-PUMP_INSULIN=Pumpen-Insulin
-
-#
-# Main Frame (Info panels) & Other places [1]
-#
-
-# general
-BG_TARGET=BZ-Ziel
-
-# hba1c
-NO_EXPRESSIVENESS=Keine Aussagekraft
-LITTLE_EXPRESSIVENESS=Geringe Aussagekraft
-STANDARD_EXPRESSIVENESS=Mittlere Aussagekraft
-GOOD_EXPRESSIVENESS=Hohe Aussagekraft
-
-#
-# Daily Values Stats [1]
-#
-
-# main
-CH_LONG=Kohlehydrate
-ACTIVITY=Bewegung
-FOOD=Lebensmittel
-UPDATE_FROM_FOOD=KH aktualisieren
-EDIT_FOOD=Lebensmittel Db [1]
-DATE_TIME=Date/Time
-FOOD_SET=Lebensmittelgruppe [%s]
-
-
-# meals
-FOOD_BY_DESCRIPTION=Description [2]
-FOOD_BY_DESCRIPTION_TITLE=Food by Description
-DESCRIBE_FOODS=<html><b>Describe food(s) you ate</b> (if you enclose CH in brackets [], CH can be automatically calculated)</html>
-CALCULATE=Calculate
-NO_DESCRIPTIONS_WITH_CH=There were no descriptions with CH\ndefinitions found within Food Description\narea. If you made mistake, edit text\nagain.\n
-CH=CH
-
-#
-# Main GUI Panels [1]
-#
-ADD_ROW=Neuer Eintrag
-EDIT_ROW=Eintrag \u00e4ndern
-CLOSE=Schlie\u00dfen
-COURSE_GRAPH=Verlaufsdiagramm
-SPREAD_GRAPH=Spread Graph
-TO_BE_DRAWN=Einzuzeichnen
-CONNECT_VALUES_FOR_ONE_DAY=Werte eines Tages verbinden
-SUM_BU=Summe KH
-SUM=Summe
-SUM_INSULIN=Summe IE
-AVG_BG_PER_DAY=mittlerer BZ pro Tag
-INS_PER_DAY=Ins. per day
-MEALS=Mahlzeiten
-INS_SLASH_BU=Ins/KH
-DRAW=Zeichnen
-DAILYGRAPHFRAME=Tagesdiagramm
-DAILYSTATSFRAME=Tagesstatistiken
-SAVE=Speichern
-DELETE_ROW=Eintrag L\u00f6schen
-LOWEST=Niedrigster
-STD_DEV=Std Dev
-READINGS=Werte
-HIGHEST=H\u00f6chster
-AVG_BG=Mittl. BZ
-BLOOD_GLUCOSE=Blutzucker
-BREAD_UNITS=Broteinheiten
-AVG=Mittl.
-INSULIN=Insulin
-URINE=Urin
-DOSE=Dosis
-TOTAL=Summe
-AVG_INS=Mittl. IE
-DOSE_INS=Insulindosis
-CANCEL=Abbrechen
-OK=OK
-HELP=Hilfe
-ADD_NEW_VALUES=Neue Werte eintragen
-COURSEGRAPHFRAME=Verlaufsdiagramm
-FREQGRAPHFRAME=Frequency Graph
-GRAPH=Diagramm
-ADD_NEW_ROW_TO_TABLE=F\u00fcgt eine neue Wertereihe in die Tabelle ein.
-DELETE_SELECTED_ROWS=L\u00f6sche ausgew\u00e4hlte Zeilen.
-SELECT_ROW_FIRST=Bitte zuerst einen Eintrag ausw\u00e4hlen!
-READINGS_SLASH_DAY=Werte/Tag
-VALUATION=Wertung
-INIT=Initialisierung
-READY=Fertig
-UNKNOWN=Unbekannt
-COMMENTS=Anmerkungen
-ARE_YOU_SURE_DELETE=Wollen Sie diesen Eintrag wirklich l\u00f6schen?
-ARE_YOU_SURE_DELETE_ROW=Wollen Sie diesen Eintrag wirklich l\u00f6schen?
-
-#
-# GGC Little (GUI) [2]
-#
-DAILY_VALUES=Tageswerte
-SHOW_DAILY_GRAPH=Diagramm anzeigen
-DAILY_CONTROL=Daily Control
-MN_QUIT_LT_DESC=GGC Little beenden
-CURRENT_DATE_HAS_CHANGED=Das Datum hat sich ge\u00e4ndert! Ihre Aktion wird deshalb verworfen und die Tabelle aktualisiert!
-TB_ADD_ROW_DESC=Add a new entry for this day
-TB_EDIT_ROW_DESC=Edit an entry for this day
-TB_DELETE_ROW_DESC=Delete an entry for this day
-TB_READ_METER_LT_DESC=Daten vom Me\u00dfger\u00e4t auslesen
-TB_ABOUT_DESC=\u00dcber GGC Little
-TB_SHOW_GRAPH_DESC=Diagramm f\u00fcr diesen Tag anzeigen
-GGC_LITTLE_TITLE=GNU Gluco Control Little
-TAB_CONTROL=Steuerung
-TAB_SCHEDULE=Terminplan
-TAB_PLUGIN=Plug-ins
-TAB_STOCKS=Bestand
-PLUGIN_IMPLEMENTED_VERSION=Dieses Plug-in wird in Version %s implementiert!
-METER_PLUGIN_PANEL=Me\u00dfger\u00e4te-Plug-in
-PUMP_PLUGIN_PANEL=Pumpen-Plug-in
-
-#
-# GGC Little (System Tray) [3]
-#
-SHOW_APP=Anzeigen
-SHOW_APP_DESC=GGC Little anzeigen
-HIDE_APP=Verstecken
-HIDE_APP_DESC=GGC Little verstecken
-EXIT_APP=Beenden
-EXIT_APP_DESC=GGC Little beenden
-
-#
-# Menus (BE CAREFUL about mnemonics used) Set mnemonic with & before mnemonic letter [1]
-#
-
-# main menus
-MN_FILE=&Datei
-MN_DATA=Pen/Injection
-MN_DATA_GRAPH=Diagramme
-MN_DOCTOR=&Arzt
-MN_FOOD=&Ern\u00e4hrung
-MN_PRINTING=D&rucken
-MN_TOOLS=&Werkzeuge
-MN_HELP=&Hilfe
-
-# file
-MN_LOGIN=Ein&loggen
-MN_LOGIN_DESC=Patient einloggen
-MN_LOGOUT=Ausl&oggen
-MN_LOGOUT_DESC=Ausloggen
-MN_QUIT=B&eenden
-MN_QUIT_DESC=GGC beenden
-
-# data
-MN_DAILY=&Tages\u00fcbersicht
-MN_DAILY_DESC=Tagesstatistik betrachten
-MN_COURSE=&Verlauf
-MN_COURSE_DESC=Verlauf betrachten
-MN_SPREAD=Ver&teilung
-MN_SPREAD_DESC=Verteilung betrachten
-MN_FREQUENCY=&Frequenz
-MN_FREQUENCY_DESC=Wertefrequenz betrachten
-MN_HBA1C=&HbA1c
-MN_HBA1C_DESC=HbA1c betrachten
-MN_DATA_RATIO=Ratio
-MN_DATA_RATIO_DESC=Ratios settings
-MN_RATIO_BASE=Base
-MN_RATIO_BASE_DESC=Base ratio settings (1 for day)
-MN_RATIO_EXTENDED=Extended
-MN_RATIO_EXTENDED_DESC=Extended ratio settings (more than 1 per day)
-MN_RATIO_CALC=&Verh\u00e4ltnisrechner
-MN_RATIO_CALC_DESC=Berechnet verschiedene Verh\u00e4ltnisse (Insulin/KH, ...)
-
-# tools
-MN_DB_MAINT=&Datenbank-Wartung
-MN_DB_MAINT_DESC=Funktionen f\u00fcr die Wartung der Datenbank
-MN_DB_BACKUP=Datenbank &sichern
-MN_DB_BACKUP_DESC=Sichert die GGC-Datenbank
-MN_DB_RESTORE=Datenbank &wiederherstellen
-MN_DB_RESTORE_DESC=Stellt die GGC-Datenbank anhand einer Sicherung wieder her
-MN_MISC_SYNCHRONIZE=&Synchronisierung
-MN_MISC_SYNCHRONIZE_DESC=Datenabgleich mit anderen GGC Instanzen
-MN_PREFERENCES=&Einstellungen
-MN_PREFERENCES_DESC=Einstellungen
-
-# help
-MN_ABOUT=\u00dc&ber
-MN_ABOUT_DESC=\u00dcber GGC
-MN_CHECK_FOR_UPDATE=Nach &Updates suchen
-MN_CHECK_FOR_UPDATE_DESC=Pr\u00fcft, ob eine neue Version verf\u00fcgbar ist
-
-# food
-MN_NUTRDB_USDB=N\u00e4hrstoff-DB (&USDA)
-MN_NUTRDB_USDB_DESC=Datenbank mit N\u00e4hrstoff-Informationen, ver\u00f6ffentlicht vom USDA
-MN_NUTRDB_USER=N\u00e4hrstoff-DB (&Benutzer)
-MN_NUTRDB_USER_DESC=N\u00e4hrstoff-Datenbank des Benutzers
-MN_MEALS=&Mahlzeiten-DB
-MN_MEALS_DESC=Datenbank mit vollst\u00e4ndigen Mahlzeiten
-
-# printing
-MN_REPORTS=&Data
-MN_REPORTS_DESC=Reports self-control data
-MN_PDF_SIMPLE=&Einfach
-MN_PDF_SIMPLE_DESC=Einfacher PDF-Bericht (monatl.)
-MN_PDF_EXT=&Ausf\u00fchrlich
-MN_PDF_EXT_DESC=Ausf\u00fchrlicher PDF-Bericht (monatl.)
-
-# doctors
-MN_DOCS=\u00c4&rzte
-MN_DOCS_DESC=\u00c4rzte
-MN_APPOINT=&Termine
-MN_APPOINT_DESC=Termine f\u00fcr Arztbesuche
-MN_STOCKS=&Bestand
-MN_STOCKS_DESC=Bestand medizinischer Ausr\u00fcstung
-
-#
-# ggc.gui.calendar [2]
-#
-ENDING_DATE=Enddatum
-STARTING_DATE=Startdatum
-1_WEEK=1 Woche
-1_MONTH=1 Monat
-3_MONTHS=3 Monate
-CUSTOM=Benutzerdefiniert
-DATE_RANGE_SELECTOR=Wahl des Zeitraumes
-SU=So
-MO=Mo
-TU=Di
-WE=Mi
-TH=Do
-FR=Fr
-SA=Sa
-JANUARY=Januar
-FEBRUARY=Februar
-MARCH=M\u00e4rz
-APRIL=April
-MAY=Mai
-JUNE=Juni
-JULY=Juli
-AUGUST=August
-SEPTEMBER=September
-OCTOBER=Oktober
-NOVEMBER=November
-DECEMBER=Dezember
-
-#
-# Main GUI Panels [1]
-#
-GENERAL_INFORMATION=Allgemeine Informationen
-YOUR_NAME=Ihr Name
-BOLUS_INSULIN=Bolusinsulin
-BASAL_INSULIN=Basalinsulin
-GLUCOMETER=Messger\u00e4t
-BG_UNIT=Ma\u00dfeinheit
-HBA1C=HbA1c
-YOUR_CURRENT_HBA1C=Ihr aktueller HbA1c
-NO_READINGS=Keine Werte
-NO_DATASOURCE=Keine Datenquelle
-SCHEDULE=Terminplan
-YOUR_NEXT_APPOINTMENT=Ihr n\u00e4chster Termin
-APP_WILL_BE_FOUND_HERE=wird hier zu finden sein...
-STATISTICS_FOR_LAST_WEEK=Statistiken f\u00fcr vorige Woche
-BG_STATISTICS=BZ Statistiken
-BU_STATISTICS=KH Statistiken
-BU_PER_DAY=KH pro Tag
-AVG_MEAL_SIZE=KH pro Mahlzeit
-MEALS_PER_DAY=Mahlzeiten pro Tag
-STATISTICS=Statistiken
-PER_DAY=pro Tag
-AVG_DOSE_SIZE=Mittl. Dosis
-DOSES_PER_DAY=Dosen pro Tag
-OTHER_INFO=Sonstiges
-STOCK=Bestand
-STOCK_DATA_HERE=Daten zu Ihrer medizinischen Ausr\u00fcstung
-STO_WILL_BE_FOUND_HERE=wird hier zu finden sein...
-NOT_YET=BISHER NOCH NICHT!
-BOLUS_INSULIN_SHORT=Bolus
-BASAL_INSULIN_SHORT=Basal
-AVERAGE=Average
-DOSES=Dosen
-
-#
-# Hba1c Dialog [1]
-#
-CALCULATED_HBA1C=Errechneter HbA1c
-
-#
-# Configuration [1]
-#
-APPLY=Anwenden
-ERROR=Fehler
-INVALID_NAME=Ung\u00fcltiger Name
-PREFERENCES=Einstellungen
-GENERAL=Allgemeines
-MEDICAL_DATA=Medizinische Daten
-COLORS_AND_FONTS=Farbe & Schrift
-RENDERING_QUALITY=Darstellungsqualit\u00e4t
-SOME_VALUES_CHANGED_LIKE_TO_SAVE=Einige Werte haben sich ge\u00e4ndert. Wollen Sie diese speichen?
-VALUES_CHANGED=Ge\u00e4nderte Werte
-CHOOSE_A_COLOR=W\u00e4hlen Sie eine Farbe
-BG_HIGH_ZONE=\u00dcberzuckerbereich
-BG_TARGET_ZONE=Zielbereich
-BG_LOW_ZONE=Unterzuckerbereich
-BG_AVERAGE=BZ Mittelwert
-INS_SLASH_BU_QUOTIENT=Ins/KH
-NAME=Name
-ABBR=Abk.
-HIGH_BG=\u00dcberzuckergrenze
-LOW_BG=Unterzuckergrenze
-TARGET_HIGH_BG=Obergrenze Zielbereich
-TARGET_LOW_BG=Untergrenze Zielbereich
-INSULIN_SETTINGS=Insulineinstellungen
-BLOOD_GLUCOSE_SETTINGS=Blutzuckereinstellungen
-BLOOD_GLUCOSE_UNIT_SETTING=BZ-Einheiteneinstellungen
-BLOOD_GLUCOSE_SETTINGS_1=BZ-Einstellungen (mg/dl)
-BLOOD_GLUCOSE_SETTINGS_2=BZ-Einstellungen (mmol/l)
-HOST=Host
-PORT=Port
-USERNAME=Benutzername
-PASSWORD=Passwort
-OPTIONS=Optionen
-ANTIALIASING=Kantengl\u00e4ttung
-COLOR_RENDERING=Farbdarstellung
-DITHERING=Dithering
-FRACTIONAL_METRICS=Fractional Metrics
-INTERPOLATION=Interpolation
-TEXT_ANTIALIASING=Kantengl\u00e4ttung Schrift
-RENDERING=Darstellung
-DE=Deutsch
-EN=Englisch
-SI=Slowenisch
-YOUR_LANGUAGE=Ihre Sprache
-COLOR_SCHEME_SELECT=Farbschemawahl
-SELECTED_COLOR_SCHEME=Gew\u00e4hltes Farbschema
-NEW_SCHEME=Neues Schema
-COLORS=Farben
-COLOR_SCHEME_PREDEFINED=Die Farbe eines vordefinierten Farbschemas kann nicht ver\u00e4ndert werden.
-USE_AS_TEMPLATE=Folgendes Schema als Vorlage benutzen
-CREATE_NEW_SCHEME=Neues Schema erstellen
-EDIT_DELETE_SCHEME=Schema Bearbeiten/L\u00f6schen
-TYPE_NAME_BEFORE=Geben Sie den Name ein und klicken Sie OK.
-SCHEME_NAME_ALREADY_USED=Dieses Schema existiert bereits!\nBitte w\u00e4hlen Sie einen anderen Namen.
-PREDEFINED_SCHEME_CANT_BE_CHANGED=Der Name eines vordefinierten Schemas kann nicht ge\u00e4ndert, und das Schema nicht gel\u00f6scht werden!
-EXECUTABLE_FILES=Ausf\u00fchrbare Dateien (*.exe)
-SELECT_PDF_VIEWER=Wahl des PDF-Betrachters
-COLOR_PREVIEW=Farbschema Vorschau
-ACTION=Aktion
-ACTION_DELETE=L\u00f6schen
-ACTION_EDIT=Bearbeiten
-SELECTED_SCHEME=Aktives Schema
-NEW_NAME=Neuer Name
-SELECT_ACTION_OR_CANCEL=Sie sollten eine Aktion oder 'Abbrechen' w\u00e4hlen
-GENERAL_SETTINGS=Allgemeine Einstellungen
-DATABASE_SETTINGS=Datenbank
-DATABASE_SETTINGS_DESC=<html><body><b><i>Warnung! \u00c4ndern Sie diese Einstellung nur wenn Sie wissen, was Sie tun!</i></b><br>Die meisten Daten und Einstellungen befinden sich in der Datenbank selbst. In der Konfigurationsdatei befinden sich nur Einstellungen zu Sprache, Datenbank und Look&Feel.<br><i>\u00c4nderungen werden sich erst nach einem Neustart auswirken.</i></body></html>
-SELECTED_DATABASE=Gew\u00e4hlte Datenbank
-LAF_SETTINGS=Look & Feel
-LAF_SETTINGS_DESC=<html><body><i>\u00c4nderungen werden sich nach einem Neustart von GGC auswirken.</i></body></html>
-SELECTED_LAF_TYPE_NAME=L&F w\u00e4hlen (Name)
-SELECTED_LAF_TYPE_CLASS=L&F w\u00e4hlen (Klasse)
-SELECTED_SKINLF_DEF=Gew\u00e4hlter Skin f\u00fcr SkinLF
-SELECT_SKINLF_SKIN=W\u00e4hlen Sie eine Oberfl\u00e4che f\u00fcr die Skin L&F Bibliothek
-SELECT=Ausw\u00e4hlen...
-BASIC_SETTINGS=Grundeinstellungen
-EMPTY_VALUE=Leerer Wert
-PDF_VIEWER_SETTINGS=PDF-Betrachter Einstellungen
-PDF_VIEWER=PDF-Betrachter
-BROWSE=Ausw\u00e4hlen...
-LUNCH_START_TIME=Mittagszeit ab (hh:mm)
-DINNER_START_TIME=Abendszeit ab (hh:mm)
-NIGHT_START_TIME=Nacht ab (hh:mm)
-
-# Mode
-MODE=Mode
-APPLICATION_MODE=Application Mode
-PEN_INJECTION_MODE=Pen/Injection Mode
-PUMP_MODE=Pump Mode
-APPLICATION_MODE_DESC=<html><body>Setting mode, won't prevent usage of other part of application, it will just select right data for statistic display, and set correct icons in toolbar.</body></html>
-PEN_INJECTION_MODE_SETTINGS=Pen/Injection Mode Settings
-PUMP_MODE_SETTINGS=Pump Mode Settings
-BASAL_PRECISSION=Basal Dose Precision
-BOLUS_PRECISSION=Bolus Dose Precision
-MAX_BASAL=Max Basal Dose
-MAX_BOLUS=Max Bolus Dose
-TBR_TYPE_SELECTOR=Temporary Basal Rate Type
-TBR_TYPE_BOTH=Both
-TBR_TYPE_UNIT=Unit (U)
-TBR_TYPE_PROC=Procent (%)
-TBR_TYPE_CHOICE=Choice in GGC
-PROCENT_MIN=Procent Min.
-UNIT_MIN=Unit Min.
-TASK_MIN=Min
-TASK_MAX=Max
-TASK_STEP=Step
-
-# Language
-LANGUAGE=Language
-LANGPACK_VERSION=Language package
-LANG_WITH_HELP=Languages with help
-LANG_WITHOUT_HELP=Languages without help
-SELECT_LANGUAGE=Select language
-NO_HELP_AVAILABLE=No help available
-HELP_AVAILABLE=Help available
-LANG_DESC=<html><body>Translation for application is done separately from development, which means that in most cases translations are "little" late. Also translations are done mostly by outside people, so we are not really responsible for any error in translation, or when next translation will be available. If you find any error feel free to contact us and we will try to fix it ASAP.<br>If something is not translated you will get expression back in default language (English).<br>If you wish to help with translation please contact us on our mail: gg...@at.... </body></html>
-NOTE_RESTART=<html><body><b>Warning:</b> This setting will start working after next restart of software.</body></html>
-NOTE_LANG_FEATURE_NOT_WORKING=<html><body><font color="red"><blink><b>Warning:</b></blink> This feature is not enabled yet. For now please use language switching in General tab. When this feature is enabled this warning will be removed as well as language switching in General tab.</font></body></html>
-
-#
-# ggc.util [6]
-#
-
-UNNAMED_USER=Unbekannter Benutzer
-THIS_FILE_WAS_AUTOMATICALY_GENERATED=Diese Datei wurde automatisch generiert.
-YOUR_VERSION=Ihre Version
-AVAILABLE_VERSION=Verf\u00fcgbare Version
-NO_NEW_VERSION=Keine aktuellere Version verf\u00fcgbar.
-CHECK_FOR_NEW_VERSION=Auf neuere Version \u00fcberpr\u00fcfen
-HOST_UNAVAILABLE_INFO=Server nicht verf\u00fcgbar
-HOST_UNAVAILABLE_MSG=Konnte nicht mit ggc.sourceforge.net verbinden!
-
-#
-# Graphs [2]
-#
-DAYS_WITH_READINGS_0_1=Tage mit 0 oder 1 Messung
-DAYS_WITH_READINGS_2_3=Tage mit 2 oder 3 Messungen
-DAYS_WITH_READINGS_4_5=Tage mit 4 oder 5 Messungen
-DAYS_WITH_READINGS_6_7=Tage mit 6 oder 7 Messungen
-DAYS_WITH_READINGS_MORE_7=Tage mit 8+ Messungen
-AXIS_TIME_LABEL=time (h)
-AXIS_VALUE_LABEL=BG (%s)
-FORMAT_DATE_DAYS=dd.MM.yyyy
-FORMAT_DATE_HOURS=HH:mm
-GRAPH_NO_DATA_AVAILABLE_CHANGE=No data available. Select different time range and/or element to draw and press Draw !
-
-#
-# Database Tool [5]
-#
-DB_TOOL=Database Hibernate Tool
-DB_CONFIGURATION=Datenbankeinstellungen
-DB_PRESS_HELP=Press the help button for detailed information on setting the connection.
-DB_CONFIG_DESC=<html><head></head><body><p>This is for configuring your database to work with your application. Please set all settings correctly, and then try to connect to the database (you must have the database configured with the correct username, password and database name). If the connection is successful, your settings are OK.</p><p>Now you are ready to create tables with the help of hibernate. You must have all jars included in the classpath before you start the second option (Init Database). You must be careful. If you have the database already set up and filled, 'Init Database' will destroy all data.<p><body><html>
-DATABASE_TYPE=DB-Typ
-DATABASE_CLASSNAME=DB-Klasse
-HIBERNATE_DIALECT=Hibernate Dialekt
-JDBC_URL=JDBC URL
-HOSTNAME=Hostname
-DATABASE=Datenbank
-
-#
-# Printing - Base [2]
-#
-PRINTING=Drucken
-TYPE_OF_REPORT=Berichttyp
-SELECT_YEAR_AND_MONTH=Monat w\u00e4hlen
-REPORT_FOOTER=Dieser Bericht stammt von \"GGC - GNU Gluco Control\", frei verf\u00fcgbar unter http://ggc.sourceforge.net
-FOR=For
-PRINTING_SETTINGS_NOT_SET=<html>Druckeinstellungen (PDF-Anzeigeprogramm) nicht gesetzt oder inkorrekt.</html>
-PRINTING_SETTINGS_NOT_SET_SOL=<html>Gehen Sie zu Werkzeuge->Einstellungen->Drucken<br>und geben Sie den Pfad zum PDF-Anzeigeprogramm an.</html>
-PDF_VIEVER_RUN_ERROR=<html>Fehler beim Aufruf des PDF-Anzeigeprogramms:<br>Unbekannter Fehler</html>
-SELECT_STARTING_RANGE=Select starting range
-SELECT_ENDING_RANGE=Select ending range
-
-#
-# Printing [2]
-#
-INS_SHORT=Ins
-CH_SHORT=KH
-BREAKFAST=Fr\u00fchst\u00fcck
-LUNCH=Mittagessen
-DINNER=Abendessen
-NIGHT=Nacht
-SIMPLE_MONTHLY_REPORT=Einfacher Bericht (monatl.)
-EXTENDED_MONTHLY_REPORT=Ausf\u00fchrlicher Bericht (monatl.)
-FOOD_MENU_BASE=Food Menu Base (CH only)
-FOOD_MENU_EXT_I=Extended Food Menu I (CH,Ins)
-FOOD_MENU_EXT_II=Extended Food Menu II (CH,Ins,BG)
-FOOD_MENU_EXT_III=Extended Food Menu III (CH,Ins,BG,kJ)
-
-#
-# Stocks [5]
-#
-STOCKS=Bestand
-
-#
-# Appointments [5]
-#
-APPOINTMENTS=Arzttermine
-
-#
-# About [1]
-#
-SYSTEM_PROPERTIES=Systemeigenschaften
-ABOUT=\u00dcber
-PROPERTY=Property
-VALUE=Wert
-LICENCE=Lizenz:
-CREDITS=Danksagungen
-LIBRARIES=Bibliotheken
-MAIN=Main
-ABOUT_GGC=\u00dcber GNU Gluco Control
-GGC_DEVELOPMENT_TEAM=GGC-Entwicklungsteam
-SEE_CREDITS=(siehe Danksagungen)
-GGC_TITLE=GNU Gluco Control
-CURRENT_DEVELOPERS=Aktive Entwickler
-PREVIOUS_DEVELOPERS=Ehemalige Entwickler
-
-#
-# Doctor types [5]
-#
-ADDICTION_MEDICINE=Addiction Medicine
-ADOLESCENT_MEDICINE=Adolescent Medicine
-AIDS_HIV_CARE=AIDS/HIV Care
-ANESTHESIOLOGY=Anesthesiology
-ASTHMA_ALLERGY_IMMUNOLOGY=Asthma, Allergy & Immunology
-BREAST_CANCER_SURGERY=Brustkrebschirurgie
-CARDIAC_SURGERY=Herzchirurgie
-CHILD_CARE=Child care (pediatrics)
-CARDIOLOGY=Kardiologie
-COLORECTAL_SURGERY=Colorectal Surgery
-COSMETIC_SURGERY=Cosmetic Surgery
-CRITICAL_CARE=Critical Care
-DENTAL_SPECIALTIES=Dental Specialties
-DERMATOLOGY=Dermatologie
-DIABETES=Diabetes
-EMERGENCY_MEDICINE=Emergency Medicine
-ENDOCRINOLOGY=Endokrinologie
-EPILEPSY=Epilepsie
-FAMILY_MEDICINE=Family Medicine
-GASTROENTEROLOGY=Gastroenterologie
-GENERAL_SURGERY=Allgemeine Chirurgie
-GENERAL_INTERNAL_MEDICINE=General Internal Medicine
-GERIATRICS=Geriatrics
-GYNECOLOGIC_ONCOLOGY=Gyn\u00e4kologische Onkologie
-GYNECOLOGY=Gyn\u00e4kologie
-HAND_SURGERY=Hand Surgery
-HEAD_AND_NECK_SURGERY=Head and Neck Surgery
-HEADACHE=Headache
-HEMATOLOGY=H\u00e4matologie
-HOSPITAL_INTERNAL_MEDICINE=Hospital Internal Medicine
-INFECTIOUS_DISEASES=Infectious Diseases
-INFERTILITY_MEDICINE=Infertility Medicine
-INTERNAL_MEDICINE=Internal Medicine
-LABORATORY_MEDICINE=Laboratory Medicine
-MIDWIFE=Midwife (CNM)
-MEDICAL_GENETICS=Medical Genetics
-METABOLISM=Stoffwechsel
-MOVEMENT_DISORDERS=Movement Disorders
-NEONATOLOGY=Neonatology
-NEPHROLOGY=Nephrologie
-NEUROLOGY=Neurologie
-NEURO_OPTHALMOLOGY=Neuro-ophthalmology
-NEUROSURGERY=Neurochirurgie
-NUCLEAR_MEDICINE=Nuclear Medicine
-NUTRITION_MEDICINE=Nutrition Medicine
-OBSTETRICS_AND_GYNECOLOGY=Geburtshilfe und Gyn\u00e4kologie
-ONCOLOGY_MEDICAL=Oncology Medical
-ONCOLOGY_RADIATION=Oncology Radiation
-OPTHALMOLOGY=Augenheilkunde
-ORAL_MAXILLOFACIAL_SURGERY=Oral/Maxillofacial Surgery
-ORTHOPEDIC_SURGERY=Orthopedic Surgery
-OTOLARYNGOLOGY=Otolaryngology (ENT)
-OTOLOGY=Otology
-PAIN_MANAGEMENT=Pain Management
-PATHOLOGY=Pathologie
-PEDIATRIC=Kinderheilkunde
-PEDIATRIC_SPECIALISTS=Pediatric Specialists
-PERINATOLOGY=Geburtshilfe
-PHYSIATRY=Physiatry
-PHYSICAL_REHABILITATION=Physical Rehabilitation
-PLASTIC_RECONSTRUCTIVE_SURGERY=Plastic/Reconstructive Surgery
-PODIATRY=Fu\u00dforthop\u00e4die
-PROSTATE_CARE=Prostate Care
-PSYCHIATRY=Psychiatrie
-PSYCHOLOGY=Psychologie
-PULMONARY_MEDICINE=Pulmonary Medicine
-RADIOLOGY=Radiologie
-RADIATION_ONCOLOGY=Radiation Oncology
-REPRODUCTIVE_ENDOCRINOLOGY_INFERTILITY=Reproductive Endocrinology and Infertility
-RHEUMATOLOGY=Rheumatologie
-SLEEP_DISOREDERS=Schlafst\u00f6rungen
-SPORTS_MEDICINE=Sportmedizin
-THORACIC_SURGERY=Thoracic Surgery
-TRANSPLANT=Transplantation
-UROLOGY=Urologie
-VASCULAR_SURGERY=Gef\u00e4\u00dfchirurgie
-
-#
-# Doctor [5]
-#
-DOCTORS=\u00c4rzte
-FILTER=Filter
-FILTER_VISIBLE=Sichtbare
-FILTER_ALL=Alle
-
-#
-# Ratio's: Base [1]
-#
-RATIO_BASE=Basic Ratio
-INSULIN_CARB_RATIO=Insulin/CH Ratio
-SENSITIVITY_FACTOR_LONG=<html>Sensitivity factor<br>(Insulin/BG Ratio)</html>
-FILL_RATIO_ENTRIES=<html>Please fill first two entries on this<br>form, or Cancel operation.</html>
-
-#
-# Ratio's: Calculator [4]
-#
-RATIO_CALCULATOR=Verh\u00e4ltnisrechner
-TYPE_SOURCE_DATA=Type of Source Data
-TYPE_SOURCE_MANUAL=Manual data
-TYPE_SOURCE_DB=Database data
-TDD_FOR_CALCULATION=Total Daily Dose (TDD) For Calculation
-RATIO_TIME_SELECT_DESC=<html>Sie müssen einen Zeitraum für die Rechnung wählen. Sind Ihre Werte stabil (keine größeren Änderungen), dürfte ein größerer Zeitraum bessere Resultate liefern. Gibt es jedoch größere Änderungen, oder befinden Sie sich mitten in einer Bolus-/Basalratenneueinstellung, sollten Sie einen kleineren Zeitraum wählen.</html>
-2_WEEKS=2 Wochen
-3_WEEKS=3 Wochen
-DB_DATA_STATUS=Db Data Status
-DB_DATA_NOT_READY=Not Ready !
-DB_DATA_READY=Ready
-GET_DATA=Get Data
-RULE_500=500er-Regel (schnellwirkende Insuline)
-RULE_450=450er-Regel (Normalinsuline)
-RULE_300=300er-Regel (kleine Kinder)
-RULE_1800=1800er-Regel (schnellwirkende Insuline)
-RULE_1500=1500er-Regel (Normalinsuline)
-SELECT_RANGE=Zeitraum w\u00e4hlen
-SELECT_RULE=Regel w\u00e4hlen
-SENSITIVITY_FACTOR=Empfindlichkeitsfaktor
-CALCULATION=Calculation
-INS_CH_RATIO_PROC=1U Insulin for %s g CH
-INS_BG_RATIO=Ins/BG Ratio
-INS_BG_RATIO_PROC=1U Insulin decreases BG for %s %s
-CH_BG_RATIO=CH/BG Ratio
-CH_BG_RATIO_PROC=1 %s is gained with %s g CH
-TDD_MUST_BE_GREATER_THAN_ZERO=<html><body>Total Daily Dose (TDD) must be greater than<br>zero. Recheck the value and start calculation<br>again.</body></html>
-RATIO_CALCULATOR_NOT_IMPLEMENTED=<html><body>This part of Ratio Calculator not implemented<br>yet.</body></html>
-RATIOS_NOT_DONE=<html><body>You never run calculation of Ratio's.<br>Either run it and click OK to transfer<br>calculated data, or use Cancel to exit.</body></html>
-
-#
-# Bolus Helper [1]
-#
-BOLUS_HELPER=Bolus Helper
-READ_RATIOS=Read Ratios
-CH_INSULIN_RATIO=CH / Insulin Ratio
-BG_INSULIN_RATIO=BG / Insulin Ratio
-BG_OH_RATIO=BG / CH Ratio
-CORRECTION_DOSE=Correction Dose
-CARB_DOSE=Dose for covering CH
-TOGETHER=Together
-TOGETHER_ROUNDED=Together (rounded)
-NO_BG_MEASURE=No BG measurment.
-NO_CARBS_DEFINED=CH not set.
-UNIT_SHORT=U
-
-#
-# Tools [1]
-#
-METERS_PLUGIN=Messger\u00e4te Plug-in
-PUMPS_PLUGIN=Pumpen Plug-in
-CGMS_PLUGIN=CGMS Plug-in
-NUTRITION_PLUGIN=Nutrition Tool Plug-in
-STATUS_NOT_INSTALLED=Nicht installiert
-STATUS_NOT_AVAILABLE=N/A (ab Version %s verf\u00fcgbar)
-STATUS_INSTALLED=Installiert (Version %s)
-PLUGIN_NOT_INSTALLED_OR_AVAILABLE=%s nicht installed und/oder verf\u00fcgbar.
-
-#
-# Backup/Restore [1]
-#
-
-# backup
-BACKUP=Sicherung
-BACKUP_DB_TITLE=Sicherung der GGC-Datenbank
-BACKUP_DB_TITLE_SHORT=Datenbanksicherung
-SELECT_ELEMENTS_TO_BACKUP=W\u00e4hlen Sie die zu sichernden Elemente
-
-# progress
-TOTAL_PROGRESS=Fortschritt insgesamt
-BACKUP_NOT_STARTED_YET=Sicherung wurde noch nicht gestartet.
-CURRENT_TASK=Aktuelle Aufgabe
-NO_TASK_STARTED=Keine Aufgabe
-
-# elements
-GGC_BACKUP=GGC-Sicherung
-NUTRITION_OBJECTS=Nahrungsobjekte
-USER_FOOD_GROUPS=Benutzer-Nahrungsgruppen
-MEAL_GROUPS=Mahlzeit-Gruppen
-FOODS=Ern\u00e4hrung
-TASK=Aufgabe
-SETTINGS=Einstellungen
-CONFIGURATION=Configuration
-COLOR_SCHEMES=Color Schemes
-
-# restore
-RESTORE_DB_TITLE=Wiederherstellung der GGC-Datenbank
-RESTORE_DB_TITLE_SHORT=Datenbankwiederherstellung
-RESTORE=Wiederherstellen
-RESTORE_NOT_STARTED_YET=Wiederherstellen hat noch nicht begonnen.
-RESTORE_SELECTOR_DESC=<html>Select file from which you wish to do restore. You can either select text file (which contains data for database) or you can select zip file containing several files (made by our 'Backup' option). In next dialog you can select which elements you wish to restore and any special options.<br><br><b>Notes:</b><br>1. Files will be not checked at this time. Check is on restore only.<br>2. Restore is full. This means that all previous data will be deleted. In some cases there is exception to this rule, but only when unlinked data is used (which is rare in itself). You will learn more about this exceptions (if there are any) on next dialog.</html>
-SELECT_ELEMENTS_TO_RESTORE=Elemente zum Wiederherstellen w\u00e4hlen:
-DAILY_VALUES_APPEND=<html>Wollen Sie diese Werte an die vorhandenen Tageswerte anhängen? Falls die Datenbank diese Einträge bereits enthält, könnten diese dadurch dupliziert werden. Neue Einträge werden ohne Vergleich mit bereits existierenden hinzugefügt.</html>
-FILE_FILTER_DBE=*.dbe - Datenbank Export Dateien
-FILE_FILTER_ZIP=*.zip - Archiv (sollte *.dbe enthalten)
-SELECT_FILE_TO_RESTORE=Wiederherzustellende Datei ausw\u00e4hlen
-NEXT_STEP=Weiter
-
-#
-# Update [1]
-#
-LEGEND=Legende
-NEWEST=Neueste Version
-NOT_UPDATED=Nicht aktualisiert
-NOT_UPDATABLE=Nicht aktualisierbar
-UNKNOWN_STATUS=Unbekannter Status
-CHECK_SERVER=Server \u00fcberpr\u00fcfen
-RUN_UPDATE=Aktualisieren!
-CURRENT_VERSION=Aktuelle Version
-SERVER_VERSION=Version auf dem Server
-UPDATEABLE=Aktualisierbarkeit
-UPDATE_APPLICATION=Aktualisierung der Anwendung
-UPDATE_SERVER_NA=<html><h2>Update Server</h2><br><br>Die Update-Server-Seite wurde noch nicht implementiert. Dieser Dialog existiert zur Zeit nur, damit die aktuelle Version der Bibliotheken überprüft werden kann.<br>Der Server sollte bis September 2008 fertig und betriebsbereit sein. Bitte sehen Sie auf http://ggc.sourceforge.net nach, ob eine neue Version verfügbar ist.<br></html>
-
-#
-# Db Check [1]
-#
-DB_ERROR_ON_LOAD=Fehler beim initialisieren der Datenbank
-DB_HEADER=<html>Das DB-Prüfwerkzeug hat festgestellt, dass Sie eine falsche Datenbankversion verwenden.<br><br>Aktuelle DB-Version: %s<br>Benötigte DB-Version: %s<br><br>%s<html>
-DB_VERSION_LOWER=Die gegenw\u00e4rtige Version ist kleiner als die ben\u00f6tigte. Das bedeutet,<br>dass Sie zu einer Version geupdated haben, die selbst geupdated werden muss.<br>Um diesen Fehler zu beheben, m\u00fcssen Sie das Verzechnis gehen, das die Sicherungskopie Ihres GGCs enh\u00e4lt<br>(wie in der Anleitung beschrieben), dieses ausf\u00fchren und eine Sicherung erstellen<br>(falls Sie das nicht schon gemacht haben). Danach m\u00fcssen Sie das init_db Skript ausf\u00fchren,<br>das die neue Version der Datenbank erstellen wird. Starten Sie GGC und stellen Sie die Datenbank<br>anhand der vorher erstellten Sicherungskopie wieder her.<br>Ihre Applikation sollte jetzt wieder alle Daten enthalten.<br>
-DB_VERSION_HIGHER=Die gegenw\u00e4rtige Version ist gr\u00f6\u00dfer als die ben\u00f6tigte. Dies kann zwei Gr\u00fcnde haben:<br><br>1. Es gabe ein Problem bei der Installation oder beim Update (Dateien fehlten oder das Update wurde unterbrochen).<br>Nach einem Teil-Update wurde die Datenbank geupdated. War dies der Fall, muss das Update wiederholt<br>(ALLE Dateien neu kopiert/installiert) und GGC erneut ausgef\u00fchrt werden.<br><br>2. Ein Downgrade wurde versucht. Dies wird nicht unterst\u00fczt. Wollen Sie eine \u00e4ltere Version benutzen,<br>m\u00fcssen Sie eine komplette Sicherungskopie erstellen, die Anwendung in ein anderes Verzeichnis installieren und<br>die Daten wiederherstellen. Dieses Problem kann auch durch das Einspielen eines Updates behoben werden.<br>
-
-#
-# Error Dialog [1]
-#
-ERROR_DIALOG=Fehlerdialog
-DETAILS=Details
-ERROR_SOLUTION=L\u00f6sung
-EXCEPTION_LOG=Exception (Stack) Trace
-SEND_TO_SERVER=An den Server senden
-SENDING_TO_SERVER=Sende an den Server...
-SEND_TO_SERVER_TEXT=<html>Diese Funktionalität wurde noch nicht implementiert.<br>Später können Sie uns hiermit Fehlerberichte senden und<br>Lösungsvorschläge erhalten (falls welche existieren).<br></html>
-NO_SOLUTION_AVAILABLE=<html>Keine Lösung verfügbar.</html>
-
-#
-# Plug-In [1]
-#
-DEVICE_METER=Meter
-DEVICE_PUMP=Pump
-DEVICE_CGMS=CGMS
-PLUGIN_NOT_INSTALLED=Plugin not installed.
-PLUGIN_NA=Plugin not available.
-PLUGIN_NO_FUNCTIONALITY=This functionality is not supported.
-DEVICES_USED=Devices Used (Configured)
-PLUGINS=Plug-ins
-PLUGIN_NOT_ACTIVE=%s is not active or present, so this operation is not possible !
-
-#
-# File Import [2]
-#
-IMPORT_FILE=Datei importieren
Added: trunk/ggc-core/src/GGC_de.properties
===================================================================
--- trunk/ggc-core/src/GGC_de.properties (rev 0)
+++ trunk/ggc-core/src/GGC_de.properties 2011-07-03 07:07:02 UTC (rev 1182)
@@ -0,0 +1,843 @@
+#
+# ######################################################################
+# ### GNU Glucose Control ###
+# ######################################################################
+# ### Language: German ###
+# ### Created by: Reinhold Rumberger (ru...@us...)###
+# ### Version: 0.5 ###
+# ### Last change: 02.07.2011 22:41:58 ###
+# ######################################################################
+#
+#
+# Translation status:
+# Words/expressions: 648
+# Not translated: 107 (16 %)
+# Need to be checked: 119 (18 %)
+#
+# Translated: 422 (65 %)
+#
+#
+#
+## GGC Core#
+# Collation Rules - In unicode we can create special rules for sorting where we specify
+# sorting order of special characters. This will be used by tree's and special tables.
+# For english this is left empty. For all other (that have non-standard, non english
+# charcters) we need to set this if we want sorting to be done correctly.
+#
+COLLATION_RULES=< 0 < 1 < 2 < 3 < 4 < 5 < 6 < 7 < 8 < 9 < a,A,\u00E4,\u00C4,\u00E1,\u00E0,\u00C1,\u00C0,\u00E2,\u00C2 < b,B < c,C < d,D < e,E,\u00E9,\u00E8,\u00EA,\u00C9,\u00C8,\u00CA < f,F < g,G < h,H < i,I < j,J < k,K < l,L < m,M < n,N < o,O,\u00F6,\u00D6 < p,P < q,Q < r,R < s,S,\u00DF < t,T < u,U,\u00FC,\u00DC < v,V < w,W < x,X < y,Y < z,Z
+
+#
+# GGC - Globally used [1]
+#
+DELETE=L\u00F6schen
+ADD=Hinzuf\u00FCgen
+EDIT=Bearbeiten
+NEW=Neu
+EDIT_DEL_SHORT=Bearb./L\u00F6schen
+FEATURE=Feature
+IMPLEMENTED_VERSION=wird in Version %s implementiert
+OR=oder
+INFORMATION=Information
+QUESTION=Frage
+YES=Ja
+NO=Nein
+COMMING_IN_VERSION=Kommt in Version %s
+NOT_WORKING_100PRO=Funktioniert noch nicht zu 100%
+NOT_TESTED_100PRO=Noch nicht zu 100% getestet
+NOT_USED=Nicht verwendet
+
+#
+# ggc.datamodels [1]
+#
+NO_NAME=Kein Name
+TIME=Zeit
+BG=BZ
+INS_1=Ins1
+INS_2=Ins2
+INS_3=Ins3
+INSULIN_1=Insulin 1
+INSULIN_2=Insulin 2
+INSULIN_3=Insulin 3
+BU=KH
+ACT=Ac.
+COMMENT=Kommentar
+DATE_MUST_BE_IN_FORMAT=Datum muss folgendes Format haben
+TIME_MUST_BE_IN_FORMAT=Zeit muss folgendes Format haben
+ERROR_PARSING_DATE=Fehler beim Einlesen des Datums
+DATETIME=Datum/Zeit
+PUMP_INSULIN=Pumpen-Insulin
+
+#
+# Main Frame (Info panels) & Other places [1]
+#
+
+# general
+BG_TARGET=BZ-Ziel
+
+# hba1c
+NO_EXPRESSIVENESS=Keine Aussagekraft
+LITTLE_EXPRESSIVENESS=Geringe Aussagekraft
+STANDARD_EXPRESSIVENESS=Mittlere Aussagekraft
+GOOD_EXPRESSIVENESS=Hohe Aussagekraft
+
+#
+# Daily Values Stats [1]
+#
+
+# main
+CH_LONG=Kohlehydrate
+ACTIVITY=Bewegung
+FOOD=Lebensmittel
+UPDATE_FROM_FOOD=KH aktualisieren
+EDIT_FOOD=Lebensmittel Db [1]
+DATE_TIME=Datum/Zeit
+FOOD_SET=Lebensmittelgruppe [%s]
+
+# meals
+FOOD_BY_DESCRIPTION=Beschreibung [2]
+FOOD_BY_DESCRIPTION_TITLE=Food by Description
+DESCRIBE_FOODS=<html><b>Beschreiben Sie Nahrungsmittel, die Sie gegessen haben</b> (wenn Sie KH in eckige Klammern [] einschließen, künnen KH automatisch errechnet werden)</html>
+CALCULATE=Berechnen
+NO_DESCRIPTIONS_WITH_CH=Es wurden keine Beschreibungen mit KH-Definitionen\nim Nahrungsbeschreibungsbereich gefunden.\nSollten Sie einen Fehler gemacht haben,\nbearbeiten Sie den Text noch einmal.\n
+CH=KH
+
+#
+# Main GUI Panels [1]
+#
+ADD_ROW=Neuer Eintrag
+EDIT_ROW=Eintrag \u00E4ndern
+CLOSE=Schlie\u00DFen
+COURSE_GRAPH=Verlaufsdiagramm
+SPREAD_GRAPH=Spread Graph
+TO_BE_DRAWN=Einzuzeichnen
+CONNECT_VALUES_FOR_ONE_DAY=Werte eines Tages verbinden
+SUM_BU=Summe KH
+SUM=Summe
+SUM_INSULIN=Summe IE
+AVG_BG_PER_DAY=mittlerer BZ pro Tag
+INS_PER_DAY=Ins. pro Tag
+MEALS=Mahlzeiten
+INS_SLASH_BU=Ins/KH
+DRAW=Zeichnen
+DAILYGRAPHFRAME=Tagesdiagramm
+DAILYSTATSFRAME=Tagesstatistiken
+SAVE=Speichern
+DELETE_ROW=Eintrag L\u00F6schen
+LOWEST=Niedrigster
+STD_DEV=Std. Abw.
+READINGS=Werte
+HIGHEST=H\u00F6chster
+AVG_BG=Mittl. BZ
+BLOOD_GLUCOSE=Blutzucker
+BREAD_UNITS=Broteinheiten
+AVG=Mittl.
+INSULIN=Insulin
+URINE=Urin
+DOSE=Dosis
+TOTAL=Summe
+AVG_INS=Mittl. IE
+DOSE_INS=Insulindosis
+CANCEL=Abbrechen
+OK=OK
+HELP=Hilfe
+ADD_NEW_VALUES=Neue Werte eintragen
+COURSEGRAPHFRAME=Verlaufsdiagramm
+FREQGRAPHFRAME=Frequency Graph
+GRAPH=Diagramm
+ADD_NEW_ROW_TO_TABLE=F\u00FCgt eine neue Wertereihe in die Tabelle ein.
+DELETE_SELECTED_ROWS=L\u00F6sche ausgew\u00E4hlte Zeilen.
+SELECT_ROW_FIRST=Bitte zuerst einen Eintrag ausw\u00E4hlen!
+READINGS_SLASH_DAY=Werte/Tag
+VALUATION=Wertung
+INIT=Initialisierung
+READY=Fertig
+UNKNOWN=Unbekannt
+COMMENTS=Anmerkungen
+ARE_YOU_SURE_DELETE=Wollen Sie diesen Eintrag wirklich l\u00F6schen?
+ARE_YOU_SURE_DELETE_ROW=Wollen Sie diesen Eintrag wirklich l\u00F6schen?
+
+#
+# GGC Little (GUI) [2]
+#
+DAILY_VALUES=Tageswerte
+SHOW_DAILY_GRAPH=Diagramm anzeigen
+DAILY_CONTROL=Daily Control
+MN_QUIT_LT_DESC=GGC Little beenden
+CURRENT_DATE_HAS_CHANGED=Das Datum hat sich ge\u00E4ndert! Ihre Aktion wird deshalb verworfen und die Tabelle aktualisiert!
+TB_ADD_ROW_DESC=Neuer Eintrag f\u00FCr diesen Tag
+TB_EDIT_ROW_DESC=Eintrag f\u00FCr diesen Tag bearbeiten
+TB_DELETE_ROW_DESC=Eintrag f\u00FCr diesen Tag l\u00F6schen
+TB_READ_METER_LT_DESC=Daten vom Me\u00DFger\u00E4t auslesen
+TB_ABOUT_DESC=\u00DCber GGC Little
+TB_SHOW_GRAPH_DESC=Diagramm f\u00FCr diesen Tag anzeigen
+GGC_LITTLE_TITLE=GNU Gluco Control Little
+TAB_CONTROL=Steuerung
+TAB_SCHEDULE=Terminplan
+TAB_PLUGIN=Plug-ins
+TAB_STOCKS=Bestand
+PLUGIN_IMPLEMENTED_VERSION=Dieses Plug-in wird in Version %s implementiert!
+METER_PLUGIN_PANEL=Me\u00DFger\u00E4te-Plug-in
+PUMP_PLUGIN_PANEL=Pumpen-Plug-in
+
+#
+# GGC Little (System Tray) [3]
+#
+SHOW_APP=Anzeigen
+SHOW_APP_DESC=GGC Little anzeigen
+HIDE_APP=Verstecken
+HIDE_APP_DESC=GGC Little verstecken
+EXIT_APP=Beenden
+EXIT_APP_DESC=GGC Little beenden
+
+#
+# Menus (BE CAREFUL about mnemonics used) Set mnemonic with & before mnemonic letter [1]
+#
+
+# main menus
+MN_FILE=&Datei
+MN_DATA=Pen/Spritze
+MN_DATA_GRAPH=Diagramme
+MN_DOCTOR=&Arzt
+MN_FOOD=&Ern\u00E4hrung
+MN_PRINTING=D&rucken
+MN_TOOLS=&Werkzeuge
+MN_HELP=&Hilfe
+
+# file
+MN_LOGIN=Ein&loggen
+MN_LOGIN_DESC=Patient einloggen
+MN_LOGOUT=Ausl&oggen
+MN_LOGOUT_DESC=Ausloggen
+MN_QUIT=B&eenden
+MN_QUIT_DESC=GGC beenden
+
+# data
+MN_DAILY=&Tages\u00FCbersicht
+MN_DAILY_DESC=Tagesstatistik betrachten
+MN_COURSE=&Verlauf
+MN_COURSE_DESC=Verlauf betrachten
+MN_SPREAD=Ver&teilung
+MN_SPREAD_DESC=Verteilung betrachten
+MN_FREQUENCY=&Frequenz
+MN_FREQUENCY_DESC=Wertefrequenz betrachten
+MN_HBA1C=&HbA1c
+MN_HBA1C_DESC=HbA1c betrachten
+MN_DATA_RATIO=Verh\u00E4ltnis
+MN_DATA_RATIO_DESC=Verh\u00E4ltnis-Einstellungen
+MN_RATIO_BASE=Basis
+MN_RATIO_BASE_DESC=Basisverh\u00E4ltniseinstellungen (1 pro Tag)
+MN_RATIO_EXTENDED=Erweitert
+MN_RATIO_EXTENDED_DESC=Erweiterte Verh\u00E4ltniseinstellungen (mehr als 1 pro Tag)
+MN_RATIO_CALC=&Verh\u00E4ltnisrechner
+MN_RATIO_CALC_DESC=Berechnet verschiedene Verh\u00E4ltnisse (Insulin/KH, ...)
+
+# tools
+MN_DB_MAINT=&Datenbank-Wartung
+MN_DB_MAINT_DESC=Funktionen f\u00FCr die Wartung der Datenbank
+MN_DB_BACKUP=Datenbank &sichern
+MN_DB_BACKUP_DESC=Sichert die GGC-Datenbank
+MN_DB_RESTORE=Datenbank &wiederherstellen
+MN_DB_RESTORE_DESC=Stellt die GGC-Datenbank anhand einer Sicherung wieder her
+MN_MISC_SYNCHRONIZE=&Synchronisierung
+MN_MISC_SYNCHRONIZE_DESC=Datenabgleich mit anderen GGC Instanzen
+MN_PREFERENCES=&Einstellungen
+MN_PREFERENCES_DESC=Einstellungen
+
+# help
+MN_ABOUT=\u00DC&ber
+MN_ABOUT_DESC=\u00DCber GGC
+MN_CHECK_FOR_UPDATE=Nach &Updates suchen
+MN_CHECK_FOR_UPDATE_DESC=Pr\u00FCft, ob eine neue Version verf\u00FCgbar ist
+
+# food
+MN_NUTRDB_USDB=N\u00E4hrstoff-DB (&USDA)
+MN_NUTRDB_USDB_DESC=Datenbank mit N\u00E4hrstoff-Informationen, ver\u00F6ffentlicht vom USDA
+MN_NUTRDB_USER=N\u00E4hrstoff-DB (&Benutzer)
+MN_NUTRDB_USER_DESC=N\u00E4hrstoff-Datenbank des Benutzers
+MN_MEALS=&Mahlzeiten-DB
+MN_MEALS_DESC=Datenbank mit vollst\u00E4ndigen Mahlzeiten
+
+# printing
+MN_REPORTS=&Data
+MN_REPORTS_DESC=Selbstkontrolldaten-Berichte
+MN_PDF_SIMPLE=&Einfach
+MN_PDF_SIMPLE_DESC=Einfacher PDF-Bericht (monatl.)
+MN_PDF_EXT=&Ausf\u00FChrlich
+MN_PDF_EXT_DESC=Ausf\u00FChrlicher PDF-Bericht (monatl.)
+
+# doctors
+MN_DOCS=\u00C4&rzte
+MN_DOCS_DESC=\u00C4rzte
+MN_APPOINT=&Termine
+MN_APPOINT_DESC=Termine f\u00FCr Arztbesuche
+MN_STOCKS=&Bestand
+MN_STOCKS_DESC=Bestand medizinischer Ausr\u00FCstung
+
+#
+# ggc.gui.calendar [2]
+#
+ENDING_DATE=Enddatum
+STARTING_DATE=Startdatum
+1_WEEK=1 Woche
+1_MONTH=1 Monat
+3_MONTHS=3 Monate
+CUSTOM=Benutzerdefiniert
+DATE_RANGE_SELECTOR=Wahl des Zeitraumes
+SU=So
+MO=Mo
+TU=Di
+WE=Mi
+TH=Do
+FR=Fr
+SA=Sa
+JANUARY=Januar
+FEBRUARY=Februar
+MARCH=M\u00E4rz
+APRIL=April
+MAY=Mai
+JUNE=Juni
+JULY=Juli
+AUGUST=August
+SEPTEMBER=September
+OCTOBER=Oktober
+NOVEMBER=November
+DECEMBER=Dezember
+
+#
+# Main GUI Panels [1]
+#
+GENERAL_INFORMATION=Allgemeine Informationen
+YOUR_NAME=Ihr Name
+BOLUS_INSULIN=Bolusinsulin
+BASAL_INSULIN=Basalinsulin
+GLUCOMETER=Messger\u00E4t
+BG_UNIT=Ma\u00DFeinheit
+HBA1C=HbA1c
+YOUR_CURRENT_HBA1C=Ihr aktueller HbA1c
+NO_READINGS=Keine Werte
+NO_DATASOURCE=Keine Datenquelle
+SCHEDULE=Terminplan
+YOUR_NEXT_APPOINTMENT=Ihr n\u00E4chster Termin
+APP_WILL_BE_FOUND_HERE=wird hier zu finden sein...
+STATISTICS_FOR_LAST_WEEK=Statistiken f\u00FCr vorige Woche
+BG_STATISTICS=BZ Statistiken
+BU_STATISTICS=KH Statistiken
+BU_PER_DAY=KH pro Tag
+AVG_MEAL_SIZE=KH pro Mahlzeit
+MEALS_PER_DAY=Mahlzeiten pro Tag
+STATISTICS=Statistiken
+PER_DAY=pro Tag
+AVG_DOSE_SIZE=Mittl. Dosis
+DOSES_PER_DAY=Dosen pro Tag
+OTHER_INFO=Sonstiges
+STOCK=Bestand
+STOCK_DATA_HERE=Daten zu Ihrer medizinischen Ausr\u00FCstung
+STO_WILL_BE_FOUND_HERE=wird hier zu finden sein...
+NOT_YET=BISHER NOCH NICHT!
+BOLUS_INSULIN_SHORT=Bolus
+BASAL_INSULIN_SHORT=Basal
+AVERAGE=Durchschnitt
+DOSES=Dosen
+
+#
+# Hba1c Dialog [1]
+#
+CALCULATED_HBA1C=Errechneter HbA1c
+
+#
+# Configuration [1]
+#
+APPLY=Anwenden
+ERROR=Fehler
+INVALID_NAME=Ung\u00FCltiger Name
+PREFERENCES=Einstellungen
+GENERAL=Allgemeines
+MEDICAL_DATA=Medizinische Daten
+COLORS_AND_FONTS=Farbe & Schrift
+RENDERING_QUALITY=Darstellungsqualit\u00E4t
+SOME_VALUES_CHANGED_LIKE_TO_SAVE=Einige Werte haben sich ge\u00E4ndert. Wollen Sie diese speichen?
+VALUES_CHANGED=Ge\u00E4nderte Werte
+CHOOSE_A_COLOR=W\u00E4hlen Sie eine Farbe
+BG_HIGH_ZONE=\u00DCberzuckerbereich
+BG_TARGET_ZONE=Zielbereich
+BG_LOW_ZONE=Unterzuckerbereich
+BG_AVERAGE=BZ Mittelwert
+INS_SLASH_BU_QUOTIENT=Ins/KH
+NAME=Name
+ABBR=Abk.
+HIGH_BG=\u00DCberzuckergrenze
+LOW_BG=Unterzuckergrenze
+TARGET_HIGH_BG=Obergrenze Zielbereich
+TARGET_LOW_BG=Untergrenze Zielbereich
+INSULIN_SETTINGS=Insulineinstellungen
+BLOOD_GLUCOSE_SETTINGS=Blutzuckereinstellungen
+BLOOD_GLUCOSE_UNIT_SETTING=BZ-Einheiteneinstellungen
+BLOOD_GLUCOSE_SETTINGS_1=BZ-Einstellungen (mg/dl)
+BLOOD_GLUCOSE_SETTINGS_2=BZ-Einstellungen (mmol/l)
+HOST=Host
+PORT=Port
+USERNAME=Benutzername
+PASSWORD=Passwort
+OPTIONS=Optionen
+ANTIALIASING=Kantengl\u00E4ttung
+COLOR_RENDERING=Farbdarstellung
+DITHERING=Dithering
+FRACTIONAL_METRICS=Fractional Metrics
+INTERPOLATION=Interpolation
+TEXT_ANTIALIASING=Kantengl\u00E4ttung Schrift
+RENDERING=Darstellung
+DE=Deutsch
+EN=Englisch
+SI=Slowenisch
+YOUR_LANGUAGE=Ihre Sprache
+COLOR_SCHEME_SELECT=Farbschemawahl
+SELECTED_COLOR_SCHEME=Gew\u00E4hltes Farbschema
+NEW_SCHEME=Neues Schema
+COLORS=Farben
+COLOR_SCHEME_PREDEFINED=Die Farbe eines vordefinierten Farbschemas kann nicht ver\u00E4ndert werden.
+USE_AS_TEMPLATE=Folgendes Schema als Vorlage benutzen
+CREATE_NEW_SCHEME=Neues Schema erstellen
+EDIT_DELETE_SCHEME=Schema Bearbeiten/L\u00F6schen
+TYPE_NAME_BEFORE=Geben Sie den Name ein und klicken Sie OK.
+SCHEME_NAME_ALREADY_USED=Dieses Schema existiert bereits!\nBitte w\u00E4hlen Sie einen anderen Namen.
+PREDEFINED_SCHEME_CANT_BE_CHANGED=Der Name eines vordefinierten Schemas kann nicht ge\u00E4ndert, und das Schema nicht gel\u00F6scht werden!
+EXECUTABLE_FILES=Ausf\u00FChrbare Dateien (*.exe)
+SELECT_PDF_VIEWER=Wahl des PDF-Betrachters
+COLOR_PREVIEW=Farbschema Vorschau
+ACTION=Aktion
+ACTION_DELETE=L\u00F6schen
+ACTION_EDIT=Bearbeiten
+SELECTED_SCHEME=Aktives Schema
+NEW_NAME=Neuer Name
+SELECT_ACTION_OR_CANCEL=Sie sollten eine Aktion oder 'Abbrechen' w\u00E4hlen
+GENERAL_SETTINGS=Allgemeine Einstellungen
+DATABASE_SETTINGS=Datenbank
+DATABASE_SETTINGS_DESC=<html><body><b><i>Warnung! \u00C4ndern Sie diese Einstellung nur wenn Sie wissen, was Sie tun!</i></b><br>Die meisten Daten und Einstellungen befinden sich in der Datenbank selbst. In der Konfigurationsdatei befinden sich nur Einstellungen zu Sprache, Datenbank und Look&Feel.<br><i>\u00C4nderungen werden sich erst nach einem Neustart auswirken.</i></body></html>
+SELECTED_DATABASE=Gew\u00E4hlte Datenbank
+LAF_SETTINGS=Look & Feel Einstellungen
+LAF_SETTINGS_DESC=<html><body><i>\u00C4nderungen werden sich erst nach einem Neustart von GGC auswirken.</i></body></html>
+SELECTED_LAF_TYPE_NAME=L&F w\u00E4hlen (Name)
+SELECTED_LAF_TYPE_CLASS=L&F w\u00E4hlen (Klasse)
+SELECTED_SKINLF_DEF=Gew\u00E4hlter Skin f\u00FCr SkinLF
+SELECT_SKINLF_SKIN=W\u00E4hlen Sie eine Oberfl\u00E4che f\u00FCr die Skin L&F-Bibliothek
+SELECT=Ausw\u00E4hlen...
+BASIC_SETTINGS=Grundeinstellungen
+EMPTY_VALUE=Leerer Wert
+PDF_VIEWER_SETTINGS=PDF-Betrachter Einstellungen
+PDF_VIEWER=PDF-Betrachter
+BROWSE=Ausw\u00E4hlen...
+LUNCH_START_TIME=Mittagszeit ab (hh:mm)
+DINNER_START_TIME=Abendszeit ab (hh:mm)
+NIGHT_START_TIME=Nacht ab (hh:mm)
+
+# Mode
+MODE=Modus
+APPLICATION_MODE=Anwendungsmodus
+PEN_INJECTION_MODE=Pen-/Spritz-Modus
+PUMP_MODE=Pumpenmodus
+APPLICATION_MODE_DESC=<html><body>Setting mode, won't prevent usage of other part of application, it will just select right data for statistic display, and set correct icons in toolbar.</body></html>
+PEN_INJECTION_MODE_SETTINGS=Pen-/-Spritzmodus Einstellungen
+PUMP_MODE_SETTINGS=Pumpenmodus Einstellungen
+BASAL_PRECISSION=Basaldosis Genauigkeit
+BOLUS_PRECISSION=Bolusdosis Genauigkeit
+MAX_BASAL=Max Basaldosis
+MAX_BOLUS=Max Bolusdosis
+TBR_TYPE_SELECTOR=Tempor\u00E4rer Basalratentyp
+TBR_TYPE_BOTH=Beide
+TBR_TYPE_UNIT=Einheit (U)
+TBR_TYPE_PROC=Prozent (%)
+TBR_TYPE_CHOICE=Choice in GGC
+PROCENT_MIN=Prozent Min.
+UNIT_MIN=Einheit Min.
+TASK_MIN=Min
+TASK_MAX=Max
+TASK_STEP=Schritt
+
+# Language
+LANGUAGE=Sprache
+LANGPACK_VERSION=Sprachpaket
+LANG_WITH_HELP=Sprachen mit Hilfe
+LANG_WITHOUT_HELP=Sprachen ohne Hilfe
+SELECT_LANGUAGE=Sprachwahl
+NO_HELP_AVAILABLE=Keine Hilfe verf\u00FCgbar
+HELP_AVAILABLE=Hilfe verf\u00FCgbar
+LANG_DESC=<html><body>Die Übersetzung der Anwendung findet getrennt von deren Entwicklung statt, weshalb die Übersetzung meistens etwas veraltet ist. Übersetzungen werden vor allem von Freiwilligen außerhalb des Projekts gepflegt, deshalb sind wir nicht direkt für Fehler in der Übersetzung, oder wann die n\u00E4chste Übersetzung verfügbar ist verantwortlich. Wenn Sie Fehler finden, können Sie uns gerne kontaktieren und wir werden sie baldmöglichst beheben.<br>Wenn etwas noch nicht übersetzt wurde, wird der Ausdruck in der Standardsprache (Englisch) angezeigt.<br>Wenn Sie bei der Übersetzung helfen wollen, kontaktieren Sie uns bitte via E-Maill: gg...@at....</body></html>
+NOTE_RESTART=<html><body><b>WarnUng:</b> Diese Einstellung wird erst nach dem nächsten Neustart der Anwendung wirksam.</body></html>
+NOTE_LANG_FEATURE_NOT_WORKING=<html><body><font color="red"><b>Warnung:</b>Dieses Feature ist noch nicht aktiviert. Bis auf weiteres verwenden Sie bitte die Sprachwahl im Allgemeines-Reiter. Wenn dieses Feature aktiviert wird, wird diese Warnung und die Sprachwahl im Allgemeines-Reiter entfernt.</font></body></html>
+
+#
+# ggc.util [6]
+#
+UNNAMED_USER=Unbekannter Benutzer
+THIS_FILE_WAS_AUTOMATICALY_GENERATED=Diese Datei wurde automatisch generiert.
+YOUR_VERSION=Ihre Version
+AVAILABLE_VERSION=Verf\u00FCgbare Version
+NO_NEW_VERSION=Keine aktuellere Version verf\u00FCgbar.
+CHECK_FOR_NEW_VERSION=Auf neue Version \u00FCberpr\u00FCfen
+HOST_UNAVAILABLE_INFO=Server nicht verf\u00FCgbar
+HOST_UNAVAILABLE_MSG=Konnte nicht mit ggc.sourceforge.net verbinden!
+
+#
+# Graphs [2]
+#
+DAYS_WITH_READINGS_0_1=Tage mit 0 oder 1 Messung
+DAYS_WITH_READINGS_2_3=Tage mit 2 oder 3 Messungen
+DAYS_WITH_READINGS_4_5=Tage mit 4 oder 5 Messungen
+DAYS_WITH_READINGS_6_7=Tage mit 6 oder 7 Messungen
+DAYS_WITH_READINGS_MORE_7=Tage mit 8+ Messungen
+AXIS_TIME_LABEL=Zeit (Std)
+AXIS_VALUE_LABEL=BZ (%s)
+FORMAT_DATE_DAYS=dd.MM.yyyy
+FORMAT_DATE_HOURS=HH:mm
+GRAPH_NO_DATA_AVAILABLE_CHANGE=Keine Daten verf\u00FCgbar. W\u00E4hlen Sie eine andere Zeitspanne und/oder zu zeichnende Elemente und klicken Sie "Zeichnen"!
+
+#
+# Database Tool [5]
+#
+DB_TOOL=Database Hibernate Tool
+DB_CONFIGURATION=Datenbankeinstellungen
+DB_PRESS_HELP=Klicken Sie auf den Hilfe-Knopf um detaillierte Informationen zu den Verbindungseinstellungen zu bekommen.
+DB_CONFIG_DESC=<html><head></head><body><p>This is for configuring your database to work with your application. Please set all settings correctly, and then try to connect to the database (you must have the database configured with the correct username, password and database name). If the connection is successful, your settings are OK.</p><p>Now you are ready to create tables with the help of hibernate. You must have all jars included in the classpath before you start the second option (Init Database). You must be careful. If you have the database already set up and filled, 'Init Database' will destroy all data.<p><body><html>
+DATABASE_TYPE=DB-Typ
+DATABASE_CLASSNAME=DB-Klasse
+HIBERNATE_DIALECT=Hibernate Dialekt
+JDBC_URL=JDBC URL
+HOSTNAME=Hostname
+DATABASE=Datenbank
+
+#
+# Printing - Base [2]
+#
+PRINTING=Drucken
+TYPE_OF_REPORT=Berichttyp
+SELECT_YEAR_AND_MONTH=Monat w\u00E4hlen
+REPORT_FOOTER=Dieser Bericht stammt von "GGC - GNU Gluco Control", frei verf\u00FCgbar unter http://ggc.sourceforge.net
+FOR=F\u00FCr
+PRINTING_SETTINGS_NOT_SET=<html>Druckeinstellungen (PDF-Anzeigeprogramm) nicht gesetzt oder inkorrekt.</html>
+PRINTING_SETTINGS_NOT_SET_SOL=<html>Gehen Sie zu Werkzeuge->Einstellungen->Drucken<br>und geben Sie den Pfad zum PDF-Anzeigeprogramm an.</html>
+PDF_VIEVER_RUN_ERROR=<html>Fehler beim Aufruf des PDF-Anzeigeprogramms:<br>Unbekannter Fehler</html>
+SELECT_STARTING_RANGE=Select starting range
+SELECT_ENDING_RANGE=Select ending range
+
+#
+# Printing [2]
+#
+INS_SHORT=Ins
+CH_SHORT=KH
+BREAKFAST=Fr\u00FChst\u00FCck
+LUNCH=Mittagessen
+DINNER=Abendessen
+NIGHT=Nacht
+SIMPLE_MONTHLY_REPORT=Einfacher Bericht (monatl.)
+EXTENDED_MONTHLY_REPORT=Ausf\u00FChrlicher Bericht (monatl.)
+FOOD_MENU_BASE=Food Menu Base (CH only)
+FOOD_MENU_EXT_I=Extended Food Menu I (CH,Ins)
+FOOD_MENU_EXT_II=Extended Food Menu II (CH,Ins,BG)
+FOOD_MENU_EXT_III=Extended Food Menu III (CH,Ins,BG,kJ)
+
+#
+# Stocks [5]
+#
+STOCKS=Bestand
+
+#
+# Appointments [5]
+#
+APPOINTMENTS=Arzttermine
+
+#
+# About [1]
+#
+SYSTEM_PROPERTIES=Systemeigenschaften
+ABOUT=\u00DCber
+PROPERTY=Eigenschaft
+VALUE=Wert
+LICENCE=Lizenz:
+CREDITS=Danksagungen
+LIBRARIES=Bibliotheken
+MAIN=Main
+ABOUT_GGC=\u00DCber GNU Gluco Control
+GGC_DEVELOPMENT_TEAM=GGC-Entwicklungsteam
+SEE_CREDITS=(siehe Danksagungen)
+GGC_TITLE=GNU Gluco Control
+CURRENT_DEVELOPERS=Aktive Entwickler
+PREVIOUS_DEVELOPERS=Ehemalige Entwickler
+
+#
+# Doctor types [5]
+#
+ADDICTION_MEDICINE=Addiction Medicine
+ADOLESCENT_MEDICINE=Adolescent Medicine
+AIDS_HIV_CARE=AIDS/HIV Care
+ANESTHESIOLOGY=Anesthesiology
+ASTHMA_ALLERGY_IMMUNOLOGY=Asthma, Allergy & Immunology
+BREAST_CANCER_SURGERY=Brustkrebschirurgie
+CARDIAC_SURGERY=Herzchirurgie
+CHILD_CARE=Child care (pediatrics)
+CARDIOLOGY=Kardiologie
+COLORECTAL_SURGERY=Colorectal Surgery
+COSMETIC_SURGERY=Cosmetic Surgery
+CRITICAL_CARE=Critical Care
+DENTAL_SPECIALTIES=Dental Specialties
+DERMATOLOGY=Dermatologie
+DIABETES=Diabetes
+EMERGENCY_MEDICINE=Emergency Medicine
+ENDOCRINOLOGY=Endokrinologie
+EPILEPSY=Epilepsie
+FAMILY_MEDICINE=Family Medicine
+GASTROENTEROLOGY=Gastroenterologie
+GENERAL_SURGERY=Allgemeine Chirurgie
+GENERAL_INTERNAL_MEDICINE=General Internal Medicine
+GERIATRICS=Geriatrics
+GYNECOLOGIC_ONCOLOGY=Gyn\u00E4kologische Onkologie
+GYNECOLOGY=Gyn\u00E4kologie
+HAND_SURGERY=Hand Surgery
+HEAD_AND_NECK_SURGERY=Head and Neck Surgery
+HEADACHE=Headache
+HEMATOLOGY=H\u00E4matologie
+HOSPITAL_INTERNAL_MEDICINE=Hospital Internal Medicine
+INFECTIOUS_DISEASES=Infectious Diseases
+INFERTILITY_MEDICINE=Infertility Medicine
+INTERNAL_MEDICINE=Internal Medicine
+LABORATORY_MEDICINE=Laboratory Medicine
+MIDWIFE=Midwife (CNM)
+MEDICAL_GENETICS=Medical Genetics
+METABOLISM=Stoffwechsel
+MOVEMENT_DISORDERS=Movement Disorders
+NEONATOLOGY=Neonatology
+NEPHROLOGY=Nephrologie
+NEUROLOGY=Neurologie
+NEURO_OPTHALMOLOGY=Neuro-ophthalmology
+NEUROSURGERY=Neurochirurgie
+NUCLEAR_MEDICINE=Nuclear Medicine
+NUTRITION_MEDICINE=Nutrition Medicine
+OBSTETRICS_AND_GYNECOLOGY=Geburtshilfe und Gyn\u00E4kologie
+ONCOLOGY_MEDICAL=Oncology Medical
+ONCOLOGY_RADIATION=Oncology Radiation
+OPTHALMOLOGY=Augenheilkunde
+ORAL_MAXILLOFACIAL_SURGERY=Oral/Maxillofacial Surgery
+ORTHOPEDIC_SURGERY=Orthopedic Surgery
+OTOLARYNGOLOGY=Otolaryngology (ENT)
+OTOLOGY=Otology
+PAIN_MANAGEMENT=Pain Management
+PATHOLOGY=Pathologie
+PEDIATRIC=Kinderheilkunde
+PEDIATRIC_SPECIALISTS=Pediatric Specialists
+PERINATOLOGY=Geburtshilfe
+PHYSIATRY=Physiatry
+PHYSICAL_REHABILITATION=Physical Rehabilitation
+PLASTIC_RECONSTRUCTIVE_SURGERY=Plastic/Reconstructive Surgery
+PODIATRY=Fu\u00DForthop\u00E4die
+PROSTATE_CARE=Prostate Care
+PSYCHIATRY=Psychiatrie
+PSYCHOLOGY=Psychologie
+PULMONARY_MEDICINE=Pulmonary Medicine
+RADIOLOGY=Radiologie
+RADIATION_ONCOLOGY=Radiation Oncology
+REPRODUCTIVE_ENDOCRINOLOGY_INFERTILITY=Reproductive Endocrinology and Infertility
+RHEUMATOLOGY=Rheumatologie
+SLEEP_DISOREDERS=Schlafst\u00F6rungen
+SPORTS_MEDICINE=Sportmedizin
+THORACIC_SURGERY=Thoracic Surgery
+TRANSPLANT=Transplantation
+UROLOGY=Urologie
+VASCULAR_SURGERY=Gef\u00E4\u00DFchirurgie
+
+#
+# Doctor [5]
+#
+DOCTORS=\u00C4rzte
+FILTER=Filter
+FILTER_VISIBLE=Sichtbare
+FILTER_ALL=Alle
+
+#
+# Ratio's: Base [1]
+#
+RATIO_BASE=Grundverh\u00E4ltnis
+INSULIN_CARB_RATIO=Insulin/KH-Verh\u00E4ltnis
+SENSITIVITY_FACTOR_LONG=<html>Empfindlichkeitsfaktor<br>(Insulin/BZ-Verh\u00E4ltnis)</html>
+FILL_RATIO_ENTRIES=<html>Bitte f¨llen Sie die ersten beiden Einträge dieses Formulars aus,<br>oder brechen Sie den Vorgang ab.</html>
+
+#
+# Ratio's: Extended [1]
+#
+RATIO_EXTENDED=Erweitertes Verh\u00E4ltnis
+RATIO_ENTRY_ADD=Neuer Verh\u00E4ltniseintrag
+RATIO_ENTRY_EDIT=Verh\u00E4ltniseintrag bearbeiten
+TIME_FROM=Von
+TIME_TILL=Bis
+PROCENT_OF_BASE=Prozent (der Basis)
+PROCENT_OF_BASE_SHORT=% der Basis
+CH_INSULIN_RATIO_SHORT=KH/Ins
+BG_INSULIN_RATIO_SHORT=BZ/Ins
+BG_OH_RATIO_SHORT=BZ/KH
+CHECK_RATIOEXTENDED_DATA_OK=<html><body>You filled all data about<br>extended ratio's for whole<br>day successfuly !<br></body></html>
+CHECK_RATIOEXTENDED_FAILED=<html><body>You filled data about extended<br>ratio's incorrectly. All minutes<br>of the day must be included (from<br>0:00 till 23:59)!<br></body></html>
+
+#
+# Ratio's: Calculator [4]
+#
+RATIO_CALCULATOR=Verh\u00E4ltnisrechner
+TYPE_SOURCE_DATA=Art der Quelldaten
+TYPE_SOURCE_MANUAL=Manuelle Daten
+TYPE_SOURCE_DB=Datenbank Daten
+TDD_FOR_CALCULATION=Total Daily Dose (TDD) For Calculation
+RATIO_TIME_SELECT_DESC=<html>Sie müssen einen Zeitraum für die Rechnung wählen. Sind Ihre Werte stabil (keine größeren Änderungen), dürfte ein größerer Zeitraum bessere Resultate liefern. Gibt es jedoch größere Änderungen, oder befinden Sie sich mitten in einer Bolus-/Basalratenneueinstellung, sollten Sie einen kleineren Zeitraum wählen.</html>
+2_WEEKS=2 Wochen
+3_WEEKS=3 Wochen
+DB_DATA_STATUS=Db Data Status
+DB_DATA_NOT_READY=Nicht bereit!
+DB_DATA_READY=Bereit
+GET_DATA=Daten abrufen
+RULE_500=500er-Regel (schnellwirkende Insuline)
+RULE_450=450er-Regel (Normalinsuline)
+RULE_300=300er-Regel (kleine Kinder)
+RULE_1800=1800er-Regel (schnellwirkende Insuline)
+RULE_1500=1500er-Regel (Normalinsuline)
+SELECT_RANGE=Zeitraum w\u00E4hlen
+SELECT_RULE=Regel w\u00E4hlen
+SENSITIVITY_FACTOR=Empfindlichkeitsfaktor
+CALCULATION=Rechnung
+INS_CH_RATIO_PROC=1E Insulin f\u00FCr %s g KH
+INS_BG_RATIO=Ins/BZ-Verh\u00E4ltnis
+INS_BG_RATIO_PROC=1E Insulin verringert den BZ um %s %s
+CH_BG_RATIO=KH/BZ-Verh\u00E4ltnis
+CH_BG_RATIO_PROC=1 %s Zunahme f\u00FCr %s g KH
+TDD_MUST_BE_GREATER_THAN_ZERO=<html><body>Total Daily Dose (TDD) must be greater than<br>zero. Recheck the value and start calculation<br>again.</body></html>
+RATIO_CALCULATOR_NOT_IMPLEMENTED=<html><body>This part of Ratio Calculator not implemented<br>yet.</body></html>
+RATIOS_NOT_DONE=<html><body>You never run calculation of Ratio's.<br>Either run it and click OK to transfer<br>calculated data, or use Cancel to exit.</body></html>
+RATIO_DB_IMPORT_NA=<html><body>Importing data from Db, doesn't work yet.<br>You can only enter data manually.</body></html>
+
+#
+# Bolus Helper [1]
+#
+BOLUS_HELPER=Bolus Helper
+READ_RATIOS=Read Ratios
+CH_INSULIN_RATIO=CH / Insulin Ratio
+BG_INSULIN_RATIO=BG / Insulin Ratio
+BG_OH_RATIO=BG / CH Ratio
+CORRECTION_DOSE=Correction Dose
+CARB_DOSE=Dose for covering CH
+TOGETHER=Together
+TOGETHER_ROUNDED=Together (rounded)
+NO_BG_MEASURE=No BG measurment.
+NO_CARBS_DEFINED=CH not set.
+UNIT_SHORT=U
+
+#
+# Tools [1]
+#
+METERS_PLUGIN=Messger\u00E4te Plug-in
+PUMPS_PLUGIN=Pumpen Plug-in
+CGMS_PLUGIN=CGMS Plug-in
+NUTRITION_PLUGIN=Nutrition Tool Plug-in
+STATUS_NOT_INSTALLED=Nicht installiert
+STATUS_NOT_AVAILABLE=N/A (ab Version %s verf\u00FCgbar)
+STATUS_INSTALLED=Installiert (Version %s)
+PLUGIN_NOT_INSTALLED_OR_AVAILABLE=%s nicht installiert und/oder verf\u00FCgbar.
+
+#
+# Backup/Restore [1]
+#
+
+# backup
+BACKUP=Sicherung
+BACKUP_DB_TITLE=Sicherung der GGC-Datenbank
+BACKUP_DB_TITLE_SHORT=Datenbanksicherung
+SELECT_ELEMENTS_TO_BACKUP=W\u00E4hlen Sie die zu sichernden Elemente
+
+# progress
+TOTAL_PROGRESS=Fortschritt insgesamt
+BACKUP_NOT_STARTED_YET=Sicherung wurde noch nicht gestartet.
+CURRENT_TASK=Aktuelle Aufgabe
+NO_TASK_STARTED=Keine Aufgabe
+
+# elements
+GGC_BACKUP=GGC-Sicherung
+NUTRITION_OBJECTS=Nahrungsobjekte
+USER_FOOD_GROUPS=Benutzer-Nahrungsgruppen
+MEAL_GROUPS=Mahlzeit-Gruppen
+FOODS=Ern\u00E4hrung
+TASK=Aufgabe
+SETTINGS=Einstellungen
+CONFIGURATION=Configuration
+COLOR_SCHEMES=Color Schemes
+
+# restore
+RESTORE_DB_TITLE=Wiederherstellung der GGC-Datenbank
+RESTORE_DB_TITLE_SHORT=Datenbankwiederherstellung
+RESTORE=Wiederherstellen
+RESTORE_NOT_STARTED_YET=Wiederherstellung wurde noch nicht gestarted.
+RESTORE_SELECTOR_DESC=<html>Select file from which you wish to do restore. You can either select text file (which contains data for database) or you can select zip file containing several files (made by our 'Backup' option). In next dialog you can select which elements you wish to restore and any special options.<br><br><b>Notes:</b><br>1. Files will be not checked at this time. Check is on restore only.<br>2. Restore is full. This means that all previous data will be deleted. In some cases there is exception to this rule, but only when unlinked data is used (which is rare in itself). You will learn more about this exceptions (if there are any) on next dialog.</html>
+SELECT_ELEMENTS_TO_RESTORE=Elemente zum Wiederherstellen w\u00E4hlen:
+DAILY_VALUES_APPEND=<html>Wollen Sie diese Werte an die vorhandenen Tageswerte anhängen? Falls die Datenbank diese Einträge bereits enthält, könnten diese dadurch dupliziert werden. Neue Einträge werden ohne Vergleich mit bereits existierenden hinzugefügt.</html>
+FILE_FILTER_DBE=*.dbe - Datenbank Export Dateien
+FILE_FILTER_ZIP=*.zip - Archiv (sollte *.dbe enthalten)
+SELECT_FILE_TO_RESTORE=Wiederherzustellende Datei ausw\u00E4hlen
+NEXT_STEP=Weiter
+
+#
+# Update [1]
+#
+LEGEND=Legende
+NEWEST=Neueste Version
+NOT_UPDATED=Nicht aktualisiert
+NOT_UPDATABLE=Nicht aktualisierbar
+UNKNOWN_STATUS=Unbekannter Status
+CHECK_SERVER=Server \u00FCberpr\u00FCfen
+RUN_UPDATE=Aktualisieren!
+CURRENT_VERSION=Aktuelle Version
+SERVER_VERSION=Version auf dem Server
+UPDATEABLE=Aktualisierbarkeit
+UPDATE_APPLICATION=Aktualisierung der Anwendung
+UPDATE_SERVER_NA=<html><h2>Update Server</h2><br><br>Die Update-Server-Seite wurde noch nicht implementiert. Dieser Dialog existiert zur Zeit nur, damit die aktuelle Version der Bibliotheken überprüft werden kann.<br>Der Server sollte bis September 2008 fertig und betriebsbereit sein. Bitte sehen Sie auf http://ggc.sourceforge.net nach, ob eine neue Version verfügbar ist.<br></html>
+NO_UPDATE_FOUND=No update was found on server !
+UPDATE_FOR_HIGHER_DB_FOUND=<html><body>No update for current database was found !<br>But there is version of application (%s)<br>for higher version of database. Since we<br>don't support update of database yet, we<br>can't continue update.<br></body></html>
+UPDATE_FOUND_VERSION=<ht...
[truncated message content] |
|
From: <ru...@us...> - 2011-07-03 11:47:36
|
Revision: 1184
http://ggc.svn.sourceforge.net/ggc/?rev=1184&view=rev
Author: rumbi
Date: 2011-07-03 11:47:27 +0000 (Sun, 03 Jul 2011)
Log Message:
-----------
RR: setting up German rolling translation
Modified Paths:
--------------
trunk/ggc-language_tool/active_translations/de/GGC_de.config
trunk/ggc-language_tool/active_translations/de/GGC_de.properties
Added Paths:
-----------
trunk/ggc-language_tool/active_translations/de/GGCMeterTool_de.properties
trunk/ggc-language_tool/active_translations/de/GGCPlugin_de.properties
trunk/ggc-language_tool/active_translations/de/GGCPumpTool_de.properties
trunk/ggc-language_tool/active_translations/de/GGC_CGMSTool_de.properties
trunk/ggc-language_tool/active_translations/de/GGC_Nutrition_de.properties
Removed Paths:
-------------
trunk/ggc-meter/src/GGCMeterTool_de.native.properties
trunk/ggc-nutri/src/GGC_Nutrition_de.native.properties
trunk/ggc-plugin_base/src/GGCPlugin_de.native.properties
trunk/ggc-pump/src/GGCPumpTool_de.native.properties
Added: trunk/ggc-language_tool/active_translations/de/GGCMeterTool_de.properties
===================================================================
--- trunk/ggc-language_tool/active_translations/de/GGCMeterTool_de.properties (rev 0)
+++ trunk/ggc-language_tool/active_translations/de/GGCMeterTool_de.properties 2011-07-03 11:47:27 UTC (rev 1184)
@@ -0,0 +1,251 @@
+#
+# ######################################################################
+# ### GGC Meter Tool ###
+# ######################################################################
+# ### Language: German ###
+# ### Created by: Reinhold Rumberger (ru...@us...) ###
+# ### Last change: 2008-10-15 Version: 0.3 ###
+# ### Plug-in Version: 1.0.6 ###
+# ### Last change: 4th February 2010 ###
+# ### Application Version: 1.1.7 ###
+# ######################################################################
+#
+# NOT FINISHED!!!
+# Very little testing!!
+# 101 keys not translated as of version 0.1
+#
+#
+# In brackets there are now tags which define urgency of some text beeing translated
+# 1 - Needed, urgent (Base functionality, options which will be used by user mostly)
+# 2 - Needed
+# 3 - Not used yet (in public releases)
+# 4 - In implementation
+#
+# * - If tags also has *, then it means that this string can change regulary, last update is in []
+#
+
+
+
+#
+# Plug-in Specific (1)
+# Most of strings here are concated with help of sprintf codes, so almost all are static
+#
+#[TODO] translate
+DEVICE_NAME_NORMAL=meter
+#[TODO] translate
+DEVICE_NAME_BIG=Meter
+DEVICE_FULL_NAME_WITH_PORT=%s auf %s
+DEVICE_FULL_NAME_WITHOUT_PORT=%s
+
+
+#
+# Menus
+#
+MN_METERS=&Messger\u00e4te
+#[TODO] translate
+MN_METERS_ABOUT=Meter plug-in about
+#[TODO] translate
+MN_METERS_ABOUT_DESC=About Meter Plugin (copyright, features, credits,...)
+MN_METERS_CONFIG=Messger\u00e4te-Plug-in &Einstellungen
+MN_METERS_CONFIG_DESC=Einstellungen zum Messger\u00e4te-Plug-in
+MN_METERS_LIST=Messger\u00e4te&liste
+MN_METERS_LIST_DESC=Liste der meisten verf\u00fcgbaren Messger\u00e4te
+MN_METERS_READ=Messger\u00e4t &auslesen
+MN_METERS_READ_DESC=Daten des Messger\u00e4ts auslesen
+MN_METERS_READ_FILE=Read file
+MN_METERS_READ_FILE_DESC=Read data from meter/sw export file
+
+
+#
+# Configuration (1)
+#
+
+#[TODO] translate
+NEW__=New
+MY__=My
+#[TODO] translate
+DEVICE_CONFIGURATION=%s Configuration
+#[TODO] translate
+SELECT_X_DEVICE=Select %s Device
+#[TODO] translate
+SELECTED_X_DEVICE=Selected %s Device
+#[TODO] translate
+DEVICE_CUSTOM_NAME=%s Custom Name
+
+
+
+
+#
+# Meter Selector (1)
+#
+#[TODO] translate
+SELECTOR_DEVICE=Meter Device Selector
+
+
+
+#
+# Instructions Dialog (1)
+#
+#[TODO] translate
+OOPS_DEVICE_NOT_CONFIGURED=Oops ! You forgot to configure your %s\nand currently there is no %s configured\nand/or selected. Please visit configuration\nand configure your %s.
+#[TODO] translate
+CONFIGURED_DEVICE_INSTRUCTIONS=Configured %s and instructions
+#[TODO] translate
+DEVICE_ICON=%s picture
+
+#[TODO] translate
+DEVICE_ICON=%s picture
+
+
+#
+# Transfer display (1)
+#
+#[TODO] translate
+ERROR_CONTACTING_DEVICE=We had problem contacting Meter device.\nPlease recheck communication port settings\n(some of cables, can change their address,\nwhen reconnected). Run configuration again\nand problem should be solved!\n
+#[TODO] translate
+DEVICE_INFO=%s Info
+
+#[TODO] translate
+STATUS_READER_ERROR=Internal %s error (or port)
+
+
+#[TODO] translate
+READ_DEVICE_DATA_TITLE=Read Meter Data [%s on %s]
+
+#
+# Table
+#
+#[TODO] translate
+DATETIME=Date/Time
+#[TODO] translate
+BG_MMOLL=BG (mmol/L)
+#[TODO] translate
+BG_MGDL=BG (mg/dL)
+MULTIPLE=Multiple
+
+
+# extended type table
+URINE=Ketones
+BG=Blood Glucose
+ENTRY_TYPE=Type
+
+#
+# Export (1)
+#
+EXPORT_DEVICE_DATA=Export %s Data
+
+
+
+#
+# List (1) [Andy]
+#
+DEVICE_LIST_WEB=%s List
+
+# non-static
+METERS_LIST_WEB_DESC=<html>Meters List is not list of all available Meters in the world, this is just list of some (mostly commonly used) Meters available. We add new devices here when our source page changes (www.diabetesnet.com) or if some user requests that their device is to be added. Meters in list are color coded, and color determines status of devices of selected company. Color coding description is shown at bottom of this page.<br></html>
+
+
+#
+# About (1)
+#
+DEVICE_PLUGIN=%s Plug-in
+DEVICE_PLUGIN_ABOUT=About %s Plug-in
+
+
+
+
+#
+# Libraries (1)
+#
+
+
+#
+# Meter Instructions (1)
+# [8.8.2008]
+#
+#[TODO] translate
+INSTRUCTIONS_ACCUCHEK_ACTIVE=<html><ul><li>Pix Device should be attached before program<br>is started</li><li>Place meter max. 10 cm from Pix device</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Keep button M (left) on Active pressed for more<br>than 3 seconds and download will start.</li></ul>Accu-Check Pix has sometimes problems with java, so<br>you might be forced to start downloading twice.</html>
+#[TODO] translate
+INSTRUCTIONS_ACCUCHEK_ADVANTAGE=<html><ul><li>Pix Device should be attached before program<br>is started</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Insert IR Key into meter and place meter max.<br>10 cm from Pix device and download will start.</li></ul>Accu-Check Pix has sometimes problems with java, so<br>you might be forced to start downloading twice.</html>
+#[TODO] translate
+INSTRUCTIONS_ACCUCHEK_AVIVA=<html><ul><li>Pix Device should be attached before program<br>is started</li><li>Place meter max. 10 cm from Pix device</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Keep both buttons on Aviva pressed for more<br>than 3 seconds and download will start.</li></ul>Accu-Check Pix has sometimes problems with java, so<br>you might be forced to start downloading twice.</html>
+#[TODO] translate
+INSTRUCTIONS_ACCUCHEK_COMFORT=<html><ul><li>Pix Device should be attached before program<br>is started</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Insert IR Key into meter and place meter max.<br>10 cm from Pix device and download will start.</li></ul>Accu-Check Pix has sometimes problems with java, so<br>you might be forced to start downloading twice.</html>
+#[TODO] translate
+INSTRUCTIONS_ACCUCHEK_COMPACT=<html><li>Pix Device should be attached before program<br>is started (it has sometimes problems with java,<br>so you might be forced to download twice)</li><li>Place meter max. 10 cm from Pix device</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Keep both SET and MEMO buttons pressed for<br>more than 3 seconds and download will start.</li></html>
+#[TODO] translate
+INSTRUCTIONS_ACCUCHEK_COMPACTPLUS=<html><li>Pix Device should be attached before program<br>is started (it has sometimes problems with java,<br>so you might be forced to download twice)</li><li>Place meter max. 10 cm from Pix device</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Keep both S and M buttons pressed for<br>more than 3 seconds and download will start.</li></html>
+#[TODO] translate
+INSTRUCTIONS_ACCUCHEK_GO=<html><ul><li>Pix Device should be attached before program<br>is started</li><li>Place meter max. 10 cm from Pix device</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Keep button M (left) on Active pressed for more<br>than 3 seconds and download will start.</li></ul>Accu-Check Pix has sometimes problems with java, so<br>you might be forced to start downloading twice.</html>
+#[TODO] translate
+INSTRUCTIONS_ACCUCHEK_INTEGRA=<html><li>Pix Device should be attached before program<br>is started (it has sometimes problems with java,<br>so you might be forced to download twice)</li><li>Place meter max. 10 cm from Pix device</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Keep both SET and MEMO buttons pressed for<br> more than 3 seconds and download will start.</li></html>
+#[TODO] translate
+INSTRUCTIONS_ACCUCHEK_PERFORMA=Instructions Performa <not supported at this time>
+#[TODO] translate
+INSTRUCTIONS_ACCUCHEK_SENSOR=<html><ul><li>Pix Device should be attached before program<br>is started</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Insert IR Key into meter and place meter max.<br>10 cm from Pix device and download will start.</li></ul>Accu-Check Pix has sometimes problems with java, so<br>you might be forced to start downloading twice.</html>
+INSTRUCTIONS_ACCUCHEK_NANO=<html><ul><li>Pix Device should be attached before program<br>is started</li><li>Place meter max. 10 cm from Pix device</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Keep Left and Right buttons on Aviva pressed for more<br>than 3 seconds and download will start.</li></ul>Accu-Check Pix has sometimes problems with java, so<br>you might be forced to start downloading twice.</html>
+
+
+#[TODO] translate
+INSTRUCTIONS_ASCENSIA_BREEZE=<html>Instructions for meter download:<ul><li>Attach the meter cable to the selected PC<br> serial port</li><li>Plug the meter cable into the round meter port<br></li><li>Press the meter button to turn the meter ON</li></ul><br>Click "Start Download" to begin reading your meter...</html>
+#[TODO] translate
+INSTRUCTIONS_ASCENSIA_CONTOUR=<html>Instructions for meter download:<ul><li>Attach the meter cable to the selected PC<br> serial port</li><li>Plug the meter cable into the round meter port<br></li><li>Press the meter button M to turn the meter ON</li></ul><br>Click "Start Download" to begin reading your meter...</html>
+#[TODO] translate
+INSTRUCTIONS_ASCENSIA_ELITE_XL=<html>Instructions for meter download:<ul><li>Attach the meter cable to the selected PC<br> serial port</li><li>Plug the meter cable into the round meter<br>port<br></li><li>Press the meter button to turn the meter ON</li></ul><br>Click "Start Download" to begin reading your meter...</html>
+#[TODO] translate
+INSTRUCTIONS_ASCENSIA_DEX=<html>Instructions for meter download:<ul><li>Attach the meter cable to the selected PC<br> serial port<br></li><li>Plug the meter cable into the port between<br> the two meter buttons<br></li><li>Slide the meter cover to turn the meter ON</li></ul><br>Click "Start Download" to begin reading your meter...</html>
+
+
+# lifescan:
+# off: InDuo(x), OT, OT: FastTake(x), SmartScan, EuroFlash, PocketScan, Select(x), Ultra(x), Ultra 2(x), Easy/Mini(x)
+# on: OT: Basic(x), Basic Plus, II(x), Profile(x), SureStep(x), GlucoTouch, UltraSmart(x)
+#[TODO] translate
+INSTRUCTIONS_LIFESCAN_ON=<html>Instructions for meter download:<ul><li>Attach the meter cable to the selected PC<br> serial port</li><li>Plug the meter cable into the meter port<br></li><li>Make sure that meter is ON</li></ul><br>Click "Start Download" to begin reading data from<br>your meter...</html>
+#[TODO] translate
+INSTRUCTIONS_LIFESCAN_OFF=<html>Instructions for meter download:<ul><li>Attach the meter cable to the selected PC<br> serial port</li><li>Plug the meter cable into the meter port<br></li><li>Make sure that meter is OFF</li></ul><br>Click "Start Download" to begin reading data from<br>your meter...</html>
+
+INSTRUCTIONS_ABBOTT_OPTIUMXCEED=<html>Instructions for meter download:<ul><li>Attach the meter cable to the selected PC<br> serial/USB port</li><li>Plug the meter cable into meter strip port<br></li></ul><br>Click "Start Download" to begin reading data from<br>your meter...</html>
+
+
+#
+# Meter companies desc. (this is not description of company, but about our connection with company) (3*)
+# [30.11.2008]
+#
+#[TODO] translate
+#ASCENSIA_DESC=Development of support for Ascensia Meters is done. Currently in testing phase.
+#[TODO] translate
+#ROCHE_DESC=Development of support for Roche Meters is done. Currently in testing phase.
+#[TODO] translate
+#LIFESCAN_DESC=Devices that we got support for are finished. Waiting for more.
+#[TODO] translate
+#ABBOTT_DESC=We got reply from company and are waiting for further communication.
+
+
+#[TODO] translate
+#DSOSC_DESC=Company was contacted, but they decided not to disclose their meter's protocol and denied any support.
+#[TODO] translate
+#HIPOGUARD_DESC=Company was contacted, but they decided not to disclose their meter's protocol and denied any support.
+
+#[TODO] translate
+#MENARINI_DESC=We contacted company, but so far there was no reply.
+#[TODO] translate
+#HOMEDIAGNOSTIC_DESC=We contacted company, but so far there was no reply.
+#[TODO] translate
+#PRODIGY_DESC=We contacted company, but so far there was no reply.
+#[TODO] translate
+#SANVITA_DESC=We contacted company, but so far there was no reply.
+#[TODO] translate
+#USDIAGNOSTIC_DESC=We contacted company, but so far there was no reply.
+#[TODO] translate
+#WAVESENSE_DESC=We contacted company, but so far there was no reply.
+
+
+
+# OT Ultra mini & OT Ultra (some) [Andy]
+READING_SW_VERSION=Reading Sw version
+READING_SERIAL_NR=Read Serial number
+READING_DATA_COUNTER=Reading data counter
+READING_PROCESSING_ENTRY=Reading and processing entry #
+READING_SERIAL_NR_SETTINGS=Read Serial number & Settings
+
+
Copied: trunk/ggc-language_tool/active_translations/de/GGCPlugin_de.properties (from rev 1181, trunk/ggc-plugin_base/src/GGCPlugin_de.native.properties)
===================================================================
--- trunk/ggc-language_tool/active_translations/de/GGCPlugin_de.properties (rev 0)
+++ trunk/ggc-language_tool/active_translations/de/GGCPlugin_de.properties 2011-07-03 11:47:27 UTC (rev 1184)
@@ -0,0 +1,518 @@
+#
+# ######################################################################
+# ### GGC PlugIn Base ###
+# ######################################################################
+# ### Language: German ###
+# ### Created by: Reinhold Rumberger (ru...@us...) ###
+# ### Last change: 2008-10-15 Version: 0.3 ###
+# ### Last change: 4th February 2010 ###
+# ### Library Version: 0.4.5 ###
+# ### Application Version: 0.4.17 ###
+# ######################################################################
+#
+# NOT FINISHED!!!
+# Very little testing!!
+# 101 keys not translated as of version 0.1
+#
+#
+# In brackets there are now tags which define urgency of some text beeing translated
+# 1 - Needed, urgent (Base functionality, options which will be used by user mostly)
+# 2 - Needed
+# 3 - Not used yet (in public releases)
+# 4 - In implementation
+#
+# * - If tags also has *, then it means that this string can change regulary, last update is in []
+#
+
+# Collation Rules - In unicode we can create special rules for sorting where we specify
+# sorting order of special characters. This will be used by tree's and special tables.
+# For english this is left empty. For all other (that have non-standarn, non-english
+# charcters) we need to set this if we want sorting to be done correctly.
+#
+COLLATION_RULES=< 0 < 1 < 2 < 3 < 4 < 5 < 6 < 7 < 8 < 9 < a,A,\u00e4,\u00c4,\u00e1,\u00e0,\u00c1,\u00c0,\u00e2,\u00c2 < b,B < c,C < d,D < e,E,\u00e9,\u00e8,\u00ea,\u00c9,\u00c8,\u00ca < f,F < g,G < h,H < i,I < j,J < k,K < l,L < m,M < n,N < o,O,\u00f6,\u00d6 < p,P < q,Q < r,R < s,S,\u00df < t,T < u,U,\u00fc,\u00dc < v,V < w,W < x,X < y,Y < z,Z
+
+
+# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+#
+# COMMENT: Need to be fixed prior to use. Some of this translations might be done in Core. We created this file from Meter
+# and Core. Translators need to fix this prior to first use on Translation Tool.
+# Andy
+#
+# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+
+#
+# !G! General (1)
+#
+
+# buttons
+CANCEL=Cancel
+OK=OK
+HELP=Help
+CLOSE=Close
+APPLY=Apply
+LOG__=log:
+SELECT=Select
+ERROR=Error
+ADD=Add
+EDIT=Edit
+DELETE=Delete
+NEXT=Next
+YES=Yes
+NO=No
+WARNING=Warning
+
+UNIT_MMOLL=mmol/L
+UNIT_MGDL=mg/dL
+FALSE=False
+TRUE=True
+
+
+DATE=Date
+TIME=Time
+GRAPH=Graph
+
+
+# weeks days and months
+SU=Su
+MO=Mo
+TU=Tu
+WE=We
+TH=Th
+FR=Fr
+SA=Sa
+JANUARY=January
+FEBRUARY=February
+MARCH=March
+APRIL=April
+MAY=May
+JUNE=June
+JULY=July
+AUGUST=August
+SEPTEMBER=September
+OCTOBER=October
+NOVEMBER=November
+DECEMBER=December
+
+SELECT_ITEM_FIRST=Please select item first.
+ARE_YOU_SURE_DELETE=Are you sure you want to delete this item/entry?
+QUESTION=Question
+
+
+
+#
+# General (1)
+#
+APPLY=Anwenden
+CANCEL=Abbrechen
+HELP=Hilfe
+#[TODO] translate
+LOG__=log:
+OK=OK
+CLOSE=Schlie\xDFen
+HELP=Hilfe
+#[TODO] translate
+ERROR=Error
+
+
+
+#
+# Configuration (1)
+#
+
+MY__=My
+
+#[TODO] translate
+DEVICE_COMPANY=Company
+#[TODO] translate
+DEVICE_DEVICE=Device
+#[TODO] translate
+NO_COMPANY_SELECTED=No company selected.
+#[TODO] translate
+NO_DEVICE_SELECTED=No device selected.
+#[TODO] translate
+TIMEZONE_CONFIGURATION=TimeZone Configuration
+#[TODO] translate
+SELECT_ITEM_OR_CANCEL=Select one of items or use Cancel option.
+#[TODO] translate
+SELECT_MASS_STORAGE_DRIVE=Select Mass Storage Drive
+#[TODO] translate
+SELECT_SERIAL_PORT=Select Serial Port
+#[TODO] translate
+SERIAL_PORT=Serial Port
+#[TODO] translate
+MASS_STORAGE_DRIVE=Mass Storage Drive
+#[TODO] translate
+NEW__=New
+#[TODO] translate
+NOT_SET=Not Set !
+#[TODO] translate
+TIMEZONE_PREFERENCES=TimeZone Preferences
+#[TODO] translate
+SELECT_TIMEZONE_LIST=Select correct timezone
+#[TODO] translate
+NEED_DAYLIGHTSAVING_FIX=Do we need daylight savings fix?
+#[TODO] translate
+WINTERTIME_FIX=Winter Time Fix
+#[TODO] translate
+SUMMERTIME_FIX=Summer Time Fix
+
+
+
+#
+# Ports
+#
+#[TODO] translate
+COMMUNICATION_PORT=Communication Port
+
+
+#
+# Meter Selector (1)
+#
+#[TODO] translate
+DEVICE_COMPANY=Company
+DEVICE_DEVICE=Ger\ufffdt
+#[TODO] translate
+
+
+#
+# Meter Interfaces (1)
+#
+#[TODO] translate
+MASS_STORAGE=Mass Storage: G:,...
+SERIAL_PORTS=Serielle Schnittstellen: COM2,...
+
+
+#
+# Instructions Dialog (1)
+#
+#[TODO] translate
+OOPS_DEVICE_NOT_CONFIGURED=Oops ! You forgot to configure your %s\nand currently there is no %s configured\nand/or selected. Please visit configuration\nand configure your %s.
+#[TODO] translate
+CONFIGURED_DEVICE_INSTRUCTIONS=Configured %s and instructions
+#[TODO] translate
+DEVICE_ICON=%s picture
+#[TODO] translate
+CONFIGURED_DEVICE=Configured Device
+#[TODO] translate
+INSTRUCTIONS=Instructions for download
+
+#[TODO] translate
+MY_DEVICE_NAME=My device name
+#[TODO] translate
+DEVICE_NAME_=Device name
+#[TODO] translate
+CONNECTION_TYPE=Connection
+#[TODO] translate
+CONNECTION_PARAMETER=C. Parameter
+#[TODO] translate
+DAYLIGHTSAVINGS_FIX=Time (DS) fix
+
+#[TODO] translate
+DEVICE_ICON=%s picture
+#[TODO] translate
+DEVICE_NAME_=Device name
+
+#[TODO] translate
+STATUS=Status
+
+#[TODO] translate
+ERROR_IN_CONFIG=Error in config
+#[TODO] translate
+READY=Ready
+
+
+DEVICE_HAS_NO_DOWNLOAD_SUPPORT=<html>Your selected device (%s [%s])<br>doesn't support downloading of data.<br></html>
+DEVICE_DOWNLOAD_NOT_SUPPORTED_BY_GGC=<html>GGC at this time doesn't support downloading<br>from selected device (%s [%s]).<br>Check device listing to see if support is planned<br>or contact us for additional info.</html>
+DEVICE_DOWNLOAD_NOT_SUPPORTED_GENERIC=<html>Generic devices have no download support !<br>You need to select "real" device (and correct<br>one at that).<br></html>
+DEVICE_HAS_NO_DEVICE_DOWNLOAD_SUPPORT=<html>Your selected device (%s [%s])<br>doesn't support downloading of data.<br></html>
+DEVICE_HAS_NO_FILE_DOWNLOAD_SUPPORT=<html>Your selected device (%s [%s])<br>doesn't support import of data through files.<br></html>
+DEVICE_HAS_NO_CONFIG_DOWNLOAD_SUPPORT=<html>Your selected device (%s [%s])<br>doesn't support download of configuration.<br></html>
+INTERNAL_CONFIGURATION_ERROR=<html>There seems to be internal problem<br>in configuration of application.<br></html>
+
+
+
+#[TODO] translate
+DS_NO=No
+#[TODO] translate
+DS_FIX_SHORT=Yes (W.=%s / S.=%s)
+#[TODO] translate
+DS_FIX_LONG=Yes (Winter time fix=%s / Summer time fix=%s). Timezone: %s
+
+#[TODO] translate
+INSTRUCTIONS_DESC=<html>On upper right side you can see your configuration. If Status in it, is not 'Ready' then there is problem with configuration. Please exit and run configuration again and try to resolve problem. If problem still persist contact support (see Documentation). On lower right side you see instructions on how to connect device to your PC. Please follow them and after you completed, click on 'Start Download' button. You will be taken to next screen where all your meter entries will be displayed as they download. All data is just displayed until you click on 'Export Data' button.</html>
+#[TODO] translate
+START_DOWNLOAD=Start Download >>>
+#[TODO] translate
+DEVICE_DOESNT_SUPPORT_DS_FIX=Device doesn't support Daylight savings fix !
+DEVICE_DOESNT_SUPPORT_DS_FIX_2=Device doesn't support Daylight savings fix
+
+#[TODO] translate
+WAIT_UNTIL_OLD_DATA_IS_READ=Please wait until old (existing) data is read!
+
+
+
+#
+# File Selector
+#
+
+IMPORT_FILE_SELECTOR=Import File Selector
+IMPORT_FILE_SELECTOR_DESC=<html><body>Please select import file of selected type. </body></html>
+SELECT_FILE=Select file:
+BROWSE=Browse
+MULTIPLE_IMPORT_SELECTOR=Multiple Import Selector
+MULTIPLE_IMPORT_SELECTOR_DESC=<html><body>This device has several possible import types. Please select correct import type, for import type you have available. </body></html>
+
+
+
+#
+# Transfer display (1)
+#
+#[TODO] translate
+ERROR_CONTACTING_DEVICE=We had problem contacting Meter device.\nPlease recheck communication port settings\n(some of cables, can change their address,\nwhen reconnected). Run configuration again\nand problem should be solved!\n
+#[TODO] translate
+BREAK_COMMUNICATION=Break Communication
+#[TODO] translate
+EXPORT_DATA=Export Data
+#[TODO] translate
+DATA=Data
+#[TODO] translate
+LOG=Log
+#[TODO] translate
+DEVICE_INFO=%s Info
+#[TODO] translate
+ACTION=Action
+
+READING_OLD_DATA=Reading old data (from Db)
+
+
+#[TODO] translate
+STATUS_NONE=Unknown Status
+#[TODO] translate
+STATUS_READY=Ready
+#[TODO] translate
+STATUS_DOWNLOADING=Downloading
+#[TODO] translate
+STATUS_STOPPED_DEVICE=Download stopped (by device)
+#[TODO] translate
+STATUS_STOPPED_USER=Download stopped by user
+#[TODO] translate
+STATUS_DOWNLOAD_FINISHED=Download finished
+#[TODO] translate
+STATUS_READER_ERROR=Internal %s error (or port)
+
+#[TODO] translate
+UNKNOWN=Unknown
+#[TODO] translate
+NEW=New
+#[TODO] translate
+CHANGED=Changed
+#[TODO] translate
+OLD=Old
+
+#[TODO] translate
+LOG_IS_CURRENTLY_NOT_IMPLEMENTED=Log is currently not available.
+
+#[TODO] translate
+READ_DEVICE_DATA_TITLE=Read Meter Data [%s on %s]
+#[TODO] translate
+SW_VERSION=SW Version
+#[TODO] translate
+HW_VERSION=HW Version
+
+#[TODO] translate
+SELECT_ALL=Select All
+#[TODO] translate
+DESELECT_ALL=Deselect All
+
+#
+# Table
+#
+#[TODO] translate
+DATETIME=Date/Time
+#[TODO] translate
+BG_MMOLL=BG (mmol/L)
+#[TODO] translate
+BG_MGDL=BG (mg/dL)
+
+#[TODO] translate
+FILTER=Filter
+
+#[TODO] translate
+FILTER_ALL=All
+#[TODO] translate
+FILTER_NEW=New
+#[TODO] translate
+FILTER_CHANGED=Changed
+#[TODO] translate
+FILTER_EXISTING=Old
+#[TODO] translate
+FILTER_UNKNOWN=Unknown
+#[TODO] translate
+FILTER_NEW_CHANGED=New + Changed
+#[TODO] translate
+FILTER_ALL_BUT_EXISTING=All except old
+
+
+#
+# List (1) [Andy]
+#
+DEVICE_LIST_WEB=%s List
+
+# non-static
+METERS_LIST_WEB_DESC=<html>Meters List is not list of all available Meters in the world, this is just list of some (mostly commonly used) Meters available. We add new devices here when our source page changes (www.diabetesnet.com) or if some user requests that their device is to be added. Meters in list are color coded, and color determines status of devices of selected company. Color coding description is shown at bottom of this page.<br></html>
+
+LEGEND_DESC=<html><b>Legend:</b><br><font color="green">Green</font> = All known devices supported<br><font color="#33FFFF">Cyan</font> = Testing<br><font color="#660066">Magenta</font> = some devices implemented<br><font color="blue">Blue</font> = work in progress<br><font color="#FFCC33">Orange</font> = Planned<br><font color="red">Red</font> = Not Planned</html>
+
+
+
+#
+# About (1)
+# Note: elements under static are same for all plugins and non-static are plugin specific
+#
+
+#[TODO] translate
+SYSTEM_PROPERTIES=System Properties
+#[TODO] translate
+ABOUT=About
+#[TODO] translate
+PROPERTY=Property
+#[TODO] translate
+VALUE=Value
+#[TODO] translate
+LICENCE=Licence
+#[TODO] translate
+CREDITS=Credits
+#[TODO] translate
+LIBRARIES=Libraries
+#[TODO] translate
+GGC_DEVELOPMENT_TEAM=GGC Development Team
+#[TODO] translate
+SEE_CREDITS=(See Credits)
+#[TODO] translate
+DEVELOPERS_DESC=Developers & features they implemented
+#[TODO] translate
+HELPERS_DESC=People that helped (testing, lending or donating hardware,...)
+#[TODO] translate
+FEATURES=Features
+#[TODO] translate
+IMPLEMENTED_FEATURES=Implemented Features
+#[TODO] translate
+SUPPORTED_DEVICES=Supported Devices
+#[TODO] translate
+NOT_IMPLEMENTED_FEATURES=Not Implemented Features
+#[TODO] translate
+PLANNED_DEVICES=Planned Devices
+#[TODO] translate
+DEVICE_PLUGIN=%s Plug-in
+#[TODO] translate
+DEVICE_PLUGIN_ABOUT=About %s Plug-in
+
+
+
+#
+# Printing - Base (2)
+#
+DATE=Date
+PRINTING=Printing
+TYPE_OF_REPORT=Type Of Report
+SELECT_YEAR_AND_MONTH=Select Year And Month
+REPORT_FOOTER=This report is from \"GGC - GNU Gluco Control\", freely available at http://ggc.sourceforge.net
+FOR=For
+PRINTING_SETTINGS_NOT_SET=<html>Printing settings (Pdf Viewer) not set or set<br>incorrectly.</html>
+PRINTING_SETTINGS_NOT_SET_SOL=<html>Go to Tools->Preferences, tab Printing and set<br>correct path to Pdf Viewer</html>
+PDF_VIEVER_RUN_ERROR=<html>Error running PDF Viewer, unknown exception.</html>
+SELECT_STARTING_RANGE=Select starting range
+SELECT_ENDING_RANGE=Select ending range
+
+
+
+#
+# Export (1)
+#
+#[TODO] translate
+EXPORT_OUTPUT=Output for export
+#[TODO] translate
+EXPORT_DEVICE_DATA=Export Meter Data
+#[TODO] translate
+GGC_APPLICATION=GGC Application
+#[TODO] translate
+EXPORT_PROGRESS=Progress of export
+#[TODO] translate
+START=Start
+#[TODO] translate
+EXPORT_STATUS_READY=Ready
+#[TODO] translate
+EXPORT_STATUS_EXPORTING=Exporting
+#[TODO] translate
+EXPORT_STATUS_FINISHED=Finished
+
+#
+# Used protocols (1)
+#
+#[TODO] translate
+PROT_NONE=None (dummy or N/A)
+#[TODO] translate
+PROT_SERIAL_BRIDGE=Serial (or USB bridge)
+#[TODO] translate
+PROT_MASS_STORAGE_XML=Mass Storage (Xml)
+#[TODO] translate
+PROT_BLUE_TOOTH=Blue Tooth
+
+#
+# Libraries (1)
+#
+#[TODO] translate
+NO_BINARY_PART_FOUND=Meter devices are using special library\ncalled: '%s' which requires "native"\n(binary) file, which is not present on\nyour system. Please take a look into\n<GGC_Install>\\lib\\native\\%s\nand look for file: '%s'.\nIf it's not there you must obtain it,\nif it is there, then there is something\nwrong with it (re-obtain it).\n
+
+
+
+#
+# Special Comments
+#
+#[TODO] translate
+DEVICE_DUMMY_SPECIAL_COMMENT=This is Dummy device.
+#[TODO] translate
+DEVICE_PIX_SPECIAL_COMMENT=Pix device displays data at end of reading and progress is just estimated.
+
+#
+# Error Dialog (1)
+#
+ERROR_DIALOG=Error Dialog
+DETAILS=Details
+ERROR_SOLUTION=Solution
+EXCEPTION_LOG=Exception (Stack) Trace
+SEND_TO_SERVER=Send to Server
+SENDING_TO_SERVER=Sending to Server
+SEND_TO_SERVER_TEXT=<html>This part is not implemented yet. But at later time when<br>this works, you will able to send us report of error<br>and receive solution (if it exists).<br></html>
+NO_SOLUTION_AVAILABLE=No solution available.
+ERROR_COUNT=Errors (%s)
+
+
+
+#
+# Devices
+#
+#[TODO] translate
+PIX_ABORT_AUTOSCAN=Autoscan aborted
+#[TODO] translate
+PIX_CREATING_REPORT=Creating report
+#[TODO] translate
+PIX_DETECT_DEVICES=Detecting devices
+#[TODO] translate
+PIX_DEVICE_NOT_FOUND=Device not found
+#[TODO] translate
+PIX_FINISHED_READING=Finished reading. Report ready.
+#[TODO] translate
+PIX_FINISHED_REPORT_READY=Finished reading. Report ready.
+#[TODO] translate
+PIX_READING=Read data
+#[TODO] translate
+PIX_READING_ELEMENT=Reading elements from device
+#[TODO] translate
+PIX_SCANNING=Scanning for device
+#[TODO] translate
+PIX_UNRECOVERABLE_ERROR=Unrecoverable error
+
+
+
Copied: trunk/ggc-language_tool/active_translations/de/GGCPumpTool_de.properties (from rev 1181, trunk/ggc-pump/src/GGCPumpTool_de.native.properties)
===================================================================
--- trunk/ggc-language_tool/active_translations/de/GGCPumpTool_de.properties (rev 0)
+++ trunk/ggc-language_tool/active_translations/de/GGCPumpTool_de.properties 2011-07-03 11:47:27 UTC (rev 1184)
@@ -0,0 +1,680 @@
+#
+# ######################################################################
+# ### GGC Pump Tool ###
+# ######################################################################
+# ### Language: German ###
+# ### Created by: Andy Rozman (an...@at...) ###
+# ### Last change: 12th July 2009 ###
+# ### Application Version: 1.0.1 ###
+# ######################################################################
+#
+#
+# In brackets there are now tags which define urgency of some text beeing translated
+# 1 - Needed, urgent (Base functionality, options which will be used by user mostly)
+# 2 - Needed
+# 3 - Not used yet (in public releases)
+# 4 - In implementation
+#
+# * - If tags also has *, then it means that this string can change regulary, last update is in []
+#
+# Most of keywords are copies from Meter Plugin and some are from GGC, so most can be copied
+# from either of this locations.
+#
+
+
+#
+# General (1)
+#
+CANCEL=Cancel
+OK=OK
+HELP=Help
+APPLY=Apply
+LOG__=log:
+ADD=Add
+EDIT=Edit
+DELETE=Delete
+NEXT=Next
+YES=Yes
+NO=No
+WARNING=Warning
+ERROR=Error
+CLOSE=Close
+LOG__=log:
+HELP=Help
+SELECT=Select
+
+SELECT_ITEM_FIRST=Please select item first.
+ARE_YOU_SURE_DELETE=Are you sure you want to delete this item?
+
+QUESTION=Question
+
+
+
+
+#
+# General Date/Time (1)
+#
+SU=Su
+MO=Mo
+TU=Tu
+WE=We
+TH=Th
+FR=Fr
+SA=Sa
+JANUARY=January
+FEBRUARY=February
+MARCH=March
+APRIL=April
+MAY=May
+JUNE=June
+JULY=July
+AUGUST=August
+SEPTEMBER=September
+OCTOBER=October
+NOVEMBER=November
+DECEMBER=December
+
+
+#
+# Plug-in Specific (1)
+# Most of strings here are concated with help of sprintf codes, so almost all are static
+#
+DEVICE_NAME_NORMAL=pump
+DEVICE_NAME_BIG=Pump
+DEVICE_FULL_NAME_WITHOUT_PORT=%s
+DEVICE_FULL_NAME_WITH_PORT=%s on %s
+
+
+#
+# About (1)
+# Note: elements under static are same for all plugins and non-static are plugin specific
+#
+
+# static
+CLOSE=Close
+SYSTEM_PROPERTIES=System Properties
+ABOUT=About
+PROPERTY=Property
+VALUE=Value
+LICENCE=Licence
+CREDITS=Credits
+LIBRARIES=Libraries
+GGC_DEVELOPMENT_TEAM=GGC Development Team
+SEE_CREDITS=(See Credits)
+DEVELOPERS_DESC=Developers & features they implemented
+HELPERS_DESC=People that helped (testing, lending or donating hardware,...)
+FEATURES=Features
+IMPLEMENTED_FEATURES=Implemented Features
+SUPPORTED_DEVICES=Supported Devices
+NOT_IMPLEMENTED_FEATURES=Not Implemented Features
+PLANNED_DEVICES=Planned Devices
+DEVICE_PLUGIN=%s Plug-in
+DEVICE_PLUGIN_ABOUT=About %s Plug-in
+
+
+
+#
+# Menus
+#
+MN_PUMPS=Pumps
+MN_PUMPS_READ=Pump Read
+MN_PUMPS_READ_DESC=Read data from pump
+MN_PUMPS_LIST=Pumps List
+MN_PUMPS_LIST_DESC=List of most pumps available
+MN_PUMPS_CONFIG=Configure...
+MN_PUMPS_CONFIG_DESC=Configuration of the Pump plug-in
+MN_PUMP_PROFILES=Profiles
+MN_PUMP_PROFILES_DESC=Basal profiles
+MN_PUMPS_MANUAL_ENTRY=Manual entry
+MN_PUMPS_MANUAL_ENTRY_DESC=Manual entry of data (if your device is not supported)
+MN_PUMPS_ADDITIONAL_DATA=Additional data
+MN_PUMPS_ADDITIONAL_DATA_DESC=Additional data entry (BG, Activity, ...)
+MN_PUMPS_ABOUT=About...
+MN_PUMPS_ABOUT_DESC=About Pump Plugin (copyright, features, credits,...)
+
+MN_PUMPS_READ_DATA=Read data
+MN_PUMPS_READ_DATA_DESC=Read data from pump
+MN_PUMPS_READ_CONFIG=Read configuration
+MN_PUMPS_READ_CONFIG_DESC=Read configuration from pump
+
+
+#
+# Configuration (1)
+#
+MY__=My
+DEVICE_COMPANY=Company
+DEVICE_DEVICE=Device
+NO_COMPANY_SELECTED=No company selected.
+NO_DEVICE_SELECTED=No device selected.
+#TIMEZONE_CONFIGURATION=TimeZone Configuration
+SELECT_ITEM_OR_CANCEL=Select one of items or use Cancel option.
+SELECT_MASS_STORAGE_DRIVE=Select Mass Storage Drive
+SELECT_SERIAL_PORT=Select Serial Port
+SERIAL_PORT=Serial Port
+MASS_STORAGE_DRIVE=Mass Storage Drive
+NEW__=New
+NOT_SET=Not Set !
+#TIMEZONE_PREFERENCES=TimeZone Preferences
+#SELECT_TIMEZONE_LIST=Select correct timezone
+#NEED_DAYLIGHTSAVING_FIX=Do we need daylight savings fix?
+#WINTERTIME_FIX=Winter Time Fix
+#SUMMERTIME_FIX=Summer Time Fix
+
+DEVICE_CONFIGURATION=%s Configuration
+SELECT_X_DEVICE=Select %s Device
+SELECTED_X_DEVICE=Selected %s Device
+DEVICE_CUSTOM_NAME=%s Custom Name
+
+DEVICE_DOWNLOAD=DL
+DEVICE_SETTINGS=Sett.
+
+
+#
+# Ports
+#
+COMMUNICATION_PORT=Communication Port
+
+
+#
+# Meter Selector (1)
+#
+SELECTOR_DEVICE=%s Device Selector
+#DEVICE_COMPANY=Company
+#DEVICE_DEVICE=Device
+DEVICE_CONNECTION=Device connection
+
+
+
+#
+# Meter Interfaces (1)
+#
+SERIAL_PORTS=Serial Ports: COM2,...
+MASS_STORAGE=Mass Storage: G:,...
+
+
+#
+# Used protocols (1)
+#
+PROT_NONE=None (dummy or N/A)
+PROT_SERIAL_BRIDGE=Serial (or USB bridge)
+PROT_MASS_STORAGE_XML=Mass Storage (Xml)
+PROT_BLUE_TOOTH=Blue Tooth
+
+#
+# Libraries
+#
+NO_BINARY_PART_FOUND=Meter devices are using special library\ncalled: '%s' which requires "native"\n(binary) file, which is not present on\nyour system. Please take a look into\n<GGC_Install>\\lib\\native\\%s\nand look for file: '%s'.\nIf it's not there you must obtain it,\nif it is there, then there is something\nwrong with it (re-obtain it).\n
+
+
+
+
+#
+# Instructions Dialog ((1))
+#
+OOPS_DEVICE_NOT_CONFIGURED=Oops ! You forgot to configure your %s\nand currently there is no %s configured\nand/or selected. Please visit configuration\nand configure your %s.
+CONFIGURED_DEVICE_INSTRUCTIONS=Configured %s and Instructions
+CONFIGURED_DEVICE=Configured Device
+INSTRUCTIONS=Instructions for Download
+MY_DEVICE_NAME=My device name
+DEVICE_ICON=%s picture
+DEVICE_NAME_=Device name
+CONNECTION_TYPE=Connection
+CONNECTION_PARAMETER=C. Parameter
+STATUS=Status
+DAYLIGHTSAVINGS_FIX=Time (DS) fix
+#DS_NO=No
+#DS_FIX_SHORT=Yes (W.=%s / S.=%s)
+#DS_FIX_LONG=Yes (Winter time fix=%s / Summer time fix=%s). Timezone: %s
+DEVICE_DOESNT_SUPPORT_DS_FIX=Not supported by device.
+INSTRUCTIONS_DESC=<html>On upper right side you can see your configuration. If Status in it, is not 'Ready' then there is problem with configuration. Please exit and run configuration again and try to resolve problem. If problem still persist contact support (see Documentation). On lower right side you see instructions on how to connect device to your PC. Please follow them and after you completed, click on 'Start Download' button. You will be taken to next screen where all your device entries will be displayed as they download. All data is just displayed until you click on 'Export Data' button.</html>
+START_DOWNLOAD=Start Download >>>
+WAIT_UNTIL_OLD_DATA_IS_READ=Please wait until old (existing) data is read!
+BASE_TYPE_SH=Base
+EXT_TYPE_SH=Ext.
+PROFILE_TYPE_SH=Profile
+
+# status
+ERROR_IN_CONFIG=Error in config
+READY=Ready
+
+ERROR_CONTACTING_DEVICE=We had problem contacting Meter device.\nPlease recheck communication port settings\n(some of cables, can change their address,\nwhen reconnected). Run configuration again\nand problem should be solved!\n
+BREAK_COMMUNICATION=Break Communication
+EXPORT_DATA=Export Data
+DATA=Data
+LOG=Log
+DEVICE_INFO=%s Info
+ACTION=Action
+
+DEVICE_HAS_NO_DOWNLOAD_SUPPORT=<html>Your selected device (%s [%s])<br>doesn't support downloading of data.<br></html>
+DEVICE_DOWNLOAD_NOT_SUPPORTED_BY_GGC=<html>GGC at this time doesn't support downloading<br>from selected device (%s [%s]).<br>Check device listing to see if support is planned<br>or contact us for additional info.</html>
+DEVICE_DOWNLOAD_NOT_SUPPORTED_GENERIC=<html>Generic devices have no download support !<br>You need to select "real" device (and correct<br>one at that).<br></html>
+
+
+STATUS_NONE=Unknown Status
+STATUS_READY=Ready
+STATUS_DOWNLOADING=Downloading
+STATUS_STOPPED_DEVICE=Download stopped (by device)
+STATUS_STOPPED_USER=Download stopped by user
+STATUS_DOWNLOAD_FINISHED=Download finished
+STATUS_READER_ERROR=Internal %s (or port) error
+
+UNKNOWN=Unknown
+NEW=New
+CHANGED=Changed
+OLD=Old
+
+LOG_IS_CURRENTLY_NOT_IMPLEMENTED=Log is currently not available.
+READ_DEVICE_DATA_TITLE=Read Meter Data [%s on %s]
+SW_VERSION=SW Version
+HW_VERSION=HW Version
+SELECT_ALL=Select All
+DESELECT_ALL=Deselect All
+FILTER=Filter
+FILTER_ALL=All
+FILTER_NEW=New
+FILTER_CHANGED=Changed
+FILTER_EXISTING=Old
+FILTER_UNKNOWN=Unknown
+FILTER_NEW_CHANGED=New + Changed
+FILTER_ALL_BUT_EXISTING=All except old
+
+# table (add new table items here)
+DATETIME=Date/Time
+BG_MMOLL=BG (mmol/L)
+BG_MGDL=BG (mg/dL)
+
+READING_OLD_DATA=Reading old data (from Db)
+
+
+#
+# Export (1)
+#
+EXPORT_OUTPUT=Output for export
+EXPORT_DEVICE_DATA=Export %s Data
+GGC_APPLICATION=GGC Application
+EXPORT_PROGRESS=Progress of export
+START=Start
+EXPORT_STATUS_READY=Ready
+EXPORT_STATUS_EXPORTING=Exporting
+EXPORT_STATUS_FINISHED=Finished
+
+
+
+#
+# Used protocols (1)
+#
+PROT_NONE=None (dummy or N/A)
+PROT_SERIAL_BRIDGE=Serial (or USB bridge)
+PROT_MASS_STORAGE_XML=Mass Storage (Xml)
+PROT_BLUE_TOOTH=Blue Tooth
+
+
+#
+# List (1)
+#
+DEVICE_LIST_WEB=Pumps List
+
+# non-static
+DEVICE_LIST_WEB_DESC=<html>Pumps list contains most of Pumps (even most of models). For each of this pumps, there is configuration entry, which contains only basic settings for device (profile names, TBR settings, etc). Devices which support download have that shown in selector (DL column). Pumps in list are color coded, and color determines status of devices of selected company. Color coding description is shown at bottom of this page.<br></html>
+
+LEGEND_DESC=<html><b>Legend:</b><br><font color="green">Green</font> = All known devices supported<br><font color="#33FFFF">Cyan</font> = Testing<br><font color="#660066">Magenta</font> = some devices implemented<br><font color="blue">Blue</font> = work in progress<br><font color="#FFCC33">Orange</font> = Planned<br><font color="red">Red</font> = Not Planned</html>
+
+
+
+
+
+#
+# Pump companies desc. (this is not description of company, but about our connection with company) (3*)
+# [12.10.2008]
+#
+ROCHE_DESC=We got full support from Roche and implementation is planned to start in March 2009.
+MINIMED_DESC=We got partitial support from company and implementation will start in December 2008.
+ANIMAS_DESC=No support from company so far. Implementation not planned at this time.
+
+
+
+
+#
+# Manual Entry (1)
+#
+
+NOT_ALL_REQUIRED_VALUES_SET=Not all required entries are selected\nand/or filled in for this type of entry.\nPlease recheck everything and try again.\n
+
+AVG_BG=Avg BG
+BLOOD_GLUCOSE=Blood Glucose
+BREAD_UNITS=Carbohydrate Units
+AVG=Avg
+INSULIN=Insulin
+TOTAL=Total
+AVG_INS=Avg Ins
+DOSE_INS=Dose Ins
+BOLUS=Bolus
+BASAL=Basal
+MEALS=Meals
+LOWEST=Lowest
+STD_DEV=Std Dev
+READINGS=Readings
+HIGHEST=Highest
+DOSE=Dose
+SUM=Sum
+FOOD=Food
+IMMEDIATE_AMOUNT=Immediate Amount
+
+
+
+PUMP_DAILY_OVERVIEW=Pump Daily Stats
+DATE=Date
+TIME=Time
+ADD_ROW=Add Pump Data
+EDIT_ROW=Edit Pump Data
+ADDITIONAL_DATA=Additional Data
+
+# delete
+DELETE_MANY_ADDITIONAL_DATA=<html>There are many additional data entries under<br>this item. Are you sure you want to delete<br>them all?<br></html>
+
+# table
+BASE_TYPE=Base Type
+SUB_TYPE=Sub-Type
+ADDITIONAL=Additional
+
+# parametes
+ADD_DATA_ACTIVITY=Activity
+ADD_DATA_COMMENT=Comment
+ADD_DATA_BG=Blood Glucose
+ADD_DATA_URINE=Urine
+ADD_DATA_CH=Carbohydrates
+ADD_DATA_FOOD_DB=Food from Db (and CH)
+ADD_DATA_FOOD_DESC=Food by Description (and CH)
+SELECT_SUBTYPE=Select Sub-type
+ENTRY_TYPE=Type Of Entry
+
+# parameters add wizard 1
+ADD_PARAMETER=Add additional data (1/2)
+SELECT_ADDITONAL_DATA=Select additional data to add
+ADD_PARAMETER2=Add additional data (2/2)
+FOOD_BY_DESC=Foods by Description
+FOOD_FROM_DB=Foods from Database
+IS_FOOD_SET=Is Food Set
+IS_FOOD_AND_CH_SET=Is Food and CH Set
+SET=Set
+FOOD_SET_DB=Food Set (Db)
+FOOD_SET_DESC=Food Set (Description)
+#FUNCTIONALITY_FOOD_DB_NA=Functionality 'Food Selector from Database'\nis not implemented yet. This functionality\nwill be probably supported in version 0.2.x.\n\n
+
+# pump data type component
+# entry types
+SELECT_ITEM=Select Item
+BASAL_DOSE=Basal Dose
+BOLUS_DOSE=Bolus Dose
+EVENT=Event
+ALARM=Alarm
+ERROR=Error
+REPORT=Report
+PEN_INJECTION_BASAL=Pen/Injection Basal
+PEN_INJECTION_BOLUS=Pen/Injection Bolus
+ADDITIONAL_DATA=Additional Data
+
+# pen/injection
+BOLUS_INSULIN=Bolus Insulin
+BASAL_INSULIN=Basal Insulin
+
+# tbr
+TEMPORARY_BASAL_RATE=Temporary Basal Rate
+BASAL_TEMPORARY_BASAL_RATE=Temporary Basal Rate
+BASAL_TEMPORARY_BASAL_RATE_PROFILE=Temp. Basal Rate + Profile
+TEMPORARY_BASAL_RATE_SHORT=TBR
+TBR_TYPE_UNIT=Unit (U)
+TBR_TYPE_PROC=Procent (%)
+
+# profile
+PROFILE=Profile
+NOT_SELECTED=Not Selected.
+BASAL_PROFILE=Profile
+
+# parameters
+#
+ACTIVITY=Activity
+COMMENT=Comment
+URINE=Urine
+CH_LONG=Carbohydrates
+
+
+
+#
+# Pump Basal (2)
+#
+BASAL_TYPE=Basal Type
+SELECT_BASAL_TYPE=Select Basal Type
+BASAL_VALUE=Value
+BASAL_PUMP_STATUS=Pump Status
+ON=On (Running)
+OFF=Off (Stopped)
+SUSPENDED=Suspended
+PUMP_STATUS=Pump Status
+BASAL_TEMPORARY_BASAL_RATE_ENDED=Temporary Basal Rate Ended
+BASAL_TEMPORARY_BASAL_RATE_CANCELED=Temporary Basal Rate Canceled
+
+#
+# Pump Bolus (2)
+#
+BOLUS_TYPE=Bolus Type
+SELECT_BOLUS_TYPE=Select Bolus Type
+BOLUS_STANDARD=Standard
+BOLUS_AUDIO=Audio / Scroll
+BOLUS_SQUARE=Square
+BOLUS_MULTIWAVE=MultiWave
+AMOUNT=Amount
+AMOUNT_MW_1=Amount #1
+AMOUNT_MW_2=Amount #2
+DURATION_SHORT=Duration
+SQUARE_AMOUNT=Square Amount
+DURATION=Duration
+
+
+#
+# Pump Alarms (2)
+#
+ALARM_TYPE=Alarm Type
+ALARM_CARTRIDGE_LOW=Cartridge Low
+ALARM_BATTERY_LOW=Baterry Low
+ALARM_REVIEW_DATETIME=Review Date/Time
+ALARM_ALARM_CLOCK=Alarm Clock
+ALARM_PUMP_TIMER=Pump Timer
+ALARM_TEMPORARY_BASAL_RATE_CANCELED=Temporary Basal Rate Canceled
+ALARM_TEMPORARY_BASAL_RATE_OVER=Temporary Basal Rate Over
+ALARM_BOLUS_CANCELED=Bolus Canceled
+
+
+#
+# Pump Errors (2)
+#
+ERROR_TYPE=Error Type
+ERROR_UNKNOWN_ERROR=Unknown Error
+ERROR_CARTRIDGE_EMPTY=Cartridge Empty
+ERROR_BATTERY_DEPLETED=Battery Depleted
+ERROR_AUTOMATIC_OFF=Automatic Off
+ERROR_NO_DELIVERY=No Delivery (Occlussion)
+ERROR_END_OF_OPERATION=End Of Operation
+ERROR_MECHANICAL_ERROR=Mechanical Error
+ERROR_ELECTRONIC_ERROR=Electronic Error
+ERROR_POWER_INTERRUPT=Power Interrupt
+ERROR_CARTRIDGE_ERROR=Cartridge Error
+ERROR_SET_NOT_PRIMED=Set Not Primed
+ERROR_DATA_INTERRUPTED=Data Interrupted
+ERROR_LANGUAGE_ERROR=Language Error
+ERROR_INSULIN_CHANGED=Insulin Changed
+
+
+#
+# Pump Events (2)
+#
+EVENT_TYPE=Event Type
+EVENT_PRIME_INFUSION_SET=Prime Infusion Set
+EVENT_CARTRIDGE_CHANGED=Cartridge changed
+EVENT_BASAL_RUN=Basal Run
+EVENT_BASAL_STOP=Basal Stop
+EVENT_POWER_DOWN=Power Down
+EVENT_POWER_UP=Power Up
+EVENT_DATETIME_SET=Date/Time Set
+EVENT_DATETIME_CORRECT=Date/Time Corrected
+EVENT_DATETIME_CORRECT_TIME_SHIFT_BACK=Date/Time Shift Back
+EVENT_DATETIME_CORRECT_TIME_SHIFT_FORWARD=Date/Time Shift Forward
+EVENT_SET_MAX_BASAL=Set Max Basal
+EVENT_SET_MAX_BOLUS=Set Max Bolus
+EVENT_BATERRY_REMOVED=Baterry removed
+EVENT_BATERRY_REPLACED=Baterry replaced
+EVENT_BATERRY_LOW=Baterry low
+EVENT_BATERRY_LOW_DESC=Baterry low (%s)
+EVENT_BG_FROM_METER=BG From Meter
+EVENT_RESERVOIR_LOW=Reservoir low
+EVENT_RESERVOIR_LOW_DESC=Reservoir low (%s)
+EVENT_SET_TEMPORARY_BASAL_RATE_TYPE=Set temporary basal rate type
+EVENT_SET_BASAL_PATTERN=Set basal pattern
+EVENT_SELF_TEST=Pump Self-test
+EVENT_DOWNLOAD=Pump data download
+
+
+#
+# Pump Reports
+#
+REPORT_TYPE=Report Type
+REPORT_TEXT=Report Text (Value)
+REPORT_MISC=Misc (undefined)
+REPORT_BOLUS_TOTAL_DAY=Daily Bolus Total
+REPORT_BASAL_TOTAL_DAY=Daily Basal Total
+REPORT_INSULIN_TOTAL_DAY=Daily Insulin Total
+
+
+#
+# Profiles
+#
+PROFILE_SELECTOR=Profile Selector
+NEW=New
+PROFILE_BASAL_ENTRY=Profile Basal Entry
+TIME_FROM=Time From
+TIME_TILL=TIme Till
+BASAL_AMOUNT=Basal Amount
+PROFILE_EDITOR=Profile Editor
+DATE_FROM=Date From
+DATE_TILL=Date Till
+BASE_BASAL=Base Basal
+NAME=Name
+FROM=From
+TILL=Till
+NEW__PROFILE=New
+NAME_OF_PROFILE=Name of Profile
+PUMP_PROFILE_SELECTOR=Profile Selector (Pump)
+
+ADD_BASAL_SUB_ENTRY=Add Basal Time Entry
+EDIT_BASAL_SUB_ENTRY=Edit Basal Time Entry
+DELETE_BASAL_SUB_ENTRY=Delete Basal Time Entry
+IMPORT_BASAL_SUB_ENTRIES=Import Basal Time Entries
+
+
+
+
+
+#
+# Devices
+#
+
+# dummy
+DEVICE_DUMMY_SPECIAL_COMMENT=This is Dummy device.
+
+# Smart pix
+DEVICE_PIX_SPECIAL_COMMENT=Pix device displays data at end of reading and progress is just estimated.
+PIX_ABORT_AUTOSCAN=Autoscan aborted
+PIX_DETECT_DEVICES=Detecting devices
+PIX_UNRECOVERABLE_ERROR=Unrecoverable error
+PIX_READING_ELEMENT=Reading elements from device
+# S_ (%s)
+PIX_FINISHED_REPORT_READY=Finished reading. Report ready.
+PIX_FINISHED_READING=Finished reading. Report ready.
+PIX_READING=Read data
+PIX_SCANNING=Scanning for device
+PIX_CREATING_REPORT=Creating report
+PIX_DEVICE_NOT_FOUND=Device not found
+
+
+#
+# Backup/Restore
+#
+PUMP_TOOL=Pump Tool
+PUMP_DATA=Pump Data
+PUMP_DATA_EXTENDED=Pump Data Extended
+PUMP_PROFILE=Pump Profile
+
+
+
+#
+# Printing - Base (2)
+#
+DATE=Date
+PRINTING=Printing
+TYPE_OF_REPORT=Type Of Report
+SELECT_YEAR_AND_MONTH=Select Year And Month
+REPORT_FOOTER=This report is from \"GGC - GNU Gluco Control\", freely available at http://ggc.sourceforge.net
+FOR=For
+PRINTING_SETTINGS_NOT_SET=<html>Printing settings (Pdf Viewer) not set or set<br>incorrectly.</html>
+PRINTING_SETTINGS_NOT_SET_SOL=<html>Go to Tools->Preferences, tab Printing and set<br>correct path to Pdf Viewer</html>
+PDF_VIEVER_RUN_ERROR=<html>Error running PDF Viewer, unknown exception.</html>
+SELECT_STARTING_RANGE=Select starting range
+SELECT_ENDING_RANGE=Select ending range
+
+#
+# Printing - Plugin specific (2)
+#
+MN_PUMP=Pump
+MN_PUMP_PRINT_DESC=Report for Pumps Data
+MN_PUMP_PRINT_SIMPLE=Simple
+MN_PUMP_PRINT_SIMPLE_DESC=Simple Report for Pump data
+MN_PUMP_PRINT_EXT=Extended
+MN_PUMP_PRINT_SIMPLE_DESC=Extended Report for Pump data (Simple + Foods)
+VALUE_SHORT=Value
+OTHER_DATA=Other Data
+OTHER_DATA_FOOD=Other Data (with Food)
+PUMP_DATA_BASE=Simple Pump Report
+PUMP_DATA_EXT=Extended Pump Report
+
+FOOD_DB_PRINT=Food (Db)
+FOOD_DESC_PRINT=Food (Desc.)
+
+FOOD_DESC_PRINT_NOT_YET=Display of Food Db data not implemented yet!
+
+
+
+
+
+#
+# Pump Configuration (this will be added by each type of pump
+#
+PCFG_BASAL_INCREMENT=Basal Increment
+PCFG_BOLUS_INCREMENT=Bolus Increment
+PCFG_BOLUS_PRESET=Bolus Preset (Breakfast/Lunch/...)
+PCFG_BOLUS_ALARM=After Bolus Alarm
+PCFG_BOLUS_BLOCK=Bolus Block
+PCFG_BASAL_UNIT=Basal Rate Unit
+UNIT_PER_HOUR=U/hr
+UNIT_PER_DAY=U/day
+
+PCFG_MAX_BOLUS=Max Bolus Insulin
+PCFG_MAX_BASAL=Max Basal Insulin
+PCFG_MAX_DAILY=Max Daily Insulin
+
+PCFG_GLUCOSE_UNIT=Blood Glucose Unit
+PCFG_EASY_MODE=Easy Mode
+
+
+PCFG_ACTIVE_INSULIN_DECREMENT_RATIO=Active Insulin Decrement Ratio
+PCFG_CH_INS_RATIO=CH/Insulin Ratio
+PCFG_BG_INS_RATIO=BG/Insulin Ratio (Correction factor)
+PCFG_TARGET_BG=Target BG
+PCFG_ACTIVE_INSULIN_RATE=Active Insulin Rate
+
+
+
+#
+# New Keywords (they are grouped), this need to be copied to right locations, after release
+#
+
+
Added: trunk/ggc-language_tool/active_translations/de/GGC_CGMSTool_de.properties
===================================================================
--- trunk/ggc-language_tool/active_translations/de/GGC_CGMSTool_de.properties (rev 0)
+++ trunk/ggc-language_tool/active_translations/de/GGC_CGMSTool_de.properties 2011-07-03 11:47:27 UTC (rev 1184)
@@ -0,0 +1,216 @@
+# ######################################################################
+# ### GGC CGMS Tool ###
+# ######################################################################
+# ### Language: German ###
+# ### Created by: Andy Rozman (an...@at...) ###
+# ### Last change: 4th February 2010 ###
+# ### Library Version: 0.4.3 ###
+# ### Application Version: 0.4.17 ###
+# ######################################################################
+#
+# In brackets there are now tags which define urgency of some text beeing translated
+# 1 - Needed, urgent (Base functionality, options which will be used by user mostly)
+# 2 - Needed
+# 3 - Not used yet (in public releases)
+# 4 - In implementation
+#
+# * - If tags also has *, then it means that this string can change regulary, last update is in []
+#
+
+
+#
+# Plug-in Specific (1)
+# Most of strings here are concated with help of sprintf codes, so almost all are static
+#
+DEVICE_NAME_NORMAL=CGMS
+DEVICE_NAME_BIG=CGMS
+DEVICE_FULL_NAME_WITHOUT_PORT=%s
+DEVICE_FULL_NAME_WITH_PORT=%s on %s
+
+#
+# Menus
+#
+MN_CGMS=CGMS
+
+
+# CGMS
+#[TODO] translate
+MN_CGMS_ABOUT=CGMS plug-in about
+#[TODO] translate
+MN_CGMS_ABOUT_DESC=About CGMS Plugin (copyright, features, credits,...)
+MN_CGMS_CONFIG=CGMS-Plug-in &Einstellungen
+MN_CGMS_CONFIG_DESC=Einstellungen zum CGMS-Plug-in
+MN_CGMS_LIST=CGMS-&Liste
+MN_CGMS_LIST_DESC=Liste der verf\u00fcgbaren CGMS-Ger\u00e4te
+MN_CGMS_READ=CGMS &auslesen
+MN_CGMS_READ_DESC=Die Daten des CGMS auslesen
+
+MN_CGMS_VIEW_DATA=View Data
+MN_CGMS_VIEW_DATA_DESC=View data read from device(s)
+
+
+#
+# About (1)
+# Note: elements under static are same for all plugins and non-static are plugin specific
+#
+
+# static
+DEVICE_PLUGIN=%s Plug-in
+DEVICE_PLUGIN_ABOUT=About %s Plug-in
+
+
+
+#
+# Configuration (1)
+#
+MY__=My
+NEW__=New
+DEVICE_CONFIGURATION=%s Configuration
+SELECT_X_DEVICE=Select %s Device
+SELECTED_X_DEVICE=Selected %s Device
+DEVICE_CUSTOM_NAME=%s Custom Name
+
+DEVICE_DOWNLOAD=DL
+DEVICE_SETTINGS=Sett.
+
+
+#
+# Device Selector (1)
+#
+SELECTOR_DEVICE=%s Device Selector
+
+
+
+
+
+
+#
+# Instructions Dialog ((1))
+#
+OOPS_DEVICE_NOT_CONFIGURED=Oops ! You forgot to configure your %s\nand currently there is no %s configured\nand/or selected. Please visit configuration\nand configure your %s.
+CONFIGURED_DEVICE_INSTRUCTIONS=Configured %s and Instructions
+DEVICE_ICON=%s picture
+STATUS_READER_ERROR=Internal %s (or port) error
+
+ERROR_CONTACTING_DEVICE=We had problem contacting CGMS device.\nPlease recheck communication port settings\n(some of cables, can change their address,\nwhen reconnected). Run configuration again\nand problem should be solved!\n
+DEVICE_INFO=%s Info
+
+
+#
+# Download
+#
+
+READ_DEVICE_DATA_TITLE=Read CGMS Data [%s on %s]
+
+
+#
+# Device Configuration (1)
+#
+READ_DEVICE_CONFIG_TITLE=Read CGMS Configuration [%s on %s]
+SETTING_GROUP=Setting / Group
+
+
+#
+# Export (1)
+#
+EXPORT_DEVICE_DATA=Export %s Data
+
+
+#
+# List (1)
+#
+DEVICE_LIST_WEB=CGMS List
+
+## TO DO
+# non-static
+DEVICE_LIST_WEB_DESC=<html>Pumps list contains most of Pumps (even most of models). For each of this pumps, there is configuration entry, which contains only basic settings for device (profile names, TBR settings, etc). Devices which support download have that shown in selector (DL column). Pumps in list are color coded, and color determines status of devices of selected company. Color coding description is shown at bottom of this page.<br></html>
+
+
+
+#
+# CGMS companies desc. (this is not description of company, but about our connection with company) (3*)
+# [12.10.2008]
+#
+MINIMED_DESC=We got partitial support from company and implementation will start in December 2008.
+
+
+#
+# CGMS Instructions (1)
+# []
+#
+
+
+#
+# Manual Entry (1)
+#
+AVG_BG=Avg BG
+BLOOD_GLUCOSE_CGMS=Blood Glucose (CGMS)
+BLOOD_GLUCOSE_CALIB=Blood Glucose (Calibration)
+AVG=Avg
+TOTAL=Total
+LOWEST=Lowest
+STD_DEV=Std Dev
+READINGS=Readings
+HIGHEST=Highest
+SUM=Sum
+READING=Reading
+CGMS_DAILY_OVERVIEW=CGMS Daily Stats
+
+# table
+ENTRY_TYPE=Entry Type
+COMMENT=Comment
+
+# types
+ENTRY_BG_READING=Reading
+ENTRY_BG_CALIBRATION=Calibration
+
+
+#
+# Devices
+#
+
+#
+# Backup/Restore
+#
+CGMS_TOOL=CGMS Tool
+CGMS_DATA=CGMS Data
+
+
+#
+# Printing - Plugin specific (2)
+#
+#MN_PUMP=Pump
+#MN_PUMP_PRINT_DESC=Report for Pumps Data
+#MN_PUMP_PRINT_SIMPLE=Simple
+#MN_PUMP_PRINT_SIMPLE_DESC=Simple Report for Pump data
+#MN_PUMP_PRINT_EXT=Extended
+#MN_PUMP_PRINT_SIMPLE_DESC=Extended Report for Pump data (Simple + Foods)
+#VALUE_SHORT=Value
+#OTHER_DATA=Other Data
+#OTHER_DATA_FOOD=Other Data (with Food)
+#PUMP_DATA_BASE=Simple Pump Report
+#PUMP_DATA_EXT=Extended Pump Report
+
+#FOOD_DB_PRINT=Food (Db)
+#FOOD_DESC_PRINT=Food (Desc.)
+
+#FOOD_DESC_PRINT_NOT_YET=Display of Food Db data not implemented yet!
+
+
+
+#
+# Types
+
+CGMS_READINGS=CGMS Readings
+CALIBRATION_READINGS=Calibration
+
+CGMS_READING=CGMS Reading
+
+
+
+
+#
+# New Keywords (they are grouped), this need to be copied to right locations, after release
+#
+
+
Added: trunk/ggc-language_tool/active_translations/de/GGC_Nutrition_de.properties
===================================================================
--- trunk/ggc-language_tool/active_translations/de/GGC_Nutrition_de.properties (rev 0)
+++ trunk/ggc-language_tool/active_translations/de/GGC_Nutrition_de.properties 2011-07-03 11:47:27 UTC (rev 1184)
@@ -0,0 +1,716 @@
+#
+# ######################################################################
+# ### GNU Gluco Control - Nutrition File ###
+# ######################################################################
+# ### Language: German ###
+# ### Created by: Reinhold Rumberger (ru...@us...) ###
+# ### Last change: 2008-10-15 Version: 0.9 ###
+# ### Application Version: 0.3.3 ###
+# ######################################################################
+#
+# NOT FINISHED!!!
+# Very little testing!!
+# 199 keys not translated as of version 0.8
+
+#####################################################################
+## WARNUNG: Diese Datei ist noch nicht komplett \u00fcbersetzt! ##
+#####################################################################
+
+# This part is intended for nutrition only, everything that is done
+# by nutrition is here.
+#
+
+# In brackets there are now tags which define urgency of some text beeing translated
+# 1 - Needed, urgent (dialogs)
+# 2 - Needed (this are mostly nutrients, home weight, which is probably nice to have translated)
+# 3 - Not so important, but nice to have
+#
+
+#
+# Collation Rules - In unicode we can create special rules for sorting where we specify
+# sorting order of special characters. This will be used by tree's and special tables.
+# For english this is left empty. For all other (that have non-standarn, non-english
+# charcters) we need to set this if we want sorting to be done correctly.
+#
+COLLATION_RULES=< 0 < 1 < 2 < 3 < 4 < 5 < 6 < 7 < 8 < 9 < a,A,\u00e4,\u00c4,\u00e1,\u00e0,\u00c1,\u00c0,\u00e2,\u00c2 < b,B < c,C < d,D < e,E,\u00e9,\u00e8,\u00ea,\u00c9,\u00c8,\u00ca < f,F < g,G < h,H < i,I < j,J < k,K < l,L < m,M < n,N < o,O,\u00f6,\u00d6 < p,P < q,Q < r,R < s,S,\u00df < t,T < u,U,\u00fc,\u00dc < v,V < w,W < x,X < y,Y < z,Z
+
+#
+# Global (1)
+#
+ADD=Hinzuf\u00fcgen
+APPLY=Anwenden
+CANCEL=Abbrechen
+DELETE=L\u00f6schen
+EDIT=Bearbeiten
+HELP=Hilfe
+INFORMATION=Information
+NEW=Neu
+NO=Nein
+OK=OK
+QUESTION=Frage
+ROOT=Wurzel
+SELECT=W\u00e4hlen
+YES=Ja
+
+#
+# Global Dialogs (1)
+#
+#[TODO] translate
+AMOUNT=Amount
+AMOUNT_LBL=Menge
+ARE_YOU_SURE_DELETE=Wollen Sie dieses Element wirklich l\u00f6schen?
+ID=ID
+MEALS_DB=Mahlzeiten-DB
+NONE=Nichts
+NUTRITION=N\u00e4hrstoff
+REFUSE=Ungenie\u00dfbarer Anteil
+SELECT_ITEM_FIRST=W\u00e4hlen Sie bitte erst einen Eintrag und danach eine Aktion!
+TRANSLATED_NAME=\u00dcbersetzter Name (falls verf\u00fcgbar)
+USER_NUTRITION_DATABASE=N\u00e4hrstoff-Datenbank des Benutzers
+USER_NUTRITION_DATABASE_DESC=<html><body>Dies ist die Nährstoff-Datenbank, zu der der Benutzer selbst Einträge hinzufügen kann. In Zukunft wird der Import fremder Nährstoff-Datenbanken unterstützt werden (die dann editierbar sein werden), damit Sie die Vorteile der erweiterten Ordnerstruktur (Ordner können Unterordner enthalten) genießen können. Wenn Sie beispielsweise in Deutschland wohnen, könnten Sie einen Ordner namens "Deutsche Nahrung" anlegen, in den Sie dann unterschiedliche Gruppen (z.B. "Zubereitung: Mikrowelle"), Nahrungstypen, usw. eintragen könnten.</body></html>
+USER_NUTRITION_DB=Benutzer N\u00e4hrstoff-DB
+USDA_NUTRITION_DATABASE=N\u00e4hrstoff-Datenbank des USDA
+USDA_NUTRITION_DATABASE_DESC=<html><body>Die USDA-DB ist die United States Department of Agriculture Datenbank, die viele in den USA erhältiche Lebensmittel enthält. Da diese Datenbank in der ganzen Welt genutzt wird, haben wir uns entschieden sie zu integrieren. Die Version, die sich in der Datenbank befindet, hängt von den Dateien ab, die importiert wurden. Erlaubt sind Versionen 18 und höher (getestet wurde SR-18).<br>In diesem Modul werden alle Einträge der Datenbank angezeigt und wenn es von bestimmten anderen Modulen (wie z.B. dem Mahlzeiten-Modul) aus aufgerufen wurde, können Lebensmittel zum Importieren ausgewählt werden.</body></html>
+USDA_NUTRITION_DB=USDA N\u00e4hrstoff-DB
+
+#
+# Popup Menu (1)
+#
+PM_NUT_ADD_FOOD_DESCRIPTION=Lebensmittelbeschreibung hinzuf\u00fcgen
+PM_NUT_ADD_GROUP=Gruppe hinzuf\u00fcgen
+PM_NUT_ADD_MEAL=Mahlzeit hinzuf\u00fcgen
+PM_NUT_CLOSE=Schlie\u00dfen
+PM_NUT_EDIT_FOOD_DESCRIPTION=Lebensmittelbeschreibung bearbeiten
+PM_NUT_EDIT_GROUP...
[truncated message content] |
|
From: <and...@us...> - 2011-08-06 14:12:36
|
Revision: 1190
http://ggc.svn.sourceforge.net/ggc/?rev=1190&view=rev
Author: andyrozman
Date: 2011-08-06 14:12:30 +0000 (Sat, 06 Aug 2011)
Log Message:
-----------
Added Paths:
-----------
trunk/ggc-test/
trunk/ggc-test/.classpath
trunk/ggc-test/.project
trunk/ggc-test/docs/
trunk/ggc-test/src/
Added: trunk/ggc-test/.classpath
===================================================================
--- trunk/ggc-test/.classpath (rev 0)
+++ trunk/ggc-test/.classpath 2011-08-06 14:12:30 UTC (rev 1190)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry combineaccessrules="false" exported="true" kind="src" path="/Atech-Tools"/>
+ <classpathentry combineaccessrules="false" exported="true" kind="src" path="/GGC Core"/>
+ <classpathentry combineaccessrules="false" exported="true" kind="src" path="/GGC Plugin Base"/>
+ <classpathentry excluding="**/.svn/**" kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-logging-1.0.4"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Xpp Xml Parser 3-1.1.4c"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/dom4j-1.6.1"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-lang-2.4"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Hibernate-3.1"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/log4j-1.2.15"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/rxtx-2.2"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: trunk/ggc-test/.project
===================================================================
--- trunk/ggc-test/.project (rev 0)
+++ trunk/ggc-test/.project 2011-08-06 14:12:30 UTC (rev 1190)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>GGC Testing</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2011-10-05 13:29:01
|
Revision: 1204
http://ggc.svn.sourceforge.net/ggc/?rev=1204&view=rev
Author: andyrozman
Date: 2011-10-05 13:28:50 +0000 (Wed, 05 Oct 2011)
Log Message:
-----------
Initial version of Doctor's Edition v 0.1
Added Paths:
-----------
trunk/ggc-doctor/
trunk/ggc-doctor/.classpath
trunk/ggc-doctor/.project
trunk/ggc-doctor/build/
trunk/ggc-doctor/data/
trunk/ggc-doctor/data/GGC_Config.properties
trunk/ggc-doctor/data/GGC_Config.properties_default
trunk/ggc-doctor/data/db/
trunk/ggc-doctor/data/db/ggc_db.2127.2191.lob.db
trunk/ggc-doctor/data/db/ggc_db.2127.2193.lob.db
trunk/ggc-doctor/data/db/ggc_db.2127.2195.lob.db
trunk/ggc-doctor/data/db/ggc_db.2127.2197.lob.db
trunk/ggc-doctor/data/db/ggc_db.2127.2199.lob.db
trunk/ggc-doctor/data/db/ggc_db.2127.2201.lob.db
trunk/ggc-doctor/data/db/ggc_db.2127.2203.lob.db
trunk/ggc-doctor/data/db/ggc_db.2127.2205.lob.db
trunk/ggc-doctor/data/db/ggc_db.2127.2207.lob.db
trunk/ggc-doctor/data/db/ggc_db.2127.2209.lob.db
trunk/ggc-doctor/data/db/ggc_db.769.log.db
trunk/ggc-doctor/data/db/ggc_db.data.db
trunk/ggc-doctor/data/db/ggc_db.index.db
trunk/ggc-doctor/data/db/ggc_db.trace.db
trunk/ggc-doctor/data/debug.txt
trunk/ggc-doctor/data/lang/
trunk/ggc-doctor/data/lang/GGC_Languages.properties
trunk/ggc-doctor/data/skinlf_themes/
trunk/ggc-doctor/data/skinlf_themes/BeOSthemepack.zip
trunk/ggc-doctor/data/skinlf_themes/amarachthemepack.zip
trunk/ggc-doctor/data/skinlf_themes/aquathemepack.zip
trunk/ggc-doctor/data/skinlf_themes/architectBluethemepack.zip
trunk/ggc-doctor/data/skinlf_themes/architectOlivethemepack.zip
trunk/ggc-doctor/data/skinlf_themes/b0sumiErgothempack.zip
trunk/ggc-doctor/data/skinlf_themes/b0sumithemepack.zip
trunk/ggc-doctor/data/skinlf_themes/bbjthemepack.zip
trunk/ggc-doctor/data/skinlf_themes/beigeazulthemepack.zip
trunk/ggc-doctor/data/skinlf_themes/beosthemepack_orig.zip
trunk/ggc-doctor/data/skinlf_themes/blueMetalthemepack.zip
trunk/ggc-doctor/data/skinlf_themes/blueTurquesathemepack.zip
trunk/ggc-doctor/data/skinlf_themes/cellshadedthemepack.zip
trunk/ggc-doctor/data/skinlf_themes/chaNinja-Bluethemepack.zip
trunk/ggc-doctor/data/skinlf_themes/coronaHthemepack.zip
trunk/ggc-doctor/data/skinlf_themes/cougarthemepack.zip
trunk/ggc-doctor/data/skinlf_themes/fatalEthemepack.zip
trunk/ggc-doctor/data/skinlf_themes/gfxOasisthemepack.zip
trunk/ggc-doctor/data/skinlf_themes/hmmXPBluethemepack.zip
trunk/ggc-doctor/data/skinlf_themes/hmmXPMonoBluethemepack.zip
trunk/ggc-doctor/data/skinlf_themes/iBarthemepack.zip
trunk/ggc-doctor/data/skinlf_themes/macosthemepack.zip
trunk/ggc-doctor/data/skinlf_themes/midnightthemepack.zip
trunk/ggc-doctor/data/skinlf_themes/mmMagra-Xthemepack.zip
trunk/ggc-doctor/data/skinlf_themes/modernthemepack_orig.zip
trunk/ggc-doctor/data/skinlf_themes/oliveGreenLunaXPthemepack.zip
trunk/ggc-doctor/data/skinlf_themes/opusLunaSilverthemepack.zip
trunk/ggc-doctor/data/skinlf_themes/opusOSBluethemepack.zip
trunk/ggc-doctor/data/skinlf_themes/opusOSDeepthemepack.zip
trunk/ggc-doctor/data/skinlf_themes/opusOSOlivethemepack.zip
trunk/ggc-doctor/data/skinlf_themes/roueBluethemepack.zip
trunk/ggc-doctor/data/skinlf_themes/roueBrownthemepack.zip
trunk/ggc-doctor/data/skinlf_themes/royalInspiratthemepack.zip
trunk/ggc-doctor/data/skinlf_themes/silverLunaXPthemepack.zip
trunk/ggc-doctor/data/skinlf_themes/solunaRthemepack.zip
trunk/ggc-doctor/data/skinlf_themes/tigerGraphitethemepack.zip
trunk/ggc-doctor/data/skinlf_themes/tigerthemepack.zip
trunk/ggc-doctor/data/skinlf_themes/toxicthemepack.zip
trunk/ggc-doctor/data/skinlf_themes/whistlerthemepack.zip
trunk/ggc-doctor/data/skinlf_themes/xplunathemepack.zip
trunk/ggc-doctor/data/update/
trunk/ggc-doctor/data/update/GGC_Update.properties
trunk/ggc-doctor/src/
trunk/ggc-doctor/src/StartupConfig.properties
trunk/ggc-doctor/src/ggc/
trunk/ggc-doctor/src/ggc/GGCDocEdition.java
trunk/ggc-doctor/src/ggc/doc/
trunk/ggc-doctor/src/ggc/doc/DocMainFrame.java
trunk/ggc-doctor/src/ggc/doc/StatusBar.java
trunk/ggc-doctor/src/ggc/gui/
trunk/ggc-doctor/src/ggc/gui/dialogs/
trunk/ggc-doctor/src/ggc/gui/dialogs/AboutGGCDialog.java
trunk/ggc-doctor/src/ggc/gui/dialogs/AppointmentDialog.java
trunk/ggc-doctor/src/ggc/gui/dialogs/AppointmentsDialog.java
trunk/ggc-doctor/src/ggc/gui/dialogs/DailyRowDialog.java
trunk/ggc-doctor/src/ggc/gui/dialogs/DailyRowMealsDialog.java
trunk/ggc-doctor/src/ggc/gui/dialogs/DailyStatsDialog.java
trunk/ggc-doctor/src/ggc/gui/dialogs/DoctorDialog.java
trunk/ggc-doctor/src/ggc/gui/dialogs/DoctorsDialog.java
trunk/ggc-doctor/src/ggc/gui/dialogs/HbA1cDialog.java
trunk/ggc-doctor/src/ggc/gui/dialogs/PrintingDialog.java
trunk/ggc-doctor/src/ggc/gui/dialogs/PropertiesDialog.java
trunk/ggc-doctor/src/ggc/gui/dialogs/SchemeDialog.java
trunk/ggc-doctor/src/ggc/gui/dialogs/SchemeEDDialog.java
trunk/ggc-doctor/src/ggc/gui/dialogs/StockAmounts.java
trunk/ggc-doctor/src/ggc/gui/dialogs/StockDialog.java
trunk/ggc-doctor/src/ggc/gui/dialogs/StockListDialog.java
trunk/ggc-doctor/src/ggc/gui/dialogs/StockTypeDialog.java
trunk/ggc-doctor/src/ggc/gui/dialogs/defs/
trunk/ggc-doctor/src/ggc/gui/dialogs/defs/StockListDef.java
trunk/ggc-doctor/src/ggc/gui/dialogs/graphs/
trunk/ggc-doctor/src/ggc/gui/dialogs/graphs/CourseGraphDialog.java
trunk/ggc-doctor/src/ggc/gui/dialogs/graphs/DailyGraphDialog.java
trunk/ggc-doctor/src/ggc/gui/dialogs/graphs/FrequencyGraphDialog.java
trunk/ggc-doctor/src/ggc/gui/dialogs/graphs/HbA1cDialog.java
trunk/ggc-doctor/src/ggc/gui/dialogs/graphs/SpreadGraphDialog.java
trunk/ggc-doctor/src/ggc/gui/dialogs/pen/
trunk/ggc-doctor/src/ggc/gui/graphs/
trunk/ggc-doctor/src/ggc/gui/graphs/AbstractGraphView.java
trunk/ggc-doctor/src/ggc/gui/graphs/CourseGraphView.java
trunk/ggc-doctor/src/ggc/gui/graphs/DailyGraphView.java
trunk/ggc-doctor/src/ggc/gui/graphs/FrequencyGraphView.java
trunk/ggc-doctor/src/ggc/gui/graphs/HbA1cView.java
trunk/ggc-doctor/src/ggc/gui/graphs/JFAbstractGraphView.java
trunk/ggc-doctor/src/ggc/gui/graphs/SpreadGraphView.java
trunk/ggc-doctor/src/ggc/gui/little/
trunk/ggc-doctor/src/ggc/gui/little/GGCLittle.java
trunk/ggc-doctor/src/ggc/gui/little/StatusBarL.java
trunk/ggc-doctor/src/ggc/gui/little/panels/
trunk/ggc-doctor/src/ggc/gui/little/panels/DailyStatsControlsL.java
trunk/ggc-doctor/src/ggc/gui/little/panels/DailyStatsPanelL.java
trunk/ggc-doctor/src/ggc/gui/little/panels/GeneralInfoPanelL.java
trunk/ggc-doctor/src/ggc/gui/little/panels/MainLittlePanel.java
trunk/ggc-doctor/src/ggc/gui/little/panels/PlugInMeterPanelL.java
trunk/ggc-doctor/src/ggc/gui/little/panels/PlugInPanelL.java
trunk/ggc-doctor/src/ggc/gui/little/panels/PlugInPumpPanelL.java
trunk/ggc-doctor/src/ggc/gui/little/panels/ScheduleInfoPanelL.java
trunk/ggc-doctor/src/ggc/gui/little/panels/StocksInfoPanelL.java
trunk/ggc-doctor/src/ggc/gui/panels/
trunk/ggc-doctor/src/ggc/gui/panels/info/
trunk/ggc-doctor/src/ggc/gui/panels/info/AbstractInfoPanel.java
trunk/ggc-doctor/src/ggc/gui/panels/info/DeviceInfoPanel.java
trunk/ggc-doctor/src/ggc/gui/panels/info/GeneralInfoPanel.java
trunk/ggc-doctor/src/ggc/gui/panels/info/HbA1cInfoPanel.java
trunk/ggc-doctor/src/ggc/gui/panels/info/InfoPanel.java
trunk/ggc-doctor/src/ggc/gui/panels/info/InfoPanelsIds.java
trunk/ggc-doctor/src/ggc/gui/panels/info/OtherInfoPanel.java
trunk/ggc-doctor/src/ggc/gui/panels/info/PlugInsInfoPanel.java
trunk/ggc-doctor/src/ggc/gui/panels/info/ScheduleInfoPanel.java
trunk/ggc-doctor/src/ggc/gui/panels/info/StatisticsInfoPanel.java
trunk/ggc-doctor/src/ggc/gui/panels/info/StocksInfoPanel.java
trunk/ggc-doctor/src/ggc/gui/panels/prefs/
trunk/ggc-doctor/src/ggc/gui/panels/prefs/AbstractPrefOptionsPanel.java
trunk/ggc-doctor/src/ggc/gui/panels/prefs/PrefFontsAndColorPane.java
trunk/ggc-doctor/src/ggc/gui/panels/prefs/PrefGeneralPane.java
trunk/ggc-doctor/src/ggc/gui/panels/prefs/PrefLanguagePane.java
trunk/ggc-doctor/src/ggc/gui/panels/prefs/PrefMainPane.java
trunk/ggc-doctor/src/ggc/gui/panels/prefs/PrefMedicalDataPane.java
trunk/ggc-doctor/src/ggc/gui/panels/prefs/PrefModePane.java
trunk/ggc-doctor/src/ggc/gui/panels/prefs/PrefNutritionConfPane.java
trunk/ggc-doctor/src/ggc/gui/panels/prefs/PrefPrintingPane.java
trunk/ggc-doctor/src/ggc/gui/panels/prefs/PrefRenderingQualityPane.java
trunk/ggc-doctor/src/ggc/gui/test/
trunk/ggc-doctor/src/ggc/gui/test/Testing.java
trunk/ggc-doctor/src/ggc/header_template.txt
trunk/ggc-doctor/src/icons/
trunk/ggc-doctor/src/icons/Remove16.gif
trunk/ggc-doctor/src/icons/RowInsertAfter16.gif
trunk/ggc-doctor/src/icons/Stop16.gif
trunk/ggc-doctor/src/icons/TipOfTheDay16.gif
trunk/ggc-doctor/src/icons/about.gif
trunk/ggc-doctor/src/icons/about.png
trunk/ggc-doctor/src/icons/about_logo.gif
trunk/ggc-doctor/src/icons/basic.gif
trunk/ggc-doctor/src/icons/calculator.png
trunk/ggc-doctor/src/icons/calendar.png
trunk/ggc-doctor/src/icons/cancel.png
trunk/ggc-doctor/src/icons/cfg_colors.png
trunk/ggc-doctor/src/icons/cfg_doctor.png
trunk/ggc-doctor/src/icons/cfg_general.png
trunk/ggc-doctor/src/icons/cfg_lang.png
trunk/ggc-doctor/src/icons/cfg_medical.png
trunk/ggc-doctor/src/icons/cfg_meter.png
trunk/ggc-doctor/src/icons/cfg_mode.png
trunk/ggc-doctor/src/icons/cfg_print.png
trunk/ggc-doctor/src/icons/cfg_render.png
trunk/ggc-doctor/src/icons/close.gif
trunk/ggc-doctor/src/icons/close.png
trunk/ggc-doctor/src/icons/column-chart.png
trunk/ggc-doctor/src/icons/connect.gif
trunk/ggc-doctor/src/icons/connect.png
trunk/ggc-doctor/src/icons/course.gif
trunk/ggc-doctor/src/icons/course.png
trunk/ggc-doctor/src/icons/course24.gif
trunk/ggc-doctor/src/icons/daily.gif
trunk/ggc-doctor/src/icons/daily.png
trunk/ggc-doctor/src/icons/daily24.gif
trunk/ggc-doctor/src/icons/diabetesbluecircle.png
trunk/ggc-doctor/src/icons/disconnect.gif
trunk/ggc-doctor/src/icons/disconnect.png
trunk/ggc-doctor/src/icons/disk_blue.png
trunk/ggc-doctor/src/icons/dot-chart.png
trunk/ggc-doctor/src/icons/download.png
trunk/ggc-doctor/src/icons/euroflash.gif
trunk/ggc-doctor/src/icons/euroflash.png
trunk/ggc-doctor/src/icons/exit.png
trunk/ggc-doctor/src/icons/export1.png
trunk/ggc-doctor/src/icons/flash.png
trunk/ggc-doctor/src/icons/food.png
trunk/ggc-doctor/src/icons/food_add.gif
trunk/ggc-doctor/src/icons/food_delete.gif
trunk/ggc-doctor/src/icons/food_edit.gif
trunk/ggc-doctor/src/icons/freestyle.gif
trunk/ggc-doctor/src/icons/freestyle.png
trunk/ggc-doctor/src/icons/frequency.gif
trunk/ggc-doctor/src/icons/frequency.png
trunk/ggc-doctor/src/icons/glucocard.gif
trunk/ggc-doctor/src/icons/glucocard.png
trunk/ggc-doctor/src/icons/help.gif
trunk/ggc-doctor/src/icons/help.png
trunk/ggc-doctor/src/icons/import1.png
trunk/ggc-doctor/src/icons/led_blue.gif
trunk/ggc-doctor/src/icons/led_gray.gif
trunk/ggc-doctor/src/icons/led_green.gif
trunk/ggc-doctor/src/icons/led_red.gif
trunk/ggc-doctor/src/icons/led_yellow.gif
trunk/ggc-doctor/src/icons/line-chart.png
trunk/ggc-doctor/src/icons/logon.png
trunk/ggc-doctor/src/icons/logout.png
trunk/ggc-doctor/src/icons/m_asc_breeze.gif
trunk/ggc-doctor/src/icons/m_asc_contour.gif
trunk/ggc-doctor/src/icons/m_asc_dex.gif
trunk/ggc-doctor/src/icons/m_asc_elite.gif
trunk/ggc-doctor/src/icons/m_euroflash.gif
trunk/ggc-doctor/src/icons/m_freestyle.gif
trunk/ggc-doctor/src/icons/m_glucocard.gif
trunk/ggc-doctor/src/icons/m_noMeter.gif
trunk/ggc-doctor/src/icons/medical_bag.png
trunk/ggc-doctor/src/icons/new.gif
trunk/ggc-doctor/src/icons/new.png
trunk/ggc-doctor/src/icons/noMeter.gif
trunk/ggc-doctor/src/icons/noMeter.png
trunk/ggc-doctor/src/icons/ok.png
trunk/ggc-doctor/src/icons/open.gif
trunk/ggc-doctor/src/icons/open.png
trunk/ggc-doctor/src/icons/paint.png
trunk/ggc-doctor/src/icons/pie-chart.png
trunk/ggc-doctor/src/icons/preferences.png
trunk/ggc-doctor/src/icons/print.gif
trunk/ggc-doctor/src/icons/print.png
trunk/ggc-doctor/src/icons/readmeter.gif
trunk/ggc-doctor/src/icons/readmeter.png
trunk/ggc-doctor/src/icons/spacer.gif
trunk/ggc-doctor/src/icons/spacer.png
trunk/ggc-doctor/src/icons/spread.gif
trunk/ggc-doctor/src/icons/spread.png
trunk/ggc-doctor/src/icons/t_asc_dex.gif
trunk/ggc-doctor/src/icons/table_add.png
trunk/ggc-doctor/src/icons/table_delete.png
trunk/ggc-doctor/src/icons/table_edit.png
trunk/ggc-doctor/src/icons/table_sql_check.png
trunk/ggc-doctor/src/icons/table_view.png
trunk/ggc-doctor/src/icons/up_down_question.png
trunk/ggc-doctor/src/icons/weight_add.png
trunk/ggc-doctor/src/icons/weight_delete.png
trunk/ggc-doctor/src/icons/weight_edit.png
trunk/ggc-doctor/src/log4j.properties
Added: trunk/ggc-doctor/.classpath
===================================================================
--- trunk/ggc-doctor/.classpath (rev 0)
+++ trunk/ggc-doctor/.classpath 2011-10-05 13:28:50 UTC (rev 1204)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry combineaccessrules="false" exported="true" kind="src" path="/Atech-Tools"/>
+ <classpathentry combineaccessrules="false" exported="true" kind="src" path="/GGC Core"/>
+ <classpathentry combineaccessrules="false" exported="true" kind="src" path="/GGC Nutrition Tool"/>
+ <classpathentry combineaccessrules="false" exported="true" kind="src" path="/GGC Pump Tool"/>
+ <classpathentry combineaccessrules="false" exported="true" kind="src" path="/GGC CGM Tool"/>
+ <classpathentry excluding="**/.svn/**" kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/SkinLF-6.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-logging-1.0.4"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/ggc-web"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/log4j-1.2.15"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/JavaHelp-2.0.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jfreechart-1.0.10"/>
+ <classpathentry kind="con" path="org.dyno.visual.swing.VS_LIBRARY/layoutext"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: trunk/ggc-doctor/.project
===================================================================
--- trunk/ggc-doctor/.project (rev 0)
+++ trunk/ggc-doctor/.project 2011-10-05 13:28:50 UTC (rev 1204)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>GGC Doctor's Edition</name>
+ <comment></comment>
+ <projects>
+ <project>Atech-Tools</project>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.jem.beaninfo.BeanInfoNature</nature>
+ </natures>
+</projectDescription>
Added: trunk/ggc-doctor/data/GGC_Config.properties
===================================================================
--- trunk/ggc-doctor/data/GGC_Config.properties (rev 0)
+++ trunk/ggc-doctor/data/GGC_Config.properties 2011-10-05 13:28:50 UTC (rev 1204)
@@ -0,0 +1,88 @@
+#
+# GGC_Config (Settings for GGC)
+#31.7.2010 13:11:37
+#
+# Don't edit by hand
+# Only settings need for application startup are written here. All other info
+# is stored in database
+#
+
+#
+# Databases settings
+#
+
+#
+# Database #0 - Internal Db (H2)
+#
+DB0_CONN_NAME=Internal Db (H2)
+DB0_DB_NAME=H2 SQL
+DB0_CONN_DRIVER_CLASS=org.h2.Driver
+DB0_CONN_URL=jdbc:h2:../data/db/ggc_db
+DB0_CONN_USERNAME=sa
+DB0_CONN_PASSWORD=
+DB0_HIBERNATE_DIALECT=org.hibernate.dialect.H2Dialect
+
+#
+# Database #1 - PostgreSQL Database (v7)
+#
+DB1_CONN_NAME=PostgreSQL Database (v7)
+DB1_DB_NAME=PostgreSQL
+DB1_CONN_DRIVER_CLASS=org.postgresql.Driver
+DB1_CONN_URL=jdbc:postgresql://localhost:5432/ggc_v7?user=ggc&password=ggc
+DB1_CONN_USERNAME=ggc
+DB1_CONN_PASSWORD=ggc
+DB1_HIBERNATE_DIALECT=org.hibernate.dialect.PostgreSQLDialect
+
+#
+# Database #2 - PostgreSQL Database (v3)
+#
+DB2_CONN_NAME=PostgreSQL Database (v3)
+DB2_DB_NAME=PostgreSQL
+DB2_CONN_DRIVER_CLASS=org.postgresql.Driver
+DB2_CONN_URL=jdbc:postgresql://localhost:5432/ggc_v3?user=ggc&password=ggc
+DB2_CONN_USERNAME=ggc
+DB2_CONN_PASSWORD=ggc
+DB2_HIBERNATE_DIALECT=org.hibernate.dialect.PostgreSQLDialect
+
+#
+# Database #3 - PostgreSQL Database (ggc_test2)
+#
+DB3_CONN_NAME=PostgreSQL Database (ggc_test2)
+DB3_DB_NAME=PostgreSQL
+DB3_CONN_DRIVER_CLASS=org.postgresql.Driver
+DB3_CONN_URL=jdbc:postgresql://localhost:5432/ggc_test2?user=ggc&password=ggc
+DB3_CONN_USERNAME=ggc
+DB3_CONN_PASSWORD=ggc
+DB3_HIBERNATE_DIALECT=org.hibernate.dialect.PostgreSQLDialect
+
+#
+# Database #4 - Internal Database
+#
+DB4_CONN_NAME=Internal Database
+DB4_DB_NAME=HypersonicSQL File
+DB4_CONN_DRIVER_CLASS=org.hsqldb.jdbcDriver
+DB4_CONN_URL=jdbc:hsqldb:file:../data/dbt/hsql/ggc_db
+DB4_CONN_USERNAME=sa
+DB4_CONN_PASSWORD=
+DB4_HIBERNATE_DIALECT=org.hibernate.dialect.HSQLDialect
+
+
+#
+# Look and Feel Settings
+#
+
+LF_NAME=SkinLF
+LF_CLASS=com.l2fprod.gui.plaf.skin.SkinLookAndFeel
+SKINLF_SELECTED=modernthemepack_orig.zip
+
+
+#
+# Db Selector
+#
+SELECTED_DB=0
+
+
+#
+# Language Selector
+#
+SELECTED_LANG=en
Added: trunk/ggc-doctor/data/GGC_Config.properties_default
===================================================================
--- trunk/ggc-doctor/data/GGC_Config.properties_default (rev 0)
+++ trunk/ggc-doctor/data/GGC_Config.properties_default 2011-10-05 13:28:50 UTC (rev 1204)
@@ -0,0 +1,88 @@
+#
+# GGC_Config (Settings for GGC)
+#31.7.2010 13:11:37
+#
+# Don't edit by hand
+# Only settings need for application startup are written here. All other info
+# is stored in database
+#
+
+#
+# Databases settings
+#
+
+#
+# Database #0 - Internal Db (H2)
+#
+DB0_CONN_NAME=Internal Db (H2)
+DB0_DB_NAME=H2 SQL
+DB0_CONN_DRIVER_CLASS=org.h2.Driver
+DB0_CONN_URL=jdbc:h2:../data/db/ggc_db
+DB0_CONN_USERNAME=sa
+DB0_CONN_PASSWORD=
+DB0_HIBERNATE_DIALECT=org.hibernate.dialect.H2Dialect
+
+#
+# Database #1 - PostgreSQL Database (v7)
+#
+DB1_CONN_NAME=PostgreSQL Database (v7)
+DB1_DB_NAME=PostgreSQL
+DB1_CONN_DRIVER_CLASS=org.postgresql.Driver
+DB1_CONN_URL=jdbc:postgresql://localhost:5432/ggc_v7?user=ggc&password=ggc
+DB1_CONN_USERNAME=ggc
+DB1_CONN_PASSWORD=ggc
+DB1_HIBERNATE_DIALECT=org.hibernate.dialect.PostgreSQLDialect
+
+#
+# Database #2 - PostgreSQL Database (v3)
+#
+DB2_CONN_NAME=PostgreSQL Database (v3)
+DB2_DB_NAME=PostgreSQL
+DB2_CONN_DRIVER_CLASS=org.postgresql.Driver
+DB2_CONN_URL=jdbc:postgresql://localhost:5432/ggc_v3?user=ggc&password=ggc
+DB2_CONN_USERNAME=ggc
+DB2_CONN_PASSWORD=ggc
+DB2_HIBERNATE_DIALECT=org.hibernate.dialect.PostgreSQLDialect
+
+#
+# Database #3 - PostgreSQL Database (ggc_test2)
+#
+DB3_CONN_NAME=PostgreSQL Database (ggc_test2)
+DB3_DB_NAME=PostgreSQL
+DB3_CONN_DRIVER_CLASS=org.postgresql.Driver
+DB3_CONN_URL=jdbc:postgresql://localhost:5432/ggc_test2?user=ggc&password=ggc
+DB3_CONN_USERNAME=ggc
+DB3_CONN_PASSWORD=ggc
+DB3_HIBERNATE_DIALECT=org.hibernate.dialect.PostgreSQLDialect
+
+#
+# Database #4 - Internal Database
+#
+DB4_CONN_NAME=Internal Database
+DB4_DB_NAME=HypersonicSQL File
+DB4_CONN_DRIVER_CLASS=org.hsqldb.jdbcDriver
+DB4_CONN_URL=jdbc:hsqldb:file:../data/dbt/hsql/ggc_db
+DB4_CONN_USERNAME=sa
+DB4_CONN_PASSWORD=
+DB4_HIBERNATE_DIALECT=org.hibernate.dialect.HSQLDialect
+
+
+#
+# Look and Feel Settings
+#
+
+LF_NAME=SkinLF
+LF_CLASS=com.l2fprod.gui.plaf.skin.SkinLookAndFeel
+SKINLF_SELECTED=modernthemepack_orig.zip
+
+
+#
+# Db Selector
+#
+SELECTED_DB=0
+
+
+#
+# Language Selector
+#
+SELECTED_LANG=en
Added: trunk/ggc-doctor/data/db/ggc_db.2127.2191.lob.db
===================================================================
(Binary files differ)
Property changes on: trunk/ggc-doctor/data/db/ggc_db.2127.2191.lob.db
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/ggc-doctor/data/db/ggc_db.2127.2193.lob.db
===================================================================
(Binary files differ)
Property changes on: trunk/ggc-doctor/data/db/ggc_db.2127.2193.lob.db
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/ggc-doctor/data/db/ggc_db.2127.2195.lob.db
===================================================================
(Binary files differ)
Property changes on: trunk/ggc-doctor/data/db/ggc_db.2127.2195.lob.db
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/ggc-doctor/data/db/ggc_db.2127.2197.lob.db
===================================================================
(Binary files differ)
Property changes on: trunk/ggc-doctor/data/db/ggc_db.2127.2197.lob.db
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/ggc-doctor/data/db/ggc_db.2127.2199.lob.db
===================================================================
(Binary files differ)
Property changes on: trunk/ggc-doctor/data/db/ggc_db.2127.2199.lob.db
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/ggc-doctor/data/db/ggc_db.2127.2201.lob.db
===================================================================
(Binary files differ)
Property changes on: trunk/ggc-doctor/data/db/ggc_db.2127.2201.lob.db
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/ggc-doctor/data/db/ggc_db.2127.2203.lob.db
===================================================================
(Binary files differ)
Property changes on: trunk/ggc-doctor/data/db/ggc_db.2127.2203.lob.db
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/ggc-doctor/data/db/ggc_db.2127.2205.lob.db
===================================================================
(Binary files differ)
Property changes on: trunk/ggc-doctor/data/db/ggc_db.2127.2205.lob.db
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/ggc-doctor/data/db/ggc_db.2127.2207.lob.db
===================================================================
(Binary files differ)
Property changes on: trunk/ggc-doctor/data/db/ggc_db.2127.2207.lob.db
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/ggc-doctor/data/db/ggc_db.2127.2209.lob.db
===================================================================
(Binary files differ)
Property changes on: trunk/ggc-doctor/data/db/ggc_db.2127.2209.lob.db
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/ggc-doctor/data/db/ggc_db.769.log.db
===================================================================
(Binary files differ)
Property changes on: trunk/ggc-doctor/data/db/ggc_db.769.log.db
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/ggc-doctor/data/db/ggc_db.data.db
===================================================================
(Binary files differ)
Property changes on: trunk/ggc-doctor/data/db/ggc_db.data.db
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/ggc-doctor/data/db/ggc_db.index.db
===================================================================
(Binary files differ)
Property changes on: trunk/ggc-doctor/data/db/ggc_db.index.db
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/ggc-doctor/data/db/ggc_db.trace.db
===================================================================
--- trunk/ggc-doctor/data/db/ggc_db.trace.db (rev 0)
+++ trunk/ggc-doctor/data/db/ggc_db.trace.db 2011-10-05 13:28:50 UTC (rev 1204)
@@ -0,0 +1,8999 @@
+04-15 23:26:35 jdbc[3]: SQLException
+org.h2.jdbc.JdbcSQLException: Table DOC_APPOINTMENT not found; SQL statement:
+alter table doc_appointment drop constraint FKC88D2B18668FC540 [42102-69]
+ at org.h2.message.Message.getSQLException(Message.java:91)
+ at org.h2.message.Message.getSQLException(Message.java:95)
+ at org.h2.message.Message.getSQLException(Message.java:73)
+ at org.h2.command.Parser.readTableOrView(Parser.java:4025)
+ at org.h2.command.Parser.readTableOrView(Parser.java:4005)
+ at org.h2.command.Parser.parseAlterTable(Parser.java:4050)
+ at org.h2.command.Parser.parseAlter(Parser.java:3622)
+ at org.h2.command.Parser.parsePrepared(Parser.java:302)
+ at org.h2.command.Parser.parse(Parser.java:285)
+ at org.h2.command.Parser.parse(Parser.java:257)
+ at org.h2.command.Parser.prepareCommand(Parser.java:229)
+ at org.h2.engine.Session.prepareLocal(Session.java:236)
+ at org.h2.engine.Session.prepareCommand(Session.java:218)
+ at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1020)
+ at org.h2.jdbc.JdbcStatement.executeUpdate(JdbcStatement.java:104)
+ at org.hibernate.tool.hbm2ddl.SchemaExport.execute(SchemaExport.java:306)
+ at org.hibernate.tool.hbm2ddl.SchemaExport.drop(SchemaExport.java:282)
+ at org.hibernate.tool.hbm2ddl.SchemaExport.execute(SchemaExport.java:184)
+ at org.hibernate.tool.hbm2ddl.SchemaExport.create(SchemaExport.java:131)
+ at ggc.core.db.GGCDb.createDatabase(GGCDb.java:255)
+ at ggc.core.db.tool.InitDb.<init>(InitDb.java:73)
+ at ggc.core.db.tool.InitDb.<init>(InitDb.java:63)
+ at ggc.core.db.tool.InitDb.main(InitDb.java:1045)
+04-15 23:26:35 jdbc[3]: SQLException
+org.h2.jdbc.JdbcSQLException: Table DOC_DOCTORS not found; SQL statement:
+alter table doc_doctors drop constraint FK6537072DFA9399E1 [42102-69]
+ at org.h2.message.Message.getSQLException(Message.java:91)
+ at org.h2.message.Message.getSQLException(Message.java:95)
+ at org.h2.message.Message.getSQLException(Message.java:73)
+ at org.h2.command.Parser.readTableOrView(Parser.java:4025)
+ at org.h2.command.Parser.readTableOrView(Parser.java:4005)
+ at org.h2.command.Parser.parseAlterTable(Parser.java:4050)
+ at org.h2.command.Parser.parseAlter(Parser.java:3622)
+ at org.h2.command.Parser.parsePrepared(Parser.java:302)
+ at org.h2.command.Parser.parse(Parser.java:285)
+ at org.h2.command.Parser.parse(Parser.java:257)
+ at org.h2.command.Parser.prepareCommand(Parser.java:229)
+ at org.h2.engine.Session.prepareLocal(Session.java:236)
+ at org.h2.engine.Session.prepareCommand(Session.java:218)
+ at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1020)
+ at org.h2.jdbc.JdbcStatement.executeUpdate(JdbcStatement.java:104)
+ at org.hibernate.tool.hbm2ddl.SchemaExport.execute(SchemaExport.java:306)
+ at org.hibernate.tool.hbm2ddl.SchemaExport.drop(SchemaExport.java:282)
+ at org.hibernate.tool.hbm2ddl.SchemaExport.execute(SchemaExport.java:184)
+ at org.hibernate.tool.hbm2ddl.SchemaExport.create(SchemaExport.java:131)
+ at ggc.core.db.GGCDb.createDatabase(GGCDb.java:255)
+ at ggc.core.db.tool.InitDb.<init>(InitDb.java:73)
+ at ggc.core.db.tool.InitDb.<init>(InitDb.java:63)
+ at ggc.core.db.tool.InitDb.main(InitDb.java:1045)
+04-22 01:08:29 database: opening D:\My_Projects\Eclipse\GNU Gluco Control\data\db\ggc_db
+org.h2.jdbc.JdbcSQLException: Database may be already in use: Locked by another process. Possible solutions: close all other connection(s); use the server mode [90020-69]
+ at org.h2.message.Message.getSQLException(Message.java:91)
+ at org.h2.message.Message.getSQLException(Message.java:95)
+ at org.h2.message.Message.getSQLException(Message.java:73)
+ at org.h2.store.FileLock.error(FileLock.java:316)
+ at org.h2.store.FileLock.lockFile(FileLock.java:178)
+ at org.h2.store.FileLock.lock(FileLock.java:74)
+ at org.h2.engine.Database.open(Database.java:467)
+ at org.h2.engine.Database.<init>(Database.java:203)
+ at org.h2.engine.Engine.openSession(Engine.java:55)
+ at org.h2.engine.Engine.getSession(Engine.java:104)
+ at org.h2.engine.Session.createSession(Session.java:203)
+ at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:976)
+ at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:957)
+ at org.h2.Driver.connect(Driver.java:57)
+ at java.sql.DriverManager.getConnection(Unknown Source)
+ at java.sql.DriverManager.getConnection(Unknown Source)
+ at org.hibernate.connection.DriverManagerConnectionProvider.getConnection(DriverManagerConnectionProvider.java:110)
+ at org.hibernate.cfg.SettingsFactory.buildSettings(SettingsFactory.java:72)
+ at org.hibernate.cfg.Configuration.buildSettings(Configuration.java:1881)
+ at org.hibernate.cfg.Configuration.buildSessionFactory(Configuration.java:1174)
+ at ggc.core.db.GGCDb.openHibernateSimple(GGCDb.java:217)
+ at ggc.core.db.GGCDb.initDb(GGCDb.java:188)
+ at ggc.core.nutrition.TestNutritionData.<init>(TestNutritionData.java:79)
+ at ggc.core.nutrition.TestNutritionData.main(TestNutritionData.java:427)
+04-22 01:08:33 database: opening D:\My_Projects\Eclipse\GNU Gluco Control\data\db\ggc_db
+org.h2.jdbc.JdbcSQLException: Database may be already in use: Locked by another process. Possible solutions: close all other connection(s); use the server mode [90020-69]
+ at org.h2.message.Message.getSQLException(Message.java:91)
+ at org.h2.message.Message.getSQLException(Message.java:95)
+ at org.h2.message.Message.getSQLException(Message.java:73)
+ at org.h2.store.FileLock.error(FileLock.java:316)
+ at org.h2.store.FileLock.lockFile(FileLock.java:178)
+ at org.h2.store.FileLock.lock(FileLock.java:74)
+ at org.h2.engine.Database.open(Database.java:467)
+ at org.h2.engine.Database.<init>(Database.java:203)
+ at org.h2.engine.Engine.openSession(Engine.java:55)
+ at org.h2.engine.Engine.getSession(Engine.java:104)
+ at org.h2.engine.Session.createSession(Session.java:203)
+ at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:976)
+ at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:957)
+ at org.h2.Driver.connect(Driver.java:57)
+ at java.sql.DriverManager.getConnection(Unknown Source)
+ at java.sql.DriverManager.getConnection(Unknown Source)
+ at org.hibernate.connection.DriverManagerConnectionProvider.getConnection(DriverManagerConnectionProvider.java:110)
+ at org.hibernate.jdbc.ConnectionManager.openConnection(ConnectionManager.java:417)
+ at org.hibernate.jdbc.ConnectionManager.getConnection(ConnectionManager.java:144)
+ at org.hibernate.jdbc.AbstractBatcher.prepareQueryStatement(AbstractBatcher.java:105)
+ at org.hibernate.loader.Loader.prepareQueryStatement(Loader.java:1561)
+ at org.hibernate.loader.hql.QueryLoader.iterate(QueryLoader.java:392)
+ at org.hibernate.hql.ast.QueryTranslatorImpl.iterate(QueryTranslatorImpl.java:318)
+ at org.hibernate.engine.query.HQLQueryPlan.performIterate(HQLQueryPlan.java:177)
+ at org.hibernate.impl.SessionImpl.iterate(SessionImpl.java:1156)
+ at org.hibernate.impl.QueryImpl.iterate(QueryImpl.java:46)
+ at ggc.core.db.GGCDb.loadNutritionDefinitions(GGCDb.java:1108)
+ at ggc.core.db.GGCDb.loadNutritionDbBase(GGCDb.java:677)
+ at ggc.core.nutrition.TestNutritionData.<init>(TestNutritionData.java:85)
+ at ggc.core.nutrition.TestNutritionData.main(TestNutritionData.java:427)
+04-22 22:23:43 database: opening D:\My_Projects\Eclipse\GNU Gluco Control\data\db\ggc_db
+org.h2.jdbc.JdbcSQLException: Database may be already in use: Locked by another process. Possible solutions: close all other connection(s); use the server mode [90020-69]
+ at org.h2.message.Message.getSQLException(Message.java:91)
+ at org.h2.message.Message.getSQLException(Message.java:95)
+ at org.h2.message.Message.getSQLException(Message.java:73)
+ at org.h2.store.FileLock.error(FileLock.java:316)
+ at org.h2.store.FileLock.lockFile(FileLock.java:178)
+ at org.h2.store.FileLock.lock(FileLock.java:74)
+ at org.h2.engine.Database.open(Database.java:467)
+ at org.h2.engine.Database.<init>(Database.java:203)
+ at org.h2.engine.Engine.openSession(Engine.java:55)
+ at org.h2.engine.Engine.getSession(Engine.java:104)
+ at org.h2.engine.Session.createSession(Session.java:203)
+ at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:976)
+ at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:957)
+ at org.h2.Driver.connect(Driver.java:57)
+ at java.sql.DriverManager.getConnection(Unknown Source)
+ at java.sql.DriverManager.getConnection(Unknown Source)
+ at org.hibernate.connection.DriverManagerConnectionProvider.getConnection(DriverManagerConnectionProvider.java:110)
+ at org.hibernate.cfg.SettingsFactory.buildSettings(SettingsFactory.java:72)
+ at org.hibernate.cfg.Configuration.buildSettings(Configuration.java:1881)
+ at org.hibernate.cfg.Configuration.buildSessionFactory(Configuration.java:1174)
+ at ggc.core.db.GGCDb.openHibernateSimple(GGCDb.java:217)
+ at ggc.core.db.GGCDb.initDb(GGCDb.java:188)
+ at ggc.core.nutrition.TestNutritionData.<init>(TestNutritionData.java:79)
+ at ggc.core.nutrition.TestNutritionData.main(TestNutritionData.java:427)
+04-22 22:23:46 database: opening D:\My_Projects\Eclipse\GNU Gluco Control\data\db\ggc_db
+org.h2.jdbc.JdbcSQLException: Database may be already in use: Locked by another process. Possible solutions: close all other connection(s); use the server mode [90020-69]
+ at org.h2.message.Message.getSQLException(Message.java:91)
+ at org.h2.message.Message.getSQLException(Message.java:95)
+ at org.h2.message.Message.getSQLException(Message.java:73)
+ at org.h2.store.FileLock.error(FileLock.java:316)
+ at org.h2.store.FileLock.lockFile(FileLock.java:178)
+ at org.h2.store.FileLock.lock(FileLock.java:74)
+ at org.h2.engine.Database.open(Database.java:467)
+ at org.h2.engine.Database.<init>(Database.java:203)
+ at org.h2.engine.Engine.openSession(Engine.java:55)
+ at org.h2.engine.Engine.getSession(Engine.java:104)
+ at org.h2.engine.Session.createSession(Session.java:203)
+ at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:976)
+ at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:957)
+ at org.h2.Driver.connect(Driver.java:57)
+ at java.sql.DriverManager.getConnection(Unknown Source)
+ at java.sql.DriverManager.getConnection(Unknown Source)
+ at org.hibernate.connection.DriverManagerConnectionProvider.getConnection(DriverManagerConnectionProvider.java:110)
+ at org.hibernate.jdbc.ConnectionManager.openConnection(ConnectionManager.java:417)
+ at org.hibernate.jdbc.ConnectionManager.getConnection(ConnectionManager.java:144)
+ at org.hibernate.jdbc.AbstractBatcher.prepareQueryStatement(AbstractBatcher.java:105)
+ at org.hibernate.loader.Loader.prepareQueryStatement(Loader.java:1561)
+ at org.hibernate.loader.hql.QueryLoader.iterate(QueryLoader.java:392)
+ at org.hibernate.hql.ast.QueryTranslatorImpl.iterate(QueryTranslatorImpl.java:318)
+ at org.hibernate.engine.query.HQLQueryPlan.performIterate(HQLQueryPlan.java:177)
+ at org.hibernate.impl.SessionImpl.iterate(SessionImpl.java:1156)
+ at org.hibernate.impl.QueryImpl.iterate(QueryImpl.java:46)
+ at ggc.core.db.GGCDb.loadNutritionDefinitions(GGCDb.java:1108)
+ at ggc.core.db.GGCDb.loadNutritionDbBase(GGCDb.java:677)
+ at ggc.core.nutrition.TestNutritionData.<init>(TestNutritionData.java:85)
+ at ggc.core.nutrition.TestNutritionData.main(TestNutritionData.java:427)
+04-22 22:34:33 database: opening D:\My_Projects\Eclipse\GNU Gluco Control\data\db\ggc_db
+org.h2.jdbc.JdbcSQLException: Database may be already in use: Locked by another process. Possible solutions: close all other connection(s); use the server mode [90020-69]
+ at org.h2.message.Message.getSQLException(Message.java:91)
+ at org.h2.message.Message.getSQLException(Message.java:95)
+ at org.h2.message.Message.getSQLException(Message.java:73)
+ at org.h2.store.FileLock.error(FileLock.java:316)
+ at org.h2.store.FileLock.lockFile(FileLock.java:178)
+ at org.h2.store.FileLock.lock(FileLock.java:74)
+ at org.h2.engine.Database.open(Database.java:467)
+ at org.h2.engine.Database.<init>(Database.java:203)
+ at org.h2.engine.Engine.openSession(Engine.java:55)
+ at org.h2.engine.Engine.getSession(Engine.java:104)
+ at org.h2.engine.Session.createSession(Session.java:203)
+ at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:976)
+ at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:957)
+ at org.h2.Driver.connect(Driver.java:57)
+ at java.sql.DriverManager.getConnection(Unknown Source)
+ at java.sql.DriverManager.getConnection(Unknown Source)
+ at org.hibernate.connection.DriverManagerConnectionProvider.getConnection(DriverManagerConnectionProvider.java:110)
+ at org.hibernate.cfg.SettingsFactory.buildSettings(SettingsFactory.java:72)
+ at org.hibernate.cfg.Configuration.buildSettings(Configuration.java:1881)
+ at org.hibernate.cfg.Configuration.buildSessionFactory(Configuration.java:1174)
+ at ggc.core.db.GGCDb.openHibernateSimple(GGCDb.java:217)
+ at ggc.core.db.GGCDb.initDb(GGCDb.java:188)
+ at ggc.core.nutrition.TestNutritionData.<init>(TestNutritionData.java:79)
+ at ggc.core.nutrition.TestNutritionData.main(TestNutritionData.java:427)
+04-22 22:34:37 database: opening D:\My_Projects\Eclipse\GNU Gluco Control\data\db\ggc_db
+org.h2.jdbc.JdbcSQLException: Database may be already in use: Locked by another process. Possible solutions: close all other connection(s); use the server mode [90020-69]
+ at org.h2.message.Message.getSQLException(Message.java:91)
+ at org.h2.message.Message.getSQLException(Message.java:95)
+ at org.h2.message.Message.getSQLException(Message.java:73)
+ at org.h2.store.FileLock.error(FileLock.java:316)
+ at org.h2.store.FileLock.lockFile(FileLock.java:178)
+ at org.h2.store.FileLock.lock(FileLock.java:74)
+ at org.h2.engine.Database.open(Database.java:467)
+ at org.h2.engine.Database.<init>(Database.java:203)
+ at org.h2.engine.Engine.openSession(Engine.java:55)
+ at org.h2.engine.Engine.getSession(Engine.java:104)
+ at org.h2.engine.Session.createSession(Session.java:203)
+ at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:976)
+ at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:957)
+ at org.h2.Driver.connect(Driver.java:57)
+ at java.sql.DriverManager.getConnection(Unknown Source)
+ at java.sql.DriverManager.getConnection(Unknown Source)
+ at org.hibernate.connection.DriverManagerConnectionProvider.getConnection(DriverManagerConnectionProvider.java:110)
+ at org.hibernate.jdbc.ConnectionManager.openConnection(ConnectionManager.java:417)
+ at org.hibernate.jdbc.ConnectionManager.getConnection(ConnectionManager.java:144)
+ at org.hibernate.jdbc.AbstractBatcher.prepareQueryStatement(AbstractBatcher.java:105)
+ at org.hibernate.loader.Loader.prepareQueryStatement(Loader.java:1561)
+ at org.hibernate.loader.hql.QueryLoader.iterate(QueryLoader.java:392)
+ at org.hibernate.hql.ast.QueryTranslatorImpl.iterate(QueryTranslatorImpl.java:318)
+ at org.hibernate.engine.query.HQLQueryPlan.performIterate(HQLQueryPlan.java:177)
+ at org.hibernate.impl.SessionImpl.iterate(SessionImpl.java:1156)
+ at org.hibernate.impl.QueryImpl.iterate(QueryImpl.java:46)
+ at ggc.core.db.GGCDb.loadNutritionDefinitions(GGCDb.java:1108)
+ at ggc.core.db.GGCDb.loadNutritionDbBase(GGCDb.java:677)
+ at ggc.core.nutrition.TestNutritionData.<init>(TestNutritionData.java:85)
+ at ggc.core.nutrition.TestNutritionData.main(TestNutritionData.java:427)
+05-24 15:32:33 database: opening D:\My_Projects\Eclipse\GNU Gluco Control\data\db\ggc_db
+org.h2.jdbc.JdbcSQLException: Database may be already in use: Locked by another process. Possible solutions: close all other connection(s); use the server mode [90020-69]
+ at org.h2.message.Message.getSQLException(Message.java:91)
+ at org.h2.message.Message.getSQLException(Message.java:95)
+ at org.h2.message.Message.getSQLException(Message.java:73)
+ at org.h2.store.FileLock.error(FileLock.java:316)
+ at org.h2.store.FileLock.lockFile(FileLock.java:178)
+ at org.h2.store.FileLock.lock(FileLock.java:74)
+ at org.h2.engine.Database.open(Database.java:467)
+ at org.h2.engine.Database.<init>(Database.java:203)
+ at org.h2.engine.Engine.openSession(Engine.java:55)
+ at org.h2.engine.Engine.getSession(Engine.java:104)
+ at org.h2.engine.Session.createSession(Session.java:203)
+ at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:976)
+ at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:957)
+ at org.h2.Driver.connect(Driver.java:57)
+ at java.sql.DriverManager.getConnection(Unknown Source)
+ at java.sql.DriverManager.getConnection(Unknown Source)
+ at org.hibernate.connection.DriverManagerConnectionProvider.getConnection(DriverManagerConnectionProvider.java:110)
+ at org.hibernate.cfg.SettingsFactory.buildSettings(SettingsFactory.java:72)
+ at org.hibernate.cfg.Configuration.buildSettings(Configuration.java:1881)
+ at org.hibernate.cfg.Configuration.buildSessionFactory(Configuration.java:1174)
+ at ggc.core.db.GGCDb.openHibernateSimple(GGCDb.java:223)
+ at ggc.core.db.GGCDb.initDb(GGCDb.java:193)
+ at ggc.core.db.GGCDbLoader.run(GGCDbLoader.java:125)
+05-24 15:32:37 database: opening D:\My_Projects\Eclipse\GNU Gluco Control\data\db\ggc_db
+org.h2.jdbc.JdbcSQLException: Database may be already in use: Locked by another process. Possible solutions: close all other connection(s); use the server mode [90020-69]
+ at org.h2.message.Message.getSQLException(Message.java:91)
+ at org.h2.message.Message.getSQLException(Message.java:95)
+ at org.h2.message.Message.getSQLException(Message.java:73)
+ at org.h2.store.FileLock.error(FileLock.java:316)
+ at org.h2.store.FileLock.lockFile(FileLock.java:178)
+ at org.h2.store.FileLock.lock(FileLock.java:74)
+ at org.h2.engine.Database.open(Database.java:467)
+ at org.h2.engine.Database.<init>(Database.java:203)
+ at org.h2.engine.Engine.openSession(Engine.java:55)
+ at org.h2.engine.Engine.getSession(Engine.java:104)
+ at org.h2.engine.Session.createSession(Session.java:203)
+ at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:976)
+ at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:957)
+ at org.h2.Driver.connect(Driver.java:57)
+ at java.sql.DriverManager.getConnection(Unknown Source)
+ at java.sql.DriverManager.getConnection(Unknown Source)
+ at org.hibernate.connection.DriverManagerConnectionProvider.getConnection(DriverManagerConnectionProvider.java:110)
+ at org.hibernate.jdbc.ConnectionManager.openConnection(ConnectionManager.java:417)
+ at org.hibernate.jdbc.ConnectionManager.getConnection(ConnectionManager.java:144)
+ at org.hibernate.jdbc.AbstractBatcher.prepareQueryStatement(AbstractBatcher.java:105)
+ at org.hibernate.loader.Loader.prepareQueryStatement(Loader.java:1561)
+ at org.hibernate.loader.hql.QueryLoader.iterate(QueryLoader.java:392)
+ at org.hibernate.hql.ast.QueryTranslatorImpl.iterate(QueryTranslatorImpl.java:318)
+ at org.hibernate.engine.query.HQLQueryPlan.performIterate(HQLQueryPlan.java:177)
+ at org.hibernate.impl.SessionImpl.iterate(SessionImpl.java:1156)
+ at org.hibernate.impl.QueryImpl.iterate(QueryImpl.java:46)
+ at ggc.core.db.GGCDb.loadColorSchemes(GGCDb.java:831)
+ at ggc.core.db.GGCDb.loadConfigData(GGCDb.java:765)
+ at ggc.core.db.GGCDbLoader.run(GGCDbLoader.java:132)
+05-24 15:32:37 database: opening D:\My_Projects\Eclipse\GNU Gluco Control\data\db\ggc_db
+org.h2.jdbc.JdbcSQLException: Database may be already in use: Lock file recently modified. Possible solutions: close all other connection(s); use the server mode [90020-69]
+ at org.h2.message.Message.getSQLException(Message.java:91)
+ at org.h2.message.Message.getSQLException(Message.java:95)
+ at org.h2.message.Message.getSQLException(Message.java:73)
+ at org.h2.store.FileLock.error(FileLock.java:316)
+ at org.h2.store.FileLock.waitUntilOld(FileLock.java:160)
+ at org.h2.store.FileLock.lockFile(FileLock.java:170)
+ at org.h2.store.FileLock.lock(FileLock.java:74)
+ at org.h2.engine.Database.open(Database.java:467)
+ at org.h2.engine.Database.<init>(Database.java:203)
+ at org.h2.engine.Engine.openSession(Engine.java:55)
+ at org.h2.engine.Engine.getSession(Engine.java:104)
+ at org.h2.engine.Session.createSession(Session.java:203)
+ at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:976)
+ at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:957)
+ at org.h2.Driver.connect(Driver.java:57)
+ at java.sql.DriverManager.getConnection(Unknown Source)
+ at java.sql.DriverManager.getConnection(Unknown Source)
+ at org.hibernate.connection.DriverManagerConnectionProvider.getConnection(DriverManagerConnectionProvider.java:110)
+ at org.hibernate.jdbc.ConnectionManager.openConnection(ConnectionManager.java:417)
+ at org.hibernate.jdbc.ConnectionManager.getConnection(ConnectionManager.java:144)
+ at org.hibernate.jdbc.AbstractBatcher.prepareQueryStatement(AbstractBatcher.java:105)
+ at org.hibernate.loader.Loader.prepareQueryStatement(Loader.java:1561)
+ at org.hibernate.loader.hql.QueryLoader.iterate(QueryLoader.java:392)
+ at org.hibernate.hql.ast.QueryTranslatorImpl.iterate(QueryTranslatorImpl.java:318)
+ at org.hibernate.engine.query.HQLQueryPlan.performIterate(HQLQueryPlan.java:177)
+ at org.hibernate.impl.SessionImpl.iterate(SessionImpl.java:1156)
+ at org.hibernate.impl.QueryImpl.iterate(QueryImpl.java:46)
+ at ggc.core.db.GGCDb.loadConfigDataEntries(GGCDb.java:791)
+ at ggc.core.db.GGCDb.loadConfigData(GGCDb.java:768)
+ at ggc.core.db.GGCDbLoader.run(GGCDbLoader.java:132)
+05-24 15:32:37 database: opening D:\My_Projects\Eclipse\GNU Gluco Control\data\db\ggc_db
+org.h2.jdbc.JdbcSQLException: Database may be already in use: Lock file recently modified. Possible solutions: close all other connection(s); use the server mode [90020-69]
+ at org.h2.message.Message.getSQLException(Message.java:91)
+ at org.h2.message.Message.getSQLException(Message.java:95)
+ at org.h2.message.Message.getSQLException(Message.java:73)
+ at org.h2.store.FileLock.error(FileLock.java:316)
+ at org.h2.store.FileLock.waitUntilOld(FileLock.java:160)
+ at org.h2.store.FileLock.lockFile(FileLock.java:170)
+ at org.h2.store.FileLock.lock(FileLock.java:74)
+ at org.h2.engine.Database.open(Database.java:467)
+ at org.h2.engine.Database.<init>(Database.java:203)
+ at org.h2.engine.Engine.openSession(Engine.java:55)
+ at org.h2.engine.Engine.getSession(Engine.java:104)
+ at org.h2.engine.Session.createSession(Session.java:203)
+ at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:976)
+ at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:957)
+ at org.h2.Driver.connect(Driver.java:57)
+ at java.sql.DriverManager.getConnection(Unknown Source)
+ at java.sql.DriverManager.getConnection(Unknown Source)
+ at org.hibernate.connection.DriverManagerConnectionProvider.getConnection(DriverManagerConnectionProvider.java:110)
+ at org.hibernate.jdbc.ConnectionManager.openConnection(ConnectionManager.java:417)
+ at org.hibernate.jdbc.ConnectionManager.getConnection(ConnectionManager.java:144)
+ at org.hibernate.jdbc.AbstractBatcher.prepareQueryStatement(AbstractBatcher.java:105)
+ at org.hibernate.loader.Loader.prepareQueryStatement(Loader.java:1561)
+ at org.hibernate.loader.Loader.doQuery(Loader.java:661)
+ at org.hibernate.loader.Loader.doQueryAndInitializeNonLazyCollections(Loader.java:224)
+ at org.hibernate.loader.Loader.doList(Loader.java:2145)
+ at org.hibernate.loader.Loader.listIgnoreQueryCache(Loader.java:2029)
+ at org.hibernate.loader.Loader.list(Loader.java:2024)
+ at org.hibernate.loader.hql.QueryLoader.list(QueryLoader.java:375)
+ at org.hibernate.hql.ast.QueryTranslatorImpl.list(QueryTranslatorImpl.java:308)
+ at org.hibernate.engine.query.HQLQueryPlan.performList(HQLQueryPlan.java:153)
+ at org.hibernate.impl.SessionImpl.list(SessionImpl.java:1106)
+ at org.hibernate.impl.QueryImpl.list(QueryImpl.java:79)
+ at ggc.core.db.GGCDb.getHbA1c(GGCDb.java:1203)
+ at ggc.core.util.DataAccess.loadDailySettings(DataAccess.java:1223)
+ at ggc.core.db.GGCDbLoader.run(GGCDbLoader.java:140)
+05-24 15:32:37 database: opening D:\My_Projects\Eclipse\GNU Gluco Control\data\db\ggc_db
+org.h2.jdbc.JdbcSQLException: Database may be already in use: Lock file recently modified. Possible solutions: close all other connection(s); use the server mode [90020-69]
+ at org.h2.message.Message.getSQLException(Message.java:91)
+ at org.h2.message.Message.getSQLException(Message.java:95)
+ at org.h2.message.Message.getSQLException(Message.java:73)
+ at org.h2.store.FileLock.error(FileLock.java:316)
+ at org.h2.store.FileLock.waitUntilOld(FileLock.java:160)
+ at org.h2.store.FileLock.lockFile(FileLock.java:170)
+ at org.h2.store.FileLock.lock(FileLock.java:74)
+ at org.h2.engine.Database.open(Database.java:467)
+ at org.h2.engine.Database.<init>(Database.java:203)
+ at org.h2.engine.Engine.openSession(Engine.java:55)
+ at org.h2.engine.Engine.getSession(Engine.java:104)
+ at org.h2.engine.Session.createSession(Session.java:203)
+ at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:976)
+ at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:957)
+ at org.h2.Driver.connect(Driver.java:57)
+ at java.sql.DriverManager.getConnection(Unknown Source)
+ at java.sql.DriverManager.getConnection(Unknown Source)
+ at org.hibernate.connection.DriverManagerConnectionProvider.getConnection(DriverManagerConnectionProvider.java:110)
+ at org.hibernate.jdbc.ConnectionManager.openConnection(ConnectionManager.java:417)
+ at org.hibernate.jdbc.ConnectionManager.getConnection(ConnectionManager.java:144)
+ at org.hibernate.jdbc.AbstractBatcher.prepareQueryStatement(AbstractBatcher.java:105)
+ at org.hibernate.loader.Loader.prepareQueryStatement(Loader.java:1561)
+ at org.hibernate.loader.Loader.doQuery(Loader.java:661)
+ at org.hibernate.loader.Loader.doQueryAndInitializeNonLazyCollections(Loader.java:224)
+ at org.hibernate.loader.Loader.doList(Loader.java:2145)
+ at org.hibernate.loader.Loader.listIgnoreQueryCache(Loader.java:2029)
+ at org.hibernate.loader.Loader.list(Loader.java:2024)
+ at org.hibernate.loader.hql.QueryLoader.list(QueryLoader.java:375)
+ at org.hibernate.hql.ast.QueryTranslatorImpl.list(QueryTranslatorImpl.java:308)
+ at org.hibernate.engine.query.HQLQueryPlan.performList(HQLQueryPlan.java:153)
+ at org.hibernate.impl.SessionImpl.list(SessionImpl.java:1106)
+ at org.hibernate.impl.QueryImpl.list(QueryImpl.java:79)
+ at ggc.core.db.GGCDb.getDayStats(GGCDb.java:1249)
+ at ggc.core.util.DataAccess.loadDailySettings(DataAccess.java:1224)
+ at ggc.core.db.GGCDbLoader.run(GGCDbLoader.java:140)
+05-24 15:32:37 database: opening D:\My_Projects\Eclipse\GNU Gluco Control\data\db\ggc_db
+org.h2.jdbc.JdbcSQLException: Database may be already in use: Lock file recently modified. Possible solutions: close all other connection(s); use the server mode [90020-69]
+ at org.h2.message.Message.getSQLException(Message.java:91)
+ at org.h2.message.Message.getSQLException(Message.java:95)
+ at org.h2.message.Message.getSQLException(Message.java:73)
+ at org.h2.store.FileLock.error(FileLock.java:316)
+ at org.h2.store.FileLock.waitUntilOld(FileLock.java:160)
+ at org.h2.store.FileLock.lockFile(FileLock.java:170)
+ at org.h2.store.FileLock.lock(FileLock.java:74)
+ at org.h2.engine.Database.open(Database.java:467)
+ at org.h2.engine.Database.<init>(Database.java:203)
+ at org.h2.engine.Engine.openSession(Engine.java:55)
+ at org.h2.engine.Engine.getSession(Engine.java:104)
+ at org.h2.engine.Session.createSession(Session.java:203)
+ at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:976)
+ at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:957)
+ at org.h2.Driver.connect(Driver.java:57)
+ at java.sql.DriverManager.getConnection(Unknown Source)
+ at java.sql.DriverManager.getConnection(Unknown Source)
+ at org.hibernate.connection.DriverManagerConnectionProvider.getConnection(DriverManagerConnectionProvider.java:110)
+ at org.hibernate.jdbc.ConnectionManager.openConnection(ConnectionManager.java:417)
+ at org.hibernate.jdbc.ConnectionManager.getConnection(ConnectionManager.java:144)
+ at org.hibernate.jdbc.AbstractBatcher.prepareQueryStatement(AbstractBatcher.java:105)
+ at org.hibernate.loader.Loader.prepareQueryStatement(Loader.java:1561)
+ at org.hibernate.loader.Loader.doQuery(Loader.java:661)
+ at org.hibernate.loader.Loader.doQueryAndInitializeNonLazyCollections(Loader.java:224)
+ at org.hibernate.loader.Loader.doList(Loader.java:2145)
+ at org.hibernate.loader.Loader.listIgnoreQueryCache(Loader.java:2029)
+ at org.hibernate.loader.Loader.list(Loader.java:2024)
+ at org.hibernate.loader.hql.QueryLoader.list(QueryLoader.java:375)
+ at org.hibernate.hql.ast.QueryTranslatorImpl.list(QueryTranslatorImpl.java:308)
+ at org.hibernate.engine.query.HQLQueryPlan.performList(HQLQueryPlan.java:153)
+ at org.hibernate.impl.SessionImpl.list(SessionImpl.java:1106)
+ at org.hibernate.impl.QueryImpl.list(QueryImpl.java:79)
+ at ggc.core.db.GGCDb.getDayStatsRange(GGCDb.java:1295)
+ at ggc.core.util.DataAccess.loadDailySettings(DataAccess.java:1229)
+ at ggc.core.db.GGCDbLoader.run(GGCDbLoader.java:140)
+05-24 15:32:37 database: opening D:\My_Projects\Eclipse\GNU Gluco Control\data\db\ggc_db
+org.h2.jdbc.JdbcSQLException: Database may be already in use: Lock file recently modified. Possible solutions: close all other connection(s); use the server mode [90020-69]
+ at org.h2.message.Message.getSQLException(Message.java:91)
+ at org.h2.message.Message.getSQLException(Message.java:95)
+ at org.h2.message.Message.getSQLException(Message.java:73)
+ at org.h2.store.FileLock.error(FileLock.java:316)
+ at org.h2.store.FileLock.waitUntilOld(FileLock.java:160)
+ at org.h2.store.FileLock.lockFile(FileLock.java:170)
+ at org.h2.store.FileLock.lock(FileLock.java:74)
+ at org.h2.engine.Database.open(Database.java:467)
+ at org.h2.engine.Database.<init>(Database.java:203)
+ at org.h2.engine.Engine.openSession(Engine.java:55)
+ at org.h2.engine.Engine.getSession(Engine.java:104)
+ at org.h2.engine.Session.createSession(Session.java:203)
+ at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:976)
+ at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:957)
+ at org.h2.Driver.connect(Driver.java:57)
+ at java.sql.DriverManager.getConnection(Unknown Source)
+ at java.sql.DriverManager.getConnection(Unknown Source)
+ at org.hibernate.connection.DriverManagerConnectionProvider.getConnection(DriverManagerConnectionProvider.java:110)
+ at org.hibernate.jdbc.ConnectionManager.openConnection(ConnectionManager.java:417)
+ at org.hibernate.jdbc.ConnectionManager.getConnection(ConnectionManager.java:144)
+ at org.hibernate.jdbc.AbstractBatcher.prepareQueryStatement(AbstractBatcher.java:105)
+ at org.hibernate.loader.Loader.prepareQueryStatement(Loader.java:1561)
+ at org.hibernate.loader.hql.QueryLoader.iterate(QueryLoader.java:392)
+ at org.hibernate.hql.ast.QueryTranslatorImpl.iterate(QueryTranslatorImpl.java:318)
+ at org.hibernate.engine.query.HQLQueryPlan.performIterate(HQLQueryPlan.java:177)
+ at org.hibernate.impl.SessionImpl.iterate(SessionImpl.java:1156)
+ at org.hibernate.impl.QueryImpl.iterate(QueryImpl.java:46)
+ at ggc.core.db.GGCDb.loadColorSchemes(GGCDb.java:831)
+ at ggc.core.db.GGCDb.loadConfigData(GGCDb.java:765)
+ at ggc.core.util.GGCProperties.load(GGCProperties.java:647)
+ at ggc.core.util.DataAccess.loadSettingsFromDb(DataAccess.java:545)
+ at ggc.core.db.GGCDbLoader.run(GGCDbLoader.java:150)
+05-24 15:32:40 database: opening D:\My_Projects\Eclipse\GNU Gluco Control\data\db\ggc_db
+org.h2.jdbc.JdbcSQLException: Database may be already in use: Locked by another process. Possible solutions: close all other connection(s); use the server mode [90020-69]
+ at org.h2.message.Message.getSQLException(Message.java:91)
+ at org.h2.message.Message.getSQLException(Message.java:95)
+ at org.h2.message.Message.getSQLException(Message.java:73)
+ at org.h2.store.FileLock.error(FileLock.java:316)
+ at org.h2.store.FileLock.lockFile(FileLock.java:178)
+ at org.h2.store.FileLock.lock(FileLock.java:74)
+ at org.h2.engine.Database.open(Database.java:467)
+ at org.h2.engine.Database.<init>(Database.java:203)
+ at org.h2.engine.Engine.openSession(Engine.java:55)
+ at org.h2.engine.Engine.getSession(Engine.java:104)
+ at org.h2.engine.Session.createSession(Session.java:203)
+ at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:976)
+ at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:957)
+ at org.h2.Driver.connect(Driver.java:57)
+ at java.sql.DriverManager.getConnection(Unknown Source)
+ at java.sql.DriverManager.getConnection(Unknown Source)
+ at org.hibernate.connection.DriverManagerConnectionProvider.getConnection(DriverManagerConnectionProvider.java:110)
+ at org.hibernate.jdbc.ConnectionManager.openConnection(ConnectionManager.java:417)
+ at org.hibernate.jdbc.ConnectionManager.getConnection(ConnectionManager.java:144)
+ at org.hibernate.jdbc.AbstractBatcher.prepareQueryStatement(AbstractBatcher.java:105)
+ at org.hibernate.loader.Loader.prepareQueryStatement(Loader.java:1561)
+ at org.hibernate.loader.hql.QueryLoader.iterate(QueryLoader.java:392)
+ at org.hibernate.hql.ast.QueryTranslatorImpl.iterate(QueryTranslatorImpl.java:318)
+ at org.hibernate.engine.query.HQLQueryPlan.performIterate(HQLQueryPlan.java:177)
+ at org.hibernate.impl.SessionImpl.iterate(SessionImpl.java:1156)
+ at org.hibernate.impl.QueryImpl.iterate(QueryImpl.java:46)
+ at ggc.core.db.GGCDb.loadConfigDataEntries(GGCDb.java:791)
+ at ggc.core.db.GGCDb.loadConfigData(GGCDb.java:768)
+ at ggc.core.util.GGCProperties.load(GGCProperties.java:647)
+ at ggc.core.util.DataAccess.loadSettingsFromDb(DataAccess.java:545)
+ at ggc.core.db.GGCDbLoader.run(GGCDbLoader.java:150)
+05-25 18:46:06 database: opening D:\My_Projects\Eclipse\GNU Gluco Control\data\db\ggc_db
+org.h2.jdbc.JdbcSQLException: Database may be already in use: Locked by another process. Possible solutions: close all other connection(s); use the server mode [90020-69]
+ at org.h2.message.Message.getSQLException(Message.java:91)
+ at org.h2.message.Message.getSQLException(Message.java:95)
+ at org.h2.message.Message.getSQLException(Message.java:73)
+ at org.h2.store.FileLock.error(FileLock.java:316)
+ at org.h2.store.FileLock.lockFile(FileLock.java:178)
+ at org.h2.store.FileLock.lock(FileLock.java:74)
+ at org.h2.engine.Database.open(Database.java:467)
+ at org.h2.engine.Database.<init>(Database.java:203)
+ at org.h2.engine.Engine.openSession(Engine.java:55)
+ at org.h2.engine.Engine.getSession(Engine.java:104)
+ at org.h2.engine.Session.createSession(Session.java:203)
+ at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:976)
+ at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:957)
+ at org.h2.Driver.connect(Driver.java:57)
+ at java.sql.DriverManager.getConnection(Unknown Source)
+ at java.sql.DriverManager.getConnection(Unknown Source)
+ at org.hibernate.connection.DriverManagerConnectionProvider.getConnection(DriverManagerConnectionProvider.java:110)
+ at org.hibernate.cfg.SettingsFactory.buildSettings(SettingsFactory.java:72)
+ at org.hibernate.cfg.Configuration.buildSettings(Configuration.java:1881)
+ at org.hibernate.cfg.Configuration.buildSessionFactory(Configuration.java:1174)
+ at ggc.core.db.GGCDb.openHibernateSimple(GGCDb.java:223)
+ at ggc.core.db.GGCDb.initDb(GGCDb.java:193)
+ at ggc.core.db.GGCDbLoader.run(GGCDbLoader.java:125)
+05-25 18:46:10 database: opening D:\My_Projects\Eclipse\GNU Gluco Control\data\db\ggc_db
+org.h2.jdbc.JdbcSQLException: Database may be already in use: Locked by another process. Possible solutions: close all other connection(s); use the server mode [90020-69]
+ at org.h2.message....
[truncated message content] |
|
From: <ru...@us...> - 2011-10-20 15:27:57
|
Revision: 1205
http://ggc.svn.sourceforge.net/ggc/?rev=1205&view=rev
Author: rumbi
Date: 2011-10-20 15:27:47 +0000 (Thu, 20 Oct 2011)
Log Message:
-----------
RR:
- small translation updates
- a small workaround and some cosmetic changes (e.g. formatting and spelling)
- symlinked the German translation to the current file in "GGC Language Translations" in the hopes that this will mean automatic updates to language files in the future (may have to be changed around if this doesn't work out)
Modified Paths:
--------------
trunk/ggc-language_tool/active_translations/de/GGC_de.config
trunk/ggc-language_tool/active_translations/de/GGC_de.properties
trunk/ggc-plugin_base/src/GGCPlugin_en.properties
Added Paths:
-----------
trunk/ggc-cgm/src/GGC_CGMSTool_de.properties
trunk/ggc-core/src/GGC_de.properties
trunk/ggc-meter/src/GGCMeterTool_de.properties
trunk/ggc-nutri/src/GGC_Nutrition_de.properties
trunk/ggc-plugin_base/src/GGCPlugin_de.properties
trunk/ggc-pump/src/GGCPumpTool_de.properties
Removed Paths:
-------------
trunk/ggc-cgm/src/GGC_CGMSTool_de.properties
trunk/ggc-core/src/GGC_de.properties
trunk/ggc-meter/src/GGCMeterTool_de.properties
trunk/ggc-nutri/src/GGC_Nutrition_de.properties
trunk/ggc-plugin_base/src/GGCPlugin_de.properties
trunk/ggc-pump/src/GGCPumpTool_de.properties
Deleted: trunk/ggc-cgm/src/GGC_CGMSTool_de.properties
===================================================================
--- trunk/ggc-cgm/src/GGC_CGMSTool_de.properties 2011-10-05 13:28:50 UTC (rev 1204)
+++ trunk/ggc-cgm/src/GGC_CGMSTool_de.properties 2011-10-20 15:27:47 UTC (rev 1205)
@@ -1,216 +0,0 @@
-# ######################################################################
-# ### GGC CGMS Tool ###
-# ######################################################################
-# ### Language: German ###
-# ### Created by: Andy Rozman (an...@at...) ###
-# ### Last change: 4th February 2010 ###
-# ### Library Version: 0.4.3 ###
-# ### Application Version: 0.4.17 ###
-# ######################################################################
-#
-# In brackets there are now tags which define urgency of some text beeing translated
-# 1 - Needed, urgent (Base functionality, options which will be used by user mostly)
-# 2 - Needed
-# 3 - Not used yet (in public releases)
-# 4 - In implementation
-#
-# * - If tags also has *, then it means that this string can change regulary, last update is in []
-#
-
-
-#
-# Plug-in Specific (1)
-# Most of strings here are concated with help of sprintf codes, so almost all are static
-#
-DEVICE_NAME_NORMAL=CGMS
-DEVICE_NAME_BIG=CGMS
-DEVICE_FULL_NAME_WITHOUT_PORT=%s
-DEVICE_FULL_NAME_WITH_PORT=%s on %s
-
-#
-# Menus
-#
-MN_CGMS=CGMS
-
-
-# CGMS
-#[TODO] translate
-MN_CGMS_ABOUT=CGMS plug-in about
-#[TODO] translate
-MN_CGMS_ABOUT_DESC=About CGMS Plugin (copyright, features, credits,...)
-MN_CGMS_CONFIG=CGMS-Plug-in &Einstellungen
-MN_CGMS_CONFIG_DESC=Einstellungen zum CGMS-Plug-in
-MN_CGMS_LIST=CGMS-&Liste
-MN_CGMS_LIST_DESC=Liste der verf\u00fcgbaren CGMS-Ger\u00e4te
-MN_CGMS_READ=CGMS &auslesen
-MN_CGMS_READ_DESC=Die Daten des CGMS auslesen
-
-MN_CGMS_VIEW_DATA=View Data
-MN_CGMS_VIEW_DATA_DESC=View data read from device(s)
-
-
-#
-# About (1)
-# Note: elements under static are same for all plugins and non-static are plugin specific
-#
-
-# static
-DEVICE_PLUGIN=%s Plug-in
-DEVICE_PLUGIN_ABOUT=About %s Plug-in
-
-
-
-#
-# Configuration (1)
-#
-MY__=My
-NEW__=New
-DEVICE_CONFIGURATION=%s Configuration
-SELECT_X_DEVICE=Select %s Device
-SELECTED_X_DEVICE=Selected %s Device
-DEVICE_CUSTOM_NAME=%s Custom Name
-
-DEVICE_DOWNLOAD=DL
-DEVICE_SETTINGS=Sett.
-
-
-#
-# Device Selector (1)
-#
-SELECTOR_DEVICE=%s Device Selector
-
-
-
-
-
-
-#
-# Instructions Dialog ((1))
-#
-OOPS_DEVICE_NOT_CONFIGURED=Oops ! You forgot to configure your %s\nand currently there is no %s configured\nand/or selected. Please visit configuration\nand configure your %s.
-CONFIGURED_DEVICE_INSTRUCTIONS=Configured %s and Instructions
-DEVICE_ICON=%s picture
-STATUS_READER_ERROR=Internal %s (or port) error
-
-ERROR_CONTACTING_DEVICE=We had problem contacting CGMS device.\nPlease recheck communication port settings\n(some of cables, can change their address,\nwhen reconnected). Run configuration again\nand problem should be solved!\n
-DEVICE_INFO=%s Info
-
-
-#
-# Download
-#
-
-READ_DEVICE_DATA_TITLE=Read CGMS Data [%s on %s]
-
-
-#
-# Device Configuration (1)
-#
-READ_DEVICE_CONFIG_TITLE=Read CGMS Configuration [%s on %s]
-SETTING_GROUP=Setting / Group
-
-
-#
-# Export (1)
-#
-EXPORT_DEVICE_DATA=Export %s Data
-
-
-#
-# List (1)
-#
-DEVICE_LIST_WEB=CGMS List
-
-## TO DO
-# non-static
-DEVICE_LIST_WEB_DESC=<html>Pumps list contains most of Pumps (even most of models). For each of this pumps, there is configuration entry, which contains only basic settings for device (profile names, TBR settings, etc). Devices which support download have that shown in selector (DL column). Pumps in list are color coded, and color determines status of devices of selected company. Color coding description is shown at bottom of this page.<br></html>
-
-
-
-#
-# CGMS companies desc. (this is not description of company, but about our connection with company) (3*)
-# [12.10.2008]
-#
-MINIMED_DESC=We got partitial support from company and implementation will start in December 2008.
-
-
-#
-# CGMS Instructions (1)
-# []
-#
-
-
-#
-# Manual Entry (1)
-#
-AVG_BG=Avg BG
-BLOOD_GLUCOSE_CGMS=Blood Glucose (CGMS)
-BLOOD_GLUCOSE_CALIB=Blood Glucose (Calibration)
-AVG=Avg
-TOTAL=Total
-LOWEST=Lowest
-STD_DEV=Std Dev
-READINGS=Readings
-HIGHEST=Highest
-SUM=Sum
-READING=Reading
-CGMS_DAILY_OVERVIEW=CGMS Daily Stats
-
-# table
-ENTRY_TYPE=Entry Type
-COMMENT=Comment
-
-# types
-ENTRY_BG_READING=Reading
-ENTRY_BG_CALIBRATION=Calibration
-
-
-#
-# Devices
-#
-
-#
-# Backup/Restore
-#
-CGMS_TOOL=CGMS Tool
-CGMS_DATA=CGMS Data
-
-
-#
-# Printing - Plugin specific (2)
-#
-#MN_PUMP=Pump
-#MN_PUMP_PRINT_DESC=Report for Pumps Data
-#MN_PUMP_PRINT_SIMPLE=Simple
-#MN_PUMP_PRINT_SIMPLE_DESC=Simple Report for Pump data
-#MN_PUMP_PRINT_EXT=Extended
-#MN_PUMP_PRINT_SIMPLE_DESC=Extended Report for Pump data (Simple + Foods)
-#VALUE_SHORT=Value
-#OTHER_DATA=Other Data
-#OTHER_DATA_FOOD=Other Data (with Food)
-#PUMP_DATA_BASE=Simple Pump Report
-#PUMP_DATA_EXT=Extended Pump Report
-
-#FOOD_DB_PRINT=Food (Db)
-#FOOD_DESC_PRINT=Food (Desc.)
-
-#FOOD_DESC_PRINT_NOT_YET=Display of Food Db data not implemented yet!
-
-
-
-#
-# Types
-
-CGMS_READINGS=CGMS Readings
-CALIBRATION_READINGS=Calibration
-
-CGMS_READING=CGMS Reading
-
-
-
-
-#
-# New Keywords (they are grouped), this need to be copied to right locations, after release
-#
-
-
Added: trunk/ggc-cgm/src/GGC_CGMSTool_de.properties
===================================================================
--- trunk/ggc-cgm/src/GGC_CGMSTool_de.properties (rev 0)
+++ trunk/ggc-cgm/src/GGC_CGMSTool_de.properties 2011-10-20 15:27:47 UTC (rev 1205)
@@ -0,0 +1 @@
+link ../../translation/files/translation/GGC_CGMSTool_de.properties
\ No newline at end of file
Property changes on: trunk/ggc-cgm/src/GGC_CGMSTool_de.properties
___________________________________________________________________
Added: svn:special
+ *
Deleted: trunk/ggc-core/src/GGC_de.properties
===================================================================
--- trunk/ggc-core/src/GGC_de.properties 2011-10-05 13:28:50 UTC (rev 1204)
+++ trunk/ggc-core/src/GGC_de.properties 2011-10-20 15:27:47 UTC (rev 1205)
@@ -1,844 +0,0 @@
-#
-# ######################################################################
-# ### GNU Glucose Control ###
-# ######################################################################
-# ### Language: German ###
-# ### Created by: Reinhold Rumberger (ru...@us...)###
-# ### Version: 0.5 ###
-# ### Last change: 02.07.2011 22:41:58 ###
-# ######################################################################
-#
-#
-# Translation status:
-# Words/expressions: 648
-# Not translated: 107 (16 %)
-# Need to be checked: 119 (18 %)
-#
-# Translated: 422 (65 %)
-#
-#
-#
-## GGC Core#
-# Collation Rules - In unicode we can create special rules for sorting where we specify
-# sorting order of special characters. This will be used by tree's and special tables.
-# For english this is left empty. For all other (that have non-standard, non english
-# charcters) we need to set this if we want sorting to be done correctly.
-#
-COLLATION_RULES=< 0 < 1 < 2 < 3 < 4 < 5 < 6 < 7 < 8 < 9 < a,A,\u00E4,\u00C4,\u00E1,\u00E0,\u00C1,\u00C0,\u00E2,\u00C2 < b,B < c,C < d,D < e,E,\u00E9,\u00E8,\u00EA,\u00C9,\u00C8,\u00CA < f,F < g,G < h,H < i,I < j,J < k,K < l,L < m,M < n,N < o,O,\u00F6,\u00D6 < p,P < q,Q < r,R < s,S,\u00DF < t,T < u,U,\u00FC,\u00DC < v,V < w,W < x,X < y,Y < z,Z
-
-#
-# GGC - Globally used [1]
-#
-DELETE=L\u00F6schen
-ADD=Hinzuf\u00FCgen
-EDIT=Bearbeiten
-NEW=Neu
-EDIT_DEL_SHORT=Bearb./L\u00F6schen
-FEATURE=Feature
-IMPLEMENTED_VERSION=wird in Version %s implementiert
-OR=oder
-INFORMATION=Information
-QUESTION=Frage
-YES=Ja
-NO=Nein
-COMMING_IN_VERSION=Kommt in Version %s
-NOT_WORKING_100PRO=Funktioniert noch nicht zu 100%
-NOT_TESTED_100PRO=Noch nicht zu 100% getestet
-NOT_USED=Nicht verwendet
-
-#
-# ggc.datamodels [1]
-#
-NO_NAME=Kein Name
-TIME=Zeit
-BG=BZ
-INS_1=Ins1
-INS_2=Ins2
-INS_3=Ins3
-INSULIN_1=Insulin 1
-INSULIN_2=Insulin 2
-INSULIN_3=Insulin 3
-BU=KH
-ACT=Ac.
-COMMENT=Kommentar
-DATE_MUST_BE_IN_FORMAT=Datum muss folgendes Format haben
-TIME_MUST_BE_IN_FORMAT=Zeit muss folgendes Format haben
-ERROR_PARSING_DATE=Fehler beim Einlesen des Datums
-DATETIME=Datum/Zeit
-PUMP_INSULIN=Pumpen-Insulin
-
-#
-# Main Frame (Info panels) & Other places [1]
-#
-
-# general
-BG_TARGET=BZ-Ziel
-
-# hba1c
-NO_EXPRESSIVENESS=Keine Aussagekraft
-LITTLE_EXPRESSIVENESS=Geringe Aussagekraft
-STANDARD_EXPRESSIVENESS=Mittlere Aussagekraft
-GOOD_EXPRESSIVENESS=Hohe Aussagekraft
-
-#
-# Daily Values Stats [1]
-#
-
-# main
-CH_LONG=Kohlehydrate
-ACTIVITY=Bewegung
-FOOD=Lebensmittel
-UPDATE_FROM_FOOD=KH aktualisieren
-EDIT_FOOD=Lebensmittel Db [1]
-DATE_TIME=Datum/Zeit
-FOOD_SET=Lebensmittelgruppe [%s]
-
-# meals
-FOOD_BY_DESCRIPTION=Beschreibung [2]
-FOOD_BY_DESCRIPTION_TITLE=Food by Description
-DESCRIBE_FOODS=<html><b>Beschreiben Sie Nahrungsmittel, die Sie gegessen haben</b> (wenn Sie KH in eckige Klammern [] einschließen, künnen KH automatisch errechnet werden)</html>
-CALCULATE=Berechnen
-NO_DESCRIPTIONS_WITH_CH=Es wurden keine Beschreibungen mit KH-Definitionen\nim Nahrungsbeschreibungsbereich gefunden.\nSollten Sie einen Fehler gemacht haben,\nbearbeiten Sie den Text noch einmal.\n
-CH=KH
-
-#
-# Main GUI Panels [1]
-#
-ADD_ROW=Neuer Eintrag
-EDIT_ROW=Eintrag \u00E4ndern
-CLOSE=Schlie\u00DFen
-COURSE_GRAPH=Verlaufsdiagramm
-SPREAD_GRAPH=Spread Graph
-TO_BE_DRAWN=Einzuzeichnen
-CONNECT_VALUES_FOR_ONE_DAY=Werte eines Tages verbinden
-SUM_BU=Summe KH
-SUM=Summe
-SUM_INSULIN=Summe IE
-AVG_BG_PER_DAY=mittlerer BZ pro Tag
-INS_PER_DAY=Ins. pro Tag
-MEALS=Mahlzeiten
-INS_SLASH_BU=Ins/KH
-DRAW=Zeichnen
-DAILYGRAPHFRAME=Tagesdiagramm
-DAILYSTATSFRAME=Tagesstatistiken
-SAVE=Speichern
-DELETE_ROW=Eintrag L\u00F6schen
-LOWEST=Niedrigster
-STD_DEV=Std. Abw.
-READINGS=Werte
-HIGHEST=H\u00F6chster
-AVG_BG=Mittl. BZ
-BLOOD_GLUCOSE=Blutzucker
-BREAD_UNITS=Broteinheiten
-AVG=Mittl.
-INSULIN=Insulin
-URINE=Urin
-DOSE=Dosis
-TOTAL=Summe
-AVG_INS=Mittl. IE
-DOSE_INS=Insulindosis
-CANCEL=Abbrechen
-OK=OK
-HELP=Hilfe
-ADD_NEW_VALUES=Neue Werte eintragen
-COURSEGRAPHFRAME=Verlaufsdiagramm
-FREQGRAPHFRAME=Frequency Graph
-GRAPH=Diagramm
-ADD_NEW_ROW_TO_TABLE=F\u00FCgt eine neue Wertereihe in die Tabelle ein.
-DELETE_SELECTED_ROWS=L\u00F6sche ausgew\u00E4hlte Zeilen.
-SELECT_ROW_FIRST=Bitte zuerst einen Eintrag ausw\u00E4hlen!
-READINGS_SLASH_DAY=Werte/Tag
-VALUATION=Wertung
-INIT=Initialisierung
-READY=Fertig
-UNKNOWN=Unbekannt
-COMMENTS=Anmerkungen
-ARE_YOU_SURE_DELETE=Wollen Sie diesen Eintrag wirklich l\u00F6schen?
-ARE_YOU_SURE_DELETE_ROW=Wollen Sie diesen Eintrag wirklich l\u00F6schen?
-
-#
-# GGC Little (GUI) [2]
-#
-DAILY_VALUES=Tageswerte
-SHOW_DAILY_GRAPH=Diagramm anzeigen
-DAILY_CONTROL=Daily Control
-MN_QUIT_LT_DESC=GGC Little beenden
-CURRENT_DATE_HAS_CHANGED=Das Datum hat sich ge\u00E4ndert! Ihre Aktion wird deshalb verworfen und die Tabelle aktualisiert!
-TB_ADD_ROW_DESC=Neuer Eintrag f\u00FCr diesen Tag
-TB_EDIT_ROW_DESC=Eintrag f\u00FCr diesen Tag bearbeiten
-TB_DELETE_ROW_DESC=Eintrag f\u00FCr diesen Tag l\u00F6schen
-TB_READ_METER_LT_DESC=Daten vom Me\u00DFger\u00E4t auslesen
-TB_ABOUT_DESC=\u00DCber GGC Little
-TB_SHOW_GRAPH_DESC=Diagramm f\u00FCr diesen Tag anzeigen
-GGC_LITTLE_TITLE=GNU Gluco Control Little
-TAB_CONTROL=Steuerung
-TAB_SCHEDULE=Terminplan
-TAB_PLUGIN=Plug-ins
-TAB_STOCKS=Bestand
-PLUGIN_IMPLEMENTED_VERSION=Dieses Plug-in wird in Version %s implementiert!
-METER_PLUGIN_PANEL=Me\u00DFger\u00E4te-Plug-in
-PUMP_PLUGIN_PANEL=Pumpen-Plug-in
-
-#
-# GGC Little (System Tray) [3]
-#
-SHOW_APP=Anzeigen
-SHOW_APP_DESC=GGC Little anzeigen
-HIDE_APP=Verstecken
-HIDE_APP_DESC=GGC Little verstecken
-EXIT_APP=Beenden
-EXIT_APP_DESC=GGC Little beenden
-
-#
-# Menus (BE CAREFUL about mnemonics used) Set mnemonic with & before mnemonic letter [1]
-#
-
-# main menus
-MN_FILE=&Datei
-MN_DATA=Pen/Spritze
-MN_DATA_GRAPH=Diagramme
-MN_DOCTOR=&Arzt
-MN_FOOD=&Ern\u00E4hrung
-MN_PRINTING=D&rucken
-MN_TOOLS=&Werkzeuge
-MN_HELP=&Hilfe
-
-# file
-MN_LOGIN=Ein&loggen
-MN_LOGIN_DESC=Patient einloggen
-MN_LOGOUT=Ausl&oggen
-MN_LOGOUT_DESC=Ausloggen
-MN_QUIT=B&eenden
-MN_QUIT_DESC=GGC beenden
-
-# data
-MN_DAILY=&Tages\u00FCbersicht
-MN_DAILY_DESC=Tagesstatistik betrachten
-MN_COURSE=&Verlauf
-MN_COURSE_DESC=Verlauf betrachten
-MN_SPREAD=Ver&teilung
-MN_SPREAD_DESC=Verteilung betrachten
-MN_FREQUENCY=&Frequenz
-MN_FREQUENCY_DESC=Wertefrequenz betrachten
-MN_HBA1C=&HbA1c
-MN_HBA1C_DESC=HbA1c betrachten
-MN_DATA_RATIO=Verh\u00E4ltnis
-MN_DATA_RATIO_DESC=Verh\u00E4ltnis-Einstellungen
-MN_RATIO_BASE=Basis
-MN_RATIO_BASE_DESC=Basisverh\u00E4ltniseinstellungen (1 pro Tag)
-MN_RATIO_EXTENDED=Erweitert
-MN_RATIO_EXTENDED_DESC=Erweiterte Verh\u00E4ltniseinstellungen (mehr als 1 pro Tag)
-MN_RATIO_CALC=&Verh\u00E4ltnisrechner
-MN_RATIO_CALC_DESC=Berechnet verschiedene Verh\u00E4ltnisse (Insulin/KH, ...)
-
-# tools
-MN_DB_MAINT=&Datenbank-Wartung
-MN_DB_MAINT_DESC=Funktionen f\u00FCr die Wartung der Datenbank
-MN_DB_BACKUP=Datenbank &sichern
-MN_DB_BACKUP_DESC=Sichert die GGC-Datenbank
-MN_DB_RESTORE=Datenbank &wiederherstellen
-MN_DB_RESTORE_DESC=Stellt die GGC-Datenbank anhand einer Sicherung wieder her
-MN_MISC_SYNCHRONIZE=&Synchronisierung
-MN_MISC_SYNCHRONIZE_DESC=Datenabgleich mit anderen GGC Instanzen
-MN_PREFERENCES=&Einstellungen
-MN_PREFERENCES_DESC=Einstellungen
-
-# help
-MN_ABOUT=\u00DC&ber
-MN_ABOUT_DESC=\u00DCber GGC
-MN_CHECK_FOR_UPDATE=Nach &Updates suchen
-MN_CHECK_FOR_UPDATE_DESC=Pr\u00FCft, ob eine neue Version verf\u00FCgbar ist
-
-# food
-MN_NUTRDB_USDB=N\u00E4hrstoff-DB (&USDA)
-MN_NUTRDB_USDB_DESC=Datenbank mit N\u00E4hrstoff-Informationen, ver\u00F6ffentlicht vom USDA
-MN_NUTRDB_USER=N\u00E4hrstoff-DB (&Benutzer)
-MN_NUTRDB_USER_DESC=N\u00E4hrstoff-Datenbank des Benutzers
-MN_MEALS=&Mahlzeiten-DB
-MN_MEALS_DESC=Datenbank mit vollst\u00E4ndigen Mahlzeiten
-
-# printing
-MN_REPORTS=&Data
-MN_REPORTS_DESC=Selbstkontrolldaten-Berichte
-MN_PDF_SIMPLE=&Einfach
-MN_PDF_SIMPLE_DESC=Einfacher PDF-Bericht (monatl.)
-MN_PDF_EXT=&Ausf\u00FChrlich
-MN_PDF_EXT_DESC=Ausf\u00FChrlicher PDF-Bericht (monatl.)
-
-# doctors
-MN_DOCS=\u00C4&rzte
-MN_DOCS_DESC=\u00C4rzte
-MN_APPOINT=&Termine
-MN_APPOINT_DESC=Termine f\u00FCr Arztbesuche
-MN_STOCKS=&Bestand
-MN_STOCKS_DESC=Bestand medizinischer Ausr\u00FCstung
-
-#
-# ggc.gui.calendar [2]
-#
-ENDING_DATE=Enddatum
-STARTING_DATE=Startdatum
-1_WEEK=1 Woche
-1_MONTH=1 Monat
-3_MONTHS=3 Monate
-CUSTOM=Benutzerdefiniert
-DATE_RANGE_SELECTOR=Wahl des Zeitraumes
-SU=So
-MO=Mo
-TU=Di
-WE=Mi
-TH=Do
-FR=Fr
-SA=Sa
-JANUARY=Januar
-FEBRUARY=Februar
-MARCH=M\u00E4rz
-APRIL=April
-MAY=Mai
-JUNE=Juni
-JULY=Juli
-AUGUST=August
-SEPTEMBER=September
-OCTOBER=Oktober
-NOVEMBER=November
-DECEMBER=Dezember
-
-#
-# Main GUI Panels [1]
-#
-GENERAL_INFORMATION=Allgemeine Informationen
-YOUR_NAME=Ihr Name
-BOLUS_INSULIN=Bolusinsulin
-BASAL_INSULIN=Basalinsulin
-GLUCOMETER=Messger\u00E4t
-BG_UNIT=Ma\u00DFeinheit
-HBA1C=HbA1c
-YOUR_CURRENT_HBA1C=Ihr aktueller HbA1c
-NO_READINGS=Keine Werte
-NO_DATASOURCE=Keine Datenquelle
-SCHEDULE=Terminplan
-YOUR_NEXT_APPOINTMENT=Ihr n\u00E4chster Termin
-APP_WILL_BE_FOUND_HERE=wird hier zu finden sein...
-STATISTICS_FOR_LAST_WEEK=Statistiken f\u00FCr vorige Woche
-BG_STATISTICS=BZ Statistiken
-BU_STATISTICS=KH Statistiken
-BU_PER_DAY=KH pro Tag
-AVG_MEAL_SIZE=KH pro Mahlzeit
-MEALS_PER_DAY=Mahlzeiten pro Tag
-STATISTICS=Statistiken
-PER_DAY=pro Tag
-AVG_DOSE_SIZE=Mittl. Dosis
-DOSES_PER_DAY=Dosen pro Tag
-OTHER_INFO=Sonstiges
-STOCK=Bestand
-STOCK_DATA_HERE=Daten zu Ihrer medizinischen Ausr\u00FCstung
-STO_WILL_BE_FOUND_HERE=wird hier zu finden sein...
-NOT_YET=BISHER NOCH NICHT!
-BOLUS_INSULIN_SHORT=Bolus
-BASAL_INSULIN_SHORT=Basal
-AVERAGE=Durchschnitt
-DOSES=Dosen
-ALL_SETTINGS_ON_PAGE_NEED_RESTART=All settings on this page will take effect after restart!
-
-#
-# Hba1c Dialog [1]
-#
-CALCULATED_HBA1C=Errechneter HbA1c
-
-#
-# Configuration [1]
-#
-APPLY=Anwenden
-ERROR=Fehler
-INVALID_NAME=Ung\u00FCltiger Name
-PREFERENCES=Einstellungen
-GENERAL=Allgemeines
-MEDICAL_DATA=Medizinische Daten
-COLORS_AND_FONTS=Farbe & Schrift
-RENDERING_QUALITY=Darstellungsqualit\u00E4t
-SOME_VALUES_CHANGED_LIKE_TO_SAVE=Einige Werte haben sich ge\u00E4ndert. Wollen Sie diese speichen?
-VALUES_CHANGED=Ge\u00E4nderte Werte
-CHOOSE_A_COLOR=W\u00E4hlen Sie eine Farbe
-BG_HIGH_ZONE=\u00DCberzuckerbereich
-BG_TARGET_ZONE=Zielbereich
-BG_LOW_ZONE=Unterzuckerbereich
-BG_AVERAGE=BZ Mittelwert
-INS_SLASH_BU_QUOTIENT=Ins/KH
-NAME=Name
-ABBR=Abk.
-HIGH_BG=\u00DCberzuckergrenze
-LOW_BG=Unterzuckergrenze
-TARGET_HIGH_BG=Obergrenze Zielbereich
-TARGET_LOW_BG=Untergrenze Zielbereich
-INSULIN_SETTINGS=Insulineinstellungen
-BLOOD_GLUCOSE_SETTINGS=Blutzuckereinstellungen
-BLOOD_GLUCOSE_UNIT_SETTING=BZ-Einheiteneinstellungen
-BLOOD_GLUCOSE_SETTINGS_1=BZ-Einstellungen (mg/dl)
-BLOOD_GLUCOSE_SETTINGS_2=BZ-Einstellungen (mmol/l)
-HOST=Host
-PORT=Port
-USERNAME=Benutzername
-PASSWORD=Passwort
-OPTIONS=Optionen
-ANTIALIASING=Kantengl\u00E4ttung
-COLOR_RENDERING=Farbdarstellung
-DITHERING=Dithering
-FRACTIONAL_METRICS=Fractional Metrics
-INTERPOLATION=Interpolation
-TEXT_ANTIALIASING=Kantengl\u00E4ttung Schrift
-RENDERING=Darstellung
-DE=Deutsch
-EN=Englisch
-SI=Slowenisch
-YOUR_LANGUAGE=Ihre Sprache
-COLOR_SCHEME_SELECT=Farbschemawahl
-SELECTED_COLOR_SCHEME=Gew\u00E4hltes Farbschema
-NEW_SCHEME=Neues Schema
-COLORS=Farben
-COLOR_SCHEME_PREDEFINED=Die Farbe eines vordefinierten Farbschemas kann nicht ver\u00E4ndert werden.
-USE_AS_TEMPLATE=Folgendes Schema als Vorlage benutzen
-CREATE_NEW_SCHEME=Neues Schema erstellen
-EDIT_DELETE_SCHEME=Schema Bearbeiten/L\u00F6schen
-TYPE_NAME_BEFORE=Geben Sie den Name ein und klicken Sie OK.
-SCHEME_NAME_ALREADY_USED=Dieses Schema existiert bereits!\nBitte w\u00E4hlen Sie einen anderen Namen.
-PREDEFINED_SCHEME_CANT_BE_CHANGED=Der Name eines vordefinierten Schemas kann nicht ge\u00E4ndert, und das Schema nicht gel\u00F6scht werden!
-EXECUTABLE_FILES=Ausf\u00FChrbare Dateien (*.exe)
-SELECT_PDF_VIEWER=Wahl des PDF-Betrachters
-COLOR_PREVIEW=Farbschema Vorschau
-ACTION=Aktion
-ACTION_DELETE=L\u00F6schen
-ACTION_EDIT=Bearbeiten
-SELECTED_SCHEME=Aktives Schema
-NEW_NAME=Neuer Name
-SELECT_ACTION_OR_CANCEL=Sie sollten eine Aktion oder 'Abbrechen' w\u00E4hlen
-GENERAL_SETTINGS=Allgemeine Einstellungen
-DATABASE_SETTINGS=Datenbank
-DATABASE_SETTINGS_DESC=<html><body><b><i>Warnung! \u00C4ndern Sie diese Einstellung nur wenn Sie wissen, was Sie tun!</i></b><br>Die meisten Daten und Einstellungen befinden sich in der Datenbank selbst. In der Konfigurationsdatei befinden sich nur Einstellungen zu Sprache, Datenbank und Look&Feel.<br><i>\u00C4nderungen werden sich erst nach einem Neustart auswirken.</i></body></html>
-SELECTED_DATABASE=Gew\u00E4hlte Datenbank
-LAF_SETTINGS=Look & Feel Einstellungen
-LAF_SETTINGS_DESC=<html><body><i>\u00C4nderungen werden sich erst nach einem Neustart von GGC auswirken.</i></body></html>
-SELECTED_LAF_TYPE_NAME=L&F w\u00E4hlen (Name)
-SELECTED_LAF_TYPE_CLASS=L&F w\u00E4hlen (Klasse)
-SELECTED_SKINLF_DEF=Gew\u00E4hlter Skin f\u00FCr SkinLF
-SELECT_SKINLF_SKIN=W\u00E4hlen Sie eine Oberfl\u00E4che f\u00FCr die Skin L&F-Bibliothek
-SELECT=Ausw\u00E4hlen...
-BASIC_SETTINGS=Grundeinstellungen
-EMPTY_VALUE=Leerer Wert
-PDF_VIEWER_SETTINGS=PDF-Betrachter Einstellungen
-PDF_VIEWER=PDF-Betrachter
-BROWSE=Ausw\u00E4hlen...
-LUNCH_START_TIME=Mittagszeit ab (hh:mm)
-DINNER_START_TIME=Abendszeit ab (hh:mm)
-NIGHT_START_TIME=Nacht ab (hh:mm)
-
-# Mode
-MODE=Modus
-APPLICATION_MODE=Anwendungsmodus
-PEN_INJECTION_MODE=Pen-/Spritz-Modus
-PUMP_MODE=Pumpenmodus
-APPLICATION_MODE_DESC=<html><body>Setting mode, won't prevent usage of other part of application, it will just select right data for statistic display, and set correct icons in toolbar.</body></html>
-PEN_INJECTION_MODE_SETTINGS=Pen-/-Spritzmodus Einstellungen
-PUMP_MODE_SETTINGS=Pumpenmodus Einstellungen
-BASAL_PRECISSION=Basaldosis Genauigkeit
-BOLUS_PRECISSION=Bolusdosis Genauigkeit
-MAX_BASAL=Max Basaldosis
-MAX_BOLUS=Max Bolusdosis
-TBR_TYPE_SELECTOR=Tempor\u00E4rer Basalratentyp
-TBR_TYPE_BOTH=Beide
-TBR_TYPE_UNIT=Einheit (U)
-TBR_TYPE_PROC=Prozent (%)
-TBR_TYPE_CHOICE=Choice in GGC
-PROCENT_MIN=Prozent Min.
-UNIT_MIN=Einheit Min.
-TASK_MIN=Min
-TASK_MAX=Max
-TASK_STEP=Schritt
-
-# Language
-LANGUAGE=Sprache
-LANGPACK_VERSION=Sprachpaket
-LANG_WITH_HELP=Sprachen mit Hilfe
-LANG_WITHOUT_HELP=Sprachen ohne Hilfe
-SELECT_LANGUAGE=Sprachwahl
-NO_HELP_AVAILABLE=Keine Hilfe verf\u00FCgbar
-HELP_AVAILABLE=Hilfe verf\u00FCgbar
-LANG_DESC=<html><body>Die Übersetzung der Anwendung findet getrennt von deren Entwicklung statt, weshalb die Übersetzung meistens etwas veraltet ist. Übersetzungen werden vor allem von Freiwilligen außerhalb des Projekts gepflegt, deshalb sind wir nicht direkt für Fehler in der Übersetzung, oder wann die n\u00E4chste Übersetzung verfügbar ist verantwortlich. Wenn Sie Fehler finden, können Sie uns gerne kontaktieren und wir werden sie baldmöglichst beheben.<br>Wenn etwas noch nicht übersetzt wurde, wird der Ausdruck in der Standardsprache (Englisch) angezeigt.<br>Wenn Sie bei der Übersetzung helfen wollen, kontaktieren Sie uns bitte via E-Maill: gg...@at....</body></html>
-NOTE_RESTART=<html><body><b>WarnUng:</b> Diese Einstellung wird erst nach dem nächsten Neustart der Anwendung wirksam.</body></html>
-NOTE_LANG_FEATURE_NOT_WORKING=<html><body><font color="red"><b>Warnung:</b>Dieses Feature ist noch nicht aktiviert. Bis auf weiteres verwenden Sie bitte die Sprachwahl im Allgemeines-Reiter. Wenn dieses Feature aktiviert wird, wird diese Warnung und die Sprachwahl im Allgemeines-Reiter entfernt.</font></body></html>
-
-#
-# ggc.util [6]
-#
-UNNAMED_USER=Unbekannter Benutzer
-THIS_FILE_WAS_AUTOMATICALY_GENERATED=Diese Datei wurde automatisch generiert.
-YOUR_VERSION=Ihre Version
-AVAILABLE_VERSION=Verf\u00FCgbare Version
-NO_NEW_VERSION=Keine aktuellere Version verf\u00FCgbar.
-CHECK_FOR_NEW_VERSION=Auf neue Version \u00FCberpr\u00FCfen
-HOST_UNAVAILABLE_INFO=Server nicht verf\u00FCgbar
-HOST_UNAVAILABLE_MSG=Konnte nicht mit ggc.sourceforge.net verbinden!
-
-#
-# Graphs [2]
-#
-DAYS_WITH_READINGS_0_1=Tage mit 0 oder 1 Messung
-DAYS_WITH_READINGS_2_3=Tage mit 2 oder 3 Messungen
-DAYS_WITH_READINGS_4_5=Tage mit 4 oder 5 Messungen
-DAYS_WITH_READINGS_6_7=Tage mit 6 oder 7 Messungen
-DAYS_WITH_READINGS_MORE_7=Tage mit 8+ Messungen
-AXIS_TIME_LABEL=Zeit (Std)
-AXIS_VALUE_LABEL=BZ (%s)
-FORMAT_DATE_DAYS=dd.MM.yyyy
-FORMAT_DATE_HOURS=HH:mm
-GRAPH_NO_DATA_AVAILABLE_CHANGE=Keine Daten verf\u00FCgbar. W\u00E4hlen Sie eine andere Zeitspanne und/oder zu zeichnende Elemente und klicken Sie "Zeichnen"!
-
-#
-# Database Tool [5]
-#
-DB_TOOL=Database Hibernate Tool
-DB_CONFIGURATION=Datenbankeinstellungen
-DB_PRESS_HELP=Klicken Sie auf den Hilfe-Knopf um detaillierte Informationen zu den Verbindungseinstellungen zu bekommen.
-DB_CONFIG_DESC=<html><head></head><body><p>This is for configuring your database to work with your application. Please set all settings correctly, and then try to connect to the database (you must have the database configured with the correct username, password and database name). If the connection is successful, your settings are OK.</p><p>Now you are ready to create tables with the help of hibernate. You must have all jars included in the classpath before you start the second option (Init Database). You must be careful. If you have the database already set up and filled, 'Init Database' will destroy all data.<p><body><html>
-DATABASE_TYPE=DB-Typ
-DATABASE_CLASSNAME=DB-Klasse
-HIBERNATE_DIALECT=Hibernate Dialekt
-JDBC_URL=JDBC URL
-HOSTNAME=Hostname
-DATABASE=Datenbank
-
-#
-# Printing - Base [2]
-#
-PRINTING=Drucken
-TYPE_OF_REPORT=Berichttyp
-SELECT_YEAR_AND_MONTH=Monat w\u00E4hlen
-REPORT_FOOTER=Dieser Bericht stammt von "GGC - GNU Gluco Control", frei verf\u00FCgbar unter http://ggc.sourceforge.net
-FOR=F\u00FCr
-PRINTING_SETTINGS_NOT_SET=<html>Druckeinstellungen (PDF-Anzeigeprogramm) nicht gesetzt oder inkorrekt.</html>
-PRINTING_SETTINGS_NOT_SET_SOL=<html>Gehen Sie zu Werkzeuge->Einstellungen->Drucken<br>und geben Sie den Pfad zum PDF-Anzeigeprogramm an.</html>
-PDF_VIEVER_RUN_ERROR=<html>Fehler beim Aufruf des PDF-Anzeigeprogramms:<br>Unbekannter Fehler</html>
-SELECT_STARTING_RANGE=Select starting range
-SELECT_ENDING_RANGE=Select ending range
-
-#
-# Printing [2]
-#
-INS_SHORT=Ins
-CH_SHORT=KH
-BREAKFAST=Fr\u00FChst\u00FCck
-LUNCH=Mittagessen
-DINNER=Abendessen
-NIGHT=Nacht
-SIMPLE_MONTHLY_REPORT=Einfacher Bericht (monatl.)
-EXTENDED_MONTHLY_REPORT=Ausf\u00FChrlicher Bericht (monatl.)
-FOOD_MENU_BASE=Food Menu Base (CH only)
-FOOD_MENU_EXT_I=Extended Food Menu I (CH,Ins)
-FOOD_MENU_EXT_II=Extended Food Menu II (CH,Ins,BG)
-FOOD_MENU_EXT_III=Extended Food Menu III (CH,Ins,BG,kJ)
-
-#
-# Stocks [5]
-#
-STOCKS=Bestand
-
-#
-# Appointments [5]
-#
-APPOINTMENTS=Arzttermine
-
-#
-# About [1]
-#
-SYSTEM_PROPERTIES=Systemeigenschaften
-ABOUT=\u00DCber
-PROPERTY=Eigenschaft
-VALUE=Wert
-LICENCE=Lizenz:
-CREDITS=Danksagungen
-LIBRARIES=Bibliotheken
-MAIN=Main
-ABOUT_GGC=\u00DCber GNU Gluco Control
-GGC_DEVELOPMENT_TEAM=GGC-Entwicklungsteam
-SEE_CREDITS=(siehe Danksagungen)
-GGC_TITLE=GNU Gluco Control
-CURRENT_DEVELOPERS=Aktive Entwickler
-PREVIOUS_DEVELOPERS=Ehemalige Entwickler
-
-#
-# Doctor types [5]
-#
-ADDICTION_MEDICINE=Addiction Medicine
-ADOLESCENT_MEDICINE=Adolescent Medicine
-AIDS_HIV_CARE=AIDS/HIV Care
-ANESTHESIOLOGY=Anesthesiology
-ASTHMA_ALLERGY_IMMUNOLOGY=Asthma, Allergy & Immunology
-BREAST_CANCER_SURGERY=Brustkrebschirurgie
-CARDIAC_SURGERY=Herzchirurgie
-CHILD_CARE=Child care (pediatrics)
-CARDIOLOGY=Kardiologie
-COLORECTAL_SURGERY=Colorectal Surgery
-COSMETIC_SURGERY=Cosmetic Surgery
-CRITICAL_CARE=Critical Care
-DENTAL_SPECIALTIES=Dental Specialties
-DERMATOLOGY=Dermatologie
-DIABETES=Diabetes
-EMERGENCY_MEDICINE=Emergency Medicine
-ENDOCRINOLOGY=Endokrinologie
-EPILEPSY=Epilepsie
-FAMILY_MEDICINE=Family Medicine
-GASTROENTEROLOGY=Gastroenterologie
-GENERAL_SURGERY=Allgemeine Chirurgie
-GENERAL_INTERNAL_MEDICINE=General Internal Medicine
-GERIATRICS=Geriatrics
-GYNECOLOGIC_ONCOLOGY=Gyn\u00E4kologische Onkologie
-GYNECOLOGY=Gyn\u00E4kologie
-HAND_SURGERY=Hand Surgery
-HEAD_AND_NECK_SURGERY=Head and Neck Surgery
-HEADACHE=Headache
-HEMATOLOGY=H\u00E4matologie
-HOSPITAL_INTERNAL_MEDICINE=Hospital Internal Medicine
-INFECTIOUS_DISEASES=Infectious Diseases
-INFERTILITY_MEDICINE=Infertility Medicine
-INTERNAL_MEDICINE=Internal Medicine
-LABORATORY_MEDICINE=Laboratory Medicine
-MIDWIFE=Midwife (CNM)
-MEDICAL_GENETICS=Medical Genetics
-METABOLISM=Stoffwechsel
-MOVEMENT_DISORDERS=Movement Disorders
-NEONATOLOGY=Neonatology
-NEPHROLOGY=Nephrologie
-NEUROLOGY=Neurologie
-NEURO_OPTHALMOLOGY=Neuro-ophthalmology
-NEUROSURGERY=Neurochirurgie
-NUCLEAR_MEDICINE=Nuclear Medicine
-NUTRITION_MEDICINE=Nutrition Medicine
-OBSTETRICS_AND_GYNECOLOGY=Geburtshilfe und Gyn\u00E4kologie
-ONCOLOGY_MEDICAL=Oncology Medical
-ONCOLOGY_RADIATION=Oncology Radiation
-OPTHALMOLOGY=Augenheilkunde
-ORAL_MAXILLOFACIAL_SURGERY=Oral/Maxillofacial Surgery
-ORTHOPEDIC_SURGERY=Orthopedic Surgery
-OTOLARYNGOLOGY=Otolaryngology (ENT)
-OTOLOGY=Otology
-PAIN_MANAGEMENT=Pain Management
-PATHOLOGY=Pathologie
-PEDIATRIC=Kinderheilkunde
-PEDIATRIC_SPECIALISTS=Pediatric Specialists
-PERINATOLOGY=Geburtshilfe
-PHYSIATRY=Physiatry
-PHYSICAL_REHABILITATION=Physical Rehabilitation
-PLASTIC_RECONSTRUCTIVE_SURGERY=Plastic/Reconstructive Surgery
-PODIATRY=Fu\u00DForthop\u00E4die
-PROSTATE_CARE=Prostate Care
-PSYCHIATRY=Psychiatrie
-PSYCHOLOGY=Psychologie
-PULMONARY_MEDICINE=Pulmonary Medicine
-RADIOLOGY=Radiologie
-RADIATION_ONCOLOGY=Radiation Oncology
-REPRODUCTIVE_ENDOCRINOLOGY_INFERTILITY=Reproductive Endocrinology and Infertility
-RHEUMATOLOGY=Rheumatologie
-SLEEP_DISOREDERS=Schlafst\u00F6rungen
-SPORTS_MEDICINE=Sportmedizin
-THORACIC_SURGERY=Thoracic Surgery
-TRANSPLANT=Transplantation
-UROLOGY=Urologie
-VASCULAR_SURGERY=Gef\u00E4\u00DFchirurgie
-
-#
-# Doctor [5]
-#
-DOCTORS=\u00C4rzte
-FILTER=Filter
-FILTER_VISIBLE=Sichtbare
-FILTER_ALL=Alle
-
-#
-# Ratio's: Base [1]
-#
-RATIO_BASE=Grundverh\u00E4ltnis
-INSULIN_CARB_RATIO=Insulin/KH-Verh\u00E4ltnis
-SENSITIVITY_FACTOR_LONG=<html>Empfindlichkeitsfaktor<br>(Insulin/BZ-Verh\u00E4ltnis)</html>
-FILL_RATIO_ENTRIES=<html>Bitte f¨llen Sie die ersten beiden Einträge dieses Formulars aus,<br>oder brechen Sie den Vorgang ab.</html>
-
-#
-# Ratio's: Extended [1]
-#
-RATIO_EXTENDED=Erweitertes Verh\u00E4ltnis
-RATIO_ENTRY_ADD=Neuer Verh\u00E4ltniseintrag
-RATIO_ENTRY_EDIT=Verh\u00E4ltniseintrag bearbeiten
-TIME_FROM=Von
-TIME_TILL=Bis
-PROCENT_OF_BASE=Prozent (der Basis)
-PROCENT_OF_BASE_SHORT=% der Basis
-CH_INSULIN_RATIO_SHORT=KH/Ins
-BG_INSULIN_RATIO_SHORT=BZ/Ins
-BG_OH_RATIO_SHORT=BZ/KH
-CHECK_RATIOEXTENDED_DATA_OK=<html><body>You filled all data about<br>extended ratio's for whole<br>day successfuly !<br></body></html>
-CHECK_RATIOEXTENDED_FAILED=<html><body>You filled data about extended<br>ratio's incorrectly. All minutes<br>of the day must be included (from<br>0:00 till 23:59)!<br></body></html>
-
-#
-# Ratio's: Calculator [4]
-#
-RATIO_CALCULATOR=Verh\u00E4ltnisrechner
-TYPE_SOURCE_DATA=Art der Quelldaten
-TYPE_SOURCE_MANUAL=Manuelle Daten
-TYPE_SOURCE_DB=Datenbank Daten
-TDD_FOR_CALCULATION=Total Daily Dose (TDD) For Calculation
-RATIO_TIME_SELECT_DESC=<html>Sie müssen einen Zeitraum für die Rechnung wählen. Sind Ihre Werte stabil (keine größeren Änderungen), dürfte ein größerer Zeitraum bessere Resultate liefern. Gibt es jedoch größere Änderungen, oder befinden Sie sich mitten in einer Bolus-/Basalratenneueinstellung, sollten Sie einen kleineren Zeitraum wählen.</html>
-2_WEEKS=2 Wochen
-3_WEEKS=3 Wochen
-DB_DATA_STATUS=Db Data Status
-DB_DATA_NOT_READY=Nicht bereit!
-DB_DATA_READY=Bereit
-GET_DATA=Daten abrufen
-RULE_500=500er-Regel (schnellwirkende Insuline)
-RULE_450=450er-Regel (Normalinsuline)
-RULE_300=300er-Regel (kleine Kinder)
-RULE_1800=1800er-Regel (schnellwirkende Insuline)
-RULE_1500=1500er-Regel (Normalinsuline)
-SELECT_RANGE=Zeitraum w\u00E4hlen
-SELECT_RULE=Regel w\u00E4hlen
-SENSITIVITY_FACTOR=Empfindlichkeitsfaktor
-CALCULATION=Rechnung
-INS_CH_RATIO_PROC=1E Insulin f\u00FCr %s g KH
-INS_BG_RATIO=Ins/BZ-Verh\u00E4ltnis
-INS_BG_RATIO_PROC=1E Insulin verringert den BZ um %s %s
-CH_BG_RATIO=KH/BZ-Verh\u00E4ltnis
-CH_BG_RATIO_PROC=1 %s Zunahme f\u00FCr %s g KH
-TDD_MUST_BE_GREATER_THAN_ZERO=<html><body>Total Daily Dose (TDD) must be greater than<br>zero. Recheck the value and start calculation<br>again.</body></html>
-RATIO_CALCULATOR_NOT_IMPLEMENTED=<html><body>This part of Ratio Calculator not implemented<br>yet.</body></html>
-RATIOS_NOT_DONE=<html><body>You never run calculation of Ratio's.<br>Either run it and click OK to transfer<br>calculated data, or use Cancel to exit.</body></html>
-RATIO_DB_IMPORT_NA=<html><body>Importing data from Db, doesn't work yet.<br>You can only enter data manually.</body></html>
-
-#
-# Bolus Helper [1]
-#
-BOLUS_HELPER=Bolus Helper
-READ_RATIOS=Read Ratios
-CH_INSULIN_RATIO=CH / Insulin Ratio
-BG_INSULIN_RATIO=BG / Insulin Ratio
-BG_OH_RATIO=BG / CH Ratio
-CORRECTION_DOSE=Correction Dose
-CARB_DOSE=Dose for covering CH
-TOGETHER=Together
-TOGETHER_ROUNDED=Together (rounded)
-NO_BG_MEASURE=No BG measurment.
-NO_CARBS_DEFINED=CH not set.
-UNIT_SHORT=U
-
-#
-# Tools [1]
-#
-METERS_PLUGIN=Messger\u00E4te Plug-in
-PUMPS_PLUGIN=Pumpen Plug-in
-CGMS_PLUGIN=CGMS Plug-in
-NUTRITION_PLUGIN=Nutrition Tool Plug-in
-STATUS_NOT_INSTALLED=Nicht installiert
-STATUS_NOT_AVAILABLE=N/A (ab Version %s verf\u00FCgbar)
-STATUS_INSTALLED=Installiert (Version %s)
-PLUGIN_NOT_INSTALLED_OR_AVAILABLE=%s nicht installiert und/oder verf\u00FCgbar.
-
-#
-# Backup/Restore [1]
-#
-
-# backup
-BACKUP=Sicherung
-BACKUP_DB_TITLE=Sicherung der GGC-Datenbank
-BACKUP_DB_TITLE_SHORT=Datenbanksicherung
-SELECT_ELEMENTS_TO_BACKUP=W\u00E4hlen Sie die zu sichernden Elemente
-
-# progress
-TOTAL_PROGRESS=Fortschritt insgesamt
-BACKUP_NOT_STARTED_YET=Sicherung wurde noch nicht gestartet.
-CURRENT_TASK=Aktuelle Aufgabe
-NO_TASK_STARTED=Keine Aufgabe
-
-# elements
-GGC_BACKUP=GGC-Sicherung
-NUTRITION_OBJECTS=Nahrungsobjekte
-USER_FOOD_GROUPS=Benutzer-Nahrungsgruppen
-MEAL_GROUPS=Mahlzeit-Gruppen
-FOODS=Ern\u00E4hrung
-TASK=Aufgabe
-SETTINGS=Einstellungen
-CONFIGURATION=Configuration
-COLOR_SCHEMES=Color Schemes
-
-# restore
-RESTORE_DB_TITLE=Wiederherstellung der GGC-Datenbank
-RESTORE_DB_TITLE_SHORT=Datenbankwiederherstellung
-RESTORE=Wiederherstellen
-RESTORE_NOT_STARTED_YET=Wiederherstellung wurde noch nicht gestarted.
-RESTORE_SELECTOR_DESC=<html>Select file from which you wish to do restore. You can either select text file (which contains data for database) or you can select zip file containing several files (made by our 'Backup' option). In next dialog you can select which elements you wish to restore and any special options.<br><br><b>Notes:</b><br>1. Files will be not checked at this time. Check is on restore only.<br>2. Restore is full. This means that all previous data will be deleted. In some cases there is exception to this rule, but only when unlinked data is used (which is rare in itself). You will learn more about this exceptions (if there are any) on next dialog.</html>
-SELECT_ELEMENTS_TO_RESTORE=Elemente zum Wiederherstellen w\u00E4hlen:
-DAILY_VALUES_APPEND=<html>Wollen Sie diese Werte an die vorhandenen Tageswerte anhängen? Falls die Datenbank diese Einträge bereits enthält, könnten diese dadurch dupliziert werden. Neue Einträge werden ohne Vergleich mit bereits existierenden hinzugefügt.</html>
-FILE_FILTER_DBE=*.dbe - Datenbank Export Dateien
-FILE_FILTER_ZIP=*.zip - Archiv (sollte *.dbe enthalten)
-SELECT_FILE_TO_RESTORE=Wiederherzustellende Datei ausw\u00E4hlen
-NEXT_STEP=Weiter
-
-#
-# Update [1]
-#
-LEGEND=Legende
-NEWEST=Neueste Version
-NOT_UPDATED=Nicht aktualisiert
-NOT_UPDATABLE=Nicht aktualisierbar
-UNKNOWN_STATUS=Unbekannter Status
-CHECK_SERVER=Server \u00FCberpr\u00FCfen
-RUN_UPDATE=Aktualisieren!
-CURRENT_VERSION=Aktuelle Version
-SERVER_VERSION=Version auf dem Server
-UPDATEABLE=Aktualisierbarkeit
-UPDATE_APPLICATION=Aktualisierung der Anwendung
-UPDATE_SERVER_NA=<html><h2>Update Server</h2><br><br>Die Update-Server-Seite wurde noch nicht implementiert. Dieser Dialog existiert zur Zeit nur, damit die aktuelle Version der Bibliotheken überprüft werden kann.<br>Der Server sollte bis September 2008 fertig und betriebsbereit sein. Bitte sehen Sie auf http://ggc.sourceforge.net nach, ob eine neue Version verfügbar ist.<br></html>
-NO_UPDATE_FOUND=No update was found on server !
-UPDATE_FOR_HIGHER_DB_FOUND=<html><body>No update for current database was found !<br>But there is version of application (%s)<br>for higher version of database. Since we<br>don't support update of database yet, we<br>can't continue update.<br></body></html>
-UPDATE_FOUND_VERSION=<html><body>We found update (%s) for your<br>version of database.<br>Do you wish to continue?</body></html>
-UPDATE_FOUND_ALSO_HIGHER_DB=<html><body>We found two updates. One with higher version of<br>database (%s) and other with the same. Since we<br>don't support update of database yet, we can update<br>only to version %s.<br>Do you wish to continue?</body></html>
-STATUS_UPD_FAILED_DATA=Data problem.
-STATUS_UPD_FAILED_COMM_ERROR=Communication failed.
-STATUS_UPD_NO_VALID_UPDATE=No valid update found.
-STATUS_UPD_NO_UPDATE=No update found.
-STATUS_UPD_UPDATE_FOUND=Update found.
-SERVER_STATUS=Server status
-NO_STATUS=No status
-
-#
-# Db Check [1]
-#
-DB_ERROR_ON_LOAD=Fehler beim initialisieren der Datenbank
-DB_HEADER=<html>Das DB-Prüfwerkzeug hat festgestellt, dass Sie eine falsche Datenbankversion verwenden.<br><br>Aktuelle DB-Version: %s<br>Benötigte DB-Version: %s<br><br>%s<html>
-DB_VERSION_LOWER=Die gegenw\u00E4rtige Version ist kleiner als die ben\u00F6tigte. Das bedeutet,<br>dass Sie zu einer Version geupdated haben, die selbst geupdated werden muss.<br>Um diesen Fehler zu beheben, m\u00FCssen Sie das Verzechnis gehen, das die Sicherungskopie Ihres GGCs enh\u00E4lt<br>(wie in der Anleitung beschrieben), dieses ausf\u00FChren und eine Sicherung erstellen<br>(falls Sie das nicht schon gemacht haben). Danach m\u00FCssen Sie das init_db Skript ausf\u00FChren,<br>das die neue Version der Datenbank erstellen wird. Starten Sie GGC und stellen Sie die Datenbank<br>anhand der vorher erstellten Sicherungskopie wieder her.<br>Ihre Applikation sollte jetzt wieder alle Daten enthalten.<br>
-DB_VERSION_HIGHER=Die gegenw\u00E4rtige Version ist gr\u00F6\u00DFer als die ben\u00F6tigte. Dies kann zwei Gr\u00FCnde haben:<br><br>1. Es gabe ein Problem bei der Installation oder beim Update (Dateien fehlten oder das Update wurde unterbrochen).<br>Nach einem Teil-Update wurde die Datenbank geupdated. War dies der Fall, muss das Update wiederholt<br>(ALLE Dateien neu kopiert/installiert) und GGC erneut ausgef\u00FChrt werden.<br><br>2. Ein Downgrade wurde versucht. Dies wird nicht unterst\u00FCzt. Wollen Sie eine \u00E4ltere Version benutzen,<br>m\u00FCssen Sie eine komplette Sicherungskopie erstellen, die Anwendung in ein anderes Verzeichnis installieren und<br>die Daten wiederherstellen. Dieses Problem kann auch durch das Einspielen eines Updates behoben werden.<br>
-
-#
-# Error Dialog [1]
-#
-ERROR_DIALOG=Fehlerdialog
-DETAILS=Details
-ERROR_SOLUTION=L\u00F6sung
-EXCEPTION_LOG=Exception (Stacktrace)
-SEND_TO_SERVER=An den Server senden
-SENDING_TO_SERVER=Sende an den Server...
-SEND_TO_SERVER_TEXT=<html>Diese Funktionalität wurde noch nicht implementiert.<br>Später können Sie uns hiermit Fehlerberichte senden und<br>Lösungsvorschläge erhalten (falls welche existieren).<br></html>
-NO_SOLUTION_AVAILABLE=<html>Keine Lösung verfügbar.</html>
-
-#
-# Plug-In [1]
-#
-DEVICE_METER=Meter
-DEVICE_PUMP=Pump
-DEVICE_CGMS=CGMS
-PLUGIN_NOT_INSTALLED=Plugin not installed.
-PLUGIN_NA=Plugin not available.
-PLUGIN_NO_FUNCTIONALITY=This functionality is not supported.
-DEVICES_USED=Devices Used (Configured)
-PLUGINS=Plug-ins
-PLUGIN_NOT_ACTIVE=%s is not active or present, so this operation is not possible !
-
-#
-# File Import [2]
-#
-IMPORT_FILE=Datei importieren
Added: trunk/ggc-core/src/GGC_de.properties
===================================================================
--- trunk/ggc-core/src/GGC_de.properties (rev 0)
+++ trunk/ggc-core/src/GGC_de.properties 2011-10-20 15:27:47 UTC (rev 1205)
@@ -0,0 +1 @@
+link ../../translation/files/translation/GGC_de.properties
\ No newline at end of file
Property changes on: trunk/ggc-core/src/GGC_de.properties
___________________________________________________________________
Added: svn:special
+ *
Modified: trunk/ggc-language_tool/active_translations/de/GGC_de.config
===================================================================
--- trunk/ggc-language_tool/active_translations/de/GGC_de.config 2011-10-05 13:28:50 UTC (rev 1204)
+++ trunk/ggc-language_tool/active_translations/de/GGC_de.config 2011-10-20 15:27:47 UTC (rev 1205)
@@ -3,7 +3,7 @@
EDIT__STATUS=2
NEW__STATUS=1
EDIT_DEL_SHORT__STATUS=1
-FEATURE__STATUS=0
+FEATURE__STATUS=1
IMPLEMENTED_VERSION__STATUS=1
OR__STATUS=1
INFORMATION__STATUS=1
@@ -17,12 +17,12 @@
NO_NAME__STATUS=1
TIME__STATUS=1
BG__STATUS=1
-INS_1__STATUS=1
-INS_2__STATUS=1
-INS_3__STATUS=1
-INSULIN_1__STATUS=1
-INSULIN_2__STATUS=1
-INSULIN_3__STATUS=1
+INS_1__STATUS=2
+INS_2__STATUS=2
+INS_3__STATUS=2
+INSULIN_1__STATUS=2
+INSULIN_2__STATUS=2
+INSULIN_3__STATUS=2
BU__STATUS=1
ACT__STATUS=2
COMMENT__STATUS=1
@@ -32,9 +32,9 @@
DATETIME__STATUS=1
PUMP_INSULIN__STATUS=1
BG_TARGET__STATUS=1
-NO_EXPRESSIVENESS__STATUS=1
-LITTLE_EXPRESSIVENESS__STATUS=1
-STANDARD_EXPRESSIVENESS__STATUS=1
+NO_EXPRESSIVENESS__STATUS=2
+LITTLE_EXPRESSIVENESS__STATUS=2
+STANDARD_EXPRESSIVENESS__STATUS=2
GOOD_EXPRESSIVENESS__STATUS=1
CH_LONG__STATUS=1
ACTIVITY__STATUS=1
@@ -331,16 +331,16 @@
DINNER_START_TIME__STATUS=2
NIGHT_START_TIME__STATUS=2
MODE__STATUS=1
-APPLICATION_MODE__STATUS=1
-PEN_INJECTION_MODE__STATUS=1
-PUMP_MODE__STATUS=1
-APPLICATION_MODE_DESC__STATUS=0
+APPLICATION_MODE__STATUS=2
+PEN_INJECTION_MODE__STATUS=2
+PUMP_MODE__STATUS=2
+APPLICATION_MODE_DESC__STATUS=2
PEN_INJECTION_MODE_SETTINGS__STATUS=1
PUMP_MODE_SETTINGS__STATUS=1
BASAL_PRECISSION__STATUS=1
BOLUS_PRECISSION__STATUS=1
-MAX_BASAL__STATUS=1
-MAX_BOLUS__STATUS=1
+MAX_BASAL__STATUS=2
+MAX_BOLUS__STATUS=2
TBR_TYPE_SELECTOR__STATUS=1
TBR_TYPE_BOTH__STATUS=1
TBR_TYPE_UNIT__STATUS=1
@@ -613,7 +613,7 @@
UPDATEABLE__STATUS=2
UPDATE_APPLICATION__STATUS=2
UPDATE_SERVER_NA__STATUS=2
-NO_UPDATE_FOUND__STATUS=0
+NO_UPDATE_FOUND__STATUS=2
UPDATE_FOR_HIGHER_DB_FOUND__STATUS=0
UPDATE_FOUND_VERSION__STATUS=0
UPDATE_FOUND_ALSO_HIGHER_DB__STATUS=0
@@ -639,10 +639,10 @@
DEVICE_METER__STATUS=0
DEVICE_PUMP__STATUS=0
DEVICE_CGMS__STATUS=0
-PLUGIN_NOT_INSTALLED__STATUS=0
-PLUGIN_NA__STATUS=0
-PLUGIN_NO_FUNCTIONALITY__STATUS=0
-DEVICES_USED__STATUS=0
+PLUGIN_NOT_INSTALLED__STATUS=2
+PLUGIN_NA__STATUS=2
+PLUGIN_NO_FUNCTIONALITY__STATUS=2
+DEVICES_USED__STATUS=2
PLUGINS__STATUS=2
-PLUGIN_NOT_ACTIVE__STATUS=0
+PLUGIN_NOT_ACTIVE__STATUS=1
IMPORT_FILE__STATUS=2
Modified: trunk/ggc-language_tool/active_translations/de/GGC_de.properties
===================================================================
--- trunk/ggc-language_tool/active_translations/de/GGC_de.properties 2011-10-05 13:28:50 UTC (rev 1204)
+++ trunk/ggc-language_tool/active_translations/de/GGC_de.properties 2011-10-20 15:27:47 UTC (rev 1205)
@@ -5,16 +5,16 @@
# ### Language: German ###
# ### Created by: Reinhold Rumberger (ru...@us...)###
# ### Version: 0.5 ###
-# ### Last change: 04.07.2011 11:56:01 ###
+# ### Last change: 20.10.2011 14:39:18 ###
# ######################################################################
#
#
# Translation status:
# Words/expressions: 648
-# Not translated: 107 (16 %)
-# Need to be checked: 119 (18 %)
+# Not translated: 99 (15 %)
+# Need to be checked: 107 (16 %)
#
-# Translated: 422 (65 %)
+# Translated: 442 (68 %)
#
#
#
@@ -433,15 +433,15 @@
# Mode
MODE=Modus
APPLICATION_MODE=Anwendungsmodus
-PEN_INJECTION_MODE=Pen-/Spritz-Modus
+PEN_INJECTION_MODE=Pen-/Spritzen-Modus
PUMP_MODE=Pumpenmodus
-APPLICATION_MODE_DESC=<html><body>Setting mode, won't prevent usage of other part of application, it will just select right data for statistic display, and set correct icons in toolbar.</body></html>
+APPLICATION_MODE_DESC=<html><body>Der Modus unterbindet nicht die Verwendung von Teilen der Anwendung. Er w\u00E4hlt nur die richtigen Daten f\u00FCr die Anzeige der Statistiken und die richtigen Symbole f\u00FCr die Toolbar aus.</body></html>
PEN_INJECTION_MODE_SETTINGS=Pen-/-Spritzmodus Einstellungen
PUMP_MODE_SETTINGS=Pumpenmodus Einstellungen
BASAL_PRECISSION=Basaldosis Genauigkeit
BOLUS_PRECISSION=Bolusdosis Genauigkeit
-MAX_BASAL=Max Basaldosis
-MAX_BOLUS=Max Bolusdosis
+MAX_BASAL=Max. Basaldosis
+MAX_BOLUS=Max. Bolusdosis
TBR_TYPE_SELECTOR=Tempor\u00E4rer Basalratentyp
TBR_TYPE_BOTH=Beide
TBR_TYPE_UNIT=Einheit (U)
@@ -462,7 +462,7 @@
NO_HELP_AVAILABLE=Keine Hilfe verf\u00FCgbar
HELP_AVAILABLE=Hilfe verf\u00FCgbar
LANG_DESC=<html><body>Die Übersetzung der Anwendung findet getrennt von deren Entwicklung statt, weshalb die Übersetzung meistens etwas veraltet ist. Übersetzungen werden vor allem von Freiwilligen außerhalb des Projekts gepflegt, deshalb sind wir nicht direkt für Fehler in der Übersetzung, oder wann die n\u00E4chste Übersetzung verfügbar ist verantwortlich. Wenn Sie Fehler finden, können Sie uns gerne kontaktieren und wir werden sie baldmöglichst beheben.<br>Wenn etwas noch nicht übersetzt wurde, wird der Ausdruck in der Standardsprache (Englisch) angezeigt.<br>Wenn Sie bei der Übersetzung helfen wollen, kontaktieren Sie uns bitte via E-Maill: gg...@at....</body></html>
-NOTE_RESTART=<html><body><b>WarnUng:</b> Diese Einstellung wird erst nach dem nächsten Neustart der Anwendung wirksam.</body></html>
+NOTE_RESTART=<html><body><b>Warnung:</b> Diese Einstellung wird erst nach dem nächsten Neustart der Anwendung wirksam.</body></html>
NOTE_LANG_FEATURE_NOT_WORKING=<html><body><font color="red"><b>Warnung:</b>Dieses Feature ist noch nicht aktiviert. Bis auf weiteres verwenden Sie bitte die Sprachwahl im Allgemeines-Reiter. Wenn dieses Feature aktiviert wird, wird diese Warnung und die Sprachwahl im Allgemeines-Reiter entfernt.</font></body></html>
#
@@ -730,7 +730,7 @@
#
METERS_PLUGIN=Messger\u00E4te Plug-in
PUMPS_PLUGIN=Pumpen Plug-in
-CGMS_PLUGIN=CGMS Plug-in
+CGMS_PLUGIN=CGMS Tool Plug-in
NUTRITION_PLUGIN=Nutrition Tool Plug-in
STATUS_NOT_INSTALLED=Nicht installiert
STATUS_NOT_AVAILABLE=N/A (ab Version %s verf\u00FCgbar)
@@ -792,7 +792,7 @@
UPDATEABLE=Aktualisierbarkeit
UPDATE_APPLICATION=Aktualisierung der Anwendung
UPDATE_SERVER_NA=<html><h2>Update Server</h2><br><br>Die Update-Server-Seite wurde noch nicht implementiert. Dieser Dialog existiert zur Zeit nur, damit die aktuelle Version der Bibliotheken überprüft werden kann.<br>Der Server sollte bis September 2008 fertig und betriebsbereit sein. Bitte sehen Sie auf http://ggc.sourceforge.net nach, ob eine neue Version verfügbar ist.<br></html>
-NO_UPDATE_FOUND=No update was found on server !
+NO_UPDATE_FOUND=No update was found on server!
UPDATE_FOR_HIGHER_DB_FOUND=<html><body>No update for current database was found !<br>But there is version of application (%s)<br>for higher version of database. Since we<br>don't support update of database yet, we<br>can't continue update.<br></body></html>
UPDATE_FOUND_VERSION=<html><body>We found update (%s) for your<br>version of database.<br>Do you wish to continue?</body></html>
UPDATE_FOUND_ALSO_HIGHER_DB=<html><body>We found two updates. One with higher version of<br>database (%s) and other with the same. Since we<br>don't support update of database yet, we can update<br>only to version %s.<br>Do you wish to continue?</body></html>
@@ -830,12 +830,12 @@
DEVICE_METER=Meter
DEVICE_PUMP=Pump
DEVICE_CGMS=CGMS
-PLUGIN_NOT_INSTALLED=Plugin not installed.
-PLUGIN_NA=Plugin not available.
-PLUGIN_NO_FUNCTIONALITY=This functionality is not supported.
-DEVICES_USED=Devices Used (Configured)
+PLUGIN_NOT_INSTALLED=Plugin nicht installiert.
+PLUGIN_NA=Plugin nicht verf\u00FCgbar.
+PLUGIN_NO_FUNCTIONALITY=Diese Funktionalit\u00E4t wird nicht unterst\u00FCtzt.
+DEVICES_USED=Verwendete Ger\u00E4te (eingerichtet)
PLUGINS=Plug-ins
-PLUGIN_NOT_ACTIVE=%s is not active or present, so this operation is not possible !
+PLUGIN_NOT_ACTIVE=%s ist nicht aktiv oder vorhanden, deshalb ist diese Operation nicht m\u00F6glich!
#
# File Import [2]
Deleted: trunk/ggc-meter/src/GGCMeterTool_de.properties
===================================================================
--- trunk/ggc-meter/src/GGCMeterTool_de.properties 2011-10-05 13:28:50 UTC (rev 1204)
+++ trunk/ggc-meter/src/GGCMeterTool_de.properties 2011-10-20 15:27:47 UTC (rev 1205)
@@ -1,251 +0,0 @@
-#
-# ######################################################################
-# ### GGC Meter Tool ###
-# ######################################################################
-# ### Language: German ###
-# ### Created by: Reinhold Rumberger (ru...@us...) ###
-# ### Last change: 2008-10-15 Version: 0.3 ###
-# ### Plug-in Version: 1.0.6 ###
-# ### Last change: 4th February 2010 ###
-# ### Application Version: 1.1.7 ###
-# ######################################################################
-#
-# NOT FINISHED!!!
-# Very little testing!!
-# 101 keys not translated as of version 0.1
-#
-#
-# In brackets there are now tags which define urgency of some text beeing translated
-# 1 - Needed, urgent (Base functionality, options which will be used by user mostly)
-# 2 - Needed
-# 3 - Not used yet (in public releases)
-# 4 - In implementation
-#
-# * - If tags also has *, then it means that this string can change regulary, last update is in []
-#
-
-
-
-#
-# Plug-in Specific (1)
-# Most of strings here are concated with help of sprintf codes, so almost all are static
-#
-#[TODO] translate
-DEVICE_NAME_NORMAL=meter
-#[TODO] translate
-DEVICE_NAME_BIG=Meter
-DEVICE_FULL_NAME_WITH_PORT=%s auf %s
-DEVICE_FULL_NAME_WITHOUT_PORT=%s
-
-
-#
-# Menus
-#
-MN_METERS=&Messger\u00e4te
-#[TODO] translate
-MN_METERS_ABOUT=Meter plug-in about
-#[TODO] translate
-MN_METERS_ABOUT_DESC=About Meter Plugin (copyright, features, credits,...)
-MN_METERS_CONFIG=Messger\u00e4te-Plug-in &Einstellungen
-MN_METERS_CONFIG_DESC=Einstellungen zum Messger\u00e4te-Plug-in
-MN_METERS_LIST=Messger\u00e4te&liste
-MN_METERS_LIST_DESC=Liste der meisten verf\u00fcgbaren Messger\u00e4te
-MN_METERS_READ=Messger\u00e4t &auslesen
-MN_METERS_READ_DESC=Daten des Messger\u00e4ts auslesen
-MN_METERS_READ_FILE=Read file
-MN_METERS_READ_FILE_DESC=Read data from meter/sw export file
-
-
-#
-# Configuration (1)
-#
-
-#[TODO] translate
-NEW__=New
-MY__=My
-#[TODO] translate
-DEVICE_CONFIGURATION=%s Configuration
-#[TODO] translate
-SELECT_X_DEVICE=Select %s Device
-#[TODO] translate
-SELECTED_X_DEVICE=Selected %s Device
-#[TODO] translate
-DEVICE_CUSTOM_NAME=%s Custom Name
-
-
-
-
-#
-# Meter Selector (1)
-#
-#[TODO] translate
-SELECTOR_DEVICE=Meter Device Selector
-
-
-
-#
-# Instructions Dialog (1)
-#
-#[TODO] translate
-OOPS_DEVICE_NOT_CONFIGURED=Oops ! You forgot to configure your %s\nand currently there is no %s configured\nand/or selected. Please visit configuration\nand configure your %s.
-#[TODO] translate
-CONFIGURED_DEVICE_INSTRUCTIONS=Configured %s and instructions
-#[TODO] translate
-DEVICE_ICON=%s picture
-
-#[TODO] translate
-DEVICE_ICON=%s picture
-
-
-#
-# Transfer display (1)
-#
-#[TODO] translate
-ERROR_CONTACTING_DEVICE=We had problem contacting Meter device.\nPlease recheck communication port settings\n(some of cables, can change their address,\nwhen reconnected). Run configuration again\nand problem should be solved!\n
-#[TODO] translate
-DEVICE_INFO=%s Info
-
-#[TODO] translate
-STATUS_READER_ERROR=Internal %s error (or port)
-
-
-#[TODO] translate
-READ_DEVICE_DATA_TITLE=Read Meter Data [%s on %s]
-
-#
-# Table
-#
-#[TODO] translate
-DATETIME=Date/Time
-#[TODO] translate
-BG_MMOLL=BG (mmol/L)
-#[TODO] translate
-BG_MGDL=BG (mg/dL)
-MULTIPLE=Multiple
-
-
-# extended type table
-URINE=Ketones
-BG=Blood Glucose
-ENTRY_TYPE=Type
-
-#
-# Export (1)
-#
-EXPORT_DEVICE_DATA=Export %s Data
-
-
-
-#
-# List (1) [Andy]
-#
-DEVICE_LIST_WEB=%s List
-
-# non-static
-METERS_LIST_WEB_DESC=<html>Meters List is not list of all available Meters in the world, this is just list of some (mostly commonly used) Meters available. We add new devices here when our source page changes (www.diabetesnet.com) or if some user requests that their device is to be added. Meters in list are color coded, and color determines status of devices of selected company. Color coding description is shown at bottom of this page.<br></html>
-
-
-#
-# About (1)
-#
-DEVICE_PLUGIN=%s Plug-in
-DEVICE_PLUGIN_ABOUT=About %s Plug-in
-
-
-
-
-#
-# Libraries (1)
-#
-
-
-#
-# Meter Instructions (1)
-# [8.8.2008]
-#
-#[TODO] translate
-INSTRUCTIONS_ACCUCHEK_ACTIVE=<html><ul><li>Pix Device should be attached before program<br>is started</li><li>Place meter max. 10 cm from Pix device</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Keep button M (left) on Active pressed for more<br>than 3 seconds and download will start.</li></ul>Accu-Check Pix has sometimes problems with java, so<br>you might be forced to start downloading twice.</html>
-#[TODO] translate
-INSTRUCTIONS_ACCUCHEK_ADVANTAGE=<html><ul><li>Pix Device should be attached before program<br>is started</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Insert IR Key into meter and place meter max.<br>10 cm from Pix device and download will start.</li></ul>Accu-Check Pix has sometimes problems with java, so<br>you might be forced to start downloading twice.</html>
-#[TODO] translate
-INSTRUCTIONS_ACCUCHEK_AVIVA=<html><ul><li>Pix Device should be attached before program<br>is started</li><li>Place meter max. 10 cm from Pix device</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Keep both buttons on Aviva pressed for more<br>than 3 seconds and download will start.</li></ul>Accu-Check Pix has sometimes problems with java, so<br>you might be forced to start downloading twice.</html>
-#[TODO] translate
-INSTRUCTIONS_ACCUCHEK_COMFORT=<html><ul><li>Pix Device should be attached before program<br>is started</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Insert IR Key into meter and place meter max.<br>10 cm from Pix device and download will start.</li></ul>Accu-Check Pix has sometimes problems with java, so<br>you might be forced to start downloading twice.</html>
-#[TODO] translate
-INSTRUCTIONS_ACCUCHEK_COMPACT=<html><li>Pix Device should be attached before program<br>is started (it has sometimes problems with java,<br>so you might be forced to download twice)</li><li>Place meter max. 10 cm from Pix device</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Keep both SET and MEMO buttons pressed for<br>more than 3 seconds and download will start.</li></html>
-#[TODO] translate
-INSTRUCTIONS_ACCUCHEK_COMPACTPLUS=<html><li>Pix Device should be attached before program<br>is started (it has sometimes problems with java,<br>so you might be forced to download twice)</li><li>Place meter max. 10 cm from Pix device</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Keep both S and M buttons pressed for<br>more than 3 seconds and download will start.</li></html>
-#[TODO] translate
-INSTRUCTIONS_ACCUCHEK_GO=<html><ul><li>Pix Device should be attached before program<br>is started</li><li>Place meter max. 10 cm from Pix device</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Keep button M (left) on Active pressed for more<br>than 3 seconds and download will start.</li></ul>Accu-Check Pix has sometimes problems with java, so<br>you might be forced to start downloading twice.</html>
-#[TODO] translate
-INSTRUCTIONS_ACCUCHEK_INTEGRA=<html><li>Pix Device should be attached before program<br>is started (it has sometimes problems with java,<br>so you might be forced to download twice)</li><li>Place meter max. 10 cm from Pix device</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Keep both SET and MEMO buttons pressed for<br> more than 3 seconds and download will start.</li></html>
-#[TODO] translate
-INSTRUCTIONS_ACCUCHEK_PERFORMA=Instructions Performa <not supported at this time>
-#[TODO] translate
-INSTRUCTIONS_ACCUCHEK_SENSOR=<html><ul><li>Pix Device should be attached before program<br>is started</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Insert IR Key into meter and place meter max.<br>10 cm from Pix device and download will start.</li></ul>Accu-Check Pix has sometimes problems with java, so<br>you might be forced to start downloading twice.</html>
-INSTRUCTIONS_ACCUCHEK_NANO=<html><ul><li>Pix Device should be attached before program<br>is started</li><li>Place meter max. 10 cm from Pix device</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Keep Left and Right buttons on Aviva pressed for more<br>than 3 seconds and download will start.</li></ul>Accu-Check Pix has sometimes problems with java, so<br>you might be forced to start downloading twice.</html>
-
-
-#[TODO] translate
-INSTRUCTIONS_ASCENSIA_BREEZE=<html>Instructions for meter download:<ul><li>Attach the meter cable to the selected PC<br> serial port</li><li>Plug the meter cable into the round meter port<br></li><li>Press the meter button to turn the meter ON</li></ul><br>Click "Start Download" to begin reading your meter...</html>
-#[TODO] translate
-INSTRUCTIONS_ASCENSIA_CONTOUR=<html>Instructions for meter download:<ul><li>Attach the meter cable to the selected PC<br> serial port</li><li>Plug the meter cable into the round meter port<br></li><li>Press the meter button M to turn the meter ON</li></ul><br>Click "Start Download" to begin reading your meter...</html>
-#[TODO] translate
-INSTRUCTIONS_ASCENSIA_ELITE_XL=<html>Instructions for meter download:<ul><li>Attach the meter cable to the selected PC<br> serial port</li><li>Plug the meter cable into the round meter<br>port<br></li><li>Press the meter button to turn the meter ON</li></ul><br>Click "Start Download" to begin reading your meter...</html>
-#[TODO] translate
-INSTRUCTIONS_ASCENSIA_DEX=<html>Instructions for meter download:<ul><li>Attach the meter cable to the selected PC<br> serial port<br></li><li>Plug the meter cable into the port between<br> the two meter buttons<br></li><li>Slide the meter cover to turn the meter ON</li></ul><br>Click "Start Download" to begin reading your meter...</html>
-
-
-# lifescan:
-# off: InDuo(x), OT, OT: FastTake(x), SmartScan, EuroFlash, PocketScan, Select(x), Ultra(x), Ultra 2(x), Easy/Mini(x)
-# on: OT: Basic(x), Basic Plus, II(x), Profile(x), SureStep(x), GlucoTouch, UltraSmart(x)
-#[TODO] translate
-INSTRUCTIONS_LIFESCAN_ON=<html>Instructions for m...
[truncated message content] |
|
From: <and...@us...> - 2012-10-09 18:26:04
|
Revision: 1237
http://ggc.svn.sourceforge.net/ggc/?rev=1237&view=rev
Author: andyrozman
Date: 2012-10-09 18:25:58 +0000 (Tue, 09 Oct 2012)
Log Message:
-----------
Added Paths:
-----------
trunk/ggc-doctor_server/
trunk/ggc-doctor_server/.classpath
trunk/ggc-doctor_server/.project
trunk/ggc-doctor_server/src/
Added: trunk/ggc-doctor_server/.classpath
===================================================================
--- trunk/ggc-doctor_server/.classpath (rev 0)
+++ trunk/ggc-doctor_server/.classpath 2012-10-09 18:25:58 UTC (rev 1237)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry combineaccessrules="false" exported="true" kind="src" path="/Atech-Tools"/>
+ <classpathentry combineaccessrules="false" exported="true" kind="src" path="/GGC Core"/>
+ <classpathentry combineaccessrules="false" exported="true" kind="src" path="/GGC Nutrition Tool"/>
+ <classpathentry combineaccessrules="false" exported="true" kind="src" path="/GGC Pump Tool"/>
+ <classpathentry combineaccessrules="false" exported="true" kind="src" path="/GGC CGM Tool"/>
+ <classpathentry excluding="**/.svn/**" kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/SkinLF-6.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/commons-logging-1.0.4"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/ggc-web"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/log4j-1.2.15"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/JavaHelp-2.0.5"/>
+ <classpathentry kind="con" path="org.dyno.visual.swing.VS_LIBRARY/layoutext"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jfreechart-1.0.14"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: trunk/ggc-doctor_server/.project
===================================================================
--- trunk/ggc-doctor_server/.project (rev 0)
+++ trunk/ggc-doctor_server/.project 2012-10-09 18:25:58 UTC (rev 1237)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>GGC Doctor's Edition Server</name>
+ <comment></comment>
+ <projects>
+ <project>Atech-Tools</project>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.jem.beaninfo.BeanInfoNature</nature>
+ </natures>
+</projectDescription>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2014-06-06 16:05:49
|
Revision: 1268
http://sourceforge.net/p/ggc/code/1268
Author: andyrozman
Date: 2014-06-06 16:05:46 +0000 (Fri, 06 Jun 2014)
Log Message:
-----------
ggc-master-pom initial checkin
Added Paths:
-----------
trunk/ggc-master-pom/
trunk/ggc-master-pom/pom.xml
Added: trunk/ggc-master-pom/pom.xml
===================================================================
--- trunk/ggc-master-pom/pom.xml (rev 0)
+++ trunk/ggc-master-pom/pom.xml 2014-06-06 16:05:46 UTC (rev 1268)
@@ -0,0 +1,285 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <name>GGC Parent POM</name>
+
+ <groupId>net.sf.ggc</groupId>
+ <artifactId>ggc-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+
+
+ <!--
+ <modules>
+<module>project-a</module>
+<module>project-b</module>
+</modules> -->
+
+
+<!--
+ <artifactId>atech-tools</artifactId>
+ <version>0.7-SNAPSHOT</version>
+ -->
+
+ <!--
+ <repositories>
+ <repository>
+ <id>central</id>
+ <name>Maven Repository Switchboard</name>
+ <layout>default</layout>
+ <url>http://repo1.maven.org/maven2</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>central</id>
+ <name>Maven Plugin Repository</name>
+ <url>http://repo1.maven.org/maven2</url>
+ <layout>default</layout>
+
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ </pluginRepository>
+ </pluginRepositories>
+
+ -->
+<!--
+ <repositories>
+ <repository>
+ <id>pygmy-repo</id>
+ <name>Pygmy Repository</name>
+ <layout>default</layout>
+ <url>https://oss.sonatype.org/service/local/repositories/netsfggc-042/content/</url>
+-->
+<!--https://oss.sonatype.org/content/repositories/netsfggc-046/net/sf/ggc/pygmy-httpd/pygmy-handlers/0.2/pygmy-handlers-0.2.pom
+
+https://oss.sonatype.org/service/local/repositories/netsfggc-042/content/
+
+-->
+<!--
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+-->
+
+ <repository>
+ <id>atechrepositorypublic</id>
+ <name>Atech Software Public Repository</name>
+ <url>http://www.atech-software.com:8080/nexus/content/groups/public/</url>
+ </repository>
+
+<!--
+ <repository>
+ <id>mvnrepository</id>
+ <name>Mvn Central Repository</name>
+ <url>http://www.mvnrepository.com</url>
+ </repository>
+
+ <repository>
+ <id>jbossrepository</id>
+ <name>jbossrepository</name>
+ <url>https://repository.jboss.org/nexus/</url>
+ </repository>
+
+ <repository>
+ <id>sonatype</id>
+ <name>Sonatype OSS Snapshots Repository</name>
+ <url>http://oss.sonatype.org/content/groups/public</url>
+ </repository>
+
+ <repository>
+ <id>javanet</id>
+ <name>Download Java Net Repository</name>
+ <url>http://download.java.net/maven/2/</url>
+ </repository>
+
+ <repository>
+ <id>mavenrepository</id>
+ <name>Maven Repository Repository</name>
+ <layout>legacy</layout>
+ <url>http://maven-repository.com/artifacts/</url>
+ </repository>
+
+ -->
+
+
+
+ </repositories>
+
+
+
+ <build>
+ <directory>target</directory>
+ <outputDirectory>target/classes</outputDirectory>
+ <finalName>${project.artifactId}-${pom.version}</finalName>
+ <testOutputDirectory>target/test-classes</testOutputDirectory>
+ <sourceDirectory>src</sourceDirectory>
+ <scriptSourceDirectory>src</scriptSourceDirectory>
+ <testSourceDirectory>src/test/java</testSourceDirectory>
+ <resources>
+ <resource>
+ <directory>src</directory>
+ <filtering>true</filtering>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ </testResource>
+ </testResources>
+ </build>
+
+
+ <reporting>
+ <outputDirectory>target/site</outputDirectory>
+ </reporting>
+
+
+
+ <dependencyManagement>
+ <dependencies>
+
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ <version>3.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.ggc.pygmy-httpd</groupId>
+ <artifactId>pygmy-core</artifactId>
+ <version>0.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.ggc.pygmy-httpd</groupId>
+ <artifactId>pygmy-handlers</artifactId>
+ <version>0.2</version>
+ </dependency>
+
+
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.10</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency> -->
+ <dependency>
+ <groupId>com.itextpdf</groupId>
+ <artifactId>itextpdf</artifactId>
+ <version>5.1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.help</groupId>
+ <artifactId>javahelp</artifactId>
+ <version>2.0.05</version>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId>
+ <artifactId>skinlf</artifactId>
+ <version>6.7</version>
+ </dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.16</version>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.jasperreports</groupId>
+ <artifactId>jasperreports</artifactId>
+ <version>3.7.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>jfree</groupId>
+ <artifactId>jfreechart</artifactId>
+ <version>1.0.13</version>
+ </dependency>
+
+
+ <!-- This should be replaced with nrserial, which is just extention of rxtx that also contains binary files in jar. -->
+ <dependency>
+ <groupId>org.bidib.jbidib.org.qbang.rxtx</groupId>
+ <artifactId>rxtxcomm</artifactId>
+ <version>${rxtxcomm.version}</version>
+ </dependency>
+
+
+ <dependency>
+ <groupId>com.atech-software</groupId>
+ <artifactId>atech-tools</artifactId>
+ <version>${atech-tools.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>jna</artifactId>
+ <version>${jna.version}</version>
+ </dependency>
+
+ <!--This is some outdated library which we use only for BlueTooth, it needs to be removed or changed, but so far it's
+ here and it's version is fixed. This NEEDS to be removed and changed to some other library in near future and
+ tested with Dana Pump (only BT device we have so far) -->
+ <dependency>
+ <groupId>com.ibm.old.comapi</groupId>
+ <artifactId>ibm-compapi</artifactId>
+ <version>1.3</version>
+ </dependency>
+
+ <!-- This library is created in parallel to GGC and it should be used for USB communication. For USB devices that have HID
+ interfaces (most of them), we will use other library, but for legacy support we use this for now. -->
+ <dependency>
+ <groupId>net.sf.ggc.libusb4j</groupId>
+ <artifactId>libusb4jwo</artifactId>
+ <version>${libusb4jwo.version}</version>
+ </dependency>
+
+
+ </dependencies>
+ </dependencyManagement>
+
+ <properties>
+ <ggc-core.version>0.5.1-SNAPSHOT</ggc-core.version>
+ <ggc-plugin-base.version>0.6.2-SNAPSHOT</ggc-plugin-base.version>
+ <atech-tools.version>0.7.1-SNAPSHOT</atech-tools.version>
+
+ <jna.version>3.3.0</jna.version>
+ <rxtxcomm.version>2.2</rxtxcomm.version>
+ <libusb4jwo.version>0.2</libusb4jwo.version>
+
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+ </properties>
+
+
+
+</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2014-08-28 21:13:25
|
Revision: 1291
http://sourceforge.net/p/ggc/code/1291
Author: andyrozman
Date: 2014-08-28 21:13:21 +0000 (Thu, 28 Aug 2014)
Log Message:
-----------
Dexcom reader (almost finished reading - all data is read, just not written to GGC and progress is not working 100%)
Modified Paths:
--------------
trunk/ggc-cgm/doc/Dexcom_TODO.txt
trunk/ggc-cgm/pom.xml
trunk/ggc-cgm/src/GGC_CGMSTool_de.properties
trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/DexcomDeviceProgressReport.java
trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/DexcomDeviceReader.java
trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/data/output/DataOutputParserType.java
trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/g4receiver/DexcomG4Api.java
trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/g4receiver/DexcomG4Commands.java
trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/g4receiver/enums/ClockModeType.java
trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/g4receiver/enums/GlucoseUnitType.java
trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/g4receiver/enums/LanguageType.java
trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/g4receiver/enums/ReceiverRecordType.java
trunk/ggc-plugin_base/src/GGCPlugin_en.properties
Added Paths:
-----------
trunk/ggc-plugin_base/src/ggc/plugin/data/progress/
trunk/ggc-plugin_base/src/ggc/plugin/data/progress/ProgressData.java
trunk/ggc-plugin_base/src/ggc/plugin/data/progress/ProgressReportInterface.java
trunk/ggc-plugin_base/src/ggc/plugin/data/progress/ProgressType.java
Modified: trunk/ggc-cgm/doc/Dexcom_TODO.txt
===================================================================
--- trunk/ggc-cgm/doc/Dexcom_TODO.txt 2014-08-27 19:48:17 UTC (rev 1290)
+++ trunk/ggc-cgm/doc/Dexcom_TODO.txt 2014-08-28 21:13:21 UTC (rev 1291)
@@ -12,30 +12,17 @@
- DexcomException use non-deprecated
- DexcomYYYCommand to interface
-CONFIGURATION
-
-- API readClockMode
-
-DATA
-
-- Parsing Binary: EGVData
-
-
-- Parsing Binary: framework
- versioning of data : - partition data saving
- - log warn on wrong version
- versioning interface used with enum
- ReceiverRecordType extension to store versioning interface
- version check only when partition is read - create report in log
+- Support for R2
--- Reader move
--- Com port init ????
-
-
UNSUPPORTED
Errors ??
case FirmwareParameterData:
@@ -65,6 +52,17 @@
- API api.readLanguage
- API readGlucoseUnits
- command is short
+-- Reader move
+-- Com port init ????
+CONFIGURATION
+
+
+- API readClockMode
+
+DATA
+
+- Parsing Binary: EGVData
+- Parsing Binary: framework
-----
Hi !
Modified: trunk/ggc-cgm/pom.xml
===================================================================
--- trunk/ggc-cgm/pom.xml 2014-08-27 19:48:17 UTC (rev 1290)
+++ trunk/ggc-cgm/pom.xml 2014-08-28 21:13:21 UTC (rev 1291)
@@ -53,11 +53,12 @@
<artifactId>ggc-plugin-base</artifactId>
</dependency>
+<!--
<dependency>
<groupId>org.bidib.jbidib.org.qbang.rxtx</groupId>
<artifactId>rxtxcomm</artifactId>
</dependency>
-
+ -->
<dependency>
<groupId>com.atech-software</groupId>
<artifactId>atech-tools</artifactId>
@@ -66,19 +67,28 @@
<!-- NEW put into parent pom -->
<dependency>
- <groupId>jdom</groupId>
+ <groupId>org.jdom</groupId>
<artifactId>jdom</artifactId>
<version>1.1</version>
</dependency>
+
+
+ <dependency>
+ <groupId>com.neuronrobotics</groupId>
+ <artifactId>nrjavaserial</artifactId>
+ <version>3.9.3</version>
+ </dependency>
+
+<!--
<dependency>
<groupId>org.scream3r</groupId>
<artifactId>jssc</artifactId>
<version>2.8.0</version>
</dependency>
+ -->
-
</dependencies>
Modified: trunk/ggc-cgm/src/GGC_CGMSTool_de.properties
===================================================================
--- trunk/ggc-cgm/src/GGC_CGMSTool_de.properties 2014-08-27 19:48:17 UTC (rev 1290)
+++ trunk/ggc-cgm/src/GGC_CGMSTool_de.properties 2014-08-28 21:13:21 UTC (rev 1291)
@@ -1,162 +1 @@
-#
-# ######################################################################
-# ### GNU Glucose Control ###
-# ######################################################################
-# ### Language: German ###
-# ### Created by: Reinhold Rumberger (ru...@us...)###
-# ### Version: 1.0.2 ###
-# ### Last change: 03.07.2011 14:44:12 ###
-# ######################################################################
-#
-#
-# Translation status:
-# Words/expressions: 63
-# Not translated: 57 (90 %)
-# Need to be checked: 0 (0 %)
-#
-# Translated: 6 (9 %)
-#
-#
-#
-##
-# Collation Rules - In unicode we can create special rules for sorting where we specify
-# sorting order of special characters. This will be used by tree's and special tables.
-# For english this is left empty. For all other (that have non-standard, non english
-# charcters) we need to set this if we want sorting to be done correctly.
-#
-COLLATION_RULES=< 0 < 1 < 2 < 3 < 4 < 5 < 6 < 7 < 8 < 9 < a,A,\u00E4,\u00C4,\u00E1,\u00E0,\u00C1,\u00C0,\u00E2,\u00C2 < b,B < c,C < d,D < e,E,\u00E9,\u00E8,\u00EA,\u00C9,\u00C8,\u00CA < f,F < g,G < h,H < i,I < j,J < k,K < l,L < m,M < n,N < o,O,\u00F6,\u00D6 < p,P < q,Q < r,R < s,S,\u00DF < t,T < u,U,\u00FC,\u00DC < v,V < w,W < x,X < y,Y < z,Z
-
-#
-# Plug-in Specific [1]
-#
-DEVICE_NAME_NORMAL=CGMS
-DEVICE_NAME_BIG=CGMS
-DEVICE_FULL_NAME_WITHOUT_PORT=%s
-DEVICE_FULL_NAME_WITH_PORT=%s on %s
-
-#
-# Menus [1]
-#
-MN_CGMS=CGMS
-MN_CGMS_READ=CGMS &auslesen
-MN_CGMS_READ_DESC=Die Daten des CGMS auslesen
-MN_CGMS_LIST=CGMS-&Liste
-MN_CGMS_LIST_DESC=Liste der verf\u00FCgbaren CGMS-Ger\u00E4te
-MN_CGMS_CONFIG=&Einstellungen
-MN_CGMS_CONFIG_DESC=Einstellungen des CGMS-Plug-ins
-MN_CGMS_ABOUT=About
-MN_CGMS_ABOUT_DESC=About CGMS Plugin (copyright, features, credits,...)
-MN_CGMS_VIEW_DATA=View Data
-MN_CGMS_VIEW_DATA_DESC=View data read from device(s)
-MN_CGMS_READ_FILE=Read file
-MN_CGMS_READ_FILE_DESC=Read data from CGMS/sw export file
-
-#
-# About [1]
-#
-DEVICE_PLUGIN=%s Plug-in
-DEVICE_PLUGIN_ABOUT=About %s Plug-in
-
-#
-# Configuration [1]
-#
-MY__=My
-NEW__=New
-DEVICE_CONFIGURATION=%s Configuration
-SELECT_X_DEVICE=Select %s Device
-SELECTED_X_DEVICE=Selected %s Device
-DEVICE_CUSTOM_NAME=%s Custom Name
-DEVICE_DOWNLOAD=DL
-DEVICE_SETTINGS=Sett.
-
-#
-# Device Selector [1]
-#
-SELECTOR_DEVICE=%s Device Selector
-
-#
-# Instructions Dialog [1]
-#
-OOPS_DEVICE_NOT_CONFIGURED=Oops ! You forgot to configure your %s\nand currently there is no %s configured\nand/or selected. Please visit configuration\nand configure your %s.
-CONFIGURED_DEVICE_INSTRUCTIONS=Configured %s and Instructions
-DEVICE_ICON=%s picture
-STATUS_READER_ERROR=Internal %s (or port) error
-ERROR_CONTACTING_DEVICE=We had problem contacting CGMS device.\nPlease recheck communication port settings\n(some of cables, can change their address,\nwhen reconnected). Run configuration again\nand problem should be solved!\n
-DEVICE_INFO=%s Info
-
-#
-# Download [1]
-#
-READ_DEVICE_DATA_TITLE=Read CGMS Data [%s on %s]
-
-#
-# Device Configuration [1]
-#
-READ_DEVICE_CONFIG_TITLE=Read CGMS Configuration [%s on %s]
-SETTING_GROUP=Setting / Group
-
-#
-# Export [1]
-#
-EXPORT_DEVICE_DATA=Export %s Data
-
-#
-# List [1]
-#
-DEVICE_LIST_WEB=CGMS List
-DEVICE_LIST_WEB_DESC=<html>Pumps list contains most of Pumps (even most of models). For each of this pumps, there is configuration entry, which contains only basic settings for device (profile names, TBR settings, etc). Devices which support download have that shown in selector (DL column). Pumps in list are color coded, and color determines status of devices of selected company. Color coding description is shown at bottom of this page.<br></html>
-
-#
-# CGMS companies descriptions [1]
-#
-
-#
-# CGMS Instructions [1]
-#
-
-#
-# Manual Entry [1]
-#
-AVG_BG=Avg BG
-BLOOD_GLUCOSE_CGMS=Blood Glucose (CGMS)
-BLOOD_GLUCOSE_CALIB=Blood Glucose (Calibration)
-AVG=Avg
-TOTAL=Total
-LOWEST=Lowest
-STD_DEV=Std Dev
-READINGS=Readings
-HIGHEST=Highest
-SUM=Sum
-READING=Reading
-CGMS_DAILY_OVERVIEW=CGMS Daily Stats
-
-# table
-ENTRY_TYPE=Entry Type
-COMMENT=Comment
-
-# types
-ENTRY_BG_READING=Reading
-ENTRY_BG_CALIBRATION=Calibration
-
-#
-# Devices [1]
-#
-
-#
-# Backup/Restore [1]
-#
-CGMS_TOOL=CGMS Tool
-CGMS_DATA=CGMS Data
-CGMS_DATA_EXTENDED=CGMS Data Extended
-
-#
-# Types [1]
-#
-CGMS_READINGS=CGMS Readings
-CALIBRATION_READINGS=Calibration
-CGMS_READING=CGMS Reading
-
-#
-# Meter Instructions [1]
-#
-INSTRUCTIONS_DEXCOM=<html>Instructions for CGMS reading:<br><ul><li>We currently support only import of Dexcom 3<br>application export files (TXT or XML).</li><li>Reading from device, might or might not be<br>supported in future (depending on company <br>support).</li><li>Select correct file and file type in next<br>screens and import will start.</li></ul></html>
+#
\ No newline at end of file
Modified: trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/DexcomDeviceProgressReport.java
===================================================================
--- trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/DexcomDeviceProgressReport.java 2014-08-27 19:48:17 UTC (rev 1290)
+++ trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/DexcomDeviceProgressReport.java 2014-08-28 21:13:21 UTC (rev 1291)
@@ -1,32 +1,25 @@
package ggc.cgms.device.dexcom.receivers;
import ggc.cgms.device.dexcom.receivers.g4receiver.util.DexcomException;
+import ggc.plugin.data.progress.ProgressReportInterface;
+import ggc.plugin.data.progress.ProgressType;
-public interface DexcomDeviceProgressReport {
+public interface DexcomDeviceProgressReport extends ProgressReportInterface
+{
// progress is static + dynamic. Static would be determinton of Pages ranges (first 10% for example)
// dynamic is then calculated with nr of pages, and 1+ for each processing task
- void setStaticProgressPercentage(int percentage);
+ //void setStaticProgressPercentage(int percentage);
-
void addToProgressAndCheckIfCanceled(ProgressType progressType, int progressAdd) throws DexcomException;
+ //void setMaxElementsForStaticProgress(int maxElements);
- void setMaxElementsForStaticProgress(int maxElements);
+ //void setMaxElementsForDynamicProgress(int maxElements);
-
- void setMaxElementsForDynamicProgress(int maxElements);
-
-
void setDownloadCancel(boolean cancel);
-
boolean isDownloadCanceled();
- public enum ProgressType {
- Dynamic,
- Static
- }
-
}
Modified: trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/DexcomDeviceReader.java
===================================================================
--- trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/DexcomDeviceReader.java 2014-08-27 19:48:17 UTC (rev 1290)
+++ trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/DexcomDeviceReader.java 2014-08-28 21:13:21 UTC (rev 1291)
@@ -8,14 +8,14 @@
import ggc.cgms.device.dexcom.receivers.g4receiver.DexcomG4Api;
import ggc.cgms.device.dexcom.receivers.g4receiver.data.EGVRecord;
import ggc.cgms.device.dexcom.receivers.g4receiver.data.UserEventDataRecord;
+import ggc.cgms.device.dexcom.receivers.g4receiver.enums.ReceiverRecordType;
import ggc.cgms.device.dexcom.receivers.g4receiver.internal.PartitionInfo;
import ggc.cgms.device.dexcom.receivers.g4receiver.util.DexcomException;
import ggc.cgms.device.dexcom.receivers.g4receiver.util.DexcomExceptionType;
import ggc.cgms.device.dexcom.receivers.g4receiver.util.DexcomUtils;
-import gnu.io.CommPort;
+import ggc.plugin.data.progress.ProgressData;
+import ggc.plugin.data.progress.ProgressType;
import gnu.io.CommPortIdentifier;
-import gnu.io.NoSuchPortException;
-import gnu.io.PortInUseException;
import java.util.Date;
import java.util.Enumeration;
@@ -25,32 +25,22 @@
import org.apache.commons.logging.LogFactory;
import org.jdom.Element;
-import com.atech.utils.data.ByteUtils;
-
//Still kludgy
//Newer, similar to Dex's architecture, classes are in progress, but this works reliably, if not the
//most efficient, elegant design around.
-public class DexcomDeviceReader implements DexcomDeviceProgressReport {
-
- // private final String EPOCH = "01-01-2009";
-
+public class DexcomDeviceReader implements DexcomDeviceProgressReport
+{
private Log log = LogFactory.getLog(DexcomDeviceReader.class);
- public String bGValue;
- public String displayTime;
- public String trend;
- public EGVRecord[] mRD;
private String portName;
CommPortIdentifier portIdentifier;
- private CommPort serialDevice;
- ByteUtils byteUtils = new ByteUtils();
DexcomG4Api api = null;
-
+ ProgressData progressData = new ProgressData();
private DataOutputParserInterface dataOutputParser = new ConsoleOutputParser();
-
- public DexcomDeviceReader(String portName, DexcomDevice dexcomDevice) throws DexcomException {
+ public DexcomDeviceReader(String portName, DexcomDevice dexcomDevice) throws DexcomException
+ {
this.portName = portName;
@SuppressWarnings("rawtypes")
@@ -59,65 +49,51 @@
boolean deviceFound = false;
- while (e.hasMoreElements()) {
- CommPortIdentifier comp = (CommPortIdentifier)e.nextElement();
+ while (e.hasMoreElements())
+ {
+ CommPortIdentifier comp = (CommPortIdentifier) e.nextElement();
- if (comp.equals(this.portName)) {
+ if (comp.getName().equals(this.portName))
+ {
deviceFound = true;
}
- sb.append(comp.getName());
+ sb.append(comp.getName() + " ");
}
- log.debug("Serial Ports found: " + sb.toString() + ", configured port found: " + deviceFound);
+ log.debug(String.format("Serial Ports found: %s, configured port (%s) found: %s", sb.toString(), portName,
+ deviceFound));
- if (!deviceFound) {
+ if (!deviceFound)
+ {
throw new DexcomException(DexcomExceptionType.DeviceNotFoundOnConfiguredPort,
- new Object[] { this.portName });
+ new Object[] { this.portName });
}
- try {
- this.portIdentifier = CommPortIdentifier.getPortIdentifier(portName);
- } catch (NoSuchPortException e1) {
- throw new DexcomException(DexcomExceptionType.DeviceNotFoundOnConfiguredPort,
- new Object[] { this.portName });
+ if (dexcomDevice.getApi() == ReceiverApiType.G4_Api)
+ {
+ this.api = new DexcomG4Api(portName, this);
+ DexcomUtils.setDexcomG4Api(api);
}
- try {
- this.serialDevice = this.portIdentifier.open("ggc", 4000);
- } catch (PortInUseException e1) {
- throw new DexcomException(DexcomExceptionType.DevicePortInUse, new Object[] { this.portName });
- }
-
- if (dexcomDevice.getApi() == ReceiverApiType.G4_Api) {
- this.api = new DexcomG4Api(this.serialDevice, portIdentifier, this);
- DexcomUtils.setDexcomG4Api(api);
- } else {
+ else
+ {
throw new DexcomException(DexcomExceptionType.UnsupportedReceiver);
}
- // this.mSerialDevice = new SerialPort(); // SerialPort(portName);
-
- /*
- * serialDevice.setSerialPortParams(9600, SerialPort.DATABITS_8,
- * SerialPort.STOPBITS_1, SerialPort.PARITY_NONE);
- */
-
- // this.mSerialDevice.openPort();
- // this.mSerialDevice.set.setParams(SerialPort.BAUDRATE_9600,
- // SerialPort.DATABITS_8, SerialPort.STOPBITS_1,
- // SerialPort.PARITY_NONE);
- // this.mSerialDevice.
-
}
+ public void downloadSettings() throws DexcomException
+ {
+ try
+ {
+ this.progressData.configureProgressReporter(ProgressType.Dynamic, 0, 0, 8);
- public void downloadSettings() throws DexcomException {
+ //currentProgressType = ProgressType.Dynamic;
- try {
ReceiverDownloadData data = new ReceiverDownloadData();
- this.setStaticProgressPercentage(0);
- this.setMaxElementsForDynamicProgress(8);
+ //this.setStaticProgressPercentage(0);
+ //this.setMaxElementsForDynamicProgress(8);
Element header = this.api.readFirmwareHeader();
this.addToProgressAndCheckIfCanceled(ProgressType.Dynamic, 1);
@@ -133,117 +109,95 @@
data.setSerialNumber(api.readReceiverSerialNumber());
data.addConfigurationEntry("SYSTEM_TIME", DexcomUtils.getDateTimeString(api.readSystemTimeAsDate()), false);
+ data.addConfigurationEntry("DISPLAY_TIME", DexcomUtils.getDateTimeString(api.readDisplayTimeAsDate()),
+ false);
+ data.addConfigurationEntry("LANGUAGE", api.readLanguage().getDescription(), true);
+ data.addConfigurationEntry("GLUCOSE_UNIT", api.readGlucoseUnit().getDescription(), true);
+ data.addConfigurationEntry("CLOCK_MODE", api.readClockMode().getDescription(), true);
- this.addToProgressAndCheckIfCanceled(ProgressType.Dynamic, 1);
-
- api.readDisplayTimeAsDate();
-
- // this.progressReport.addToProgressAndCheckIfCanceled(ProgressType.Dynamic, 1);
-
- this.addToProgressAndCheckIfCanceled(ProgressType.Dynamic, 1);
-
- // api.readLanguage()
- this.addToProgressAndCheckIfCanceled(ProgressType.Dynamic, 1);
-
- // api.readGlucoseUnit()
- this.addToProgressAndCheckIfCanceled(ProgressType.Dynamic, 1);
-
- // api.readClockMode()
- this.addToProgressAndCheckIfCanceled(ProgressType.Dynamic, 1);
-
// parse
this.dataOutputParser.parse(DataOutputParserType.Configuration, data);
this.addToProgressAndCheckIfCanceled(ProgressType.Dynamic, 1);
- } catch (DexcomException ex) {
+ }
+ catch (DexcomException ex)
+ {
if ((ex.getExceptionType() != null)
- && (ex.getExceptionType() == DexcomExceptionType.DownloadCanceledByUser)) {
+ && (ex.getExceptionType() == DexcomExceptionType.DownloadCanceledByUser))
+ {
return;
}
throw ex;
}
- // SERIAL_NUMBER=Serial Number
- /*
- * SYSTEM_TIME=System Time
- * DISPLAY_TIME=Display Time
- * LANGUAGE=Language
- * LANGUAGE_ENGLISH=English
- * GLUCOSE_UNIT=Glucose Unit
- * GLUCOSE_UNIT_MGDL=mg/dL
- * GLUCOSE_UNIT_MMOLL=mmol/L
- * CLOCK_MODE=Clock
- * Mode
- * CLOCK_MODE_12H=12h
- * CLOCK_MODE_24H=24h
- */
}
+ public void addToProgressAndCheckIfCanceled(ProgressType progressType, int progressAdd) throws DexcomException
+ {
- public void addToProgressAndCheckIfCanceled(ProgressType progressType, int i) throws DexcomException {
+ this.progressData.addToProgressAndCheckIfCanceled(progressType, progressAdd);
- // if this.
+ log.debug("Progress: " + this.progressData.calculateProgress());
- // progress
-
- if (this.isDownloadCanceled()) {
+ if (this.isDownloadCanceled())
+ {
throw new DexcomException(DexcomExceptionType.DownloadCanceledByUser);
}
}
-
- public void downloadData() throws DexcomException {
+ public void downloadData() throws DexcomException
+ {
// Element info = (Element) api.readDatabasePartitionInfo();
ReceiverDownloadData data = new ReceiverDownloadData();
+ this.configureProgressReporter(ProgressType.Dynamic_Static, 10, 10, 200);
+
+ this.progressData.setCurrentProgressType(ProgressType.Static);
+
+ for (ReceiverRecordType rrt : ReceiverRecordType.getDownloadSupported().keySet())
+ {
+
+ }
+
// FIXME
// read page ranges to create dynamic counter
- // FIXME
- // serial number
+ data.setSerialNumber(api.readReceiverSerialNumber());
PartitionInfo info = this.api.readDatabasePartitionInfo();
log.debug("Partition Info: PageLength: " + info.getPageDataLength());
- log.debug("Partitions: " + info.getPartitions().size());
-
- this.addToDynamicProgress(1);
-
// FIXME
// report
- this.addToDynamicProgress(1);
- // ranges cached
- data.setSerialNumber(api.readReceiverSerialNumber());
+ log.debug("Partitions: " + info.getPartitions().size());
+
// log.debug(api.readDatabasePageRange(ReceiverRecordType.InsertionTime));
- this.addToDynamicProgress(1);
+ //this.addToDynamicProgress(1);
- // pages extend
+ // set dynamic
+ this.progressData.setCurrentProgressType(ProgressType.Dynamic);
data.addData(DataOutputParserType.G4_UserEventData, api.readAllRecordsForEvents());
- // parse
- this.addToDynamicProgress(1);
+ // FIXME parse
data.addData(DataOutputParserType.G4_EGVData, api.readAllRecordsForEGVData());
- // parse
- this.addToDynamicProgress(1);
+ // FIXME parse
data.addData(DataOutputParserType.G4_InsertionTime, api.readAllRecordsForInsertionTime());
- // parse
- this.addToDynamicProgress(1);
+ // FIXME parse
data.addData(DataOutputParserType.G4_MeterData, api.readAllRecordsForMeterData());
- // parse
- this.addToDynamicProgress(1);
+ // FIXME parse
}
+ public ReceiverDownloadData doDownloadReceiverDataAsObject() throws Exception
+ {
- public ReceiverDownloadData doDownloadReceiverDataAsObject() throws Exception {
-
// DexcomReader api = this;
ReceiverDownloadData data = new ReceiverDownloadData();
@@ -285,7 +239,8 @@
// data.addConfigurationEntry("CLOCK_MODE", api.readClockMode().name());
this.log.debug("Configuration: ");
- for (ReceiverDownloadDataConfig cfg : data.getConfigs()) {
+ for (ReceiverDownloadDataConfig cfg : data.getConfigs())
+ {
log.debug(cfg.getKey() + " = " + cfg.getValue());
}
@@ -397,7 +352,8 @@
// DexcomUtils.debugXmlTree(el);
- if (true) {
+ if (true)
+ {
return data;
}
@@ -486,10 +442,19 @@
return data;
}
+ public void dispose()
+ {
+ this.api.disconnectDevice();
+ }
- public static void main(String[] args) {
- try {
- DexcomDeviceReader dr = new DexcomDeviceReader("COM4", DexcomDevice.Dexcom_G4);
+ public static void main(String[] args)
+ {
+ try
+ {
+
+ long now = System.currentTimeMillis();
+
+ DexcomDeviceReader dr = new DexcomDeviceReader("COM9", DexcomDevice.Dexcom_G4);
// Date d = dr.getDisplayTime();
// System.out.println("Display Time: " + d);
// System.out.println("SysTime: " + dr.getSystemTime());
@@ -506,98 +471,53 @@
* dr.getDisplayTime());
*/
- // System.out.println("SysTime2: " + dr.getSystemTime2());
- } catch (Exception ex) {
+ dr.dispose();
+
+ double time_elapsed = System.currentTimeMillis() - now;
+
+ time_elapsed /= 1000.0;
+
+ System.out.println("Time needed for reading " + time_elapsed + " s.");
+ }
+ catch (Exception ex)
+ {
System.out.println("Error reading from " + ex);
ex.printStackTrace();
}
- Date d = new Date(2009, 1, 1);
- // d.setTime(177714110);
- // 177716034
-
- long ddd = d.getTime();
- ddd += 33555969;
-
- d.setTime(177716034 * 1000);
-
- System.out.println("SysTime: " + d);
-
- System.out.println("Ms: " + System.currentTimeMillis());
-
}
-
- public void setStaticProgressPercentage(int percentage) {
+ public void setDownloadCancel(boolean cancel)
+ {
// TODO Auto-generated method stub
}
-
- public void addToDynamicProgress(int progressAdd) {
+ public boolean isDownloadCanceled()
+ {
// TODO Auto-generated method stub
-
+ return false;
}
-
- public void addToStaticProgress(int progressAdd) {
- // TODO Auto-generated method stub
-
+ public DataOutputParserInterface getDataOutputParser()
+ {
+ return dataOutputParser;
}
-
- public void setMaxElementsForStaticProgress(int maxElements) {
- // TODO Auto-generated method stub
-
+ public void setDataOutputParser(DataOutputParserInterface dataOutputParser)
+ {
+ this.dataOutputParser = dataOutputParser;
}
-
- public void setMaxElementsForDynamicProgress(int maxElements) {
- // TODO Auto-generated method stub
-
+ public void addToProgress(ProgressType arg0, int arg1)
+ {
}
-
- public void setDownloadCancel(boolean cancel) {
- // TODO Auto-generated method stub
-
+ public void configureProgressReporter(ProgressType baseProgressType, int staticProgressPercentage,
+ int staticMaxElements, int dynamicMaxElements)
+ {
+ this.progressData.configureProgressReporter(baseProgressType, staticProgressPercentage, staticMaxElements,
+ dynamicMaxElements);
}
-
- public boolean isDownloadCanceled() {
- // TODO Auto-generated method stub
- return false;
- }
-
-
- public DataOutputParserInterface getDataOutputParser() {
- return dataOutputParser;
- }
-
-
- public void setDataOutputParser(DataOutputParserInterface dataOutputParser) {
- this.dataOutputParser = dataOutputParser;
- }
-
- // public ClockModeType ReadClockMode()
- // {
- //
- //
- // this.WriteGenericCommandPacket(DexcomCommands.ReadClockMode);
- // byte commandId = 0;
- // byte[] payload = this.ReadGenericCommandPacket(this.CommandTimeout, out
- // commandId);
- // this.VerifyResponseCommandByte(commandId, payload);
- // this.VerifyPayloadLength(payload.Length, 1);
- // return (ClockModeType) payload[0];
- // }
- //
- // public void readData(DexcomCommand dexCmd)
- // {
- // CommandPacket cmdPacket = new CommandPacket(dexCmd);
- //
- // this.writeCommandAndReadResult2(command)
- //
- // }
-
}
Modified: trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/data/output/DataOutputParserType.java
===================================================================
--- trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/data/output/DataOutputParserType.java 2014-08-27 19:48:17 UTC (rev 1290)
+++ trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/data/output/DataOutputParserType.java 2014-08-28 21:13:21 UTC (rev 1291)
@@ -7,4 +7,5 @@
G4_InsertionTime, //
G4_MeterData, //
G4_UserEventData //
+
}
Modified: trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/g4receiver/DexcomG4Api.java
===================================================================
--- trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/g4receiver/DexcomG4Api.java 2014-08-27 19:48:17 UTC (rev 1290)
+++ trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/g4receiver/DexcomG4Api.java 2014-08-28 21:13:21 UTC (rev 1291)
@@ -1,7 +1,6 @@
package ggc.cgms.device.dexcom.receivers.g4receiver;
import ggc.cgms.device.dexcom.receivers.DexcomDeviceProgressReport;
-import ggc.cgms.device.dexcom.receivers.DexcomDeviceProgressReport.ProgressType;
import ggc.cgms.device.dexcom.receivers.data.CommandPacket;
import ggc.cgms.device.dexcom.receivers.g4receiver.converter.BytesToDatabasePagesConverter;
import ggc.cgms.device.dexcom.receivers.g4receiver.converter.ConverterType;
@@ -32,8 +31,9 @@
import ggc.cgms.device.dexcom.receivers.g4receiver.util.DexcomUtils;
import ggc.cgms.device.dexcom.receivers.g4receiver.util.DexcomUtils.BitConversion;
import ggc.cgms.device.dexcom.receivers.g4receiver.util.DexcomUtils.DexcomDateParsing;
-import gnu.io.CommPort;
+import ggc.plugin.data.progress.ProgressType;
import gnu.io.CommPortIdentifier;
+import gnu.io.NRSerialPort;
import gnu.io.PortInUseException;
import gnu.io.SerialPort;
@@ -51,84 +51,125 @@
import com.atech.utils.data.ShortUtils;
-public class DexcomG4Api {
+public class DexcomG4Api
+{
private static final Log log = LogFactory.getLog(DexcomG4Api.class);
- private CommPort serialDevice;
+ //private CommPort serialDevice;
private ShortUtils shortUtils = DexcomUtils.getShortUtils();
private PartitionInfo partitionInfo;
private CommPortIdentifier commPortIdentifier;
private DexcomDeviceProgressReport progressReport;
+ NRSerialPort serialDevice;
+ InputStream inputStream;
+ HashMap<ReceiverRecordType, DatabasePageRange> databasePagesRanges = new HashMap<ReceiverRecordType, DatabasePageRange>();
+ public DexcomG4Api(String portName, /*
+ * CommPort serialPort,
+ * CommPortIdentifier
+ * commPortIdentifier,
+ */
+ DexcomDeviceProgressReport progressReport)
+ {
+ serialDevice = new NRSerialPort(portName, 115200);
- public DexcomG4Api(CommPort serialPort, CommPortIdentifier commPortIdentifier,
- DexcomDeviceProgressReport progressReport) {
- this.serialDevice = serialPort;
- this.commPortIdentifier = commPortIdentifier;
+ //this.serialDevice = serialPort;
+ //this.commPortIdentifier = commPortIdentifier;
+ this.progressReport = progressReport;
+
+ serialDevice.connect();
+
+ inputStream = this.serialDevice.getInputStream();
}
+ public void disconnectDevice()
+ {
+ if (this.serialDevice.isConnected())
+ {
+ this.serialDevice.disconnect();
+ }
+ }
- public Element readFirmwareHeader() throws DexcomException {
- Element result = (Element)this.writeCommandAndReadParsedResponse(DexcomG4Commands.ReadFirmwareHeader);
- this.progressReport.addToProgressAndCheckIfCanceled(ProgressType.Dynamic, 1);
+ public Element readFirmwareHeader() throws DexcomException
+ {
+ Element result = (Element) this.writeCommandAndReadParsedResponse(DexcomG4Commands.ReadFirmwareHeader);
+ this.addToProgressAndCheckIfCanceled(1);
return result;
}
-
- public String readReceiverSerialNumber() throws DexcomException {
+ public String readReceiverSerialNumber() throws DexcomException
+ {
HashMap<String, String> map = readAllRecordsForManufacturingData();
return map.get("SerialNumber");
}
+ public void shutDownReceiver() throws DexcomException
+ {
- public void shutDownReceiver() throws DexcomException {
+ try
+ {
+ SerialPort serialPort = (SerialPort) this.commPortIdentifier.open("ggc", 4000);
- try {
- SerialPort serialPort = (SerialPort)this.commPortIdentifier.open("ggc", 4000);
-
- if (serialPort != null) {
+ if (serialPort != null)
+ {
byte[] resetPacket = new byte[6];
resetPacket[0] = 0x01;
resetPacket[1] = 0x06;
resetPacket[3] = 0x2e;
- resetPacket[4] = (byte)0xb8;
- resetPacket[5] = (byte)0x01;
+ resetPacket[4] = (byte) 0xb8;
+ resetPacket[5] = (byte) 0x01;
serialPort.getOutputStream().write(resetPacket); // , 200);
}
- } catch (IOException ex) {
+ }
+ catch (IOException ex)
+ {
log.error("Unable to write to serial device to shutdown.", ex);
throw new DexcomException(DexcomExceptionType.Receiver_ErrorWritingToReceiver, ex);
- } catch (PortInUseException ex) {
+ }
+ catch (PortInUseException ex)
+ {
throw new DexcomException(DexcomExceptionType.Receiver_ErrorWritingToReceiver, ex);
}
}
+ public DatabasePageRange readDatabasePageRange(ReceiverRecordType recordType) throws DexcomException
+ {
+ if (!databasePagesRanges.containsKey(recordType))
+ {
- public DatabasePageRange readDatabasePageRange(ReceiverRecordType recordType) throws DexcomException {
+ }
+
+ return this.readDatabasePageRangeReal(recordType);
+
+ }
+
+ public DatabasePageRange readDatabasePageRangeReal(ReceiverRecordType recordType) throws DexcomException
+ {
short[] data = this.writeCommandAndReadRawResponse(DexcomG4Commands.ReadDatabasePageRange, null,
- new Object[] { (long)recordType.getValue() });
+ new Object[] { (long) recordType.getValue() });
DatabasePageRange dpr = new DatabasePageRange();
dpr.setFirstPage(DexcomUtils.toInt(this.shortUtils.getShortSubArray(data, 0, 4), BitConversion.LITTLE_ENDIAN));
dpr.setLastPage(DexcomUtils.toInt(this.shortUtils.getShortSubArray(data, 4, 4), BitConversion.LITTLE_ENDIAN));
- log.debug("First page: " + dpr.getFirstPage() + ", Last page: " + dpr.getLastPage());
+ log.debug(String.format("DatabasePageRange [RecordType=%s, FirstPage=%s, LastPage=%s, PageCount=%s",
+ recordType.name(), dpr.getFirstPage(), dpr.getLastPage(), dpr.getPagesCount()));
return dpr;
}
-
- public List<InsertionTimeRecord> readAllRecordsForInsertionTime() throws DexcomException {
+ public List<InsertionTimeRecord> readAllRecordsForInsertionTime() throws DexcomException
+ {
List<DatabasePage> pages = readDatabasePagesAll(ReceiverRecordType.InsertionTime);
// log.debug("InsertionTime pages: " + pages.size());
- DataPagesToInsertionTimeConverter cnv = (DataPagesToInsertionTimeConverter)ConverterUtils
- .getConverter(ConverterType.DataPagesToInsertionTimeConverter);
+ DataPagesToInsertionTimeConverter cnv = (DataPagesToInsertionTimeConverter) ConverterUtils
+ .getConverter(ConverterType.DataPagesToInsertionTimeConverter);
List<InsertionTimeRecord> records = cnv.convert(pages);
@@ -137,14 +178,14 @@
return records;
}
-
- public List<MeterDataRecord> readAllRecordsForMeterData() throws DexcomException {
+ public List<MeterDataRecord> readAllRecordsForMeterData() throws DexcomException
+ {
List<DatabasePage> pages = readDatabasePagesAll(ReceiverRecordType.MeterData);
log.debug("Meter entries pages: " + pages.size());
- DataPagesToMeterConverter cnv = (DataPagesToMeterConverter)ConverterUtils
- .getConverter(ConverterType.DataPagesToMeterConverter);
+ DataPagesToMeterConverter cnv = (DataPagesToMeterConverter) ConverterUtils
+ .getConverter(ConverterType.DataPagesToMeterConverter);
List<MeterDataRecord> records = cnv.convert(pages);
@@ -153,14 +194,14 @@
return records;
}
-
- public List<UserEventDataRecord> readAllRecordsForEvents() throws DexcomException {
+ public List<UserEventDataRecord> readAllRecordsForEvents() throws DexcomException
+ {
List<DatabasePage> pages = readDatabasePagesAll(ReceiverRecordType.UserEventData);
log.debug("EventData pages: " + pages.size());
- DataPageToUserEventDataConverter cnv = (DataPageToUserEventDataConverter)ConverterUtils
- .getConverter(ConverterType.DataPageToUserEventDataConverter);
+ DataPageToUserEventDataConverter cnv = (DataPageToUserEventDataConverter) ConverterUtils
+ .getConverter(ConverterType.DataPageToUserEventDataConverter);
List<UserEventDataRecord> records = cnv.convert(pages);
@@ -169,15 +210,15 @@
return records;
}
+ public List<EGVRecord> readAllRecordsForEGVData() throws DexcomException
+ {
- public List<EGVRecord> readAllRecordsForEGVData() throws DexcomException {
-
List<DatabasePage> pages = readDatabasePagesAll(ReceiverRecordType.EGVData);
log.debug("EGV Data pages: " + pages.size());
- DataPageToEGVDataConverter cnv = (DataPageToEGVDataConverter)ConverterUtils
- .getConverter(ConverterType.DataPageToEGVDataConverter);
+ DataPageToEGVDataConverter cnv = (DataPageToEGVDataConverter) ConverterUtils
+ .getConverter(ConverterType.DataPageToEGVDataConverter);
List<EGVRecord> records = cnv.convert(pages);
@@ -186,29 +227,31 @@
return records;
}
-
- public HashMap<String, String> readAllRecordsForManufacturingData() throws DexcomException {
+ public HashMap<String, String> readAllRecordsForManufacturingData() throws DexcomException
+ {
List<DatabasePage> pages = readDatabasePagesAll(ReceiverRecordType.ManufacturingData);
log.debug("Manufacturing pages: " + pages.size());
- DataPagesToXmlRecordConverter cnv = (DataPagesToXmlRecordConverter)ConverterUtils
- .getConverter(ConverterType.DataPagesToXmlRecordConverter);
+ DataPagesToXmlRecordConverter cnv = (DataPagesToXmlRecordConverter) ConverterUtils
+ .getConverter(ConverterType.DataPagesToXmlRecordConverter);
List<XmlRecord> records = cnv.convert(pages, new ManufacturingDataRecord());
// there is only one record here and it's filled with Xml Data
- ManufacturingDataRecord xmlRecord = (ManufacturingDataRecord)records.get(0);
+ ManufacturingDataRecord xmlRecord = (ManufacturingDataRecord) records.get(0);
StringTokenizer strtok = new StringTokenizer(xmlRecord.getXmlData(), " ");
strtok.nextToken();
HashMap<String, String> paramMap = new HashMap<String, String>();
- while (strtok.hasMoreTokens()) {
+ while (strtok.hasMoreTokens())
+ {
String el = strtok.nextToken();
- if (el.contains("=")) {
+ if (el.contains("="))
+ {
String k = el.substring(0, el.indexOf("="));
String v = el.substring(el.indexOf("=") + 2);
v = v.substring(0, v.length() - 1);
@@ -217,24 +260,28 @@
}
}
- log.debug(paramMap);
+ //log.debug(paramMap);
+ this.addToProgressAndCheckIfCanceled(1);
+
return paramMap;
}
-
- public List<DatabasePage> readDatabasePagesAll(ReceiverRecordType recordType) throws DexcomException {
+ public List<DatabasePage> readDatabasePagesAll(ReceiverRecordType recordType) throws DexcomException
+ {
DatabasePageRange dpr = readDatabasePageRange(recordType);
int i = dpr.getFirstPage();
int j = 4;
List<DatabasePage> pages = new ArrayList<DatabasePage>();
- while (i <= dpr.getLastPage()) {
+ while (i <= dpr.getLastPage())
+ {
// if i>
// j = i + 5;
- if ((i + j) > dpr.getLastPage()) {
+ if ((i + j) > dpr.getLastPage())
+ {
// adjust j
j = dpr.getPagesCount() - i;
log.debug("J: " + j);
@@ -248,125 +295,137 @@
return pages;
}
-
public List<DatabasePage> readDatabasePages(ReceiverRecordType recordType, int pageNumber, int numberOfPages)
- throws DexcomException {
+ throws DexcomException
+ {
- if ((numberOfPages == 1) && (pageNumber == 0)) {
+ if ((numberOfPages == 1) && (pageNumber == 0))
+ {
log.debug(String.format("Reading pages %s of %s", pageNumber, recordType.name()));
- } else {
+ }
+ else
+ {
log.debug(String.format("Reading pages %s - %s of %s", pageNumber, ((pageNumber + numberOfPages) - 1),
recordType.name()));
}
- short[] data = this.writeCommandAndReadRawResponse(DexcomG4Commands.ReadDatabasePages, null, new Object[] {
- (long)recordType.getValue(), (long)pageNumber, (long)numberOfPages });
+ short[] data = this.writeCommandAndReadRawResponse(DexcomG4Commands.ReadDatabasePages, null,
+ new Object[] { (long) recordType.getValue(), (long) pageNumber, (long) numberOfPages });
- BytesToDatabasePagesConverter cnv = (BytesToDatabasePagesConverter)ConverterUtils
- .getConverter(ConverterType.BytesToDatabasePagesConverter);
+ BytesToDatabasePagesConverter cnv = (BytesToDatabasePagesConverter) ConverterUtils
+ .getConverter(ConverterType.BytesToDatabasePagesConverter);
List<DatabasePage> pages = cnv.convert(data);
- this.progressReport.addToProgressAndCheckIfCanceled(ProgressType.Dynamic, numberOfPages);
+ this.addToProgressAndCheckIfCanceled(numberOfPages);
return pages;
}
+ public int readSystemTime() throws DexcomException
+ {
+ Integer result = (Integer) this.writeCommandAndReadParsedResponse(DexcomG4Commands.ReadSystemTime, null);
+ this.addToProgressAndCheckIfCanceled(1);
- public int readSystemTime() throws DexcomException {
- Integer result = (Integer)this.writeCommandAndReadParsedResponse(DexcomG4Commands.ReadSystemTime, null);
- this.progressReport.addToProgressAndCheckIfCanceled(ProgressType.Dynamic, 1);
-
return result;
}
-
- public int readDisplayTime() throws DexcomException {
+ public int readDisplayTime() throws DexcomException
+ {
return readSystemTime() + DexcomUtils.readDisplayTimeOffset();
}
-
- public Date readSystemTimeAsDate() throws DexcomException {
+ public Date readSystemTimeAsDate() throws DexcomException
+ {
int systemTime = readSystemTime();
return DexcomUtils.getDateFromSeconds(systemTime);
}
-
- public Date readDisplayTimeAsDate() throws DexcomException {
+ public Date readDisplayTimeAsDate() throws DexcomException
+ {
return DexcomUtils.getDateFromSeconds(readSystemTime(), DexcomDateParsing.DateWithDifferenceWithTimeZoneFix);
}
+ public PartitionInfo readDatabasePartitionInfo() throws DexcomException
+ {
+ if (this.partitionInfo == null)
+ {
+ ElementToPartitionInfoConverter cnv = (ElementToPartitionInfoConverter) ConverterUtils
+ .getConverter(ConverterType.ElementToPartitionInfoConverter);
- public PartitionInfo readDatabasePartitionInfo() throws DexcomException {
- if (this.partitionInfo == null) {
- ElementToPartitionInfoConverter cnv = (ElementToPartitionInfoConverter)ConverterUtils
- .getConverter(ConverterType.ElementToPartitionInfoConverter);
-
- this.partitionInfo = cnv.convert((Element)this
- .writeCommandAndReadParsedResponse(DexcomG4Commands.ReadDatabaseParitionInfo));
+ this.partitionInfo = cnv.convert((Element) this
+ .writeCommandAndReadParsedResponse(DexcomG4Commands.ReadDatabaseParitionInfo));
}
-
+ this.addToProgressAndCheckIfCanceled(1);
return this.partitionInfo;
}
-
- public Partition getPartition(ReceiverRecordType recordType) throws Exception {
- if (this.partitionInfo == null) {
+ public Partition getPartition(ReceiverRecordType recordType) throws Exception
+ {
+ if (this.partitionInfo == null)
+ {
this.readDatabasePartitionInfo();
}
return this.partitionInfo.getPartitionByRecordType(recordType);
}
+ public int readDisplayTimeOffset() throws DexcomException
+ {
+ Integer value = (Integer) this.writeCommandAndReadParsedResponse(DexcomG4Commands.ReadDisplayTimeOffset);
- public int readDisplayTimeOffset() throws DexcomException {
- return (Integer)this.writeCommandAndReadParsedResponse(DexcomG4Commands.ReadDisplayTimeOffset);
+ this.addToProgressAndCheckIfCanceled(1);
+
+ return value;
}
+ public LanguageType readLanguage() throws DexcomException
+ {
+ Integer language = (Integer) this.writeCommandAndReadParsedResponse(DexcomG4Commands.ReadLanguage);
- public LanguageType readLanguage() throws DexcomException {
- Integer language = (Integer)this.writeCommandAndReadParsedResponse(DexcomG4Commands.ReadLanguage);
-
LanguageType lang = LanguageType.getEnum(language);
- if (lang == null) {
+ if (lang == null)
+ {
log.warn("Unknown language code: " + language);
return LanguageType.None;
}
-
+ this.addToProgressAndCheckIfCanceled(1);
return lang;
}
+ public GlucoseUnitType readGlucoseUnit() throws DexcomException
+ {
+ Integer glu = (Integer) this.writeCommandAndReadParsedResponse(DexcomG4Commands.ReadGlucoseUnit);
- public GlucoseUnitType readGlucoseUnit() throws DexcomException {
- Integer glu = (Integer)this.writeCommandAndReadParsedResponse(DexcomG4Commands.ReadGlucoseUnit);
-
GlucoseUnitType gluType = GlucoseUnitType.getEnum(glu);
- if (gluType == null) {
+ if (gluType == null)
+ {
log.warn("Unknown Glucose Unit Type code: " + glu);
return GlucoseUnitType.None;
}
-
+ this.addToProgressAndCheckIfCanceled(1);
return gluType;
}
+ public ClockModeType readClockMode() throws DexcomException
+ {
+ Integer clock = (Integer) this.writeCommandAndReadParsedResponse(DexcomG4Commands.ReadClockMode);
- public ClockModeType readClockMode() throws DexcomException {
- Integer clock = (Integer)this.writeCommandAndReadParsedResponse(DexcomG4Commands.ReadClockMode);
-
ClockModeType clockType = ClockModeType.getEnum(clock);
- if (clockType == null) {
+ if (clockType == null)
+ {
log.warn("Unknown Clock Mode Type code: " + clock);
return ClockModeType.ClockMode12Hour;
}
-
+ this.addToProgressAndCheckIfCanceled(1);
return clockType;
}
-
- private Object writeCommandAndReadParsedResponse(DexcomG4Commands command) throws DexcomException {
+ private Object writeCommandAndReadParsedResponse(DexcomG4Commands command) throws DexcomException
+ {
CommandPacket cmdPacket = this.createCommandPacket(command, null);
this.writeCommandAndReadRawResponse(null, cmdPacket, null);
@@ -375,103 +434,123 @@
return ParserUtils.parsePacketResponse(cmdPacket);
}
-
private Object writeCommandAndReadParsedResponse(DexcomG4Commands command, Object[] parameters)
- throws DexcomException {
+ throws DexcomException
+ {
CommandPacket cmdPacket = this.createCommandPacket(command, parameters);
this.writeCommandAndReadRawResponse(null, cmdPacket, parameters);
- System.out.println(cmdPacket.getResponse());
- log.debug(cmdPacket.getResponse());
+ //System.out.println(cmdPacket.getResponse());
+ //log.debug(cmdPacket.getResponse());
return ParserUtils.parsePacketResponse(cmdPacket);
}
-
- private CommandPacket createCommandPacket(DexcomG4Commands command, Object[] parameters) {
+ private CommandPacket createCommandPacket(DexcomG4Commands command, Object[] parameters)
+ {
CommandPacket cmdPacket;
- if (parameters == null) {
+ if (parameters == null)
+ {
cmdPacket = new CommandPacket(command);
- } else {
+ }
+ else
+ {
cmdPacket = new CommandPacket(command, parameters);
}
return cmdPacket;
}
-
private short[] writeCommandAndReadRawResponse(DexcomG4Commands command, CommandPacket cmdPacket,
- Object[] parameters) throws DexcomException {
- if (cmdPacket == null) {
+ Object[] parameters) throws DexcomException
+ {
+ if (cmdPacket == null)
+ {
cmdPacket = this.createCommandPacket(command, parameters);
}
// log.debug(byteUtils.getDebugByteArray(byteUtils.getByteSubArray(cmdPacket.getCommand(),
// 0, 12)));
- try {
+ try
+ {
short[] cmd = cmdPacket.getCommand();
- for (int element : cmd) {
+ for (int element : cmd)
+ {
this.serialDevice.getOutputStream().write(element);
}
- } catch (IOException ex) {
+ }
+ catch (IOException ex)
+ {
throw new DexcomException(DexcomExceptionType.Receiver_ErrorWritingToReceiver,
- new Object[] { ex.getLocalizedMessage() }, ex);
+ new Object[] { ex.getLocalizedMessage() }, ex);
}
- if (cmdPacket.getExpectedResponseLength() != 0) {
+ if (cmdPacket.getExpectedResponseLength() != 0)
+ {
this.readGenericCommandPacket(5000, cmdPacket);
this.verifyResponseCommandByte(cmdPacket);
- if (cmdPacket.getExpectedResponseLength() > 0) {
+ if (cmdPacket.getExpectedResponseLength() > 0)
+ {
this.verifyPayloadLength(cmdPacket);
}
return cmdPacket.getResponse();
- } else {
+ }
+ else
+ {
return new short[0];
}
}
-
- public short[] readGenericCommandPacket(int maxWaitMs, CommandPacket packet) throws DexcomException {
- if (this.serialDevice == null) {
+ // FIXME
+ public short[] readGenericCommandPacket(int maxWaitMs, CommandPacket packet) throws DexcomException
+ {
+ if (this.serialDevice == null)
+ {
throw new DexcomException("Invalid port or port closed!");
}
short[] destinationArray = null;
short[] buffer2 = new short[0x10005];
int destinationIndex = 0;
- long now = System.currentTimeMillis();
+ //long now = System.currentTimeMillis();
DexcomException exception = null;
// maxWaitMs
// while (System.currentTimeMillis() < (now + 20000))
{
- try {
+ try
+ {
short[] sourceArray = this.readSpecifiedBytes(4);
- try {
- if (sourceArray[0] == 1) {
+ try
+ {
+ if (sourceArray[0] == 1)
+ {
System.arraycopy(sourceArray, 0, buffer2, 0, 4);
destinationIndex = 4;
packet.setResponseCommandId(sourceArray[3]);
int length = this.shortUtils.convertIntsToUnsignedShort(sourceArray[2], sourceArray[1]);
// BitConverter.ToUInt16(sourceArray, 1);
- if (length > 6) {
+ if (length > 6)
+ {
length = (length - 6);
destinationArray = new short[length];
- log.debug("Expected length: " + length);
+ //log.debug("Expected length: " + length);
short[] buffer4 = this.readSpecifiedBytes(length);
System.arraycopy(buffer4, 0, buffer2, destinationIndex, length);
System.arraycopy(buffer4, 0, destinationArray, 0, length);
destinationIndex += length;
- } else {
+ }
+ else
+ {
destinationArray = new short[0];
}
@@ -482,27 +561,38 @@
int num4 = DexcomUtils.calculateCRC16(buffer2, 0, destinationIndex);
System.arraycopy(buffer5, 0, buffer2, destinationIndex, 2);
destinationIndex += 2;
- if (num3 != num4) {
+ if (num3 != num4)
+ {
exception = new DexcomException("Failed CRC check in packet.");
throw exception;
- } else {
+ }
+ else
+ {
exception = null;
}
- } else {
+ }
+ else
+ {
// log.error("SourceArray: " + this.byteUtils.getDebugByteArray(sourceArray));
exception = new DexcomException("Unknown data read. Failed to read start of packet.");
throw exception;
}
// break;
- } catch (DexcomException exception2) {
+ }
+ catch (DexcomException exception2)
+ {
exception = new DexcomException("Failed to read contents of generic packets.", exception2);
// throw exception;
}
- } catch (DexcomException ex) {
+ }
+ catch (DexcomException ex)
+ {
packet.setException(exception);
throw ex;
- } catch (Exception ex) {
+ }
+ catch (Exception ex)
+ {
exception = new DexcomException("Timed out waiting for response from receiver.", ex);
packet.setException(exception);
throw exception;
@@ -510,7 +600,8 @@
}
}
- if (exception != null) {
+ if (exception != null)
+ {
packet.setException(exception);
throw exception;
}
@@ -519,70 +610,62 @@
return destinationArray;
}
-
// FIXME DexcomException
- public short[] readSpecifiedBytes(int nrBytes) throws Exception {
+ @SuppressWarnings("resource")
+ public short[] readSpecifiedBytes(int nrBytes) throws Exception
+ {
int count = 0;
short[] retData = new short[nrBytes];
- // try
- // {
- // System.out.println("Av: " +
- // this.serialDevice.getInputStream().available());
- // this.serialDevice.getInputStream().read(retData);
- // }
- // catch (IOException e)
- // {
- // // TODO Auto-generated catch block
- // e.printStackTrace();
- // }
+ long till = System.currentTimeMillis() + 20000;
- Thread.sleep(500);
+ while (inputStream.available() < nrBytes)
+ {
- InputStream is = this.serialDevice.getInputStream();
+ if (System.currentTimeMillis() > till)
+ {
+ throw new DexcomException("Timeout: ");
+ }
- long till = System.currentTimeMillis() + 20000;
+ //log.warn("Waiting for data: " + is.available() + ", Req: " + nrBytes);
- while (is.available() == 0) {
- if (System.currentTimeMillis() > till) {
- throw new DexcomException("Timeout: ");
- }
+ Thread.sleep(44);
}
- //
- //
- while (count < nrBytes) {
- try {
- retData[count] = (short)is.read();
+ while (count < nrBytes)
+ {
+ try
+ {
+ retData[count] = (short) inputStream.read();
- // System.out.println("Count: " + count + ", " +
- // is.available());
- } catch (IOException ex) {
+ }
+ catch (IOException ex)
+ {
log.error("Error reading from Serial Port: " + ex, ex);
}
count++;
}
- // is.close();
-
return retData;
}
+ private void verifyPayloadLength(CommandPacket cmdPacket) throws DexcomException
+ {
- private void verifyPayloadLength(CommandPacket cmdPacket) throws DexcomException {
-
- if (cmdPacket.getResponse().length != cmdPacket.getExpectedResponseLength()) {
+ if (cmdPacket.getResponse().length != cmdPacket.getExpectedResponseLength())
+ {
throw new DexcomException(String.format("Receiver packet response length of %d != expected length of %d",
cmdPacket.getResponse().length, cmdPacket.getExpectedResponseLength()));
}
}
-
- public void verifyResponseCommandByte(CommandPacket packet) throws DexcomException {
+ public void verifyResponseCommandByte(CommandPacket packet) throws DexcomException
+ {
DexcomG4Commands receiverCommandFromByte = DexcomG4Commands.getCommandById(packet.getResponseCommandId());
// ReceiverCommands receiverCommandFromByte =
// ReceiverTools.GetReceiverCommandFromByte(commandByte);
- switch (receiverCommandFromByte) {
+ switch (receiverCommandFromByte)
+ {
case Ack:
return;
@@ -593,7 +676,8 @@
throw new DexcomException("Receiver reported an invalid command error.");
case InvalidParam:
- if ((packet.getResponse() != null) && (packet.getResponse().length >= 1)) {
+ if ((packet.getResponse() != null) && (packet.getResponse().length >= 1))
+ {
throw new DexcomException(String.format(
"Receiver reported an invalid parameter error for parameter {0}.", packet.getResponse()[0]));
}
@@ -609,4 +693,12 @@
packet.getResponseCommandId(), receiverCommandFromByte));
}
+ public void addToProgressAndCheckIfCanceled(int numberOfPages) throws DexcomException
+ {
+ if (this.progressReport != null)
+ {
+ this.progressReport.addToProgressAndCheckIfCanceled(ProgressType.Dynamic, numberOfPages);
+ }
+ }
+
}
Modified: trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/g4receiver/DexcomG4Commands.java
===================================================================
--- trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/g4receiver/DexcomG4Commands.java 2014-08-27 19:48:17 UTC (rev 1290)
+++ trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/g4receiver/DexcomG4Commands.java 2014-08-28 21:13:21 UTC (rev 1291)
@@ -22,20 +22,14 @@
InvalidParam(4), //
ReceiverError(6), //
- // new byte[] { 0x01, 0x06, 0x00, 0xb, 127, 117 }
- //1 6 0 11 127 117
-
// Commands
ReadSystemTime(0x22, 4, ParserType.IntegerParser, CommandParameter.None), //
//ReadSystemTimeOffset(0x23, 4, ParserType.IntegerParser, CommandParameter.None), //
-
ReadDisplayTimeOffset(0x1d, 4, ParserType.IntegerParser, CommandParameter.None), //
ReadLanguage(0x1b, 2, ParserType.IntegerParser, CommandParameter.None), //
ReadGlucoseUnit(0x25, 1, ParserType.IntegerParser, CommandParameter.None), //
ReadClockMode(0x29, 1, ParserType.IntegerParser, CommandParameter.None), //
-
ReadFirmwareHeader(11, -1, ParserType.XmlParser, CommandParameter.None), //
- // 15, new byte[]{ 0x01, 0x06, 0x00, 15, (byte)0xfb, 53 }
ReadDatabaseParitionInfo(15, -1, ParserType.XmlParser, CommandParameter.None), //
ReadDatabasePageRange(0x10, -1, ParserType.StringUTF8Parser, CommandParameter.Byte), //
ReadDatabasePages(0x11, -1, ParserType.None, CommandParameter.ByteIntByte), //
@@ -50,18 +44,16 @@
// ReadBatteryLevel = 0x21,
// ReadBatteryState = 0x30,
// ReadBlindedMode = 0x27,
- // ReadClockMode = 0x29,
// ReadDeviceMode = 0x2b,
// ReadDisplayTimeOffset = 0x1d,
//
- // ReadFirmwareSettings = 0x36,
+
// ReadFlashPage = 0x33,
// ReadHardwareBoardId = 0x31,
// ReadRTC = 0x1f,
- // ReadSystemTime = 0x22,
// ReadSystemTimeOffset = 0x23,
// ReadTransmi...
[truncated message content] |
|
From: <and...@us...> - 2014-08-29 15:34:28
|
Revision: 1292
http://sourceforge.net/p/ggc/code/1292
Author: andyrozman
Date: 2014-08-29 15:34:24 +0000 (Fri, 29 Aug 2014)
Log Message:
-----------
Dexcom - reading finsihed, with progress correct
Modified Paths:
--------------
trunk/ggc-cgm/pom.xml
trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/DexcomDeviceReader.java
trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/data/ReceiverDownloadData.java
trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/data/output/ConsoleOutputParser.java
trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/g4receiver/DexcomG4Api.java
trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/g4receiver/converter/data/DataPageToEGVDataConverter.java
trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/g4receiver/converter/data/DataPageToUserEventDataConverter.java
trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/g4receiver/converter/data/DataPagesToInsertionTimeConverter.java
trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/g4receiver/converter/data/DataPagesToMeterConverter.java
trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/g4receiver/util/DexcomUtils.java
trunk/ggc-plugin_base/src/ggc/plugin/data/progress/ProgressData.java
Removed Paths:
-------------
trunk/ggc-cgm/src/ggc/cgms/device/dexcom/FRC_DexcomTxt_DM3.java
trunk/ggc-cgm/src/ggc/cgms/device/dexcom/FRC_DexcomXml_DM3.java
trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/g4receiver/converter/ConverterUtils.java
Modified: trunk/ggc-cgm/pom.xml
===================================================================
--- trunk/ggc-cgm/pom.xml 2014-08-28 21:13:21 UTC (rev 1291)
+++ trunk/ggc-cgm/pom.xml 2014-08-29 15:34:24 UTC (rev 1292)
@@ -72,22 +72,16 @@
<version>1.1</version>
</dependency>
+
- <dependency>
- <groupId>com.neuronrobotics</groupId>
- <artifactId>nrjavaserial</artifactId>
- <version>3.9.3</version>
- </dependency>
+<dependency>
+ <groupId>com.neuronrobotics</groupId>
+ <artifactId>nrjavaserial</artifactId>
+ <version>3.9.3</version>
+</dependency>
-<!--
- <dependency>
- <groupId>org.scream3r</groupId>
- <artifactId>jssc</artifactId>
- <version>2.8.0</version>
- </dependency>
- -->
</dependencies>
Deleted: trunk/ggc-cgm/src/ggc/cgms/device/dexcom/FRC_DexcomTxt_DM3.java
===================================================================
--- trunk/ggc-cgm/src/ggc/cgms/device/dexcom/FRC_DexcomTxt_DM3.java 2014-08-28 21:13:21 UTC (rev 1291)
+++ trunk/ggc-cgm/src/ggc/cgms/device/dexcom/FRC_DexcomTxt_DM3.java 2014-08-29 15:34:24 UTC (rev 1292)
@@ -1,285 +0,0 @@
-package ggc.cgms.device.dexcom;
-
-import ggc.cgms.data.CGMSValuesSubEntry;
-import ggc.cgms.data.CGMSValuesTableModel;
-import ggc.plugin.data.GGCPlugInFileReaderContext;
-import ggc.plugin.device.DeviceIdentification;
-import ggc.plugin.output.OutputWriter;
-import ggc.plugin.protocol.XmlProtocolFile;
-import ggc.plugin.util.DataAccessPlugInBase;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.StringTokenizer;
-
-import javax.swing.JDialog;
-import javax.swing.JPanel;
-import javax.swing.filechooser.FileFilter;
-
-/**
- * Application: GGC - GNU Gluco Control
- * Plug-in: CGMS Tool (support for Pump devices)
- *
- * See AUTHORS for copyright information.
- *
- * 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
- *
- * Filename: Dexcom 7 Plus
- * Description: Dexcom 7 Plus implementation (just settings)
- *
- * Author: Andy {an...@at...}
- */
-
-public class FRC_DexcomTxt_DM3 extends XmlProtocolFile implements GGCPlugInFileReaderContext
-{
-
- ArrayList<CGMSValuesSubEntry> list = new ArrayList<CGMSValuesSubEntry>();
- CGMSValuesTableModel cvtm = null;
-
-
- /**
- * Constructor
- *
- * @param da
- * @param ow
- */
- public FRC_DexcomTxt_DM3(DataAccessPlugInBase da, OutputWriter ow)
- {
- super(da, ow);
- }
-
- public String getFileDescription()
- {
- return "DM3 Dexcom Software Export";
- }
-
- /**
- * Get File Download Panel
- *
- * @return
- */
- public JPanel getFileDownloadPanel()
- {
- return null;
- }
-
- public String getFileExtension()
- {
- return ".txt";
- }
-
- public String getFullFileDescription()
- {
- return "DM3 Dexcom Software Export (TXT)";
- }
-
-
- public boolean hasSpecialSelectorDialog()
- {
- return false;
- }
-
- public void readFile(String filename)
- {
- BufferedReader br=null;
- try
- {
-
- DeviceIdentification di = this.output_writer.getDeviceIdentification();
- di.is_file_import = true;
- di.fi_file_name = new File(filename).getName();
- di.company = this.m_da.getSelectedDeviceInstance().getDeviceCompany().getName();
- di.device_selected = this.m_da.getSelectedDeviceInstance().getName();
-
- this.output_writer.setDeviceIdentification(di);
- this.output_writer.writeDeviceIdentification();
-
-
- cvtm = (CGMSValuesTableModel)m_da.getDeviceDataHandler().getDeviceValuesTableModel();
-
- br = new BufferedReader(new FileReader(filename));
-
- String line = null;
-
- while ((line=br.readLine()) != null)
- {
- processLine(line);
- }
-
- }
- catch (Exception ex)
- {
- ex.printStackTrace();
- }
- finally
- {
- if (br!=null)
- {
- try
- {
- br.close();
- }
- catch (IOException e)
- {
- }
- }
- }
- //System.out.println("i = " + i + " lisr: " + list.size());
-
- }
-
-
- int i = 0;
- String tmp_time;
-
-
- private void addEntry(CGMSValuesSubEntry entry)
- {
- this.list.add(entry);
- this.cvtm.addEntry(entry);
- }
-
-
- private void processLine(String line)
- {
-
- //if (i>20)
- // return;
-
- StringTokenizer strtok = new StringTokenizer(line, "\t");
-
-
- int count = strtok.countTokens();
-
- int read_type = 0;
-
- if (count==6)
- {
- read_type = 2;
- }
- else if (count==12)
- {
- read_type = 0;
- }
- else if (count==8)
- {
- strtok.nextToken();
- strtok.nextToken();
- read_type = 2;
- }
- else if (count==7)
- {
- strtok.nextToken();
- read_type = 2;
- }
- else if (count==3)
- {
- read_type = 1;
- }
- else
- {
- System.out.println("Tokens: " + count);
- }
-
-
-
- //if (read_type>0)
-// if (read_type == 20)
- if (read_type>0)
- {
- CGMSValuesSubEntry sub = new CGMSValuesSubEntry();
- tmp_time = strtok.nextToken();
- //sub.setDate(DexcomCGMS.getDateFromString(tmp_time));
- //sub.datetime = DexcomCGMS.getDateFromString(tmp_time);
- //sub.time = DexcomCGMS.getTimeFromString(tmp_time);
- sub.setDateTime(DexcomCGMS.getDateTimeFromString(tmp_time));
- sub.type = CGMSValuesSubEntry.CGMS_BG_READING;
- strtok.nextToken();
- sub.value = Integer.parseInt(strtok.nextToken());
- addEntry(sub);
-
- if (read_type==2)
- {
- sub = new CGMSValuesSubEntry();
- tmp_time = strtok.nextToken();
- sub.setDateTime(DexcomCGMS.getDateTimeFromString(tmp_time));
- //sub.datetime = DexcomCGMS.getDateFromString(tmp_time);
- //sub.time = DexcomCGMS.getTimeFromString(tmp_time);
- sub.type = CGMSValuesSubEntry.METER_CALIBRATION_READING;
- strtok.nextToken();
- sub.value = Integer.parseInt(strtok.nextToken());
- addEntry(sub);
-
- //System.out.println("" + sub);
- }
-
- }
-
-
- i++;
-
- }
-
- public FileFilter getFileFilter()
- {
-
- return new FileFilter()
- {
-
- @Override
- public boolean accept(File f)
- {
- if (f.isDirectory())
- return true;
-
- return (f.getName().toLowerCase().endsWith(getFileExtension()));
- }
-
- @Override
- public String getDescription()
- {
- return getFileDescription() + " (" + getFileExtension() + ")";
- }
-
- };
-
-
- }
-
- public void goToNextDialog(JDialog currentDialog)
- {
- }
-
-
-
-
- public String toString()
- {
- return this.getFullFileDescription();
- }
-
- public void setOutputWriter(OutputWriter ow)
- {
- this.output_writer = ow;
- }
-
-
-
-
-
-}
Deleted: trunk/ggc-cgm/src/ggc/cgms/device/dexcom/FRC_DexcomXml_DM3.java
===================================================================
--- trunk/ggc-cgm/src/ggc/cgms/device/dexcom/FRC_DexcomXml_DM3.java 2014-08-28 21:13:21 UTC (rev 1291)
+++ trunk/ggc-cgm/src/ggc/cgms/device/dexcom/FRC_DexcomXml_DM3.java 2014-08-29 15:34:24 UTC (rev 1292)
@@ -1,286 +0,0 @@
-package ggc.cgms.device.dexcom;
-
-import ggc.cgms.data.CGMSValuesSubEntry;
-import ggc.cgms.data.CGMSValuesTableModel;
-import ggc.plugin.data.GGCPlugInFileReaderContext;
-import ggc.plugin.device.DeviceIdentification;
-import ggc.plugin.output.OutputWriter;
-import ggc.plugin.protocol.XmlProtocolFile;
-import ggc.plugin.util.DataAccessPlugInBase;
-
-import java.io.File;
-import java.util.ArrayList;
-
-import javax.swing.JDialog;
-import javax.swing.JPanel;
-import javax.swing.filechooser.FileFilter;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.xml.sax.Attributes;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.ext.DeclHandler;
-import org.xml.sax.ext.LexicalHandler;
-import org.xml.sax.helpers.XMLReaderFactory;
-
-/**
- * Application: GGC - GNU Gluco Control
- * Plug-in: CGMS Tool (support for Pump devices)
- *
- * See AUTHORS for copyright information.
- *
- * 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
- *
- * Filename: Dexcom 7 Plus
- * Description: Dexcom 7 Plus implementation (just settings)
- *
- * Author: Andy {an...@at...}
- */
-
-
-public class FRC_DexcomXml_DM3 extends XmlProtocolFile implements GGCPlugInFileReaderContext
-{
-
- private static Log log = LogFactory.getLog(FRC_DexcomXml_DM3.class);
-
- /**
- * Constructor
- *
- * @param da
- * @param ow
- */
- public FRC_DexcomXml_DM3(DataAccessPlugInBase da, OutputWriter ow)
- {
- super(da, ow);
- }
-
- public String getFileDescription()
- {
- return "DM3 Dexcom Software Export";
- }
-
- public String getFullFileDescription()
- {
- return "DM3 Dexcom Software Export (XML)";
- }
-
-
- /**
- * Get File Download Panel
- *
- * @return
- */
- public JPanel getFileDownloadPanel()
- {
- return null;
- }
-
- public String getFileExtension()
- {
- return ".xml";
- }
-
- public boolean hasSpecialSelectorDialog()
- {
- return false;
- }
-
-
-
-
-
- public void readFile(String filename)
- {
- try
- {
- DeviceIdentification di = this.output_writer.getDeviceIdentification();
- di.is_file_import = true;
- di.fi_file_name = new File(filename).getName();
- di.company = this.m_da.getSelectedDeviceInstance().getDeviceCompany().getName();
- di.device_selected = this.m_da.getSelectedDeviceInstance().getName();
-
- this.output_writer.setDeviceIdentification(di);
- this.output_writer.writeDeviceIdentification();
-
-
- XMLReader xmlReader = XMLReaderFactory.createXMLReader();
-
- MyContentHandler myCH = new MyContentHandler(this.m_da);
- xmlReader.setProperty("http://xml.org/sax/properties/lexical-handler",myCH);
- xmlReader.setProperty("http://xml.org/sax/properties/declaration-handler",myCH);
- xmlReader.setContentHandler(myCH);
- xmlReader.parse(filename);
-
- //ArrayList<CGMSValuesSubEntry> d = myCH.getData();
- myCH.finishReading();
-
- //System.out.println("Readings: " + d.size());
- }
- catch(Exception ex)
- {
- log.error("Exception on readFile. Ex: " + ex, ex);
- }
-
- }
-
-
- public String toString()
- {
- return this.getFullFileDescription();
- }
-
-
-
- private class MyContentHandler implements ContentHandler, DeclHandler, LexicalHandler //DefaultHandler,
- {
- //int i=0;
-
- //private int reading_element = 0;
-
-
- //public static final int READING_NOTHING = 0;
- //public static final int READING_SENSOR = 1;
- //public static final int READING_METER = 2;
-
- private ArrayList<CGMSValuesSubEntry> list_subs = new ArrayList<CGMSValuesSubEntry>();
- CGMSValuesTableModel cvtm = null;
- //DataAccessPlugInBase m_da;
-
- public MyContentHandler(DataAccessPlugInBase da)
- {
- cvtm = (CGMSValuesTableModel)da.getDeviceDataHandler().getDeviceValuesTableModel();
- }
-
-
- public void finishReading()
- {
- this.cvtm.finishReading();
- }
-
-
- /*
- public ArrayList<CGMSValuesSubEntry> getData()
- {
- return this.list_subs;
- }*/
-
-
- public void addEntry(CGMSValuesSubEntry entry)
- {
- this.list_subs.add(entry);
- this.cvtm.addEntry(entry);
- }
-
-
- public void startPrefixMapping(String prefix, String uri) throws SAXException { }
- public void attributeDecl(String eName, String aName, String type, String mode, String value) throws SAXException { }
- public void elementDecl(String name, String model) throws SAXException { }
- public void externalEntityDecl(String name, String publicId, String systemId) throws SAXException { }
- public void internalEntityDecl(String name, String value) throws SAXException { }
- public void comment(char[] ch, int start, int length) throws SAXException { }
- public void endCDATA() throws SAXException { }
- public void endDTD() throws SAXException { }
- public void endEntity(String name) throws SAXException { }
- public void startCDATA() throws SAXException { }
- public void startDTD(String name, String publicId, String systemId) throws SAXException { }
- public void startEntity(String name) throws SAXException { }
- public void characters(char[] ch, int start, int length) throws SAXException { }
- public void endDocument() throws SAXException { }
- public void endElement(String uri, String localName, String qName) throws SAXException { }
- public void endPrefixMapping(String prefix) throws SAXException { }
- public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException { }
- public void processingInstruction(String target, String data) throws SAXException { }
- public void setDocumentLocator(Locator locator) { }
- public void skippedEntity(String name) throws SAXException { }
- public void startDocument() throws SAXException { }
-
-
- public void startElement(String uri, String localName, String qName, Attributes atts) throws SAXException
- {
-
- if (localName.equals("Sensor"))
- {
- CGMSValuesSubEntry sub = new CGMSValuesSubEntry();
- String tmp_time = atts.getValue(0);
- sub.setDateTime(DexcomCGMS.getDateTimeFromString(tmp_time));
- sub.type = CGMSValuesSubEntry.CGMS_BG_READING;
- sub.value = Integer.parseInt(atts.getValue(2));
-
- this.addEntry(sub);
- }
- else if (localName.equals("Meter"))
- {
- CGMSValuesSubEntry sub = new CGMSValuesSubEntry();
- String tmp_time = atts.getValue(0);
- sub.setDateTime(DexcomCGMS.getDateTimeFromString(tmp_time));
- sub.type = CGMSValuesSubEntry.METER_CALIBRATION_READING;
- sub.value = Integer.parseInt(atts.getValue(2));
-
- this.addEntry(sub);
- }
- //else
- // this.reading_element = this.READING_NOTHING;
-
-
-// i++;
-
- }
-
- }
-
-
-
-
- public FileFilter getFileFilter()
- {
-
- return new FileFilter()
- {
-
- @Override
- public boolean accept(File f)
- {
- if (f.isDirectory())
- return true;
-
- return (f.getName().toLowerCase().endsWith(getFileExtension()));
- }
-
- @Override
- public String getDescription()
- {
- return getFileDescription() + " (*" + getFileExtension() + ")";
- }
-
- };
-
-
- }
-
-
- public void goToNextDialog(JDialog currentDialog)
- {
- }
-
- public void setOutputWriter(OutputWriter ow)
- {
- this.output_writer = ow;
- }
-
-
-}
Modified: trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/DexcomDeviceReader.java
===================================================================
--- trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/DexcomDeviceReader.java 2014-08-28 21:13:21 UTC (rev 1291)
+++ trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/DexcomDeviceReader.java 2014-08-29 15:34:24 UTC (rev 1292)
@@ -1,7 +1,6 @@
package ggc.cgms.device.dexcom.receivers;
import ggc.cgms.device.dexcom.receivers.data.ReceiverDownloadData;
-import ggc.cgms.device.dexcom.receivers.data.ReceiverDownloadDataConfig;
import ggc.cgms.device.dexcom.receivers.data.output.ConsoleOutputParser;
import ggc.cgms.device.dexcom.receivers.data.output.DataOutputParserInterface;
import ggc.cgms.device.dexcom.receivers.data.output.DataOutputParserType;
@@ -9,6 +8,7 @@
import ggc.cgms.device.dexcom.receivers.g4receiver.data.EGVRecord;
import ggc.cgms.device.dexcom.receivers.g4receiver.data.UserEventDataRecord;
import ggc.cgms.device.dexcom.receivers.g4receiver.enums.ReceiverRecordType;
+import ggc.cgms.device.dexcom.receivers.g4receiver.internal.DatabasePageRange;
import ggc.cgms.device.dexcom.receivers.g4receiver.internal.PartitionInfo;
import ggc.cgms.device.dexcom.receivers.g4receiver.util.DexcomException;
import ggc.cgms.device.dexcom.receivers.g4receiver.util.DexcomExceptionType;
@@ -17,7 +17,6 @@
import ggc.plugin.data.progress.ProgressType;
import gnu.io.CommPortIdentifier;
-import java.util.Date;
import java.util.Enumeration;
import java.util.List;
@@ -25,10 +24,8 @@
import org.apache.commons.logging.LogFactory;
import org.jdom.Element;
-//Still kludgy
-//Newer, similar to Dex's architecture, classes are in progress, but this works reliably, if not the
-//most efficient, elegant design around.
+
public class DexcomDeviceReader implements DexcomDeviceProgressReport
{
private Log log = LogFactory.getLog(DexcomDeviceReader.class);
@@ -38,6 +35,7 @@
DexcomG4Api api = null;
ProgressData progressData = new ProgressData();
private DataOutputParserInterface dataOutputParser = new ConsoleOutputParser();
+ boolean downloadCanceled = false;
public DexcomDeviceReader(String portName, DexcomDevice dexcomDevice) throws DexcomException
{
@@ -86,17 +84,15 @@
{
try
{
- this.progressData.configureProgressReporter(ProgressType.Dynamic, 0, 0, 8);
+ int progressDynamic = 10; // header 1, serial 3, system 1, display 2, lang 1, glu 1 clock 1
+ progressDynamic += api.isDatabasePageRangeCached(ReceiverRecordType.ManufacturingData) ? 0 : 1;
+
+
+ this.progressData.configureProgressReporter(ProgressType.Dynamic, 0, 0, progressDynamic);
- //currentProgressType = ProgressType.Dynamic;
-
ReceiverDownloadData data = new ReceiverDownloadData();
-
- //this.setStaticProgressPercentage(0);
- //this.setMaxElementsForDynamicProgress(8);
-
+
Element header = this.api.readFirmwareHeader();
- this.addToProgressAndCheckIfCanceled(ProgressType.Dynamic, 1);
data.addConfigurationEntry("API_VERSION", header.getAttributeValue("ApiVersion"), false);
data.addConfigurationEntry("PRODUCT_ID", header.getAttributeValue("ProductId"), false);
@@ -105,7 +101,7 @@
data.addConfigurationEntry("FIRMWARE_VERSION", header.getAttributeValue("FirmwareVersion"), false);
data.addConfigurationEntry("PORT_VERSION", header.getAttributeValue("PortVersion"), false);
data.addConfigurationEntry("RF_VERSION", header.getAttributeValue("RFVersion"), false);
-
+
data.setSerialNumber(api.readReceiverSerialNumber());
data.addConfigurationEntry("SYSTEM_TIME", DexcomUtils.getDateTimeString(api.readSystemTimeAsDate()), false);
@@ -115,9 +111,7 @@
data.addConfigurationEntry("GLUCOSE_UNIT", api.readGlucoseUnit().getDescription(), true);
data.addConfigurationEntry("CLOCK_MODE", api.readClockMode().getDescription(), true);
- // parse
- this.dataOutputParser.parse(DataOutputParserType.Configuration, data);
- this.addToProgressAndCheckIfCanceled(ProgressType.Dynamic, 1);
+ parseData(DataOutputParserType.Configuration, data);
}
catch (DexcomException ex)
@@ -133,6 +127,13 @@
}
}
+
+
+ private void parseData(DataOutputParserType parserType, ReceiverDownloadData data) throws DexcomException
+ {
+ this.dataOutputParser.parse(parserType, data);
+ this.addToProgressAndCheckIfCanceled(ProgressType.Dynamic, 1);
+ }
public void addToProgressAndCheckIfCanceled(ProgressType progressType, int progressAdd) throws DexcomException
{
@@ -150,100 +151,97 @@
public void downloadData() throws DexcomException
{
- // Element info = (Element) api.readDatabasePartitionInfo();
- ReceiverDownloadData data = new ReceiverDownloadData();
+ try {
+
+ ReceiverDownloadData data = new ReceiverDownloadData();
+
+ int staticProgressMax = 3; // serial (2), partition (1)
+ for (ReceiverRecordType rrt : ReceiverRecordType.getDownloadSupported().keySet())
+ {
+ staticProgressMax += api.isDatabasePageRangeCached(rrt) ? 0 : 1;
+ }
- this.configureProgressReporter(ProgressType.Dynamic_Static, 10, 10, 200);
+ this.configureProgressReporter(ProgressType.Dynamic_Static, 10, staticProgressMax, 200);
+
+
- this.progressData.setCurrentProgressType(ProgressType.Static);
+ this.progressData.setCurrentProgressType(ProgressType.Static);
+ int countDynamicElements = ReceiverRecordType.getDownloadSupported().size(); // parsing
+
+ for (ReceiverRecordType rrt : ReceiverRecordType.getDownloadSupported().keySet())
+ {
+ DatabasePageRange range = api.readDatabasePageRange(rrt);
+ countDynamicElements += range.getPagesCount();
+ }
- for (ReceiverRecordType rrt : ReceiverRecordType.getDownloadSupported().keySet())
- {
+ //log.debug(" === Progress should be 4");
+
+ this.progressData.setProgressDynamicMax(countDynamicElements);
+
+
- }
+ //log.debug(" === Progress should be 6");
+
+ PartitionInfo info = this.api.readDatabasePartitionInfo();
+ log.debug("Partition Info: PageLength: " + info.getPageDataLength());
- // FIXME
- // read page ranges to create dynamic counter
+ // FIXME
+ // report
- data.setSerialNumber(api.readReceiverSerialNumber());
+ log.debug("Partitions: " + info.getPartitions().size());
- PartitionInfo info = this.api.readDatabasePartitionInfo();
- log.debug("Partition Info: PageLength: " + info.getPageDataLength());
+ data.setSerialNumber(api.readReceiverSerialNumber());
+
+ log.debug("Progress: " + progressData.calculateProgress());
- // FIXME
- // report
+ //log.debug(" === Progress should be 7");
+
+
+
+ // set dynamic
+ this.progressData.setCurrentProgressType(ProgressType.Dynamic);
- log.debug("Partitions: " + info.getPartitions().size());
+ data.addData(DataOutputParserType.G4_UserEventData, api.readAllRecordsForEvents());
+ parseData(DataOutputParserType.Configuration, data);
- // log.debug(api.readDatabasePageRange(ReceiverRecordType.InsertionTime));
- //this.addToDynamicProgress(1);
- // set dynamic
- this.progressData.setCurrentProgressType(ProgressType.Dynamic);
+ data.addData(DataOutputParserType.G4_EGVData, api.readAllRecordsForEGVData());
+ parseData(DataOutputParserType.Configuration, data);
- data.addData(DataOutputParserType.G4_UserEventData, api.readAllRecordsForEvents());
- // FIXME parse
- data.addData(DataOutputParserType.G4_EGVData, api.readAllRecordsForEGVData());
- // FIXME parse
+ data.addData(DataOutputParserType.G4_InsertionTime, api.readAllRecordsForInsertionTime());
+ parseData(DataOutputParserType.Configuration, data);
- data.addData(DataOutputParserType.G4_InsertionTime, api.readAllRecordsForInsertionTime());
- // FIXME parse
- data.addData(DataOutputParserType.G4_MeterData, api.readAllRecordsForMeterData());
- // FIXME parse
+ data.addData(DataOutputParserType.G4_MeterData, api.readAllRecordsForMeterData());
+ parseData(DataOutputParserType.Configuration, data);
+
+
+ } catch (DexcomException ex) {
+ if ((ex.getExceptionType() != null)
+ && (ex.getExceptionType() == DexcomExceptionType.DownloadCanceledByUser))
+ {
+ return;
+ }
+ throw ex;
+ }
+
}
- public ReceiverDownloadData doDownloadReceiverDataAsObject() throws Exception
+ public ReceiverDownloadData testDownload() throws Exception
{
// DexcomReader api = this;
ReceiverDownloadData data = new ReceiverDownloadData();
- Date now = new Date();
+
// Element header = this.api.readFirmwareHeader();
//
- // //log.debug("Xml: " + header.toString());
- //
- // data.addConfigurationEntry("API_VERSION", header.getAttributeValue("ApiVersion"));
- // data.addConfigurationEntry("PRODUCT_ID", header.getAttributeValue("ProductId")); // header.getProductId());
- // data.addConfigurationEntry("PRODUCT_NAME", header.getAttributeValue("ProductName")); //
- // header.getProductName());
- // data.addConfigurationEntry("SOFTWARE_NUMBER", header.getAttributeValue("SoftwareNumber")); //
- // header.getSoftwareNumber());
- // data.addConfigurationEntry("FIRMWARE_VERSION", header.getAttributeValue("FirmwareVersion")); //
- // header.getFirmwareVersion());
- // data.addConfigurationEntry("PORT_VERSION", header.getAttributeValue("PortVersion")); //
- // header.getPortVersion());
- // data.addConfigurationEntry("RF_VERSION", header.getAttributeValue("RFVersion")); // header.getRFVersion());
- // FIXME
- // data.setSerialNumber(api.readReceiverSerialNumber());
- // obj2.Element.AppendChild(ownerDocument.ImportNode(obj3.Element,
- // true));
- // data.addConfigurationEntry("SYSTEM_TIME", api.readSystemTime()); //
- // obj3.getAttributeAsDateTime("SystemTime").ToString("YYYYMMDDHHmmSS"));
- // data.addConfigurationEntry("DISPLAY_TIME",
- // this.getDisplayTime().toString());
- // //obj3.getAttributeAsDateTime("DisplayTime").ToString("YYYYMMDDHHmmSS"));
- // data.addConfigurationEntry("DISPLAY_TIME_OFFSET",
- // api.readDisplayTimeOffset());
- // //obj3.getAttributeAsDateTimeOffset("DisplayTimeOffset").ToString("HHmmSS"));
- // data.addConfigurationEntry("LANGUAGE", api.readLanguage().name());
- // data.addConfigurationEntry("GLUCOSE_UNIT",
- // api.readGlucoseUnits().name());
- // data.addConfigurationEntry("CLOCK_MODE", api.readClockMode().name());
-
- this.log.debug("Configuration: ");
- for (ReceiverDownloadDataConfig cfg : data.getConfigs())
- {
- log.debug(cfg.getKey() + " = " + cfg.getValue());
- }
-
// ERRORS
// if ((recordsFilter & ReceiverRecordTypeFlags.ProcessorErrors) ==
// ReceiverRecordTypeFlags.ProcessorErrors)
@@ -261,58 +259,8 @@
//
// }
- // {
- //
- // XPartitionInfo info = api.readDatabasePartitionInfo();
- //
+
- // Element info = (Element)api.readDatabasePartitionInfo();
-
- // XmlParser parser =
- // (XmlParser)ParserUtils.getParser(ParserType.XmlParser);
-
- // log.debug("PartitionInfo: "+ info);
- // log.debug("PartitionInfo Xml: \n" +
- // ((XmlParser)ParserUtils.getParser(ParserType.XmlParser)).getXml(info));
-
- // <PartitionInfo SchemaVersion="1" PageHeaderVersion="1"
- // PageDataLength="500">
- // <Partition Name="ManufacturingData" Id="0" RecordRevision="1"
- // RecordLength="500" />
- // <Partition Name="FirmwareParameterData" Id="1" RecordRevision="1"
- // RecordLength="500" />
- // <Partition Name="PCSoftwareParameter" Id="2" RecordRevision="1"
- // RecordLength="500" />
- // <Partition Name="SensorData" Id="3" RecordRevision="1"
- // RecordLength="20" />
- // <Partition Name="EGVData" Id="4" RecordRevision="2" RecordLength="13"
- // />
- // <Partition Name="CalSet" Id="5" RecordRevision="2" RecordLength="148"
- // />
- // <Partition Name="Aberration" Id="6" RecordRevision="1"
- // RecordLength="15" />
- // <Partition Name="InsertionTime" Id="7" RecordRevision="1"
- // RecordLength="15" />
- // <Partition Name="ReceiverLogData" Id="8" RecordRevision="1"
- // RecordLength="20" />
- // <Partition Name="ReceiverErrorData" Id="9" RecordRevision="1"
- // RecordLength="500" />
- // <Partition Name="MeterData" Id="10" RecordRevision="1"
- // RecordLength="16" />
- // <Partition Name="UserEventData" Id="11" RecordRevision="1"
- // RecordLength="20" />
- // <Partition Name="UserSettingData" Id="12" RecordRevision="3"
- // RecordLength="48" />
- // </PartitionInfo>
-
- /*
- * for(Object ch : info.getChildren()) { Element ell = (Element)ch;
- *
- * log.debug(ell.getAttribute("Name").toString());
- *
- * }
- */
-
PartitionInfo info = this.api.readDatabasePartitionInfo();
log.debug("Partition Info: PageLength: " + info.getPageDataLength());
@@ -352,93 +300,7 @@
// DexcomUtils.debugXmlTree(el);
- if (true)
- {
- return data;
- }
-
- // int allPages = doCountDatabasePagesInReceiver(api);
- // log.debug("All pages count: " + allPages);
- // int num3 = 6;
- // allPages += num3 + 1;
- // //
- //
- // List<XPage> dataPages = new List<XPage>();
- // log.Debug("Partirions count: " + info.getPartitions().getCount());
- // for (Object __dummyForeachVar2 : info.getPartitions())
- // {
- // XPartition partition = (XPartition)__dummyForeachVar2;
- // int num7 = 0; //new int();
- // Func<KeyValuePair<ReceiverRecordType, XPageHeader>, boolean>
- // predicate = null;
- //
- // byte id = partition.getId();
- // ReceiverRecordType record_type = (ReceiverRecordType)id;
- //
- // log.Debug("Partition for ReceiverRecordType: " +
- // record_type.ToString());
- // DatabasePageRange range = api.readDatabasePageRange(record_type);
- //
- // if (range.LastPage == Integer.MAX_VALUE)
- // {
- // continue;
- // }
- //
- // int first_page = range.FirstPage;
- // int last_page = range.LastPage;
- // log.Debug("Range: first=" + range.FirstPage + ", last=" +
- // range.LastPage);
- // //if (true)
- // // continue;
- // num7 = first_page;
- // while (num7 <= last_page)
- // {
- // // if ((backgroundWorker != null) &&
- // backgroundWorker.CancellationPending)
- // // {
- // // break;
- // // }
- //
- // num3++;
- // int num8 = Convert.ToInt32((double)(((((double)num3) /
- // ((double)allPages)) * 100.0) * 10.0));
- //
- //
- // int num9 = (last_page - num7) + 1;
- // if (num9 > 4)
- // {
- // num9 = 4;
- // }
- //
- // for (Object __dummyForeachVar1 :
- // api.readDatabasePages(record_type,num7,(byte)num9))
- // {
- // DatabasePage page = (DatabasePage)__dummyForeachVar1;
- // XPage page2 = new XPage();
- // //obj8.AppendChild(page2);
- // page2.getPageHeader().setPageNumber(page.PageHeader.PageNumber);
- // page2.getPageHeader().setRecordType(page.PageHeader.RecordType.ToString());
- // page2.getPageHeader().setRecordTypeId(((Enum)page.PageHeader.RecordType).ordinal());
- // page2.getPageHeader().setRecordRevision(page.PageHeader.Revision);
- // page2.getPageHeader().setFirstRecordIndex(page.PageHeader.FirstRecordIndex);
- // page2.getPageHeader().setNumberOfRecords(page.PageHeader.NumberOfRecords);
- // page2.getPageHeader().setCrc(page.PageHeader.Crc);
- // page2.setPageData(page.PageData);
- // dataPages.Add(page2);
- // }
- // num3 += ((int)num9) - 1;
- // num7 += num9 - 1;
- // num7++;
- // }
- // }
- // ReceiverDatabaseRecordsParser records = new
- // ReceiverDatabaseRecordsParser();
- // records.ParsePages(dataPages);
- // data.setData(records);
- // }
- // records.Parse(receiverData);
-
- int intValue = 0;
+
return data;
}
@@ -449,17 +311,22 @@
public static void main(String[] args)
{
+ DexcomDeviceReader dr = null;
+
try
{
long now = System.currentTimeMillis();
- DexcomDeviceReader dr = new DexcomDeviceReader("COM9", DexcomDevice.Dexcom_G4);
+ dr = new DexcomDeviceReader("COM9", DexcomDevice.Dexcom_G4);
// Date d = dr.getDisplayTime();
// System.out.println("Display Time: " + d);
// System.out.println("SysTime: " + dr.getSystemTime());
+
+ dr.downloadSettings();
+ //dr.downloadData();
- dr.doDownloadReceiverDataAsObject();
+ //dr.doDownloadReceiverDataAsObject();
// Date d = new
@@ -484,19 +351,24 @@
System.out.println("Error reading from " + ex);
ex.printStackTrace();
}
+ finally
+ {
+ if (dr!=null)
+ dr.dispose();
+ }
+
+
}
public void setDownloadCancel(boolean cancel)
{
- // TODO Auto-generated method stub
-
+ downloadCanceled = cancel;
}
public boolean isDownloadCanceled()
{
- // TODO Auto-generated method stub
- return false;
+ return downloadCanceled;
}
public DataOutputParserInterface getDataOutputParser()
Modified: trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/data/ReceiverDownloadData.java
===================================================================
--- trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/data/ReceiverDownloadData.java 2014-08-28 21:13:21 UTC (rev 1291)
+++ trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/data/ReceiverDownloadData.java 2014-08-29 15:34:24 UTC (rev 1292)
@@ -50,4 +50,10 @@
this.data.put(dataType, list);
}
+
+ public List<?> getDataByType(DataOutputParserType type)
+ {
+ return data.get(type);
+ }
+
}
Modified: trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/data/output/ConsoleOutputParser.java
===================================================================
--- trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/data/output/ConsoleOutputParser.java 2014-08-28 21:13:21 UTC (rev 1291)
+++ trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/data/output/ConsoleOutputParser.java 2014-08-29 15:34:24 UTC (rev 1292)
@@ -1,13 +1,45 @@
package ggc.cgms.device.dexcom.receivers.data.output;
import ggc.cgms.device.dexcom.receivers.data.ReceiverDownloadData;
+import ggc.cgms.device.dexcom.receivers.data.ReceiverDownloadDataConfig;
+
public class ConsoleOutputParser implements DataOutputParserInterface
{
public void parse(DataOutputParserType parserType, ReceiverDownloadData data)
{
- // TODO Auto-generated method stub
+
+ System.out.println("Serial Number: " + data.getSerialNumber());
+
+
+ switch(parserType)
+ {
+ case Configuration:
+ {
+ for(ReceiverDownloadDataConfig cfg : data.getConfigs())
+ {
+ System.out.println(cfg);
+ }
+ }
+ break;
+ case G4_EGVData:
+ case G4_InsertionTime:
+ case G4_MeterData:
+ case G4_UserEventData:
+ {
+ for(Object dtEl : data.getDataByType(parserType))
+ {
+ System.out.println(dtEl);
+ }
+ }
+ break;
+ default:
+ break;
+
+ }
+
+
}
Modified: trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/g4receiver/DexcomG4Api.java
===================================================================
--- trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/g4receiver/DexcomG4Api.java 2014-08-28 21:13:21 UTC (rev 1291)
+++ trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/g4receiver/DexcomG4Api.java 2014-08-29 15:34:24 UTC (rev 1292)
@@ -4,7 +4,7 @@
import ggc.cgms.device.dexcom.receivers.data.CommandPacket;
import ggc.cgms.device.dexcom.receivers.g4receiver.converter.BytesToDatabasePagesConverter;
import ggc.cgms.device.dexcom.receivers.g4receiver.converter.ConverterType;
-import ggc.cgms.device.dexcom.receivers.g4receiver.converter.ConverterUtils;
+
import ggc.cgms.device.dexcom.receivers.g4receiver.converter.ElementToPartitionInfoConverter;
import ggc.cgms.device.dexcom.receivers.g4receiver.converter.data.DataPageToEGVDataConverter;
import ggc.cgms.device.dexcom.receivers.g4receiver.converter.data.DataPageToUserEventDataConverter;
@@ -139,12 +139,16 @@
{
if (!databasePagesRanges.containsKey(recordType))
{
-
+ databasePagesRanges.put(recordType, this.readDatabasePageRangeReal(recordType));
}
- return this.readDatabasePageRangeReal(recordType);
-
+ return databasePagesRanges.get(recordType);
}
+
+ public boolean isDatabasePageRangeCached(ReceiverRecordType recordType)
+ {
+ return databasePagesRanges.containsKey(recordType);
+ }
public DatabasePageRange readDatabasePageRangeReal(ReceiverRecordType recordType) throws DexcomException
{
@@ -156,9 +160,11 @@
dpr.setFirstPage(DexcomUtils.toInt(this.shortUtils.getShortSubArray(data, 0, 4), BitConversion.LITTLE_ENDIAN));
dpr.setLastPage(DexcomUtils.toInt(this.shortUtils.getShortSubArray(data, 4, 4), BitConversion.LITTLE_ENDIAN));
- log.debug(String.format("DatabasePageRange [RecordType=%s, FirstPage=%s, LastPage=%s, PageCount=%s",
+ log.debug(String.format("DatabasePageRange [RecordType=%s, FirstPage=%s, LastPage=%s, PageCount=%s]",
recordType.name(), dpr.getFirstPage(), dpr.getLastPage(), dpr.getPagesCount()));
+ this.addToProgressAndCheckIfCanceled(1);
+
return dpr;
}
@@ -168,12 +174,13 @@
// log.debug("InsertionTime pages: " + pages.size());
- DataPagesToInsertionTimeConverter cnv = (DataPagesToInsertionTimeConverter) ConverterUtils
+ DataPagesToInsertionTimeConverter cnv = (DataPagesToInsertionTimeConverter) DexcomUtils
.getConverter(ConverterType.DataPagesToInsertionTimeConverter);
List<InsertionTimeRecord> records = cnv.convert(pages);
// log.debug("InsertionTime Records: " + records.size());
+ log.debug(String.format("InsertionTime Data [records=%s,pages=%s]", records.size(), pages.size()));
return records;
}
@@ -182,14 +189,15 @@
{
List<DatabasePage> pages = readDatabasePagesAll(ReceiverRecordType.MeterData);
- log.debug("Meter entries pages: " + pages.size());
+ //log.debug("Meter entries pages: " + pages.size());
- DataPagesToMeterConverter cnv = (DataPagesToMeterConverter) ConverterUtils
+ DataPagesToMeterConverter cnv = (DataPagesToMeterConverter) DexcomUtils
.getConverter(ConverterType.DataPagesToMeterConverter);
List<MeterDataRecord> records = cnv.convert(pages);
- log.debug("MeterDataRecord Records: " + records.size());
+ //log.debug("MeterDataRecord Records: " + records.size());
+ log.debug(String.format("Meter Data [records=%s,pages=%s]", records.size(), pages.size()));
return records;
}
@@ -198,14 +206,15 @@
{
List<DatabasePage> pages = readDatabasePagesAll(ReceiverRecordType.UserEventData);
- log.debug("EventData pages: " + pages.size());
+ //log.debug("EventData pages: " + pages.size());
- DataPageToUserEventDataConverter cnv = (DataPageToUserEventDataConverter) ConverterUtils
+ DataPageToUserEventDataConverter cnv = (DataPageToUserEventDataConverter) DexcomUtils
.getConverter(ConverterType.DataPageToUserEventDataConverter);
List<UserEventDataRecord> records = cnv.convert(pages);
- log.debug("EventData Records: " + records.size());
+ //log.debug("EventData Records: " + records.size());
+ log.debug(String.format("Event Data [records=%s,pages=%s]", records.size(), pages.size()));
return records;
}
@@ -215,14 +224,14 @@
List<DatabasePage> pages = readDatabasePagesAll(ReceiverRecordType.EGVData);
- log.debug("EGV Data pages: " + pages.size());
+ //log.debug("EGV Data pages: " + pages.size());
- DataPageToEGVDataConverter cnv = (DataPageToEGVDataConverter) ConverterUtils
+ DataPageToEGVDataConverter cnv = (DataPageToEGVDataConverter) DexcomUtils
.getConverter(ConverterType.DataPageToEGVDataConverter);
List<EGVRecord> records = cnv.convert(pages);
- log.debug("EGV Data records: " + records.size());
+ log.debug(String.format("EGV Data [records=%s,pages=%s]", records.size(), pages.size()));
return records;
}
@@ -233,7 +242,7 @@
log.debug("Manufacturing pages: " + pages.size());
- DataPagesToXmlRecordConverter cnv = (DataPagesToXmlRecordConverter) ConverterUtils
+ DataPagesToXmlRecordConverter cnv = (DataPagesToXmlRecordConverter) DexcomUtils
.getConverter(ConverterType.DataPagesToXmlRecordConverter);
List<XmlRecord> records = cnv.convert(pages, new ManufacturingDataRecord());
@@ -261,9 +270,9 @@
}
//log.debug(paramMap);
+ log.debug(String.format("Manufacturing Data [parameters=%s, pages=%s]", paramMap.size(), pages.size()));
+ //this.addToProgressAndCheckIfCanceled(1);
- this.addToProgressAndCheckIfCanceled(1);
-
return paramMap;
}
@@ -284,7 +293,7 @@
{
// adjust j
j = dpr.getPagesCount() - i;
- log.debug("J: " + j);
+ //log.debug("J: " + j);
}
pages.addAll(readDatabasePages(recordType, i, j));
@@ -312,7 +321,7 @@
short[] data = this.writeCommandAndReadRawResponse(DexcomG4Commands.ReadDatabasePages, null,
new Object[] { (long) recordType.getValue(), (long) pageNumber, (long) numberOfPages });
- BytesToDatabasePagesConverter cnv = (BytesToDatabasePagesConverter) ConverterUtils
+ BytesToDatabasePagesConverter cnv = (BytesToDatabasePagesConverter) DexcomUtils
.getConverter(ConverterType.BytesToDatabasePagesConverter);
List<DatabasePage> pages = cnv.convert(data);
@@ -350,7 +359,7 @@
{
if (this.partitionInfo == null)
{
- ElementToPartitionInfoConverter cnv = (ElementToPartitionInfoConverter) ConverterUtils
+ ElementToPartitionInfoConverter cnv = (ElementToPartitionInfoConverter) DexcomUtils
.getConverter(ConverterType.ElementToPartitionInfoConverter);
this.partitionInfo = cnv.convert((Element) this
@@ -360,7 +369,7 @@
return this.partitionInfo;
}
- public Partition getPartition(ReceiverRecordType recordType) throws Exception
+ public Partition getPartition(ReceiverRecordType recordType) throws DexcomException
{
if (this.partitionInfo == null)
{
Deleted: trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/g4receiver/converter/ConverterUtils.java
===================================================================
--- trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/g4receiver/converter/ConverterUtils.java 2014-08-28 21:13:21 UTC (rev 1291)
+++ trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/g4receiver/converter/ConverterUtils.java 2014-08-29 15:34:24 UTC (rev 1292)
@@ -1,39 +0,0 @@
-package ggc.cgms.device.dexcom.receivers.g4receiver.converter;
-
-import ggc.cgms.device.dexcom.receivers.g4receiver.converter.data.DataPageToEGVDataConverter;
-import ggc.cgms.device.dexcom.receivers.g4receiver.converter.data.DataPageToUserEventDataConverter;
-import ggc.cgms.device.dexcom.receivers.g4receiver.converter.data.DataPagesToInsertionTimeConverter;
-import ggc.cgms.device.dexcom.receivers.g4receiver.converter.data.DataPagesToMeterConverter;
-import ggc.cgms.device.dexcom.receivers.g4receiver.converter.data.DataPagesToXmlRecordConverter;
-
-import java.util.HashMap;
-
-public class ConverterUtils
-{
- private static HashMap<ConverterType, Object> converters = new HashMap<ConverterType, Object>();
-
- static
- {
- converters.put(ConverterType.ElementToPartitionInfoConverter, new ElementToPartitionInfoConverter());
- converters.put(ConverterType.BytesToDatabasePagesConverter, new BytesToDatabasePagesConverter());
- converters.put(ConverterType.DataPagesToInsertionTimeConverter, new DataPagesToInsertionTimeConverter());
- converters.put(ConverterType.DataPagesToXmlRecordConverter, new DataPagesToXmlRecordConverter());
- converters.put(ConverterType.DataPageToEGVDataConverter, new DataPageToEGVDataConverter());
- converters.put(ConverterType.DataPageToUserEventDataConverter, new DataPageToUserEventDataConverter());
- converters.put(ConverterType.DataPagesToMeterConverter, new DataPagesToMeterConverter());
-
- // parsers.put(ParserType.IntegerParser, new IntegerParser());
- // parsers.put(ParserType.StringUTF8Parser, new StringUTF8Parser());
- // parsers.put(ParserType.XmlParser, new XmlParser());
- }
-
- private ConverterUtils()
- {
- }
-
- public static Object getConverter(ConverterType converterType)
- {
- return converters.get(converterType);
- }
-
-}
Modified: trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/g4receiver/converter/data/DataPageToEGVDataConverter.java
===================================================================
--- trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/g4receiver/converter/data/DataPageToEGVDataConverter.java 2014-08-28 21:13:21 UTC (rev 1291)
+++ trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/g4receiver/converter/data/DataPageToEGVDataConverter.java 2014-08-29 15:34:24 UTC (rev 1292)
@@ -9,12 +9,9 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
public class DataPageToEGVDataConverter extends BytesConverterAbstract
{
- private static final Log log = LogFactory.getLog(DataPageToEGVDataConverter.class);
+ //private static final Log log = LogFactory.getLog(DataPageToEGVDataConverter.class);
public List<EGVRecord> convert(List<DatabasePage> pages) throws DexcomException
{
@@ -31,13 +28,13 @@
egv.setDisplaySeconds(this.getIntFromArray(data, 4));
egv.glucoseValueWithFlags = this.getShortFromArray(data, 8);
egv.trendArrowAndNoise = (byte) data[10];
- egv.setCrc(this.getShortFromArray(data, 11));
+ egv.setCrc(this.getIntShortFromArray(data, 11));
- //this.checkCrc(data, itr.getCrc());
+ this.checkCrc(data, egv.getCrc());
records.add(egv);
- log.debug(egv);
+ //log.debug(egv);
}
return records;
Modified: trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/g4receiver/converter/data/DataPageToUserEventDataConverter.java
===================================================================
--- trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/g4receiver/converter/data/DataPageToUserEventDataConverter.java 2014-08-28 21:13:21 UTC (rev 1291)
+++ trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/g4receiver/converter/data/DataPageToUserEventDataConverter.java 2014-08-29 15:34:24 UTC (rev 1292)
@@ -10,13 +10,9 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
public class DataPageToUserEventDataConverter extends BytesConverterAbstract
{
- private static final Log log = LogFactory.getLog(DataPageToUserEventDataConverter.class);
-
+
public List<UserEventDataRecord> convert(List<DatabasePage> pages) throws DexcomException
{
ArrayList<DatabaseRecord> rawRecords = this.getRawRecords(pages, new UserEventDataRecord());
@@ -30,9 +26,6 @@
ued.setSystemSeconds(this.getIntFromArray(data, 0));
ued.setDisplaySeconds(this.getIntFromArray(data, 4));
-
- //log.debug("Event Type: " + data[8]);
-
ued.setEventType(UserEvent.getEnum(data[8]));
ued.setEventSubType((byte) data[9]);
ued.setEventTime(this.getIntFromArray(data, 10));
@@ -43,7 +36,7 @@
records.add(ued);
- log.debug(ued);
+ //log.debug(ued);
}
return records;
Modified: trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/g4receiver/converter/data/DataPagesToInsertionTimeConverter.java
===================================================================
--- trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/g4receiver/converter/data/DataPagesToInsertionTimeConverter.java 2014-08-28 21:13:21 UTC (rev 1291)
+++ trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/g4receiver/converter/data/DataPagesToInsertionTimeConverter.java 2014-08-29 15:34:24 UTC (rev 1292)
@@ -10,12 +10,9 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
public class DataPagesToInsertionTimeConverter extends BytesConverterAbstract
{
- private static final Log log = LogFactory.getLog(DataPagesToInsertionTimeConverter.class);
+ //private static final Log log = LogFactory.getLog(DataPagesToInsertionTimeConverter.class);
public List<InsertionTimeRecord> convert(List<DatabasePage> pages) throws DexcomException
{
@@ -38,7 +35,7 @@
records.add(itr);
- log.debug(itr);
+ //log.debug(itr);
}
return records;
Modified: trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/g4receiver/converter/data/DataPagesToMeterConverter.java
===================================================================
--- trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/g4receiver/converter/data/DataPagesToMeterConverter.java 2014-08-28 21:13:21 UTC (rev 1291)
+++ trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/g4receiver/converter/data/DataPagesToMeterConverter.java 2014-08-29 15:34:24 UTC (rev 1292)
@@ -9,12 +9,9 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
public class DataPagesToMeterConverter extends BytesConverterAbstract
{
- private static final Log log = LogFactory.getLog(DataPagesToMeterConverter.class);
+ //private static final Log log = LogFactory.getLog(DataPagesToMeterConverter.class);
public List<MeterDataRecord> convert(List<DatabasePage> pages) throws DexcomException
{
@@ -37,7 +34,7 @@
records.add(mr);
- log.debug(mr);
+ //log.debug(mr);
}
return records;
Modified: trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/g4receiver/util/DexcomUtils.java
===================================================================
--- trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/g4receiver/util/DexcomUtils.java 2014-08-28 21:13:21 UTC (rev 1291)
+++ trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/g4receiver/util/DexcomUtils.java 2014-08-29 15:34:24 UTC (rev 1292)
@@ -1,6 +1,14 @@
package ggc.cgms.device.dexcom.receivers.g4receiver.util;
import ggc.cgms.device.dexcom.receivers.g4receiver.DexcomG4Api;
+import ggc.cgms.device.dexcom.receivers.g4receiver.converter.BytesToDatabasePagesConverter;
+import ggc.cgms.device.dexcom.receivers.g4receiver.converter.ConverterType;
+import ggc.cgms.device.dexcom.receivers.g4receiver.converter.ElementToPartitionInfoConverter;
+import ggc.cgms.device.dexcom.receivers.g4receiver.converter.data.DataPageToEGVDataConverter;
+import ggc.cgms.device.dexcom.receivers.g4receiver.converter.data.DataPageToUserEventDataConverter;
+import ggc.cgms.device.dexcom.receivers.g4receiver.converter.data.DataPagesToInsertionTimeConverter;
+import ggc.cgms.device.dexcom.receivers.g4receiver.converter.data.DataPagesToMeterConverter;
+import ggc.cgms.device.dexcom.receivers.g4receiver.converter.data.DataPagesToXmlRecordConverter;
import ggc.cgms.device.dexcom.receivers.g4receiver.enums.ReceiverRecordType;
import ggc.cgms.device.dexcom.receivers.g4receiver.internal.Partition;
import ggc.cgms.device.dexcom.receivers.g4receiver.internal.PartitionInfo;
@@ -9,6 +17,7 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.HashMap;
import java.util.TimeZone;
import org.apache.commons.logging.Log;
@@ -32,7 +41,21 @@
private static Integer displayTimeOffset = null;
static SimpleDateFormat dateTimeFormater = new SimpleDateFormat("dd.MM.yyyy hh:mm:ss");
private static ShortUtils shortUtils = new ShortUtils();
+ private static HashMap<ConverterType, Object> converters = new HashMap<ConverterType, Object>();
+ static
+ {
+ converters.put(ConverterType.ElementToPartitionInfoConverter, new ElementToPartitionInfoConverter());
+ converters.put(ConverterType.BytesToDatabasePagesConverter, new BytesToDatabasePagesConverter());
+ converters.put(ConverterType.DataPagesToInsertionTimeConverter, new DataPagesToInsertionTimeConverter());
+ converters.put(ConverterType.DataPagesToXmlRecordConverter, new DataPagesToXmlRecordConverter());
+ converters.put(ConverterType.DataPageToEGVDataConverter, new DataPageToEGVDataConverter());
+ converters.put(ConverterType.DataPageToUserEventDataConverter, new DataPageToUserEventDataConverter());
+ converters.put(ConverterType.DataPagesToMeterConverter, new DataPagesToMeterConverter());
+
+
+ }
+
public enum BitConversion
{
LITTLE_ENDIAN, // 20 0 0 0 = reverse
@@ -148,7 +171,7 @@
return b;
}
- // FIXME temove possibly see CrcUtil
+ // TODO remove possibly see CrcUtil
// CRC methods
public static int calculateCRC16(byte[] buff, int start, int end)
{
@@ -207,22 +230,25 @@
public static PartitionInfo getPartitionInfo() throws DexcomException
{
- if (partitionInfo == null)
- {
- partitionInfo = dexcomG4Api.readDatabasePartitionInfo();
- }
-
- return partitionInfo;
+ return dexcomG4Api.readDatabasePartitionInfo();
+
+// if (partitionInfo == null)
+// {
+// partitionInfo = dexcomG4Api.readDatabasePartitionInfo();
+// }
+//
+// return partitionInfo;
}
public static Partition getPartition(ReceiverRecordType recordType) throws DexcomException
{
- if (partitionInfo == null)
- {
- getPartitionInfo();
- }
-
- return partitionInfo.getPartitionByRecordType(recordType);
+ return dexcomG4Api.getPartition(recordType);
+// if (partitionInfo == null)
+// {
+// getPartitionInfo();
+// }
+//
+// return partitionInfo.getPartitionByRecordType(recordType);
}
public static Element createXmlTree(String xmlData) throws DexcomException
@@ -336,4 +362,14 @@
{
return shortUtils;
}
+
+
+
+
+ public static Object getConverter(ConverterType converterType)
+ {
+ return converters.get(converterType);
+ }
+
+
}
Modified: trunk/ggc-plugin_base/src/ggc/plugin/data/progress/ProgressData.java
===================================================================
--- trunk/ggc-plugin_base/src/ggc/plugin/data/progress/ProgressData.java 2014-08-28 21:13:21 UTC (rev 1291)
+++ trunk/ggc-plugin_base/src/ggc/plugin/data/progress/ProgressData.java 2014-08-29 15:34:24 UTC (rev 1292)
@@ -1,8 +1,13 @@
package ggc...
[truncated message content] |
|
From: <and...@us...> - 2014-08-31 10:15:42
|
Revision: 1294
http://sourceforge.net/p/ggc/code/1294
Author: andyrozman
Date: 2014-08-31 10:15:38 +0000 (Sun, 31 Aug 2014)
Log Message:
-----------
Dexcom G4 development finished:
- reading works
- data saving too
- display of data needs some work - Class -> Enum
CGMS
- added saving of exetnded data (saved normally, this is other non CGMS data -> activity, health, insulin, carbs, which can be sometimes set on device)
Printing via new PDF library (viwer) should be covered (not tested 100% yet)
Replaced Rxtx library with nrjavaserial (it's Rxtx fork, with some bugs fixed, and jar file contains binary files, best of all... it's activelly developed)
Modified Paths:
--------------
trunk/ggc-cgm/pom.xml
trunk/ggc-cgm/src/GGC_CGMSTool_en.properties
trunk/ggc-cgm/src/ggc/cgms/data/CGMSValuesEntry.java
trunk/ggc-cgm/src/ggc/cgms/data/CGMSValuesSubEntry.java
trunk/ggc-cgm/src/ggc/cgms/data/CGMSValuesTableModel.java
trunk/ggc-cgm/src/ggc/cgms/data/defs/CGMSEvents.java
trunk/ggc-cgm/src/ggc/cgms/device/dexcom/file/FRC_DexcomTxt_DM3.java
trunk/ggc-cgm/src/ggc/cgms/device/dexcom/file/FRC_DexcomXml_DM3.java
trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/DexcomDevice.java
trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/DexcomDeviceReader.java
trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/data/ReceiverDownloadData.java
trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/data/output/DataOutputParserType.java
trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/data/output/GGCOutputParser.java
trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/g4receiver/DexcomG4Api.java
trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/g4receiver/converter/BytesToDatabasePagesConverter.java
trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/g4receiver/converter/ConverterType.java
trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/g4receiver/data/UserEventDataRecord.java
trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/g4receiver/enums/TrendArrow.java
trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/g4receiver/internal/DatabasePage.java
trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/g4receiver/util/DexcomUtils.java
trunk/ggc-cgm/src/ggc/cgms/device/minimed/file/MinimedCareLinkCGMS.java
trunk/ggc-cgm/src/ggc/cgms/manager/CGMSDevicesIds.java
trunk/ggc-cgm/src/ggc/cgms/manager/company/Dexcom.java
trunk/ggc-cgm/src/ggc/cgms/util/DataAccessCGMS.java
trunk/ggc-core/src/ggc/core/data/cfg/ConfigurationManager.java
trunk/ggc-core/src/ggc/core/print/PrintExtendedMonthlyReport.java
trunk/ggc-core/src/ggc/core/print/PrintSimpleMonthlyReport.java
trunk/ggc-core/src/ggc/core/util/GGCProperties.java
trunk/ggc-desktop/doc/BUGS.txt
trunk/ggc-desktop/doc/TO-DO.txt
trunk/ggc-desktop/pom.xml
trunk/ggc-desktop/src/ggc/gui/dialogs/PrintingDialog.java
trunk/ggc-desktop/src/ggc/gui/panels/prefs/PrefPrintingPane.java
trunk/ggc-master-pom/pom.xml
trunk/ggc-meter/pom.xml
trunk/ggc-nutri/src/ggc/nutri/gui/print/PrintFoodDialog.java
trunk/ggc-nutri/src/ggc/nutri/print/PrintFoodMenuAbstract.java
trunk/ggc-nutri/src/ggc/nutri/print/PrintFoodMenuBase.java
trunk/ggc-nutri/src/ggc/nutri/print/PrintFoodMenuExt1.java
trunk/ggc-nutri/src/ggc/nutri/print/PrintFoodMenuExt2.java
trunk/ggc-nutri/src/ggc/nutri/print/PrintFoodMenuExt3.java
trunk/ggc-plugin_base/pom.xml
trunk/ggc-plugin_base/src/ggc/plugin/data/DeviceValuesTableModel.java
trunk/ggc-plugin_base/src/ggc/plugin/util/DataAccessPlugInBase.java
trunk/ggc-pump/pom.xml
trunk/ggc-pump/src/ggc/pump/gui/PumpPrintDialog.java
trunk/ggc-pump/src/ggc/pump/print/PrintPumpDataAbstract.java
trunk/ggc-pump/src/ggc/pump/print/PrintPumpDataBase.java
trunk/ggc-pump/src/ggc/pump/print/PrintPumpDataExt.java
Added Paths:
-----------
trunk/ggc-cgm/src/ggc/cgms/data/CGMSValuesExtendedEntry.java
trunk/ggc-cgm/src/ggc/cgms/data/ExtendedCGMSValuesExtendedEntry.java
trunk/ggc-cgm/src/ggc/cgms/data/defs/CGMSBaseDataType.java
trunk/ggc-cgm/src/ggc/cgms/data/defs/CGMSTrendArrow.java
trunk/ggc-cgm/src/ggc/cgms/data/defs/extended/
trunk/ggc-cgm/src/ggc/cgms/data/defs/extended/CGMSExtendedDataType.java
trunk/ggc-cgm/src/ggc/cgms/device/AbstractSerialCGMS.java
trunk/ggc-cgm/src/ggc/cgms/device/dexcom/DexcomG4.java
trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/g4receiver/converter/data/DataPageToFileConverter.java
trunk/ggc-cgm/src/ggc/cgms/util/CGMSUtil.java
trunk/ggc-core/src/ggc/core/data/defs/
trunk/ggc-core/src/ggc/core/data/defs/ExerciseStrength.java
trunk/ggc-core/src/ggc/core/data/defs/Health.java
Removed Paths:
-------------
trunk/ggc-cgm/src/ggc/cgms/data/CGMSOutputDataPreparer.java
trunk/ggc-cgm/src/ggc/cgms/data/defs/CGMSDataType.java
trunk/ggc-cgm/src/ggc/cgms/data/defs/CGMSExtendedDataType.java
trunk/ggc-core/src/ggc/core/print/PrintAbstract.java
Modified: trunk/ggc-cgm/pom.xml
===================================================================
--- trunk/ggc-cgm/pom.xml 2014-08-29 16:12:31 UTC (rev 1293)
+++ trunk/ggc-cgm/pom.xml 2014-08-31 10:15:38 UTC (rev 1294)
@@ -75,11 +75,11 @@
-<dependency>
- <groupId>com.neuronrobotics</groupId>
- <artifactId>nrjavaserial</artifactId>
- <version>3.9.3</version>
-</dependency>
+ <dependency>
+ <groupId>com.neuronrobotics</groupId>
+ <artifactId>nrjavaserial</artifactId>
+ <version>3.9.3</version>
+ </dependency>
Modified: trunk/ggc-cgm/src/GGC_CGMSTool_en.properties
===================================================================
--- trunk/ggc-cgm/src/GGC_CGMSTool_en.properties 2014-08-29 16:12:31 UTC (rev 1293)
+++ trunk/ggc-cgm/src/GGC_CGMSTool_en.properties 2014-08-31 10:15:38 UTC (rev 1294)
@@ -175,8 +175,20 @@
CGMS_READINGS=CGMS Readings
CALIBRATION_READINGS=Calibration
CGMS_READING=CGMS Reading
+CGMS_DATA_EVENT=Event
+CGMS_DATA_ALARM=Alarm
+CGMS_DATA_ERROR=Error
+CGMS_READING_TREND=Trend
+#
+# !G! CGMS Extended Types
+#
+CGMS_EXT_CARBS=Carbs
+CGMS_EXT_INSULIN=Insulin
+CGMS_EXT_HEALTH=Health
+CGMS_EXT_EXERCISE=Exercise
+
#
# !G! Meter Instructions [1]
#
@@ -187,5 +199,6 @@
#
# New Keywords (they are grouped), this need to be copied to right locations, after release
#
+DEXCOM_INSTRUCTIONS_DL_SERIAL_USB=No instructions available.
-
+HEALTH_DESCRIPTION=Health - %s
Deleted: trunk/ggc-cgm/src/ggc/cgms/data/CGMSOutputDataPreparer.java
===================================================================
--- trunk/ggc-cgm/src/ggc/cgms/data/CGMSOutputDataPreparer.java 2014-08-29 16:12:31 UTC (rev 1293)
+++ trunk/ggc-cgm/src/ggc/cgms/data/CGMSOutputDataPreparer.java 2014-08-31 10:15:38 UTC (rev 1294)
@@ -1,6 +0,0 @@
-package ggc.cgms.data;
-
-
-public class CGMSOutputDataPreparer {
-
-}
Modified: trunk/ggc-cgm/src/ggc/cgms/data/CGMSValuesEntry.java
===================================================================
--- trunk/ggc-cgm/src/ggc/cgms/data/CGMSValuesEntry.java 2014-08-29 16:12:31 UTC (rev 1293)
+++ trunk/ggc-cgm/src/ggc/cgms/data/CGMSValuesEntry.java 2014-08-31 10:15:38 UTC (rev 1294)
@@ -485,7 +485,7 @@
return this.date_obj.getDateString();
case 1:
- return DataAccessCGMS.value_types[this.type]; //m_ic.getMessage("BASE_TYPE_SH");
+ return DataAccessCGMS.value_type[this.type]; //m_ic.getMessage("BASE_TYPE_SH");
case 2:
return "" + this.list.size(); //this.getBaseTypeString();
@@ -569,7 +569,11 @@
this.person_id = (int)this.da.getCurrentUserId();
Transaction tx = sess.beginTransaction();
- //System.out.println("id: " + old_id);
+
+ System.out.println("old_id: " + old_id);
+ System.out.println("id: " + this.id);
+
+
CGMSDataH pdh = (CGMSDataH)sess.get(CGMSDataH.class, new Long(this.id));
pdh.setId(this.id);
@@ -710,7 +714,7 @@
*/
public void setId(long id_in)
{
- this.old_id = id_in;
+ this.id = id_in;
}
@@ -721,8 +725,32 @@
*/
public long getId()
{
+ return this.id;
+ }
+
+
+ /**
+ * Set Old Id (this is used for changing old objects in framework v2)
+ * THIS IS JUST COPY, IT MIGHT NOT BE USED, OR PERHAPS NOW FUNCTIONALITY WILL BE BROKEN.
+ * NEED TO TEST. URGENTLY
+ * @param id_in
+ */
+ public void setOldId(long id_in)
+ {
+ this.old_id = id_in;
+ }
+
+
+ /**
+ * Get Old Id (this is used for changing old objects in framework v2)
+ *
+ * @return id of old object
+ */
+ public long getOldId()
+ {
return this.old_id;
}
+
String source;
Added: trunk/ggc-cgm/src/ggc/cgms/data/CGMSValuesExtendedEntry.java
===================================================================
--- trunk/ggc-cgm/src/ggc/cgms/data/CGMSValuesExtendedEntry.java (rev 0)
+++ trunk/ggc-cgm/src/ggc/cgms/data/CGMSValuesExtendedEntry.java 2014-08-31 10:15:38 UTC (rev 1294)
@@ -0,0 +1,452 @@
+package ggc.cgms.data;
+
+import java.util.ArrayList;
+import java.util.Hashtable;
+
+import org.apache.commons.lang.StringUtils;
+import org.hibernate.Session;
+import org.hibernate.Transaction;
+
+import ggc.cgms.data.defs.extended.CGMSExtendedDataType;
+import ggc.cgms.util.CGMSUtil;
+import ggc.cgms.util.DataAccessCGMS;
+import ggc.core.db.hibernate.GGCHibernateObject;
+import ggc.core.db.hibernate.cgms.CGMSDataExtendedH;
+import ggc.core.db.hibernate.cgms.CGMSDataH;
+import ggc.plugin.data.DeviceValuesEntry;
+import ggc.plugin.output.OutputWriterType;
+
+import com.atech.db.ext.ExtendedHandler;
+import com.atech.misc.statistics.StatisticsItem;
+import com.atech.utils.data.ATechDate;
+
+public class CGMSValuesExtendedEntry extends DeviceValuesEntry implements StatisticsItem
+{
+
+ public long id;
+ public long datetime;
+ //public int type;
+ private CGMSExtendedDataType type;
+ public String value;
+ public String extended;
+ public int personId;
+ public String comment;
+ public int subType = -1; // not stored directly
+
+ //DataAccessCGMS dataAccess = DataAccessCGMS.getInstance();
+
+ public CGMSValuesExtendedEntry()
+ {
+ super();
+ }
+
+
+
+ /**
+ * Constructor
+ *
+ * @param pdh
+ */
+ public CGMSValuesExtendedEntry(CGMSDataExtendedH pdh)
+ {
+ super();
+
+ loadDbData(pdh);
+ }
+
+
+
+ private void loadDbData(CGMSDataExtendedH pdh)
+ {
+ this.id = pdh.getId();
+
+ this.datetime = pdh.getDt_info();
+ this.type = CGMSExtendedDataType.getEnum(pdh.getType());
+ this.value = pdh.getValue();
+ loadExtended(pdh.getExtended());
+ this.personId = pdh.getPerson_id();
+ this.comment = pdh.getComment();
+ }
+
+ public Object getTableColumnValue(int index)
+ {
+ switch (index)
+ {
+ case 0:
+ return this.getDateTimeObject().getDateTimeString();
+
+ case 1:
+ return CGMSUtil.getTranslatedString(this.type.getDescription());
+
+ case 2:
+ return getDisplayValue();
+
+ case 3:
+ return new Boolean(getChecked());
+
+ case 4:
+ return this.getStatus();
+
+ default:
+ return "";
+ }
+ }
+
+ private Object getDisplayValue()
+ {
+ // FIXME
+ switch(type)
+ {
+ case Insulin:
+ case Carbs:
+ return this.value;
+
+ case Exercise:
+ // FIXME
+ return "N/I: " + this.subType;
+
+ case Health:
+ // FIXME
+ return "N/I: " + this.subType;
+
+ case None:
+ default:
+ break;
+
+ }
+
+
+
+ // TODO Auto-generated method stub
+ return "N/I";
+ }
+
+
+ /**
+ * Prepare Entry [Framework v2]
+ */
+ public void prepareEntry_v2()
+ {
+ this.saveExtended();
+ }
+
+
+ public String getDVEName()
+ {
+ return "CGMSValuesExtendedEntry";
+ }
+
+ public String getValue()
+ {
+ return this.value;
+ }
+
+ long old_id;
+
+ /**
+ * Set Old Id (this is used for changing old objects in framework v2)
+ *
+ * @param id_in
+ */
+ public void setId(long id_in)
+ {
+ this.old_id = id_in;
+ }
+
+
+ /**
+ * Get Old Id (this is used for changing old objects in framework v2)
+ *
+ * @return id of old object
+ */
+ public long getId()
+ {
+ return this.old_id;
+ }
+
+
+ String source;
+
+ /**
+ * Set Source
+ *
+ * @param src
+ */
+ public void setSource(String src)
+ {
+ this.source = src;
+
+ }
+
+ /**
+ * Get Source
+ *
+ * @return
+ */
+ public String getSource()
+ {
+ return this.source;
+ }
+
+ public String getSpecialId()
+ {
+ return "CDE_" + this.datetime+ "_" + this.type.getValue();
+ }
+
+
+
+ public String getDataAsString()
+ {
+ switch(output_type)
+ {
+ case OutputWriterType.DUMMY:
+ return "";
+
+ case OutputWriterType.CONSOLE:
+ case OutputWriterType.FILE:
+ return this.getDateTimeObject().getDateTimeString() + ": Type=" + this.type.getDescription() + ", Value=" + this.getValue() ;
+
+ case OutputWriterType.GGC_FILE_EXPORT:
+ {
+ /*
+ PumpData pd = new PumpData(this);
+ try
+ {
+ return pd.dbExport();
+ }
+ catch(Exception ex)
+ {
+ log.error("Problem with PumpValuesEntry export ! Exception: " + ex, ex);
+ return "Value could not be decoded for export!";
+ }*/
+ }
+
+
+ default:
+ return "Value is undefined";
+
+ }
+ }
+
+ public String getObjectUniqueId()
+ {
+ return "" + this.datetime;
+ }
+
+ public String DbAdd(Session sess) throws Exception
+ {
+ Transaction tx = sess.beginTransaction();
+
+ CGMSDataExtendedH ext = new CGMSDataExtendedH();
+
+ ext.setId(this.id);
+
+ this.saveDbData(ext);
+
+ Long _id = (Long)sess.save(ext);
+ tx.commit();
+
+ ext.setId(_id.longValue());
+ this.id = _id.longValue();
+
+ return ""+_id.longValue();
+ }
+
+
+
+ private void saveDbData(CGMSDataExtendedH ch)
+ {
+ this.personId = CGMSUtil.getCurrentUserId();
+
+ ch.setDt_info(this.datetime);
+ ch.setType(this.type.getValue());
+ ch.setValue(this.getValue());
+ ch.setExtended(extended = this.saveExtended());
+ ch.setPerson_id(this.personId);
+ ch.setComment(this.comment);
+ ch.setChanged(System.currentTimeMillis());
+ }
+
+ public boolean DbEdit(Session sess) throws Exception
+ {
+ Transaction tx = sess.beginTransaction();
+ //System.out.println("id: " + old_id);
+ CGMSDataExtendedH ext = (CGMSDataExtendedH)sess.get(CGMSDataExtendedH.class, new Long(this.id));
+
+ ext.setId(this.id);
+
+ this.saveDbData(ext);
+
+ sess.update(ext);
+ tx.commit();
+
+ return true;
+ }
+
+
+
+
+
+ public boolean DbDelete(Session sess) throws Exception
+ {
+ Transaction tx = sess.beginTransaction();
+
+ CGMSDataExtendedH ch = (CGMSDataExtendedH) sess.get(CGMSDataExtendedH.class, new Long(this.getId()));
+
+ sess.delete(ch);
+ tx.commit();
+
+ return true;
+ }
+
+ public boolean DbHasChildren(Session sess) throws Exception
+ {
+ return false;
+ }
+
+ public boolean DbGet(Session sess) throws Exception
+ {
+ CGMSDataExtendedH ch = (CGMSDataExtendedH) sess.get(CGMSDataExtendedH.class, new Long(this.getId()));
+
+ loadDbData(ch);
+
+ return true;
+ }
+
+
+
+
+
+ public String getObjectName()
+ {
+ return "CGMSValuesExtendedEntry";
+ }
+
+ public boolean isDebugMode()
+ {
+ return false;
+ }
+
+ public int getAction()
+ {
+ return 0;
+ }
+
+ public float getValueForItem(int index)
+ {
+ return 0;
+ }
+
+ public int getStatisticsAction(int index)
+ {
+ return 0;
+ }
+
+ public boolean isSpecialAction(int index)
+ {
+ return false;
+ }
+
+ public int getMaxStatisticsObject()
+ {
+ return 0;
+ }
+
+ public boolean weHaveSpecialActions()
+ {
+ return false;
+ }
+
+ @Override
+ public ArrayList<? extends GGCHibernateObject> getDbObjects()
+ {
+ return null;
+ }
+
+ @Override
+ public Object getColumnValue(int index)
+ {
+ return "N/A";
+ }
+
+ @Override
+ public long getDateTime()
+ {
+ return this.datetime;
+ }
+
+ @Override
+ public void setDateTimeObject(ATechDate dt)
+ {
+ this.datetime = dt.getATDateTimeAsLong();
+ }
+
+ @Override
+ public ATechDate getDateTimeObject()
+ {
+ return new ATechDate(ATechDate.FORMAT_DATE_AND_TIME_S, this.datetime);
+ }
+
+ @Override
+ public int getDateTimeFormat()
+ {
+ return ATechDate.FORMAT_DATE_AND_TIME_S;
+ }
+
+
+ private void loadExtended(String extended2)
+ {
+ ExtendedHandler handler = CGMSUtil.getExtendedHandler(this.getDVEName());
+ Hashtable<String,String> data = handler.loadExtended(extended2);
+
+ if (handler.isExtendedValueSet(ExtendedCGMSValuesExtendedEntry.EXTENDED_SUB_TYPE, data))
+ {
+ this.subType = Integer.parseInt(handler.getExtendedValue(ExtendedCGMSValuesExtendedEntry.EXTENDED_SUB_TYPE, data));
+ }
+
+ if (handler.isExtendedValueSet(ExtendedCGMSValuesExtendedEntry.EXTENDED_SUB_TYPE, data))
+ {
+ this.source = handler.getExtendedValue(ExtendedCGMSValuesExtendedEntry.EXTENDED_SOURCE, data);
+ }
+ }
+
+
+ private String saveExtended()
+ {
+ ExtendedHandler handler = CGMSUtil.getExtendedHandler(this.getDVEName());
+ Hashtable<String,String> data = new Hashtable<String,String>();
+
+ if (this.subType>0)
+ {
+ handler.setExtendedValue(ExtendedCGMSValuesExtendedEntry.EXTENDED_SUB_TYPE, "" + this.subType, data);
+ }
+
+ if (StringUtils.isNotBlank(this.source))
+ {
+ handler.setExtendedValue(ExtendedCGMSValuesExtendedEntry.EXTENDED_SOURCE, this.source, data);
+ }
+
+ String ext = handler.saveExtended(data);
+
+ return StringUtils.isNotBlank(ext) ? ext : null;
+
+ }
+
+
+
+ public CGMSExtendedDataType getType()
+ {
+ return type;
+ }
+
+
+
+ public void setType(CGMSExtendedDataType type)
+ {
+ this.type = type;
+ }
+
+
+
+
+}
Modified: trunk/ggc-cgm/src/ggc/cgms/data/CGMSValuesSubEntry.java
===================================================================
--- trunk/ggc-cgm/src/ggc/cgms/data/CGMSValuesSubEntry.java 2014-08-29 16:12:31 UTC (rev 1293)
+++ trunk/ggc-cgm/src/ggc/cgms/data/CGMSValuesSubEntry.java 2014-08-31 10:15:38 UTC (rev 1294)
@@ -1,5 +1,7 @@
package ggc.cgms.data;
+import ggc.cgms.data.defs.CGMSBaseDataType;
+import ggc.cgms.data.defs.CGMSTrendArrow;
import ggc.cgms.util.DataAccessCGMS;
import ggc.core.db.hibernate.GGCHibernateObject;
import ggc.plugin.data.DeviceValuesEntry;
@@ -7,6 +9,8 @@
import java.util.ArrayList;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.hibernate.Session;
import com.atech.misc.statistics.StatisticsItem;
@@ -43,6 +47,9 @@
public class CGMSValuesSubEntry extends DeviceValuesEntry implements StatisticsItem
{
+ private static final Log log = LogFactory.getLog(CGMSValuesSubEntry.class);
+
+
/**
* Sub Entry Type: CGMS BG Reading
*/
@@ -73,6 +80,9 @@
public static final int CGMS_ERROR = 5;
+
+ public static final int CGMS_TREND = 6;
+
/**
* DateTime
*/
@@ -96,7 +106,7 @@
/**
* Type
*/
- public int type = 0;
+ private int type = 0;
// NEW
@@ -115,6 +125,9 @@
* Time only
*/
public boolean time_only = false;
+
+
+ private CGMSBaseDataType typeObject;
/**
@@ -136,7 +149,7 @@
//115329=147
this.time = Integer.parseInt(entry.substring(0, entry.indexOf("=")));
this.value = Integer.parseInt(entry.substring(entry.indexOf("=")+1));
- this.type = type;
+ this.setType(type);
this.datetime = (time * 10) + type;
@@ -192,15 +205,39 @@
return DataAccessCGMS.value_type[type];
case 2:
- return DataAccessCGMS.getInstance().getDisplayedBGString("" + this.value);
+ return getDisplayValue();
case 3:
return "";
+
+ default:
+ return "N/A";
+ }
+ }
+
+
+ private Object getDisplayValue()
+ {
+ switch(this.typeObject)
+ {
+ case DeviceAlarm:
+ case DeviceEvent:
+ return "?? " + this.value;
+
+ case MeterCalibration:
+ case SensorReading:
+ return DataAccessCGMS.getInstance().getDisplayedBGString("" + this.value);
+
+ case SensorReadingTrend:
+ // ??
+ return CGMSTrendArrow.getEnum(this.value).name();
+
+ default:
+ return "??";
+
}
-
- return "N/A";
}
@@ -521,9 +558,26 @@
{
return true;
}
+
+
+ public int getType()
+ {
+ return type;
+ }
+
+
+ public void setType(int type)
+ {
+ this.type = type;
+ this.typeObject = CGMSBaseDataType.getEnum(type);
+ }
+ public void setType(CGMSBaseDataType type)
+ {
+ this.type = type.getValue();
+ this.typeObject = type;
+ }
-
/**
* Comparator method, for sorting objects
*
Modified: trunk/ggc-cgm/src/ggc/cgms/data/CGMSValuesTableModel.java
===================================================================
--- trunk/ggc-cgm/src/ggc/cgms/data/CGMSValuesTableModel.java 2014-08-29 16:12:31 UTC (rev 1293)
+++ trunk/ggc-cgm/src/ggc/cgms/data/CGMSValuesTableModel.java 2014-08-31 10:15:38 UTC (rev 1294)
@@ -77,56 +77,79 @@
//if (i>5)
// return;
- CGMSValuesSubEntry se = (CGMSValuesSubEntry)mve;
-
- String key = se.date + "_" + se.type;
-
- if (old_key == null)
+ if (mve instanceof CGMSValuesSubEntry)
{
- old_key = key;
- this.current_main = new CGMSValuesEntry();
- }
- if (!old_key.equals(key))
- {
- processDeviceValueEntry(this.current_main);
- this.dl_data.add(this.current_main);
+ CGMSValuesSubEntry se = (CGMSValuesSubEntry)mve;
+
+ String key = se.date + "_" + se.getType();
- if (this.shouldBeDisplayed(this.current_main.getStatus()))
+ if (old_key == null)
{
- this.displayed_dl_data.add(this.current_main);
- Collections.sort(displayed_dl_data);
+ old_key = key;
+ this.current_main = new CGMSValuesEntry();
}
- this.fireTableDataChanged();
-
- this.current_main = new CGMSValuesEntry();
- i++;
+ if (!old_key.equals(key))
+ {
+ processDeviceValueEntry(this.current_main);
+ this.dl_data.add(this.current_main);
+
+ if (this.shouldBeDisplayed(this.current_main.getStatus()))
+ {
+ this.displayed_dl_data.add(this.current_main);
+ Collections.sort(displayed_dl_data);
+ }
+ this.fireTableDataChanged();
+
+ this.current_main = new CGMSValuesEntry();
+
+ i++;
+ }
+
+
+ if (current_main.isEmpty())
+ {
+ //CGMSValuesEntry cve = new CGMSValuesEntry();
+ this.current_main.setDateTimeObject(new ATechDate(ATechDate.FORMAT_DATE_AND_TIME_S, se.datetime));
+ this.current_main.setDate(se.date);
+
+ this.current_main.setEmpty(false);
+ this.current_main.setType(se.getType());
+ //this.htable.put(key, cve);
+ this.current_main.addSubEntry(se);
+
+ old_key = key;
+
+ this.htable.put(key, this.current_main);
+ }
+ else
+ {
+ this.current_main.addSubEntry(se);
+ }
}
-
-
- if (current_main.isEmpty())
+ else
{
- //CGMSValuesEntry cve = new CGMSValuesEntry();
- this.current_main.setDateTimeObject(new ATechDate(ATechDate.FORMAT_DATE_AND_TIME_S, se.datetime));
- this.current_main.setDate(se.date);
- this.current_main.setEmpty(false);
- this.current_main.setType(se.type);
- //this.htable.put(key, cve);
- this.current_main.addSubEntry(se);
+ CGMSValuesExtendedEntry ext = (CGMSValuesExtendedEntry)mve;
- old_key = key;
- this.htable.put(key, this.current_main);
+ processDeviceValueEntry(ext);
+ this.dl_data.add(ext);
+
+ if (this.shouldBeDisplayed(ext.getStatus()))
+ {
+ this.displayed_dl_data.add(ext);
+ Collections.sort(displayed_dl_data);
+ }
+ this.fireTableDataChanged();
+
}
- else
- {
- this.current_main.addSubEntry(se);
- }
+
+
/*
if (this.htable.containsKey(key))
{
Added: trunk/ggc-cgm/src/ggc/cgms/data/ExtendedCGMSValuesExtendedEntry.java
===================================================================
--- trunk/ggc-cgm/src/ggc/cgms/data/ExtendedCGMSValuesExtendedEntry.java (rev 0)
+++ trunk/ggc-cgm/src/ggc/cgms/data/ExtendedCGMSValuesExtendedEntry.java 2014-08-31 10:15:38 UTC (rev 1294)
@@ -0,0 +1,36 @@
+package ggc.cgms.data;
+
+import java.util.Hashtable;
+
+import com.atech.db.ext.ExtendedHandler;
+import com.atech.utils.ATDataAccessAbstract;
+
+public class ExtendedCGMSValuesExtendedEntry extends ExtendedHandler
+{
+
+ public static final int EXTENDED_SUB_TYPE = 0;
+ public static final int EXTENDED_SOURCE = 1;
+ @SuppressWarnings("unused")
+ private static final int EXTENDED_MAX = 1;
+
+ public ExtendedCGMSValuesExtendedEntry(ATDataAccessAbstract da)
+ {
+ super(da);
+
+ }
+
+ @Override
+ public void initExtended()
+ {
+ ext_mapped_types = new Hashtable<Integer,String>();
+ ext_mapped_types.put(ExtendedCGMSValuesExtendedEntry.EXTENDED_SUB_TYPE,"SUB_TYPE");
+ ext_mapped_types.put(ExtendedCGMSValuesExtendedEntry.EXTENDED_SOURCE ,"SOURCE");
+ }
+
+ @Override
+ public String getExtendedObject()
+ {
+ return "CGMSValuesExtendedEntry";
+ }
+
+}
Copied: trunk/ggc-cgm/src/ggc/cgms/data/defs/CGMSBaseDataType.java (from rev 1293, trunk/ggc-cgm/src/ggc/cgms/data/defs/CGMSDataType.java)
===================================================================
--- trunk/ggc-cgm/src/ggc/cgms/data/defs/CGMSBaseDataType.java (rev 0)
+++ trunk/ggc-cgm/src/ggc/cgms/data/defs/CGMSBaseDataType.java 2014-08-31 10:15:38 UTC (rev 1294)
@@ -0,0 +1,116 @@
+package ggc.cgms.data.defs;
+
+import ggc.cgms.data.defs.extended.CGMSExtendedDataType;
+import ggc.cgms.util.DataAccessCGMS;
+
+import java.util.HashMap;
+
+/**
+ * Application: GGC - GNU Gluco Control
+ * Plug-in: CGMS Tool (support for CGMS devices)
+ *
+ * See AUTHORS for copyright information.
+ *
+ * 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
+ *
+ * Filename: CGMDataType
+ * Description: CGMS Data types, as used in database (undefined at this time)
+ *
+ * Author: Andy {an...@at...}
+ */
+
+// IMPORTANT NOTICE:
+// This class is not implemented yet, all existing methods should be rechecked (they were copied from similar
+// class, with different type of data.
+
+// TODO this class/enum is in refactoring process
+
+public enum CGMSBaseDataType {
+
+// CGMS_BG_READING(1),
+//
+// CGMS_METER_CALIBRATION(2),
+//
+// CGMS_DATA_EVENT(3),
+//
+// CGMS_DATA_ALARM(4),
+//
+// CGMS_DATA_ERROR(5),
+//
+// CGMS_TREND(6),
+
+ None(0, "NONE"),
+ SensorReading(1, "CGMS_READING"),
+ MeterCalibration(2, "CALIBRATION_READINGS"),
+ DeviceAlarm(3, "CGMS_DATA_ALARM"),
+ DeviceEvent(4, "CGMS_DATA_EVENT"),
+ DeviceError(5, "CGMS_DATA_ERROR"),
+ SensorReadingTrend(6, "CGMS_READING_TREND"),
+
+ ;
+
+// DataAccessCGMS.value_type[1] = this.i18n_plugin.getMessage("CGMS_READING");
+// DataAccessCGMS.value_type[2] = this.i18n_plugin.getMessage("CALIBRATION_READINGS");
+// DataAccessCGMS.value_type[4] = this.i18n_plugin.getMessage("CGMS_DATA_EVENT");
+// DataAccessCGMS.value_type[3] = this.i18n_plugin.getMessage("CGMS_DATA_ALARM");
+// DataAccessCGMS.value_type[5] = this.i18n_plugin.getMessage("CGMS_DATA_ERROR");
+// DataAccessCGMS.value_type[6] = this.i18n_plugin.getMessage("CGMS_READING_TREND");
+
+
+
+ private int dataType;
+
+
+ private String description;
+ private static HashMap<Integer,CGMSBaseDataType> map = new HashMap<Integer,CGMSBaseDataType>();
+
+ static
+ {
+ for(CGMSBaseDataType el : values())
+ {
+ map.put(el.getValue(), el);
+ }
+ }
+
+
+ private CGMSBaseDataType(int type, String description) {
+ this.dataType = type;
+ this.description = description;
+ }
+
+
+ public int getValue() {
+ return dataType;
+ }
+
+ public static CGMSBaseDataType getEnum(int value)
+ {
+ if (map.containsKey(value))
+ return map.get(value);
+ else
+ return CGMSBaseDataType.None;
+ }
+
+ public String getDescription()
+ {
+ return description;
+ }
+
+ public void setDescription(String description)
+ {
+ this.description = description;
+ }
+
+}
Deleted: trunk/ggc-cgm/src/ggc/cgms/data/defs/CGMSDataType.java
===================================================================
--- trunk/ggc-cgm/src/ggc/cgms/data/defs/CGMSDataType.java 2014-08-29 16:12:31 UTC (rev 1293)
+++ trunk/ggc-cgm/src/ggc/cgms/data/defs/CGMSDataType.java 2014-08-31 10:15:38 UTC (rev 1294)
@@ -1,86 +0,0 @@
-package ggc.cgms.data.defs;
-
-/**
- * Application: GGC - GNU Gluco Control
- * Plug-in: CGMS Tool (support for CGMS devices)
- *
- * See AUTHORS for copyright information.
- *
- * 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
- *
- * Filename: CGMDataType
- * Description: CGMS Data types, as used in database (undefined at this time)
- *
- * Author: Andy {an...@at...}
- */
-
-// IMPORTANT NOTICE:
-// This class is not implemented yet, all existing methods should be rechecked (they were copied from similar
-// class, with different type of data.
-
-public enum CGMSDataType {
-
- CGMS_BG_READING(1),
-
- CGMS_METER_CALIBRATION(2),
-
- CGMS_DATA_EVENT(3),
-
- CGMS_DATA_ALARM(4),
-
- CGMS_DATA_ERROR(5),
-
- CGMS_USER_EVENT(6)
-
- ;
-
- private int dataType;
-
-
- private CGMSDataType(int type) {
- this.dataType = type;
- }
-
-
- public int getValue() {
- return dataType;
- }
-
- /**
- *
- */
- // public static final int CGMS_BG_READING = 1;
-
- /**
- *
- */
- // public static final int CGMS_METER_CALIBRATION = 2;
-
- /**
- *
- */
- // public static final int CGMS_DATA_EVENT = 3;
-
- /**
- *
- */
- // public static final int CGMS_DATA_ALARM = 4;
-
- /**
- *
- */
- // public static final int CGMS_DATA_ERROR = 5;
-
-}
Modified: trunk/ggc-cgm/src/ggc/cgms/data/defs/CGMSEvents.java
===================================================================
--- trunk/ggc-cgm/src/ggc/cgms/data/defs/CGMSEvents.java 2014-08-29 16:12:31 UTC (rev 1293)
+++ trunk/ggc-cgm/src/ggc/cgms/data/defs/CGMSEvents.java 2014-08-31 10:15:38 UTC (rev 1294)
@@ -37,6 +37,8 @@
{
+
+
// start / end
/**
*
@@ -74,12 +76,24 @@
public static final int CGMS_EVENT_SENSOR_POWER_UP = 41;
+
+
+
+
/**
*
*/
public static final int CGMS_EVENT_SENSOR_LOST = 42;
+
+ public static final int CGMS_EVENT_SENSOR_START = 43;
+
+
+
+ public static final int CGMS_EVENT_SENSOR_STOP = 44;
+
+
/**
*
*/
Deleted: trunk/ggc-cgm/src/ggc/cgms/data/defs/CGMSExtendedDataType.java
===================================================================
--- trunk/ggc-cgm/src/ggc/cgms/data/defs/CGMSExtendedDataType.java 2014-08-29 16:12:31 UTC (rev 1293)
+++ trunk/ggc-cgm/src/ggc/cgms/data/defs/CGMSExtendedDataType.java 2014-08-31 10:15:38 UTC (rev 1294)
@@ -1,5 +0,0 @@
-package ggc.cgms.data.defs;
-
-public enum CGMSExtendedDataType {
-
-}
Added: trunk/ggc-cgm/src/ggc/cgms/data/defs/CGMSTrendArrow.java
===================================================================
--- trunk/ggc-cgm/src/ggc/cgms/data/defs/CGMSTrendArrow.java (rev 0)
+++ trunk/ggc-cgm/src/ggc/cgms/data/defs/CGMSTrendArrow.java 2014-08-31 10:15:38 UTC (rev 1294)
@@ -0,0 +1,54 @@
+package ggc.cgms.data.defs;
+
+import java.util.HashMap;
+
+
+public enum CGMSTrendArrow
+{
+
+ DoubleUp(1),
+ SingleUp(2),
+ FortyFiveUp(3),
+ Flat(4),
+ FortyFiveDown(5),
+ SingleDown(6),
+ DoubleDown(7),
+
+ None(0),
+ NotComputable(8),
+ RateOutOfRange(9),
+ ;
+
+ private int value;
+ private static HashMap<Integer,CGMSTrendArrow> map = new HashMap<Integer,CGMSTrendArrow>();
+
+ static
+ {
+ for(CGMSTrendArrow el : values())
+ {
+ map.put(el.getValue(), el);
+ }
+ }
+
+ CGMSTrendArrow(int value)
+ {
+ this.value = value;
+ }
+
+ public int getValue()
+ {
+ return value;
+ }
+
+ public void setValue(int value)
+ {
+ this.value = value;
+ }
+
+ public static CGMSTrendArrow getEnum(int value)
+ {
+ return map.get(value);
+ }
+
+}
+
Copied: trunk/ggc-cgm/src/ggc/cgms/data/defs/extended/CGMSExtendedDataType.java (from rev 1293, trunk/ggc-cgm/src/ggc/cgms/data/defs/CGMSExtendedDataType.java)
===================================================================
--- trunk/ggc-cgm/src/ggc/cgms/data/defs/extended/CGMSExtendedDataType.java (rev 0)
+++ trunk/ggc-cgm/src/ggc/cgms/data/defs/extended/CGMSExtendedDataType.java 2014-08-31 10:15:38 UTC (rev 1294)
@@ -0,0 +1,62 @@
+package ggc.cgms.data.defs.extended;
+
+import java.util.HashMap;
+
+public enum CGMSExtendedDataType {
+
+
+ None(0, "NONE"), //
+ Carbs(1, "CGMS_EXT_CARBS"), //
+ Insulin(2, "CGMS_EXT_INSULIN"), //
+ Health(3, "CGMS_EXT_HEALTH"), //
+ Exercise(4, "CGMS_EXT_EXERCISE"), //
+ ;
+
+
+
+ private int value;
+ private String description;
+ private static HashMap<Integer,CGMSExtendedDataType> map = new HashMap<Integer,CGMSExtendedDataType>();
+
+ static
+ {
+ for(CGMSExtendedDataType el : values())
+ {
+ map.put(el.getValue(), el);
+ }
+ }
+
+ CGMSExtendedDataType(int value, String description)
+ {
+ this.value = value;
+ this.description = description;
+ }
+
+ public int getValue()
+ {
+ return value;
+ }
+
+ public void setValue(int value)
+ {
+ this.value = value;
+ }
+
+ public static CGMSExtendedDataType getEnum(int value)
+ {
+ if (map.containsKey(value))
+ return map.get(value);
+ else
+ return CGMSExtendedDataType.None;
+ }
+
+ public String getDescription()
+ {
+ return description;
+ }
+
+ public void setDescription(String description)
+ {
+ this.description = description;
+ }
+}
Added: trunk/ggc-cgm/src/ggc/cgms/device/AbstractSerialCGMS.java
===================================================================
--- trunk/ggc-cgm/src/ggc/cgms/device/AbstractSerialCGMS.java (rev 0)
+++ trunk/ggc-cgm/src/ggc/cgms/device/AbstractSerialCGMS.java 2014-08-31 10:15:38 UTC (rev 1294)
@@ -0,0 +1,258 @@
+package ggc.cgms.device;
+
+import ggc.cgms.util.DataAccessCGMS;
+import ggc.plugin.device.DeviceIdentification;
+import ggc.plugin.device.DownloadSupportType;
+import ggc.plugin.device.PlugInBaseException;
+import ggc.plugin.manager.company.AbstractDeviceCompany;
+import ggc.plugin.output.AbstractOutputWriter;
+import ggc.plugin.output.OutputWriter;
+import ggc.plugin.protocol.SerialProtocol;
+import ggc.plugin.util.DataAccessPlugInBase;
+import gnu.io.SerialPortEvent;
+
+import com.atech.graphics.dialogs.selector.SelectableInterface;
+
+/**
+ * Application: GGC - GNU Gluco Control
+ * Plug-in: Meter Tool (support for Meter devices)
+ *
+ * See AUTHORS for copyright information.
+ *
+ * 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
+ *
+ * Filename: AbstractSerialMeter
+ * Description: This abstract class for all meters using serial interface
+ *
+ * Author: Andy {an...@at...}
+ */
+
+
+public abstract class AbstractSerialCGMS extends SerialProtocol implements CGMSInterface, SelectableInterface
+{
+
+ //protected I18nControlAbstract ic = null; //DataAccessMeter.getInstance().getI18nControlInstance();
+ //protected OutputWriter output_writer;
+ //AbstractDeviceCompany device_company = null;
+ protected int m_status = 0;
+ protected boolean communication_established = false;
+
+
+ /**
+ * Constructor
+ */
+ public AbstractSerialCGMS()
+ {
+ super(DataAccessCGMS.getInstance());
+ }
+
+
+ /**
+ * Constructor
+ * @param cmp
+ */
+ public AbstractSerialCGMS(AbstractDeviceCompany cmp)
+ {
+ super(DataAccessCGMS.getInstance());
+ this.setDeviceCompany(cmp);
+ this.setMeterType(cmp.getName(), getName());
+ }
+
+
+ /**
+ * Constructor
+ *
+ * @param parameters
+ * @param writer
+ * @param da
+ */
+ public AbstractSerialCGMS(String parameters, OutputWriter writer, DataAccessPlugInBase da)
+ {
+ super(parameters, writer, da);
+ }
+
+
+ /**
+ * Serial Event - for handling serial events, this method is called internally
+ */
+ public void serialEvent(SerialPortEvent event)
+ {
+
+ }
+
+
+ /**
+ * Set Communication Settings
+ */
+ public void setCommunicationSettings(int baudrate, int databits, int stopbits, int parity, int flow_control, int event_type)
+ {
+ super.setCommunicationSettings(baudrate, databits, stopbits, parity, flow_control, event_type);
+ }
+
+ //String meter_group = null;
+ //String meter_device = null;
+
+ /**
+ * Dispose this instance
+ */
+ public void dispose()
+ {
+ this.close();
+ }
+
+ /**
+ * Set Meter type
+ *
+ * @param group
+ * @param device
+ */
+ public void setMeterType(String group, String device)
+ {
+// this.device_name = device;
+
+ DeviceIdentification di = new DeviceIdentification(m_da.getI18nControlInstance());
+ di.company = group;
+ di.device_selected = device;
+
+ if (this.output_writer!=null)
+ this.output_writer.setDeviceIdentification(di);
+ //this.output_writer.
+ //this.device_instance = MeterManager.getInstance().getMeterDevice(group, device);
+
+ this.device_source_name = group + " " + device;
+ }
+
+
+ String serial_port = null;
+
+ /**
+ * Set Serial Port used
+ *
+ * @param port
+ * @throws PlugInBaseException
+ */
+ public void setSerialPort(String port) throws PlugInBaseException
+ {
+ this.serial_port = port;
+ this.setPort(port);
+ }
+
+ /**
+ * getConnectionPort - connection port data
+ *
+ * @return connection port as string
+ */
+ public String getConnectionPort()
+ {
+ return this.serial_port;
+ }
+
+ /**
+ * Get Serial port
+ *
+ * @return
+ */
+ public String getSerialPort()
+ {
+ return this.serial_port;
+ }
+
+ /**
+ * hasSpecialProgressStatus - in most cases we read data directly from device, in this case we have
+ * normal progress status, but with some special devices we calculate progress through other means.
+ * @return true is progress status is special
+ */
+ public boolean hasSpecialProgressStatus()
+ {
+ return false;
+ }
+
+ /**
+ * Used for opening connection with device.
+ *
+ * @return boolean - if connection established
+ */
+ public boolean open() throws PlugInBaseException
+ {
+ return (communication_established = super.open());
+ }
+
+
+ /**
+ * Is Device Communicating
+ *
+ * @return
+ */
+ public boolean isDeviceCommunicating()
+ {
+ return this.communication_established;
+ }
+
+ /**
+ * Will be called, when the import is ended and freeing resources.
+ */
+ public void close()
+ {
+ if (this.serialPort == null)
+ return;
+
+ this.serialPort.removeEventListener();
+ this.serialPort.close();
+ }
+
+
+
+ // ************************************************
+ // *** Device Implemented methods ***
+ // ************************************************
+
+
+
+
+ protected void deviceDisconnected()
+ {
+ this.output_writer.setStatus(AbstractOutputWriter.STATUS_STOPPED_DEVICE);
+ this.output_writer.endOutput();
+ }
+
+
+
+
+
+ /**
+ * Get Download Support Type
+ *
+ * @return
+ */
+ public int getDownloadSupportType()
+ {
+ return DownloadSupportType.DOWNLOAD_FROM_DEVICE;
+ }
+
+
+ /**
+ * getInterfaceTypeForMeter - most meter devices, store just BG data, this use simple interface, but
+ * there are some device which can store different kind of data (Ketones - Optium Xceed; Food, Insulin
+ * ... - OT Smart, etc), this devices require more extended data display.
+ * @return
+ */
+ public int getInterfaceTypeForMeter()
+ {
+ return 0;
+ }
+
+
+
+}
Added: trunk/ggc-cgm/src/ggc/cgms/device/dexcom/DexcomG4.java
===================================================================
--- trunk/ggc-cgm/src/ggc/cgms/device/dexcom/DexcomG4.java (rev 0)
+++ trunk/ggc-cgm/src/ggc/cgms/device/dexcom/DexcomG4.java 2014-08-31 10:15:38 UTC (rev 1294)
@@ -0,0 +1,322 @@
+package ggc.cgms.device.dexcom;
+
+import java.io.File;
+
+import ggc.cgms.device.AbstractSerialCGMS;
+import ggc.cgms.device.dexcom.receivers.DexcomDevice;
+import ggc.cgms.device.dexcom.receivers.DexcomDeviceReader;
+import ggc.cgms.device.dexcom.receivers.data.output.GGCOutputParser;
+import ggc.cgms.device.dexcom.receivers.g4receiver.util.DexcomException;
+import ggc.cgms.manager.CGMSDevicesIds;
+import ggc.cgms.util.DataAccessCGMS;
+import ggc.plugin.device.DeviceIdentification;
+import ggc.plugin.device.DownloadSupportType;
+import ggc.plugin.device.PlugInBaseException;
+import ggc.plugin.manager.DeviceImplementationStatus;
+import ggc.plugin.manager.company.AbstractDeviceCompany;
+import ggc.plugin.output.OutputWriter;
+import ggc.plugin.protocol.ConnectionProtocols;
+import ggc.plugin.util.DataAccessPlugInBase;
+
+/**
+ * Application: GGC - GNU Gluco Control
+ * Plug-in: Pump Tool (support for Pump devices)
+ *
+ * See AUTHORS for copyright information.
+ *
+ * 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
+ *
+ * Filename: Dexcom 7
+ * Description: Dexcom 7 implementation (just settings)
+ *
+ * Author: Andy {an...@at...}
+ */
+
+public class DexcomG4 extends AbstractSerialCGMS
+{
+
+ /**
+ * Constructor
+ */
+ public DexcomG4()
+ {
+ super();
+ }
+
+
+ /**
+ * Constructor
+ *
+ * @param communicationParameters
+ * @param writer
+ */
+ public DexcomG4(String communicationParameters, OutputWriter writer)
+ {
+ super(communicationParameters, writer, DataAccessCGMS.getInstance());
+ }
+
+
+ /**
+ * Constructor
+ *
+ * @param communicationParameters
+ * @param writer
+ * @param da
+ */
+ public DexcomG4(String communicationParameters, OutputWriter writer, DataAccessPlugInBase da)
+ {
+ super(communicationParameters, writer, da);
+ }
+
+
+ /**
+ * Constructor
+ *
+ * @param cmp
+ */
+ public DexcomG4(AbstractDeviceCompany cmp)
+ {
+ super(cmp);
+ }
+
+
+ //************************************************
+ //*** Device Identification Methods ***
+ //************************************************
+
+
+ /**
+ * getName - Get Name of device
+ *
+ * @return name of device
+ */
+ public String getName()
+ {
+ return "Dexcom G4";
+ }
+
+
+
+ /**
+ * getIconName - Get Icon of meter
+ *
+ * @return icon name
+ */
+ public String getIconName()
+ {
+ // FIXME
+ return "dx_dexcom7.jpg";
+ }
+
+
+ /**
+ * getDeviceId - Get Device Id, within MgrCompany class
+ * Should be implemented by device class.
+ *
+ * @return id of device within company
+ */
+ public int getDeviceId()
+ {
+ return CGMSDevicesIds.CGMS_DEXCOM_G4;
+ }
+
+
+ /**
+ * getComment - Get Comment for device
+ *
+ * @return comment or null
+ */
+ public String getComment()
+ {
+ return "";
+ }
+
+
+ /**
+ * getImplementationStatus - Get Implementation Status
+ *
+ * @return implementation status as number
+ * @see ggc.plugin.manager.DeviceImplementationStatus
+ */
+ public int getImplementationStatus()
+ {
+ return DeviceImplementationStatus.IMPLEMENTATION_DONE;
+ }
+
+
+ /**
+ * getDeviceClassName - Get Class name of device implementation, used by Reflection at later time
+ *
+ * @return class name as string
+ */
+ public String getDeviceClassName()
+ {
+ return "ggc.cgms.device.dexcom.DexcomG4";
+ }
+
+
+ /**
+ * Get Max Memory Records
+ *
+ * @return
+ */
+ public int getMaxMemoryRecords()
+ {
+ return 0;
+ }
+
+
+ /**
+ * Get Download Support Type
+ *
+ * @return
+ */
+ public int getDownloadSupportType()
+ {
+ return DownloadSupportType.DOWNLOAD_CONFIG_FROM_DEVICE | DownloadSupportType.DOWNLOAD_FROM_DEVICE;
+ //DownloadSupportType.DOWNLOAD_FROM_DEVICE_FILE;
+ }
+
+
+ /**
+ * How Many Months Of Data Stored
+ *
+ * @return
+ */
+ public int howManyMonthsOfDataStored()
+ {
+ return -1;
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void readConfiguration() throws PlugInBaseException
+ {
+
+ DexcomDeviceReader ddr = null;
+
+ try
+ {
+ prepareBaseDeviceIdentification();
+
+ ddr = new DexcomDeviceReader(this.connection_parameters, DexcomDevice.Dexcom_G4);
+
+ GGCOutputParser gop = new GGCOutputParser(this.output_writer, DexcomDevice.Dexcom_G4);
+ ddr.setOutputWriter(output_writer);
+ ddr.setDataOutputParser(gop);
+
+ ddr.downloadSettings();
+ }
+ catch (DexcomException ex)
+ {
+ throw new PlugInBaseException("Error reading Dexcom G4 device. Exception: " + ex, ex);
+ }
+ finally
+ {
+ if (ddr!=null)
+ ddr.dispose();
+ }
+
+
+
+
+ }
+
+
+ private void prepareBaseDeviceIdentification()
+ {
+ DeviceIdentification di = this.output_writer.getDeviceIdentification();
+ //di.is_file_import = true;
+ //di.fi_file_name = new File(filename).getName();
+ di.company = this.m_da.getSelectedDeviceInstance().getDeviceCompany().getName();
+ di.device_selected = this.m_da.getSelectedDeviceInstance().getName();
+ //di.device_serial_number = "";
+
+ this.output_writer.setDeviceIdentification(di);
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void readDeviceDataFull() throws PlugInBaseException
+ {
+ DexcomDeviceReader ddr = null;
+ try
+ {
+ prepareBaseDeviceIdentification();
+
+ ddr = new DexcomDeviceReader(this.connection_parameters, DexcomDevice.Dexcom_G4);
+
+ GGCOutputParser gop = new GGCOutputParser(this.output_writer, DexcomDevice.Dexcom_G4);
+ ddr.setOutputWriter(output_writer);
+ ddr.setDataOutputParser(gop);
+
+ ddr.downloadData();
+ }
+ catch (DexcomException ex)
+ {
+ throw new PlugInBaseException("Error reading Dexcom G4 device. Exception: " + ex, ex);
+ }
+ finally
+ {
+ if (ddr!=null)
+ ddr.dispose();
+
+ this.output_writer.endOutput();
+ }
+
+
+ }
+
+
+
+ /**
+ * hasIndeterminateProgressStatus - if status can't be determined then JProgressBar will go from
+ * left to right side, without displaying progress.
+ * @return
+ */
+ public boolean hasIndeterminateProgressStatus()
+ {
+ return false;
+ }
+
+
+ /**
+ * getConnectionProtocol - returns id of connection protocol
+ *
+ * @return id of connection protocol
+ */
+ public int getConnectionProtocol() {
+ return ConnectionProtocols.PROTOCOL_SERIAL_USBBRIDGE;
+ }
+
+
+ public String getInstructions()
+ {
+ // FIXME
+ return "DEXCOM_INSTRUCTIONS_DL_SERIAL_USB";
+ }
+
+ public boolean isDeviceCommunicating()
+ {
+ return true;
+ }
+
+
+
+}
\ No newline at end of file
Modified: trunk/ggc-cgm/src/ggc/cgms/device/dexcom/file/FRC_DexcomTxt_DM3.java
===================================================================
--- trunk/ggc-cgm/src/ggc/cgms/device/dexcom/file/FRC_DexcomTxt_DM3.java 2014-08-29 16:12:31 UTC (rev 1293)
+++ trunk/ggc-cgm/src/ggc/cgms/device/dexcom/file/FRC_DexcomTxt_DM3.java 2014-08-31 10:15:38 UTC (rev 1294)
@@ -177,7 +177,7 @@
// sub.datetime = DexcomCGMS.getDateFromString(tmp_time);
// sub.time = DexcomCGMS.getTimeFromString(tmp_time);
sub.setDateTime(DexcomCGMS.getDateTimeFromString(tmp_time));
- sub.type = CGMSValuesSubEntry.CGMS_BG_READING;
+ sub.setType(CGMSValuesSubEntry.CGMS_BG_READING);
strtok.nextToken();
sub.value = Integer.parseInt(strtok.nextToken());
addEntry(sub);
@@ -188,7 +188,7 @@
sub.setDateTime(DexcomCGMS.getDateTimeFromString(tmp_time));
// sub.datetime = DexcomCGMS.getDateFromString(tmp_time);
// sub.time = DexcomCGMS.getTimeFromString(tmp_time);
- sub.type = CGMSValuesSubEntry.METER_CALIBRATION_READING;
+ sub.setType(CGMSValuesSubEntry.METER_CALIBRATION_READING);
strtok.nextToken();
sub.value = Integer.parseInt(strtok.nextToken());
addEntry(sub);
Modified: trunk/ggc-cgm/src/ggc/cgms/device/dexcom/file/FRC_DexcomXml_DM3.java
===================================================================
--- trunk/ggc-cgm/src/ggc/cgms/device/dexcom/file/FRC_DexcomXml_DM3.java 2014-08-29 16:12:31 UTC (rev 1293)
+++ trunk/ggc-cgm/src/ggc/cgms/device/dexcom/file/FRC_DexcomXml_DM3.java 2014-08-31 10:15:38 UTC (rev 1294)
@@ -264,7 +264,7 @@
CGMSValuesSubEntry sub = new CGMSValuesSubEntry();
String tmp_time = atts.getValue(0);
sub.setDateTime(DexcomCGMS.getDateTimeFromString(tmp_time));
- sub.type = CGMSValuesSubEntry.CGMS_BG_READING;
+ sub.setType(CGMSValuesSubEntry.CGMS_BG_READING);
sub.value = Integer.parseInt(atts.getValue(2));
this.addEntry(sub);
@@ -272,7 +272,7 @@
CGMSValuesSubEntry sub = new CGMSValuesSubEntry();
String tmp_time = atts.getValue(0);
sub.setDateTime(DexcomCGMS.getDateTimeFromString(tmp_time));
- sub.type = CGMSValuesSubEntry.METER_CALIBRATION_READING;
+ sub.setType(CGMSValuesSubEntry.METER_CALIBRATION_READING);
sub.value = Integer.parseInt(atts.getValue(2));
this.addEntry(sub);
Modified: trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/DexcomDevice.java
===================================================================
--- trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/DexcomDevice.java 2014-08-29 16:12:31 UTC (rev 1293)
+++ trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/DexcomDevice.java 2014-08-31 10:15:38 UTC (rev 1294)
@@ -1,18 +1,20 @@
package ggc.cgms.device.dexcom.receivers;
public enum DexcomDevice {
- Dexcom_G4(ReceiverApiType.G4_Api),
+ Dexcom_G4(ReceiverApiType.G4_Api, "Dexcom G4"),
- Dexcom_7_Receiver(ReceiverApiType.R2_Api),
- Dexcom_7_Plus(ReceiverApiType.R2_Api),
+ Dexcom_7_Receiver(ReceiverApiType.R2_Api, "Dexcom 7"),
+ Dexcom_7_Plus(ReceiverApiType.R2_Api, "Dexcom 7 Plus"),
;
private ReceiverApiType api;
+ private String description;
- private DexcomDevice(ReceiverApiType api) {
+ private DexcomDevice(ReceiverApiType api, String desc) {
this.api = api;
+ this.description = desc;
}
@@ -25,4 +27,16 @@
this.api = api;
}
+
+ public String getDescription()
+ {
+ return description;
+ }
+
+
+ public void setDescription(String description)
+ {
+ this.description = description;
+ }
+
}
Modified: trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/DexcomDeviceReader.java
===================================================================
--- trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/DexcomDeviceReader.java 2014-08-29 16:12:31 UTC (rev 1293)
+++ trunk/ggc-cgm/src/ggc/cgms/device/dexcom/receivers/DexcomDeviceReader.java 2014-08-31 10:15:38 UTC (rev 1294)
@@ -9,12 +9,14 @@
import ggc.cgms.device.dexcom.receivers.g4receiver.data.UserEventDataRecord;
import ggc.cgms.device.dexcom.receivers.g4receiver.enums.ReceiverRecordType;
import ggc.cgms.device.dexcom.receivers.g4receiver.internal.DatabasePageRange;
+import ggc.cgms.device.dexcom.receivers.g4receiver.internal.Partition;
import ggc.cgms.device.dexcom.receivers.g4receiver.internal.PartitionInfo;
import ggc.cgms.device.dexcom.receivers.g4receiver.util.DexcomException;
import ggc.cgms.device.dexcom.receivers.g4receiver.util.DexcomExceptionType;
import ggc.cgms.device.dexcom.receivers.g4receiver.util.DexcomUtils;
import ggc.plugin.data.progress.ProgressData;
import ggc.plugin.data.progress.ProgressType;
+import ggc.plugin.output.OutputWriter;
import gnu.io.CommPortIdentifier;
import java.util.Enumeration;
@@ -36,6 +38,7 @@
ProgressData progressData = new ProgressData();
private DataOutputParserInterface dataOutputParser = new ConsoleOutputParser();
boolean downloadCanceled = false;
+ OutputWriter outputWriter;
public DexcomDeviceReader(String portName, DexcomDevice dexcomDevice) throws DexcomException
{
@@ -79,6 +82,11 @@
}
}
+
+ public void setOutputWriter(OutputWriter outputWriter)
+ {
+ this.outputWriter = outputWriter;
+ }
public void downloadSettings() throws DexcomException
{
@@ -140,7 +148,12 @@
this.progressData.addToProgressAndCheckIfCanceled(progressType, progressAdd);
- log.debug("Progress: " + this.progressData.calculateProgress());
+ //log.debug("Progress: " + this.progressData.calculateProgress());
+
+ if (this.outputWriter!=null)
+ {
+ this.outputWriter.setSpecialProgress(this.progressData.getCurrentProgress());
+ }
if (this.isDownloadCanceled())
{
@@ -155,7...
[truncated message content] |
|
From: <and...@us...> - 2014-08-31 11:14:08
|
Revision: 1295
http://sourceforge.net/p/ggc/code/1295
Author: andyrozman
Date: 2014-08-31 11:14:06 +0000 (Sun, 31 Aug 2014)
Log Message:
-----------
maven changes
Modified Paths:
--------------
trunk/ggc-master-pom/pom.xml
trunk/ggc-meter/pom.xml
Property Changed:
----------------
trunk/ggc-master-pom/
Index: trunk/ggc-master-pom
===================================================================
--- trunk/ggc-master-pom 2014-08-31 10:15:38 UTC (rev 1294)
+++ trunk/ggc-master-pom 2014-08-31 11:14:06 UTC (rev 1295)
Property changes on: trunk/ggc-master-pom
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+.project
Modified: trunk/ggc-master-pom/pom.xml
===================================================================
--- trunk/ggc-master-pom/pom.xml 2014-08-31 10:15:38 UTC (rev 1294)
+++ trunk/ggc-master-pom/pom.xml 2014-08-31 11:14:06 UTC (rev 1295)
@@ -283,27 +283,15 @@
<version>${hidapi.version}</version>
</dependency>
-
<dependency>
<groupId>org.scream3r</groupId>
<artifactId>jssc</artifactId>
<version>${jssc.version}</version>
</dependency>
- <dependency>
- <groupId>org.swinglabs</groupId>
- <artifactId>pdf-renderer</artifactId>
- <version>${pdf-renderer.version}</version>
- </dependency>
+
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${guava.version}</version>
- </dependency>
-
-
<dependency>
<groupId>com.neuronrobotics</groupId>
<artifactId>nrjavaserial</artifactId>
@@ -355,11 +343,8 @@
<!-- NEW THIS VERSION -->
<hidapi.version>1.1</hidapi.version>
<jssc.version>2.8.0</jssc.version>
- <pdf-renderer.version>1.0.5</pdf-renderer.version>
- <guava.version>13.0.1</guava.version>
<nrjavaserial.version>3.9.3</nrjavaserial.version>
-
<maven.compiler.source>1.5</maven.compiler.source>
<maven.compiler.target>1.5</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Modified: trunk/ggc-meter/pom.xml
===================================================================
--- trunk/ggc-meter/pom.xml 2014-08-31 10:15:38 UTC (rev 1294)
+++ trunk/ggc-meter/pom.xml 2014-08-31 11:14:06 UTC (rev 1295)
@@ -82,7 +82,7 @@
<dependency>
<groupId>com.neuronrobotics</groupId>
<artifactId>nrjavaserial</artifactId>
- <version>3.9.3</version>
+
</dependency>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ru...@us...> - 2014-09-02 20:50:02
|
Revision: 1299
http://sourceforge.net/p/ggc/code/1299
Author: rumbi
Date: 2014-09-02 20:49:50 +0000 (Tue, 02 Sep 2014)
Log Message:
-----------
RR: removing to work around an SVN corruption
Removed Paths:
-------------
trunk/ggc-core/src/GGC_de.properties
trunk/ggc-meter/src/GGCMeterTool_de.properties
trunk/ggc-nutri/src/GGC_Nutrition_de.properties
trunk/ggc-plugin_base/src/GGCPlugin_de.properties
trunk/ggc-pump/src/GGCPumpTool_de.properties
Deleted: trunk/ggc-core/src/GGC_de.properties
===================================================================
--- trunk/ggc-core/src/GGC_de.properties 2014-09-02 17:11:19 UTC (rev 1298)
+++ trunk/ggc-core/src/GGC_de.properties 2014-09-02 20:49:50 UTC (rev 1299)
@@ -1,843 +0,0 @@
-#
-# ######################################################################
-# ### GNU Glucose Control ###
-# ######################################################################
-# ### Language: German ###
-# ### Created by: Reinhold Rumberger (ru...@us...)###
-# ### Version: 0.5 ###
-# ### Last change: 20.10.2011 14:39:18 ###
-# ######################################################################
-#
-#
-# Translation status:
-# Words/expressions: 648
-# Not translated: 99 (15 %)
-# Need to be checked: 107 (16 %)
-#
-# Translated: 442 (68 %)
-#
-#
-#
-## GGC Core#
-# Collation Rules - In unicode we can create special rules for sorting where we specify
-# sorting order of special characters. This will be used by tree's and special tables.
-# For english this is left empty. For all other (that have non-standard, non english
-# charcters) we need to set this if we want sorting to be done correctly.
-#
-COLLATION_RULES=< 0 < 1 < 2 < 3 < 4 < 5 < 6 < 7 < 8 < 9 < a,A,\u00E4,\u00C4,\u00E1,\u00E0,\u00C1,\u00C0,\u00E2,\u00C2 < b,B < c,C < d,D < e,E,\u00E9,\u00E8,\u00EA,\u00C9,\u00C8,\u00CA < f,F < g,G < h,H < i,I < j,J < k,K < l,L < m,M < n,N < o,O,\u00F6,\u00D6 < p,P < q,Q < r,R < s,S,\u00DF < t,T < u,U,\u00FC,\u00DC < v,V < w,W < x,X < y,Y < z,Z
-
-#
-# GGC - Globally used [1]
-#
-DELETE=L\u00F6schen
-ADD=Hinzuf\u00FCgen
-EDIT=Bearbeiten
-NEW=Neu
-EDIT_DEL_SHORT=Bearb./L\u00F6schen
-FEATURE=Feature
-IMPLEMENTED_VERSION=wird in Version %s implementiert
-OR=oder
-INFORMATION=Information
-QUESTION=Frage
-YES=Ja
-NO=Nein
-COMMING_IN_VERSION=Kommt in Version %s
-NOT_WORKING_100PRO=Funktioniert noch nicht zu 100%
-NOT_TESTED_100PRO=Noch nicht zu 100% getestet
-NOT_USED=Nicht verwendet
-
-#
-# ggc.datamodels [1]
-#
-NO_NAME=Kein Name
-TIME=Zeit
-BG=BZ
-INS_1=Ins1
-INS_2=Ins2
-INS_3=Ins3
-INSULIN_1=Insulin 1
-INSULIN_2=Insulin 2
-INSULIN_3=Insulin 3
-BU=KH
-ACT=Ac.
-COMMENT=Kommentar
-DATE_MUST_BE_IN_FORMAT=Datum muss folgendes Format haben
-TIME_MUST_BE_IN_FORMAT=Zeit muss folgendes Format haben
-ERROR_PARSING_DATE=Fehler beim Einlesen des Datums
-DATETIME=Datum/Zeit
-PUMP_INSULIN=Pumpen-Insulin
-
-#
-# Main Frame (Info panels) & Other places [1]
-#
-
-# general
-BG_TARGET=BZ-Ziel
-
-# hba1c
-NO_EXPRESSIVENESS=Keine Aussagekraft
-LITTLE_EXPRESSIVENESS=Geringe Aussagekraft
-STANDARD_EXPRESSIVENESS=Mittlere Aussagekraft
-GOOD_EXPRESSIVENESS=Hohe Aussagekraft
-
-#
-# Daily Values Stats [1]
-#
-
-# main
-CH_LONG=Kohlehydrate
-ACTIVITY=Bewegung
-FOOD=Lebensmittel
-UPDATE_FROM_FOOD=KH aktualisieren
-EDIT_FOOD=Lebensmittel Db [1]
-DATE_TIME=Datum/Zeit
-FOOD_SET=Lebensmittelgruppe [%s]
-
-# meals
-FOOD_BY_DESCRIPTION=Beschreibung [2]
-FOOD_BY_DESCRIPTION_TITLE=Nahrungsmittel nach Beschreibung
-DESCRIBE_FOODS=<html><b>Beschreiben Sie Nahrungsmittel, die Sie gegessen haben</b> (wenn Sie KH in eckige Klammern [] einschließen, künnen KH automatisch errechnet werden)</html>
-CALCULATE=Berechnen
-NO_DESCRIPTIONS_WITH_CH=Es wurden keine Beschreibungen mit KH-Definitionen\nim Nahrungsbeschreibungsbereich gefunden.\nSollten Sie einen Fehler gemacht haben,\nbearbeiten Sie den Text noch einmal.\n
-CH=KH
-
-#
-# Main GUI Panels [1]
-#
-ADD_ROW=Neuer Eintrag
-EDIT_ROW=Eintrag \u00E4ndern
-CLOSE=Schlie\u00DFen
-COURSE_GRAPH=Verlaufsdiagramm
-SPREAD_GRAPH=Spread Graph
-TO_BE_DRAWN=Einzuzeichnen
-CONNECT_VALUES_FOR_ONE_DAY=Werte eines Tages verbinden
-SUM_BU=Summe KH
-SUM=Summe
-SUM_INSULIN=Summe IE
-AVG_BG_PER_DAY=mittlerer BZ pro Tag
-INS_PER_DAY=Ins. pro Tag
-MEALS=Mahlzeiten
-INS_SLASH_BU=Ins/KH
-DRAW=Zeichnen
-DAILYGRAPHFRAME=Tagesdiagramm
-DAILYSTATSFRAME=Tagesstatistiken
-SAVE=Speichern
-DELETE_ROW=Eintrag L\u00F6schen
-LOWEST=Niedrigster
-STD_DEV=Std. Abw.
-READINGS=Werte
-HIGHEST=H\u00F6chster
-AVG_BG=Mittl. BZ
-BLOOD_GLUCOSE=Blutzucker
-BREAD_UNITS=Broteinheiten
-AVG=Mittl.
-INSULIN=Insulin
-URINE=Urin
-DOSE=Dosis
-TOTAL=Summe
-AVG_INS=Mittl. IE
-DOSE_INS=Insulindosis
-CANCEL=Abbrechen
-OK=OK
-HELP=Hilfe
-ADD_NEW_VALUES=Neue Werte eintragen
-COURSEGRAPHFRAME=Verlaufsdiagramm
-FREQGRAPHFRAME=Frequency Graph
-GRAPH=Diagramm
-ADD_NEW_ROW_TO_TABLE=F\u00FCgt eine neue Wertereihe in die Tabelle ein.
-DELETE_SELECTED_ROWS=L\u00F6sche ausgew\u00E4hlte Zeilen.
-SELECT_ROW_FIRST=Bitte zuerst einen Eintrag ausw\u00E4hlen!
-READINGS_SLASH_DAY=Werte/Tag
-VALUATION=Wertung
-INIT=Initialisierung
-READY=Fertig
-UNKNOWN=Unbekannt
-COMMENTS=Anmerkungen
-ARE_YOU_SURE_DELETE=Wollen Sie diesen Eintrag wirklich l\u00F6schen?
-ARE_YOU_SURE_DELETE_ROW=Wollen Sie diesen Eintrag wirklich l\u00F6schen?
-
-#
-# GGC Little (GUI) [2]
-#
-DAILY_VALUES=Tageswerte
-SHOW_DAILY_GRAPH=Diagramm anzeigen
-DAILY_CONTROL=Daily Control
-MN_QUIT_LT_DESC=GGC Little beenden
-CURRENT_DATE_HAS_CHANGED=Das Datum hat sich ge\u00E4ndert! Ihre Aktion wird deshalb verworfen und die Tabelle aktualisiert!
-TB_ADD_ROW_DESC=Neuer Eintrag f\u00FCr diesen Tag
-TB_EDIT_ROW_DESC=Eintrag f\u00FCr diesen Tag bearbeiten
-TB_DELETE_ROW_DESC=Eintrag f\u00FCr diesen Tag l\u00F6schen
-TB_READ_METER_LT_DESC=Daten vom Me\u00DFger\u00E4t auslesen
-TB_ABOUT_DESC=\u00DCber GGC Little
-TB_SHOW_GRAPH_DESC=Diagramm f\u00FCr diesen Tag anzeigen
-GGC_LITTLE_TITLE=GNU Gluco Control Little
-TAB_CONTROL=Steuerung
-TAB_SCHEDULE=Terminplan
-TAB_PLUGIN=Plug-ins
-TAB_STOCKS=Bestand
-PLUGIN_IMPLEMENTED_VERSION=Dieses Plug-in wird in Version %s implementiert!
-METER_PLUGIN_PANEL=Me\u00DFger\u00E4te-Plug-in
-PUMP_PLUGIN_PANEL=Pumpen-Plug-in
-
-#
-# GGC Little (System Tray) [3]
-#
-SHOW_APP=Anzeigen
-SHOW_APP_DESC=GGC Little anzeigen
-HIDE_APP=Verstecken
-HIDE_APP_DESC=GGC Little verstecken
-EXIT_APP=Beenden
-EXIT_APP_DESC=GGC Little beenden
-
-#
-# Menus (BE CAREFUL about mnemonics used) Set mnemonic with & before mnemonic letter [1]
-#
-
-# main menus
-MN_FILE=&Datei
-MN_DATA=Pen/Spritze
-MN_DATA_GRAPH=Diagramme
-MN_DOCTOR=&Arzt
-MN_FOOD=&Ern\u00E4hrung
-MN_PRINTING=D&rucken
-MN_TOOLS=&Werkzeuge
-MN_HELP=&Hilfe
-
-# file
-MN_LOGIN=Ein&loggen
-MN_LOGIN_DESC=Patient einloggen
-MN_LOGOUT=Ausl&oggen
-MN_LOGOUT_DESC=Ausloggen
-MN_QUIT=B&eenden
-MN_QUIT_DESC=GGC beenden
-
-# data
-MN_DAILY=&Tages\u00FCbersicht
-MN_DAILY_DESC=Tagesstatistik betrachten
-MN_COURSE=&Verlauf
-MN_COURSE_DESC=Verlauf betrachten
-MN_SPREAD=Ver&teilung
-MN_SPREAD_DESC=Verteilung betrachten
-MN_FREQUENCY=&Frequenz
-MN_FREQUENCY_DESC=Wertefrequenz betrachten
-MN_HBA1C=&HbA1c
-MN_HBA1C_DESC=HbA1c betrachten
-MN_DATA_RATIO=Verh\u00E4ltnis
-MN_DATA_RATIO_DESC=Verh\u00E4ltnis-Einstellungen
-MN_RATIO_BASE=Basis
-MN_RATIO_BASE_DESC=Basisverh\u00E4ltniseinstellungen (1 pro Tag)
-MN_RATIO_EXTENDED=Erweitert
-MN_RATIO_EXTENDED_DESC=Erweiterte Verh\u00E4ltniseinstellungen (mehr als 1 pro Tag)
-MN_RATIO_CALC=&Verh\u00E4ltnisrechner
-MN_RATIO_CALC_DESC=Berechnet verschiedene Verh\u00E4ltnisse (Insulin/KH, ...)
-
-# tools
-MN_DB_MAINT=&Datenbank-Wartung
-MN_DB_MAINT_DESC=Funktionen f\u00FCr die Wartung der Datenbank
-MN_DB_BACKUP=Datenbank &sichern
-MN_DB_BACKUP_DESC=Sichert die GGC-Datenbank
-MN_DB_RESTORE=Datenbank &wiederherstellen
-MN_DB_RESTORE_DESC=Stellt die GGC-Datenbank anhand einer Sicherung wieder her
-MN_MISC_SYNCHRONIZE=&Synchronisierung
-MN_MISC_SYNCHRONIZE_DESC=Datenabgleich mit anderen GGC Instanzen
-MN_PREFERENCES=&Einstellungen
-MN_PREFERENCES_DESC=Einstellungen
-
-# help
-MN_ABOUT=\u00DC&ber
-MN_ABOUT_DESC=\u00DCber GGC
-MN_CHECK_FOR_UPDATE=Nach &Updates suchen
-MN_CHECK_FOR_UPDATE_DESC=Pr\u00FCft, ob eine neue Version verf\u00FCgbar ist
-
-# food
-MN_NUTRDB_USDB=N\u00E4hrstoff-DB (&USDA)
-MN_NUTRDB_USDB_DESC=Datenbank mit N\u00E4hrstoff-Informationen, ver\u00F6ffentlicht vom USDA
-MN_NUTRDB_USER=N\u00E4hrstoff-DB (&Benutzer)
-MN_NUTRDB_USER_DESC=N\u00E4hrstoff-Datenbank des Benutzers
-MN_MEALS=&Mahlzeiten-DB
-MN_MEALS_DESC=Datenbank mit vollst\u00E4ndigen Mahlzeiten
-
-# printing
-MN_REPORTS=&Data
-MN_REPORTS_DESC=Selbstkontrolldaten-Berichte
-MN_PDF_SIMPLE=&Einfach
-MN_PDF_SIMPLE_DESC=Einfacher PDF-Bericht (monatl.)
-MN_PDF_EXT=&Ausf\u00FChrlich
-MN_PDF_EXT_DESC=Ausf\u00FChrlicher PDF-Bericht (monatl.)
-
-# doctors
-MN_DOCS=\u00C4&rzte
-MN_DOCS_DESC=\u00C4rzte
-MN_APPOINT=&Termine
-MN_APPOINT_DESC=Termine f\u00FCr Arztbesuche
-MN_STOCKS=&Bestand
-MN_STOCKS_DESC=Bestand medizinischer Ausr\u00FCstung
-
-#
-# ggc.gui.calendar [2]
-#
-ENDING_DATE=Enddatum
-STARTING_DATE=Startdatum
-1_WEEK=1 Woche
-1_MONTH=1 Monat
-3_MONTHS=3 Monate
-CUSTOM=Benutzerdefiniert
-DATE_RANGE_SELECTOR=Wahl des Zeitraumes
-SU=So
-MO=Mo
-TU=Di
-WE=Mi
-TH=Do
-FR=Fr
-SA=Sa
-JANUARY=Januar
-FEBRUARY=Februar
-MARCH=M\u00E4rz
-APRIL=April
-MAY=Mai
-JUNE=Juni
-JULY=Juli
-AUGUST=August
-SEPTEMBER=September
-OCTOBER=Oktober
-NOVEMBER=November
-DECEMBER=Dezember
-
-#
-# Main GUI Panels [1]
-#
-GENERAL_INFORMATION=Allgemeine Informationen
-YOUR_NAME=Ihr Name
-BOLUS_INSULIN=Bolusinsulin
-BASAL_INSULIN=Basalinsulin
-GLUCOMETER=Messger\u00E4t
-BG_UNIT=Ma\u00DFeinheit
-HBA1C=HbA1c
-YOUR_CURRENT_HBA1C=Ihr aktueller HbA1c
-NO_READINGS=Keine Werte
-NO_DATASOURCE=Keine Datenquelle
-SCHEDULE=Terminplan
-YOUR_NEXT_APPOINTMENT=Ihr n\u00E4chster Termin
-APP_WILL_BE_FOUND_HERE=wird hier zu finden sein...
-STATISTICS_FOR_LAST_WEEK=Statistiken f\u00FCr vorige Woche
-BG_STATISTICS=BZ Statistiken
-BU_STATISTICS=KH Statistiken
-BU_PER_DAY=KH pro Tag
-AVG_MEAL_SIZE=KH pro Mahlzeit
-MEALS_PER_DAY=Mahlzeiten pro Tag
-STATISTICS=Statistiken
-PER_DAY=pro Tag
-AVG_DOSE_SIZE=Mittl. Dosis
-DOSES_PER_DAY=Dosen pro Tag
-OTHER_INFO=Sonstiges
-STOCK=Bestand
-STOCK_DATA_HERE=Daten zu Ihrer medizinischen Ausr\u00FCstung
-STO_WILL_BE_FOUND_HERE=wird hier zu finden sein...
-NOT_YET=BISHER NOCH NICHT!
-BOLUS_INSULIN_SHORT=Bolus
-BASAL_INSULIN_SHORT=Basal
-AVERAGE=Durchschnitt
-DOSES=Dosen
-
-#
-# Hba1c Dialog [1]
-#
-CALCULATED_HBA1C=Errechneter HbA1c
-
-#
-# Configuration [1]
-#
-APPLY=Anwenden
-ERROR=Fehler
-INVALID_NAME=Ung\u00FCltiger Name
-PREFERENCES=Einstellungen
-GENERAL=Allgemeines
-MEDICAL_DATA=Medizinische Daten
-COLORS_AND_FONTS=Farbe & Schrift
-RENDERING_QUALITY=Darstellungsqualit\u00E4t
-SOME_VALUES_CHANGED_LIKE_TO_SAVE=Einige Werte haben sich ge\u00E4ndert. Wollen Sie diese speichen?
-VALUES_CHANGED=Ge\u00E4nderte Werte
-CHOOSE_A_COLOR=W\u00E4hlen Sie eine Farbe
-BG_HIGH_ZONE=\u00DCberzuckerbereich
-BG_TARGET_ZONE=Zielbereich
-BG_LOW_ZONE=Unterzuckerbereich
-BG_AVERAGE=BZ Mittelwert
-INS_SLASH_BU_QUOTIENT=Ins/KH
-NAME=Name
-ABBR=Abk.
-HIGH_BG=\u00DCberzuckergrenze
-LOW_BG=Unterzuckergrenze
-TARGET_HIGH_BG=Obergrenze Zielbereich
-TARGET_LOW_BG=Untergrenze Zielbereich
-INSULIN_SETTINGS=Insulineinstellungen
-BLOOD_GLUCOSE_SETTINGS=Blutzuckereinstellungen
-BLOOD_GLUCOSE_UNIT_SETTING=BZ-Einheiteneinstellungen
-BLOOD_GLUCOSE_SETTINGS_1=BZ-Einstellungen (mg/dl)
-BLOOD_GLUCOSE_SETTINGS_2=BZ-Einstellungen (mmol/l)
-HOST=Host
-PORT=Port
-USERNAME=Benutzername
-PASSWORD=Passwort
-OPTIONS=Optionen
-ANTIALIASING=Kantengl\u00E4ttung
-COLOR_RENDERING=Farbdarstellung
-DITHERING=Dithering
-FRACTIONAL_METRICS=Fractional Metrics
-INTERPOLATION=Interpolation
-TEXT_ANTIALIASING=Kantengl\u00E4ttung Schrift
-RENDERING=Darstellung
-DE=Deutsch
-EN=Englisch
-SI=Slowenisch
-YOUR_LANGUAGE=Ihre Sprache
-COLOR_SCHEME_SELECT=Farbschemawahl
-SELECTED_COLOR_SCHEME=Gew\u00E4hltes Farbschema
-NEW_SCHEME=Neues Schema
-COLORS=Farben
-COLOR_SCHEME_PREDEFINED=Die Farbe eines vordefinierten Farbschemas kann nicht ver\u00E4ndert werden.
-USE_AS_TEMPLATE=Folgendes Schema als Vorlage benutzen
-CREATE_NEW_SCHEME=Neues Schema erstellen
-EDIT_DELETE_SCHEME=Schema Bearbeiten/L\u00F6schen
-TYPE_NAME_BEFORE=Geben Sie den Name ein und klicken Sie OK.
-SCHEME_NAME_ALREADY_USED=Dieses Schema existiert bereits!\nBitte w\u00E4hlen Sie einen anderen Namen.
-PREDEFINED_SCHEME_CANT_BE_CHANGED=Der Name eines vordefinierten Schemas kann nicht ge\u00E4ndert, und das Schema nicht gel\u00F6scht werden!
-EXECUTABLE_FILES=Ausf\u00FChrbare Dateien (*.exe)
-SELECT_PDF_VIEWER=Wahl des PDF-Betrachters
-COLOR_PREVIEW=Farbschema Vorschau
-ACTION=Aktion
-ACTION_DELETE=L\u00F6schen
-ACTION_EDIT=Bearbeiten
-SELECTED_SCHEME=Aktives Schema
-NEW_NAME=Neuer Name
-SELECT_ACTION_OR_CANCEL=Sie sollten eine Aktion oder 'Abbrechen' w\u00E4hlen
-GENERAL_SETTINGS=Allgemeine Einstellungen
-DATABASE_SETTINGS=Datenbank
-DATABASE_SETTINGS_DESC=<html><body><b><i>Warnung! \u00C4ndern Sie diese Einstellung nur wenn Sie wissen, was Sie tun!</i></b><br>Die meisten Daten und Einstellungen befinden sich in der Datenbank selbst. In der Konfigurationsdatei befinden sich nur Einstellungen zu Sprache, Datenbank und Look&Feel.<br><i>\u00C4nderungen werden sich erst nach einem Neustart auswirken.</i></body></html>
-SELECTED_DATABASE=Gew\u00E4hlte Datenbank
-LAF_SETTINGS=Look & Feel Einstellungen
-LAF_SETTINGS_DESC=<html><body><i>\u00C4nderungen werden sich erst nach einem Neustart von GGC auswirken.</i></body></html>
-SELECTED_LAF_TYPE_NAME=L&F w\u00E4hlen (Name)
-SELECTED_LAF_TYPE_CLASS=L&F w\u00E4hlen (Klasse)
-SELECTED_SKINLF_DEF=Gew\u00E4hlter Skin f\u00FCr SkinLF
-SELECT_SKINLF_SKIN=W\u00E4hlen Sie eine Oberfl\u00E4che f\u00FCr die Skin L&F-Bibliothek
-SELECT=Ausw\u00E4hlen...
-BASIC_SETTINGS=Grundeinstellungen
-EMPTY_VALUE=Leerer Wert
-PDF_VIEWER_SETTINGS=PDF-Betrachter Einstellungen
-PDF_VIEWER=PDF-Betrachter
-BROWSE=Ausw\u00E4hlen...
-LUNCH_START_TIME=Mittagszeit ab (hh:mm)
-DINNER_START_TIME=Abendszeit ab (hh:mm)
-NIGHT_START_TIME=Nacht ab (hh:mm)
-
-# Mode
-MODE=Modus
-APPLICATION_MODE=Anwendungsmodus
-PEN_INJECTION_MODE=Pen-/Spritzen-Modus
-PUMP_MODE=Pumpenmodus
-APPLICATION_MODE_DESC=<html><body>Der Modus unterbindet nicht die Verwendung von Teilen der Anwendung. Er w\u00E4hlt nur die richtigen Daten f\u00FCr die Anzeige der Statistiken und die richtigen Symbole f\u00FCr die Toolbar aus.</body></html>
-PEN_INJECTION_MODE_SETTINGS=Pen-/-Spritzmodus Einstellungen
-PUMP_MODE_SETTINGS=Pumpenmodus Einstellungen
-BASAL_PRECISSION=Basaldosis Genauigkeit
-BOLUS_PRECISSION=Bolusdosis Genauigkeit
-MAX_BASAL=Max. Basaldosis
-MAX_BOLUS=Max. Bolusdosis
-TBR_TYPE_SELECTOR=Tempor\u00E4rer Basalratentyp
-TBR_TYPE_BOTH=Beide
-TBR_TYPE_UNIT=Einheit (U)
-TBR_TYPE_PROC=Prozent (%)
-TBR_TYPE_CHOICE=Choice in GGC
-PROCENT_MIN=Prozent Min.
-UNIT_MIN=Einheit Min.
-TASK_MIN=Min
-TASK_MAX=Max
-TASK_STEP=Schritt
-
-# Language
-LANGUAGE=Sprache
-LANGPACK_VERSION=Sprachpaket
-LANG_WITH_HELP=Sprachen mit Hilfe
-LANG_WITHOUT_HELP=Sprachen ohne Hilfe
-SELECT_LANGUAGE=Sprachwahl
-NO_HELP_AVAILABLE=Keine Hilfe verf\u00FCgbar
-HELP_AVAILABLE=Hilfe verf\u00FCgbar
-LANG_DESC=<html><body>Die Übersetzung der Anwendung findet getrennt von deren Entwicklung statt, weshalb die Übersetzung meistens etwas veraltet ist. Übersetzungen werden vor allem von Freiwilligen außerhalb des Projekts gepflegt, deshalb sind wir nicht direkt für Fehler in der Übersetzung, oder wann die n\u00E4chste Übersetzung verfügbar ist verantwortlich. Wenn Sie Fehler finden, können Sie uns gerne kontaktieren und wir werden sie baldmöglichst beheben.<br>Wenn etwas noch nicht übersetzt wurde, wird der Ausdruck in der Standardsprache (Englisch) angezeigt.<br>Wenn Sie bei der Übersetzung helfen wollen, kontaktieren Sie uns bitte via E-Maill: gg...@at....</body></html>
-NOTE_RESTART=<html><body><b>Warnung:</b> Diese Einstellung wird erst nach dem nächsten Neustart der Anwendung wirksam.</body></html>
-NOTE_LANG_FEATURE_NOT_WORKING=<html><body><font color="red"><b>Warnung:</b>Dieses Feature ist noch nicht aktiviert. Bis auf weiteres verwenden Sie bitte die Sprachwahl im Allgemeines-Reiter. Wenn dieses Feature aktiviert wird, wird diese Warnung und die Sprachwahl im Allgemeines-Reiter entfernt.</font></body></html>
-
-#
-# ggc.util [6]
-#
-UNNAMED_USER=Unbekannter Benutzer
-THIS_FILE_WAS_AUTOMATICALY_GENERATED=Diese Datei wurde automatisch generiert.
-YOUR_VERSION=Ihre Version
-AVAILABLE_VERSION=Verf\u00FCgbare Version
-NO_NEW_VERSION=Keine aktuellere Version verf\u00FCgbar.
-CHECK_FOR_NEW_VERSION=Auf neue Version \u00FCberpr\u00FCfen
-HOST_UNAVAILABLE_INFO=Server nicht verf\u00FCgbar
-HOST_UNAVAILABLE_MSG=Konnte nicht mit ggc.sourceforge.net verbinden!
-
-#
-# Graphs [2]
-#
-DAYS_WITH_READINGS_0_1=Tage mit 0 oder 1 Messung
-DAYS_WITH_READINGS_2_3=Tage mit 2 oder 3 Messungen
-DAYS_WITH_READINGS_4_5=Tage mit 4 oder 5 Messungen
-DAYS_WITH_READINGS_6_7=Tage mit 6 oder 7 Messungen
-DAYS_WITH_READINGS_MORE_7=Tage mit 8+ Messungen
-AXIS_TIME_LABEL=Zeit (Std)
-AXIS_VALUE_LABEL=BZ (%s)
-FORMAT_DATE_DAYS=dd.MM.yyyy
-FORMAT_DATE_HOURS=HH:mm
-GRAPH_NO_DATA_AVAILABLE_CHANGE=Keine Daten verf\u00FCgbar. W\u00E4hlen Sie eine andere Zeitspanne und/oder zu zeichnende Elemente und klicken Sie "Zeichnen"!
-
-#
-# Database Tool [5]
-#
-DB_TOOL=Database Hibernate Tool
-DB_CONFIGURATION=Datenbankeinstellungen
-DB_PRESS_HELP=Klicken Sie auf den Hilfe-Knopf um detaillierte Informationen zu den Verbindungseinstellungen zu bekommen.
-DB_CONFIG_DESC=<html><head></head><body><p>This is for configuring your database to work with your application. Please set all settings correctly, and then try to connect to the database (you must have the database configured with the correct username, password and database name). If the connection is successful, your settings are OK.</p><p>Now you are ready to create tables with the help of hibernate. You must have all jars included in the classpath before you start the second option (Init Database). You must be careful. If you have the database already set up and filled, 'Init Database' will destroy all data.<p><body><html>
-DATABASE_TYPE=DB-Typ
-DATABASE_CLASSNAME=DB-Klasse
-HIBERNATE_DIALECT=Hibernate Dialekt
-JDBC_URL=JDBC URL
-HOSTNAME=Hostname
-DATABASE=Datenbank
-
-#
-# Printing - Base [2]
-#
-PRINTING=Drucken
-TYPE_OF_REPORT=Berichttyp
-SELECT_YEAR_AND_MONTH=Monat w\u00E4hlen
-REPORT_FOOTER=Dieser Bericht stammt von "GGC - GNU Gluco Control", frei verf\u00FCgbar unter http://ggc.sourceforge.net
-FOR=F\u00FCr
-PRINTING_SETTINGS_NOT_SET=<html>Druckeinstellungen (PDF-Anzeigeprogramm) nicht gesetzt oder inkorrekt.</html>
-PRINTING_SETTINGS_NOT_SET_SOL=<html>Gehen Sie zu Werkzeuge->Einstellungen->Drucken<br>und geben Sie den Pfad zum PDF-Anzeigeprogramm an.</html>
-PDF_VIEVER_RUN_ERROR=<html>Fehler beim Aufruf des PDF-Anzeigeprogramms:<br>Unbekannter Fehler</html>
-SELECT_STARTING_RANGE=Select starting range
-SELECT_ENDING_RANGE=Select ending range
-
-#
-# Printing [2]
-#
-INS_SHORT=Ins
-CH_SHORT=KH
-BREAKFAST=Fr\u00FChst\u00FCck
-LUNCH=Mittagessen
-DINNER=Abendessen
-NIGHT=Nacht
-SIMPLE_MONTHLY_REPORT=Einfacher Bericht (monatl.)
-EXTENDED_MONTHLY_REPORT=Ausf\u00FChrlicher Bericht (monatl.)
-FOOD_MENU_BASE=Food Menu Base (CH only)
-FOOD_MENU_EXT_I=Extended Food Menu I (CH,Ins)
-FOOD_MENU_EXT_II=Extended Food Menu II (CH,Ins,BG)
-FOOD_MENU_EXT_III=Extended Food Menu III (CH,Ins,BG,kJ)
-
-#
-# Stocks [5]
-#
-STOCKS=Bestand
-
-#
-# Appointments [5]
-#
-APPOINTMENTS=Arzttermine
-
-#
-# About [1]
-#
-SYSTEM_PROPERTIES=Systemeigenschaften
-ABOUT=\u00DCber
-PROPERTY=Eigenschaft
-VALUE=Wert
-LICENCE=Lizenz:
-CREDITS=Danksagungen
-LIBRARIES=Bibliotheken
-MAIN=Main
-ABOUT_GGC=\u00DCber GNU Gluco Control
-GGC_DEVELOPMENT_TEAM=GGC-Entwicklungsteam
-SEE_CREDITS=(siehe Danksagungen)
-GGC_TITLE=GNU Gluco Control
-CURRENT_DEVELOPERS=Aktive Entwickler
-PREVIOUS_DEVELOPERS=Ehemalige Entwickler
-
-#
-# Doctor types [5]
-#
-ADDICTION_MEDICINE=Addiction Medicine
-ADOLESCENT_MEDICINE=Adolescent Medicine
-AIDS_HIV_CARE=AIDS/HIV Care
-ANESTHESIOLOGY=Anesthesiology
-ASTHMA_ALLERGY_IMMUNOLOGY=Asthma, Allergy & Immunology
-BREAST_CANCER_SURGERY=Brustkrebschirurgie
-CARDIAC_SURGERY=Herzchirurgie
-CHILD_CARE=Child care (pediatrics)
-CARDIOLOGY=Kardiologie
-COLORECTAL_SURGERY=Colorectal Surgery
-COSMETIC_SURGERY=Cosmetic Surgery
-CRITICAL_CARE=Critical Care
-DENTAL_SPECIALTIES=Dental Specialties
-DERMATOLOGY=Dermatologie
-DIABETES=Diabetes
-EMERGENCY_MEDICINE=Emergency Medicine
-ENDOCRINOLOGY=Endokrinologie
-EPILEPSY=Epilepsie
-FAMILY_MEDICINE=Family Medicine
-GASTROENTEROLOGY=Gastroenterologie
-GENERAL_SURGERY=Allgemeine Chirurgie
-GENERAL_INTERNAL_MEDICINE=General Internal Medicine
-GERIATRICS=Geriatrics
-GYNECOLOGIC_ONCOLOGY=Gyn\u00E4kologische Onkologie
-GYNECOLOGY=Gyn\u00E4kologie
-HAND_SURGERY=Hand Surgery
-HEAD_AND_NECK_SURGERY=Head and Neck Surgery
-HEADACHE=Headache
-HEMATOLOGY=H\u00E4matologie
-HOSPITAL_INTERNAL_MEDICINE=Hospital Internal Medicine
-INFECTIOUS_DISEASES=Infectious Diseases
-INFERTILITY_MEDICINE=Infertility Medicine
-INTERNAL_MEDICINE=Internal Medicine
-LABORATORY_MEDICINE=Laboratory Medicine
-MIDWIFE=Midwife (CNM)
-MEDICAL_GENETICS=Medical Genetics
-METABOLISM=Stoffwechsel
-MOVEMENT_DISORDERS=Movement Disorders
-NEONATOLOGY=Neonatology
-NEPHROLOGY=Nephrologie
-NEUROLOGY=Neurologie
-NEURO_OPTHALMOLOGY=Neuro-ophthalmology
-NEUROSURGERY=Neurochirurgie
-NUCLEAR_MEDICINE=Nuclear Medicine
-NUTRITION_MEDICINE=Nutrition Medicine
-OBSTETRICS_AND_GYNECOLOGY=Geburtshilfe und Gyn\u00E4kologie
-ONCOLOGY_MEDICAL=Oncology Medical
-ONCOLOGY_RADIATION=Oncology Radiation
-OPTHALMOLOGY=Augenheilkunde
-ORAL_MAXILLOFACIAL_SURGERY=Oral/Maxillofacial Surgery
-ORTHOPEDIC_SURGERY=Orthopedic Surgery
-OTOLARYNGOLOGY=Otolaryngology (ENT)
-OTOLOGY=Otology
-PAIN_MANAGEMENT=Pain Management
-PATHOLOGY=Pathologie
-PEDIATRIC=Kinderheilkunde
-PEDIATRIC_SPECIALISTS=Pediatric Specialists
-PERINATOLOGY=Geburtshilfe
-PHYSIATRY=Physiatry
-PHYSICAL_REHABILITATION=Physical Rehabilitation
-PLASTIC_RECONSTRUCTIVE_SURGERY=Plastic/Reconstructive Surgery
-PODIATRY=Fu\u00DForthop\u00E4die
-PROSTATE_CARE=Prostate Care
-PSYCHIATRY=Psychiatrie
-PSYCHOLOGY=Psychologie
-PULMONARY_MEDICINE=Pulmonary Medicine
-RADIOLOGY=Radiologie
-RADIATION_ONCOLOGY=Radiation Oncology
-REPRODUCTIVE_ENDOCRINOLOGY_INFERTILITY=Reproductive Endocrinology and Infertility
-RHEUMATOLOGY=Rheumatologie
-SLEEP_DISOREDERS=Schlafst\u00F6rungen
-SPORTS_MEDICINE=Sportmedizin
-THORACIC_SURGERY=Thoracic Surgery
-TRANSPLANT=Transplantation
-UROLOGY=Urologie
-VASCULAR_SURGERY=Gef\u00E4\u00DFchirurgie
-
-#
-# Doctor [5]
-#
-DOCTORS=\u00C4rzte
-FILTER=Filter
-FILTER_VISIBLE=Sichtbare
-FILTER_ALL=Alle
-
-#
-# Ratio's: Base [1]
-#
-RATIO_BASE=Grundverh\u00E4ltnis
-INSULIN_CARB_RATIO=Insulin/KH-Verh\u00E4ltnis
-SENSITIVITY_FACTOR_LONG=<html>Empfindlichkeitsfaktor<br>(Insulin/BZ-Verh\u00E4ltnis)</html>
-FILL_RATIO_ENTRIES=<html>Bitte f¨llen Sie die ersten beiden Einträge dieses Formulars aus,<br>oder brechen Sie den Vorgang ab.</html>
-
-#
-# Ratio's: Extended [1]
-#
-RATIO_EXTENDED=Erweitertes Verh\u00E4ltnis
-RATIO_ENTRY_ADD=Neuer Verh\u00E4ltniseintrag
-RATIO_ENTRY_EDIT=Verh\u00E4ltniseintrag bearbeiten
-TIME_FROM=Von
-TIME_TILL=Bis
-PROCENT_OF_BASE=Prozent (der Basis)
-PROCENT_OF_BASE_SHORT=% der Basis
-CH_INSULIN_RATIO_SHORT=KH/Ins
-BG_INSULIN_RATIO_SHORT=BZ/Ins
-BG_OH_RATIO_SHORT=BZ/KH
-CHECK_RATIOEXTENDED_DATA_OK=<html><body>You filled all data about<br>extended ratio's for whole<br>day successfuly !<br></body></html>
-CHECK_RATIOEXTENDED_FAILED=<html><body>You filled data about extended<br>ratio's incorrectly. All minutes<br>of the day must be included (from<br>0:00 till 23:59)!<br></body></html>
-
-#
-# Ratio's: Calculator [4]
-#
-RATIO_CALCULATOR=Verh\u00E4ltnisrechner
-TYPE_SOURCE_DATA=Art der Quelldaten
-TYPE_SOURCE_MANUAL=Manuelle Daten
-TYPE_SOURCE_DB=Datenbank Daten
-TDD_FOR_CALCULATION=Total Daily Dose (TDD) For Calculation
-RATIO_TIME_SELECT_DESC=<html>Sie müssen einen Zeitraum für die Rechnung wählen. Sind Ihre Werte stabil (keine größeren Änderungen), dürfte ein größerer Zeitraum bessere Resultate liefern. Gibt es jedoch größere Änderungen, oder befinden Sie sich mitten in einer Bolus-/Basalratenneueinstellung, sollten Sie einen kleineren Zeitraum wählen.</html>
-2_WEEKS=2 Wochen
-3_WEEKS=3 Wochen
-DB_DATA_STATUS=Db Data Status
-DB_DATA_NOT_READY=Nicht bereit!
-DB_DATA_READY=Bereit
-GET_DATA=Daten abrufen
-RULE_500=500er-Regel (schnellwirkende Insuline)
-RULE_450=450er-Regel (Normalinsuline)
-RULE_300=300er-Regel (kleine Kinder)
-RULE_1800=1800er-Regel (schnellwirkende Insuline)
-RULE_1500=1500er-Regel (Normalinsuline)
-SELECT_RANGE=Zeitraum w\u00E4hlen
-SELECT_RULE=Regel w\u00E4hlen
-SENSITIVITY_FACTOR=Empfindlichkeitsfaktor
-CALCULATION=Rechnung
-INS_CH_RATIO_PROC=1E Insulin f\u00FCr %s g KH
-INS_BG_RATIO=Ins/BZ-Verh\u00E4ltnis
-INS_BG_RATIO_PROC=1E Insulin verringert den BZ um %s %s
-CH_BG_RATIO=KH/BZ-Verh\u00E4ltnis
-CH_BG_RATIO_PROC=1 %s Zunahme f\u00FCr %s g KH
-TDD_MUST_BE_GREATER_THAN_ZERO=<html><body>Total Daily Dose (TDD) must be greater than<br>zero. Recheck the value and start calculation<br>again.</body></html>
-RATIO_CALCULATOR_NOT_IMPLEMENTED=<html><body>This part of Ratio Calculator not implemented<br>yet.</body></html>
-RATIOS_NOT_DONE=<html><body>You never run calculation of Ratio's.<br>Either run it and click OK to transfer<br>calculated data, or use Cancel to exit.</body></html>
-RATIO_DB_IMPORT_NA=<html><body>Importing data from Db, doesn't work yet.<br>You can only enter data manually.</body></html>
-
-#
-# Bolus Helper [1]
-#
-BOLUS_HELPER=Bolus Helper
-READ_RATIOS=Read Ratios
-CH_INSULIN_RATIO=CH / Insulin Ratio
-BG_INSULIN_RATIO=BG / Insulin Ratio
-BG_OH_RATIO=BG / CH Ratio
-CORRECTION_DOSE=Correction Dose
-CARB_DOSE=Dose for covering CH
-TOGETHER=Together
-TOGETHER_ROUNDED=Together (rounded)
-NO_BG_MEASURE=No BG measurment.
-NO_CARBS_DEFINED=CH not set.
-UNIT_SHORT=U
-
-#
-# Tools [1]
-#
-METERS_PLUGIN=Messger\u00E4te Plug-in
-PUMPS_PLUGIN=Pumpen Plug-in
-CGMS_PLUGIN=CGMS Tool Plug-in
-NUTRITION_PLUGIN=Nutrition Tool Plug-in
-STATUS_NOT_INSTALLED=Nicht installiert
-STATUS_NOT_AVAILABLE=N/A (ab Version %s verf\u00FCgbar)
-STATUS_INSTALLED=Installiert (Version %s)
-PLUGIN_NOT_INSTALLED_OR_AVAILABLE=%s nicht installiert und/oder verf\u00FCgbar.
-
-#
-# Backup/Restore [1]
-#
-
-# backup
-BACKUP=Sicherung
-BACKUP_DB_TITLE=Sicherung der GGC-Datenbank
-BACKUP_DB_TITLE_SHORT=Datenbanksicherung
-SELECT_ELEMENTS_TO_BACKUP=W\u00E4hlen Sie die zu sichernden Elemente
-
-# progress
-TOTAL_PROGRESS=Fortschritt insgesamt
-BACKUP_NOT_STARTED_YET=Sicherung wurde noch nicht gestartet.
-CURRENT_TASK=Aktuelle Aufgabe
-NO_TASK_STARTED=Keine Aufgabe
-
-# elements
-GGC_BACKUP=GGC-Sicherung
-NUTRITION_OBJECTS=Nahrungsobjekte
-USER_FOOD_GROUPS=Benutzer-Nahrungsgruppen
-MEAL_GROUPS=Mahlzeit-Gruppen
-FOODS=Ern\u00E4hrung
-TASK=Aufgabe
-SETTINGS=Einstellungen
-CONFIGURATION=Configuration
-COLOR_SCHEMES=Color Schemes
-
-# restore
-RESTORE_DB_TITLE=Wiederherstellung der GGC-Datenbank
-RESTORE_DB_TITLE_SHORT=Datenbankwiederherstellung
-RESTORE=Wiederherstellen
-RESTORE_NOT_STARTED_YET=Wiederherstellung wurde noch nicht gestarted.
-RESTORE_SELECTOR_DESC=<html>Select file from which you wish to do restore. You can either select text file (which contains data for database) or you can select zip file containing several files (made by our 'Backup' option). In next dialog you can select which elements you wish to restore and any special options.<br><br><b>Notes:</b><br>1. Files will be not checked at this time. Check is on restore only.<br>2. Restore is full. This means that all previous data will be deleted. In some cases there is exception to this rule, but only when unlinked data is used (which is rare in itself). You will learn more about this exceptions (if there are any) on next dialog.</html>
-SELECT_ELEMENTS_TO_RESTORE=Elemente zum Wiederherstellen w\u00E4hlen:
-DAILY_VALUES_APPEND=<html>Wollen Sie diese Werte an die vorhandenen Tageswerte anhängen? Falls die Datenbank diese Einträge bereits enthält, könnten diese dadurch dupliziert werden. Neue Einträge werden ohne Vergleich mit bereits existierenden hinzugefügt.</html>
-FILE_FILTER_DBE=*.dbe - Datenbank Export Dateien
-FILE_FILTER_ZIP=*.zip - Archiv (sollte *.dbe enthalten)
-SELECT_FILE_TO_RESTORE=Wiederherzustellende Datei ausw\u00E4hlen
-NEXT_STEP=Weiter
-
-#
-# Update [1]
-#
-LEGEND=Legende
-NEWEST=Neueste Version
-NOT_UPDATED=Nicht aktualisiert
-NOT_UPDATABLE=Nicht aktualisierbar
-UNKNOWN_STATUS=Unbekannter Status
-CHECK_SERVER=Server \u00FCberpr\u00FCfen
-RUN_UPDATE=Aktualisieren!
-CURRENT_VERSION=Aktuelle Version
-SERVER_VERSION=Version auf dem Server
-UPDATEABLE=Aktualisierbarkeit
-UPDATE_APPLICATION=Aktualisierung der Anwendung
-UPDATE_SERVER_NA=<html><h2>Update Server</h2><br><br>Die Update-Server-Seite wurde noch nicht implementiert. Dieser Dialog existiert zur Zeit nur, damit die aktuelle Version der Bibliotheken überprüft werden kann.<br>Der Server sollte bis September 2008 fertig und betriebsbereit sein. Bitte sehen Sie auf http://ggc.sourceforge.net nach, ob eine neue Version verfügbar ist.<br></html>
-NO_UPDATE_FOUND=No update was found on server!
-UPDATE_FOR_HIGHER_DB_FOUND=<html><body>No update for current database was found !<br>But there is version of application (%s)<br>for higher version of database. Since we<br>don't support update of database yet, we<br>can't continue update.<br></body></html>
-UPDATE_FOUND_VERSION=<html><body>We found update (%s) for your<br>version of database.<br>Do you wish to continue?</body></html>
-UPDATE_FOUND_ALSO_HIGHER_DB=<html><body>We found two updates. One with higher version of<br>database (%s) and other with the same. Since we<br>don't support update of database yet, we can update<br>only to version %s.<br>Do you wish to continue?</body></html>
-STATUS_UPD_FAILED_DATA=Data problem.
-STATUS_UPD_FAILED_COMM_ERROR=Communication failed.
-STATUS_UPD_NO_VALID_UPDATE=No valid update found.
-STATUS_UPD_NO_UPDATE=No update found.
-STATUS_UPD_UPDATE_FOUND=Update found.
-SERVER_STATUS=Server status
-NO_STATUS=No status
-
-#
-# Db Check [1]
-#
-DB_ERROR_ON_LOAD=Fehler beim initialisieren der Datenbank
-DB_HEADER=<html>Das DB-Prüfwerkzeug hat festgestellt, dass Sie eine falsche Datenbankversion verwenden.<br><br>Aktuelle DB-Version: %s<br>Benötigte DB-Version: %s<br><br>%s<html>
-DB_VERSION_LOWER=Die gegenw\u00E4rtige Version ist kleiner als die ben\u00F6tigte. Das bedeutet,<br>dass Sie zu einer Version geupdated haben, die selbst geupdated werden muss.<br>Um diesen Fehler zu beheben, m\u00FCssen Sie das Verzechnis gehen, das die Sicherungskopie Ihres GGCs enh\u00E4lt<br>(wie in der Anleitung beschrieben), dieses ausf\u00FChren und eine Sicherung erstellen<br>(falls Sie das nicht schon gemacht haben). Danach m\u00FCssen Sie das init_db Skript ausf\u00FChren,<br>das die neue Version der Datenbank erstellen wird. Starten Sie GGC und stellen Sie die Datenbank<br>anhand der vorher erstellten Sicherungskopie wieder her.<br>Ihre Applikation sollte jetzt wieder alle Daten enthalten.<br>
-DB_VERSION_HIGHER=Die gegenw\u00E4rtige Version ist gr\u00F6\u00DFer als die ben\u00F6tigte. Dies kann zwei Gr\u00FCnde haben:<br><br>1. Es gabe ein Problem bei der Installation oder beim Update (Dateien fehlten oder das Update wurde unterbrochen).<br>Nach einem Teil-Update wurde die Datenbank geupdated. War dies der Fall, muss das Update wiederholt<br>(ALLE Dateien neu kopiert/installiert) und GGC erneut ausgef\u00FChrt werden.<br><br>2. Ein Downgrade wurde versucht. Dies wird nicht unterst\u00FCzt. Wollen Sie eine \u00E4ltere Version benutzen,<br>m\u00FCssen Sie eine komplette Sicherungskopie erstellen, die Anwendung in ein anderes Verzeichnis installieren und<br>die Daten wiederherstellen. Dieses Problem kann auch durch das Einspielen eines Updates behoben werden.<br>
-
-#
-# Error Dialog [1]
-#
-ERROR_DIALOG=Fehlerdialog
-DETAILS=Details
-ERROR_SOLUTION=L\u00F6sung
-EXCEPTION_LOG=Exception (Stacktrace)
-SEND_TO_SERVER=An den Server senden
-SENDING_TO_SERVER=Sende an den Server...
-SEND_TO_SERVER_TEXT=<html>Diese Funktionalität wurde noch nicht implementiert.<br>Später können Sie uns hiermit Fehlerberichte senden und<br>Lösungsvorschläge erhalten (falls welche existieren).<br></html>
-NO_SOLUTION_AVAILABLE=<html>Keine Lösung verfügbar.</html>
-
-#
-# Plug-In [1]
-#
-DEVICE_METER=Meter
-DEVICE_PUMP=Pump
-DEVICE_CGMS=CGMS
-PLUGIN_NOT_INSTALLED=Plugin nicht installiert.
-PLUGIN_NA=Plugin nicht verf\u00FCgbar.
-PLUGIN_NO_FUNCTIONALITY=Diese Funktionalit\u00E4t wird nicht unterst\u00FCtzt.
-DEVICES_USED=Verwendete Ger\u00E4te (eingerichtet)
-PLUGINS=Plug-ins
-PLUGIN_NOT_ACTIVE=%s ist nicht aktiv oder vorhanden, deshalb ist diese Operation nicht m\u00F6glich!
-
-#
-# File Import [2]
-#
-IMPORT_FILE=Datei importieren
Deleted: trunk/ggc-meter/src/GGCMeterTool_de.properties
===================================================================
--- trunk/ggc-meter/src/GGCMeterTool_de.properties 2014-09-02 17:11:19 UTC (rev 1298)
+++ trunk/ggc-meter/src/GGCMeterTool_de.properties 2014-09-02 20:49:50 UTC (rev 1299)
@@ -1,154 +0,0 @@
-#
-# ######################################################################
-# ### GNU Glucose Control ###
-# ######################################################################
-# ### Language: German ###
-# ### Created by: Reinhold Rumberger (ru...@us...)###
-# ### Version: 2.0.3 ###
-# ### Last change: 03.07.2011 14:30:06 ###
-# ######################################################################
-#
-#
-# Translation status:
-# Words/expressions: 67
-# Not translated: 58 (86 %)
-# Need to be checked: 0 (0 %)
-#
-# Translated: 9 (13 %)
-#
-#
-#
-##
-# Collation Rules - In unicode we can create special rules for sorting where we specify
-# sorting order of special characters. This will be used by tree's and special tables.
-# For english this is left empty. For all other (that have non-standard, non english
-# charcters) we need to set this if we want sorting to be done correctly.
-#
-COLLATION_RULES=< 0 < 1 < 2 < 3 < 4 < 5 < 6 < 7 < 8 < 9 < a,A,\u00E4,\u00C4,\u00E1,\u00E0,\u00C1,\u00C0,\u00E2,\u00C2 < b,B < c,C < d,D < e,E,\u00E9,\u00E8,\u00EA,\u00C9,\u00C8,\u00CA < f,F < g,G < h,H < i,I < j,J < k,K < l,L < m,M < n,N < o,O,\u00F6,\u00D6 < p,P < q,Q < r,R < s,S,\u00DF < t,T < u,U,\u00FC,\u00DC < v,V < w,W < x,X < y,Y < z,Z
-
-#
-# Plug-in Specific [1]
-#
-DEVICE_NAME_NORMAL=meter
-DEVICE_NAME_BIG=Meter
-DEVICE_FULL_NAME_WITH_PORT=%s auf %s
-DEVICE_FULL_NAME_WITHOUT_PORT=%s
-DEVICE_DEVICE=Meter device
-
-#
-# Menus [1]
-#
-MN_METERS=&Messger\u00E4te
-MN_METERS_READ=Messger\u00E4t &auslesen
-MN_METERS_READ_DESC=Daten des Messger\u00E4ts auslesen
-MN_METERS_LIST=Messger\u00E4te&liste
-MN_METERS_LIST_DESC=Liste der meisten verf\u00FCgbaren Messger\u00E4te
-MN_METERS_CONFIG=Messger\u00E4te-Plug-in &Einstellungen
-MN_METERS_CONFIG_DESC=Einstellungen zum Messger\u00E4te-Plug-in
-MN_METERS_ABOUT=About...
-MN_METERS_ABOUT_DESC=About Meter Plugin (copyright, features, credits,...)
-MN_METERS_READ_FILE=Read file
-MN_METERS_READ_FILE_DESC=Read data from meter/sw export file
-
-#
-# Configuration [1]
-#
-MY__=My
-NEW__=New
-DEVICE_CONFIGURATION=%s Configuration
-SELECT_X_DEVICE=Select %s Device
-SELECTED_X_DEVICE=Selected %s Device
-DEVICE_CUSTOM_NAME=%s Custom Name
-
-#
-# Meter Selector [1]
-#
-SELECTOR_DEVICE=%s Device Selector
-
-#
-# Instructions Dialog [1]
-#
-OOPS_DEVICE_NOT_CONFIGURED=Oops ! You forgot to configure your %s\nand currently there is no %s configured\nand/or selected. Please visit configuration\nand configure your %s.
-CONFIGURED_DEVICE_INSTRUCTIONS=Configured %s and Instructions
-DEVICE_ICON=%s picture
-DEVICE_INFO=%s Info
-
-#
-# Transfer display [1]
-#
-ERROR_CONTACTING_DEVICE=We had problem contacting Meter device.\nPlease recheck communication port settings\n(some of cables, can change their address,\nwhen reconnected). Run configuration again\nand problem should be solved!\n
-READ_DEVICE_DATA_TITLE=Read Meter Data [%s on %s]
-STATUS_READER_ERROR=Internal %s (or port) error
-
-# table (add new table items here)
-DATETIME=Date/Time
-BG_MMOLL=BG (mmol/L)
-BG_MGDL=BG (mg/dL)
-MULTIPLE=Multiple
-
-# extended type table
-URINE=Ketones
-BG=Blood Glucose
-ENTRY_TYPE=Type
-
-#
-# Export [1]
-#
-EXPORT_DEVICE_DATA=Export %s Data
-
-#
-# List [1]
-#
-DEVICE_LIST_WEB=%s List
-METERS_LIST_WEB_DESC=<html>Meters List is not list of all available Meters in the world, this is just list of some (mostly commonly used) Meters available. We add new devices here when our source page changes (www.diabetesnet.com) or if some user requests that their device is to be added. Meters in list are color coded, and color determines status of devices of selected company. Color coding description is shown at bottom of this page.<br></html>
-
-#
-# About [1]
-#
-DEVICE_PLUGIN=%s Plug-in
-DEVICE_PLUGIN_ABOUT=About %s Plug-in
-
-#
-# Meter Instructions [1]
-#
-
-# ascensia
-INSTRUCTIONS_ASCENSIA_BREEZE=<html>Instructions for meter download:<ul><li>Attach the meter cable to the selected PC<br> serial port</li><li>Plug the meter cable into the round meter port<br></li><li>Press the meter button to turn the meter ON</li></ul><br>Click "Start Download" to begin reading data from<br>your meter...</html>
-INSTRUCTIONS_ASCENSIA_CONTOUR=<html>Instructions for meter download:<ul><li>Attach the meter cable to the selected PC<br> serial port</li><li>Plug the meter cable into the round meter port<br></li><li>Press the meter button M to turn the meter ON</li></ul><br>Click "Start Download" to begin reading data from<br>your meter...</html>
-INSTRUCTIONS_ASCENSIA_ELITE_XL=<html>Instructions for meter download:<ul><li>Attach the meter cable to the selected PC<br> serial port</li><li>Plug the meter cable into the round meter<br>port<br></li><li>Press the meter button to turn the meter ON</li></ul><br>Click "Start Download" to begin reading data from<br>your meter...</html>
-INSTRUCTIONS_ASCENSIA_DEX=<html>Instructions for meter download:<ul><li>Attach the meter cable to the selected PC<br> serial port<br></li><li>Plug the meter cable into the port between<br> the two meter buttons<br></li><li>Slide the meter cover to turn the meter ON</li></ul><br>Click "Start Download" to begin reading data from<br>your meter...</html>
-
-# roche
-INSTRUCTIONS_ACCUCHEK_ACTIVE=<html><ul><li>Pix Device should be attached before program<br>is started</li><li>Place meter max. 10 cm from Pix device</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Keep button M (left) on Active pressed for more<br>than 3 seconds and download will start.</li></ul>Accu-Check Pix has sometimes problems with java, so<br>you might be forced to start downloading twice.</html>
-INSTRUCTIONS_ACCUCHEK_ADVANTAGE=<html><ul><li>Pix Device should be attached before program<br>is started</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Insert IR Key into meter and place meter max.<br>10 cm from Pix device and download will start.</li></ul>Accu-Check Pix has sometimes problems with java, so<br>you might be forced to start downloading twice.</html>
-INSTRUCTIONS_ACCUCHEK_AVIVA=<html><ul><li>Pix Device should be attached before program<br>is started</li><li>Place meter max. 10 cm from Pix device</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Keep both buttons on Aviva pressed for more<br>than 3 seconds and download will start.</li></ul>Accu-Check Pix has sometimes problems with java, so<br>you might be forced to start downloading twice.</html>
-INSTRUCTIONS_ACCUCHEK_COMFORT=<html><ul><li>Pix Device should be attached before program<br>is started</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Insert IR Key into meter and place meter max.<br>10 cm from Pix device and download will start.</li></ul>Accu-Check Pix has sometimes problems with java, so<br>you might be forced to start downloading twice.</html>
-INSTRUCTIONS_ACCUCHEK_COMPACT=<html><li>Pix Device should be attached before program<br>is started (it has sometimes problems with java,<br>so you might be forced to download twice)</li><li>Place meter max. 10 cm from Pix device</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Keep both SET and MEMO buttons pressed for<br>more than 3 seconds and download will start.</li></html>
-INSTRUCTIONS_ACCUCHEK_COMPACTPLUS=<html><li>Pix Device should be attached before program<br>is started (it has sometimes problems with java,<br>so you might be forced to download twice)</li><li>Place meter max. 10 cm from Pix device</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Keep both S and M buttons pressed for<br>more than 3 seconds and download will start.</li></html>
-INSTRUCTIONS_ACCUCHEK_GO=<html><ul><li>Pix Device should be attached before program<br>is started</li><li>Place meter max. 10 cm from Pix device</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Keep button M (left) on Active pressed for more<br>than 3 seconds and download will start.</li></ul>Accu-Check Pix has sometimes problems with java, so<br>you might be forced to start downloading twice.</html>
-INSTRUCTIONS_ACCUCHEK_INTEGRA=<html><li>Pix Device should be attached before program<br>is started (it has sometimes problems with java,<br>so you might be forced to download twice)</li><li>Place meter max. 10 cm from Pix device</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Keep both SET and MEMO buttons pressed for<br> more than 3 seconds and download will start.</li></html>
-INSTRUCTIONS_ACCUCHEK_PERFORMA=Performa not supported at this time.
-INSTRUCTIONS_ACCUCHEK_SENSOR=<html><ul><li>Pix Device should be attached before program<br>is started</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Insert IR Key into meter and place meter max.<br>10 cm from Pix device and download will start.</li></ul>Accu-Check Pix has sometimes problems with java, so<br>you might be forced to start downloading twice.</html>
-INSTRUCTIONS_ACCUCHEK_NANO=<html><ul><li>Pix Device should be attached before program<br>is started</li><li>Place meter max. 10 cm from Pix device</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Keep Left and Right buttons on Aviva pressed<br>for more than 3 seconds and download will<br>start.</li></ul>Accu-Check Pix has sometimes problems with java, so<br>you might be forced to start downloading twice.</html>
-
-# lifescan
-INSTRUCTIONS_LIFESCAN_ON=<html>Instructions for meter download:<ul><li>Attach the meter cable to the selected PC<br> serial port</li><li>Plug the meter cable into the meter port<br></li><li>Make sure that meter is ON</li></ul><br>Click "Start Download" to begin reading data from<br>your meter...</html>
-INSTRUCTIONS_LIFESCAN_OFF=<html>Instructions for meter download:<ul><li>Attach the meter cable to the selected PC<br> serial port</li><li>Plug the meter cable into the meter port<br></li><li>Make sure that meter is OFF</li></ul><br>Click "Start Download" to begin reading data from<br>your meter...</html>
-
-# Abbott and also Menarini
-INSTRUCTIONS_ABBOTT_OPTIUMXCEED=<html>Instructions for meter download:<ul><li>Attach the meter cable to the selected PC<br> serial/USB port</li><li>Plug the meter cable into meter strip port<br></li></ul><br>Click "Start Download" to begin reading data from<br>your meter...</html>
-
-#
-# Devices [2]
-#
-
-# OT Ultra mini & OT Ultra (some)
-READING_SW_VERSION=Reading Sw version
-READING_SERIAL_NR=Read Serial number
-READING_DATA_COUNTER=Reading data counter
-READING_PROCESSING_ENTRY=Reading and processing entry #
-READING_SERIAL_NR_SETTINGS=Read Serial number & Settings
-
-# AccuChek Combo
-BG_UNIT=BG Unit
-TIME_ON_DEVICE=Time on device
Deleted: trunk/ggc-nutri/src/GGC_Nutrition_de.properties
===================================================================
--- trunk/ggc-nutri/src/GGC_Nutrition_de.properties 2014-09-02 17:11:19 UTC (rev 1298)
+++ trunk/ggc-nutri/src/GGC_Nutrition_de.properties 2014-09-02 20:49:50 UTC (rev 1299)
@@ -1,507 +0,0 @@
-#
-# ######################################################################
-# ### GNU Glucose Control ###
-# ######################################################################
-# ### Language: German ###
-# ### Created by: Reinhold Rumberger (ru...@us...)###
-# ### Version: 1.3.1 ###
-# ### Last change: 03.07.2011 14:12:02 ###
-# ######################################################################
-#
-#
-# Translation status:
-# Words/expressions: 418
-# Not translated: 215 (51 %)
-# Need to be checked: 21 (5 %)
-#
-# Translated: 182 (43 %)
-#
-#
-#
-##
-# Collation Rules - In unicode we can create special rules for sorting where we specify
-# sorting order of special characters. This will be used by tree's and special tables.
-# For english this is left empty. For all other (that have non-standard, non english
-# charcters) we need to set this if we want sorting to be done correctly.
-#
-COLLATION_RULES=< 0 < 1 < 2 < 3 < 4 < 5 < 6 < 7 < 8 < 9 < a,A,\u00E4,\u00C4,\u00E1,\u00E0,\u00C1,\u00C0,\u00E2,\u00C2 < b,B < c,C < d,D < e,E,\u00E9,\u00E8,\u00EA,\u00C9,\u00C8,\u00CA < f,F < g,G < h,H < i,I < j,J < k,K < l,L < m,M < n,N < o,O,\u00F6,\u00D6 < p,P < q,Q < r,R < s,S,\u00DF < t,T < u,U,\u00FC,\u00DC < v,V < w,W < x,X < y,Y < z,Z
-
-#
-# Global [1]
-#
-DELETE=L\u00F6schen
-ADD=Hinzuf\u00FCgen
-EDIT=Bearbeiten
-NEW=Neu
-INFORMATION=Information
-QUESTION=Frage
-YES=Ja
-NO=Nein
-OK=OK
-CANCEL=Abbrechen
-APPLY=Anwenden
-SELECT=W\u00E4hlen
-HELP=Hilfe
-ROOT=root
-
-#
-# Global Dialogs [1]
-#
-SELECT_ITEM_FIRST=W\u00E4hlen Sie bitte erst einen Eintrag und danach eine Aktion!
-ARE_YOU_SURE_DELETE=Wollen Sie dieses Element wirklich l\u00F6schen?
-TRANSLATED_NAME=\u00DCbersetzter Name (falls verf\u00FCgbar)
-ID=ID
-USDA_NUTRITION_DATABASE=N\u00E4hrstoff-Datenbank des USDA
-USER_NUTRITION_DATABASE=N\u00E4hrstoff-Datenbank des Benutzers
-USDA_NUTRITION_DATABASE_DESC=<html><body>Die USDA-DB ist die United States Department of Agriculture Datenbank, die viele in den USA erhältiche Lebensmittel enthält. Da diese Datenbank in der ganzen Welt genutzt wird, haben wir uns entschieden sie zu integrieren. Die Version, die sich in der Datenbank befindet, hängt von den Dateien ab, die importiert wurden. Erlaubt sind Versionen 18 und höher (getestet wurde SR-18).<br>In diesem Modul werden alle Einträge der Datenbank angezeigt und wenn es von bestimmten anderen Modulen (wie z.B. dem Mahlzeiten-Modul) aus aufgerufen wurde, können Lebensmittel zum Importieren ausgewählt werden.</body></html>
-USER_NUTRITION_DATABASE_DESC=<html><body>Dies ist die Nährstoff-Datenbank, zu der der Benutzer selbst Einträge hinzufügen kann. In Zukunft wird der Import fremder Nährstoff-Datenbanken unterstützt werden (die dann editierbar sein werden), damit Sie die Vorteile der erweiterten Ordnerstruktur (Ordner können Unterordner enthalten) genießen können. Wenn Sie beispielsweise in Deutschland wohnen, könnten Sie einen Ordner namens "Deutsche Nahrung" anlegen, in den Sie dann unterschiedliche Gruppen (z.B. "Zubereitung: Mikrowelle"), Nahrungstypen, usw. eintragen könnten.</body></html>
-USDA_NUTRITION_DB=USDA N\u00E4hrstoff-DB
-USER_NUTRITION_DB=Benutzer N\u00E4hrstoff-DB
-MEALS_DB=Mahlzeiten-DB
-NONE=Nichts
-NUTRITION=N\u00E4hrstoff
-AMOUNT_LBL=Menge
-
-#
-# Menus [0]
-#
-
-# main menus
-MN_FOOD=&Nahrungsmittel
-MN_NUTRDB_USDB=Nahrungsmittel-DB (USDA)
-MN_NUTRDB_USDB_DESC=Nahrungsmittel-Datenbank des USDA
-MN_NUTRDB_USER=Nahrungsmittel-DB (Benutzer)
-MN_NUTRDB_USER_DESC=Nahrungsmittel-Datenbank des Benutzers
-MN_MEALS=Mahlzeiten-DB
-MN_MEALS_DESC=Datenbank mit Mahlzeiten
-MN_FOODMENU=N&ahrungsmen\u00FC
-MN_FOODMENU_DESC=Reports for Food Menus
-MN_FOODMENU_SIMPLE=Einfach (nur KH)
-MN_FOODMENU_SIMPLE_DESC=Printing food menu (Simple)
-MN_FOODMENU_EXT1=Erweitert I (KH, Ins.)
-MN_FOODMENU_EXT1_DESC=Printing food menu (Extended - CH,Ins)
-MN_FOODMENU_EXT2=Erweitert II (KH, Ins., BZ)
-MN_FOODMENU_EXT2_DESC=Printing food menu (Extended - CH,Ins,BG)
-MN_FOODMENU_EXT3=Extended III (CH,Ins,BG,kJ)
-MN_FOODMENU_EXT3_DESC=Printing food menu (Extended - CH,Ins,BG,kJ)
-
-#
-# Popup Menu [1]
-#
-PM_NUT_VIEW=Anzeigen
-PM_NUT_CLOSE=Schlie\u00DFen
-PM_NUT_EDIT_GROUP=Gruppe bearbeiten
-PM_NUT_ADD_GROUP=Gruppe hinzuf\u00FCgen
-PM_NUT_ADD_FOOD_DESCRIPTION=Lebensmittelbeschreibung hinzuf\u00FCgen
-PM_NUT_EDIT_FOOD_DESCRIPTION=Lebensmittelbeschreibung bearbeiten
-PM_NUT_ADD_MEAL=Mahlzeit hinzuf\u00FCgen
-PM_NUT_EDIT_MEAL=Mahlzeit bearbeiten
-
-#
-# Backup Objects [1]
-#
-NUTRITION_OBJECTS=Nahrungsobjekte
-USER_FOOD_GROUPS=Benutzer-Nahrungsgruppen
-MEAL_GROUPS=Mahlzeitengruppen
-MEALS=Mahlzeiten
-FOODS=Ern\u00E4hrung
-
-#
-# Food [1]
-#
-NEW_FOOD=Neues Lebensmittel
-ADD_FOOD=Neues Lebensmittel hinzuf\u00FCgen
-FOOD_GROUP=Lebensmittelgruppe
-GROUP_NAME=Gruppenname
-FOOD_NAME=Name des Lebensmittels
-REFUSE_LBL=Ungenie\u00DFbarer Anteil
-NUTRITIONS_FOOD=N\u00E4hrstoffe
-FOOD_DESCRIPTION=Lebensmittel-Beschreibung
-HOME_WEIGHTS=Home weights (if defined)
-WEIGHT_TYPE=Weight Type
-AMOUNT_WEIGHT=Menge & Gewicht
-WEIGHT=Gewicht (in g)
-UNITS=Einheiten
-FOOD_GROUPS=Lebensmittelgruppen
-MEAL_GROUP=Mahlzeitengruppe
-SELECTED_GROUP=Gew\u00E4hlte Gruppe
-SELECT_GROUP=Gruppe w\u00E4hlen
-PARENT_GROUP=\u00DCbergeordnete Gruppe
-EDIT_MEAL_GROUP=Mahlzeitengruppe bearbeiten
-ADD_MEAL_GROUP=Neue Mahlzeitengruppe hinzuf\u00FCgen
-NEW_GROUP=Neue Gruppe
-TRANSLATION_KEYWORD=Schl\u00FCsselwort f\u00FCr die \u00DCbersetzung
-WISH_TO_SAVE_NEW_GROUP=Sie haben eine neue Gruppe erstellt. Wollen Sie speichern?
-WISH_TO_SAVE_EDITED_GROUP=Sie haben eine Gruppe ge\u00E4ndert. Wollen Sie speichern?
-ADD_FOOD_GROUP=Lebensmittelgruppe hinzuf\u00FCgen
-EDIT_FOOD_GROUP=Lebensmittelgruppe bearbeiten
-
-#
-# Meal [1]
-#
-NUTRITION_TYPE=N\u00E4hrstofftyp
-SELECTED_ITEM=gew\u00E4hltes Element
-NUTRITION_TYPE_FOR_SELECTOR=Nutrition type for selector
-SELECTOR=Selector
-USDA_NUTRITION=USDA N\u00E4hrstoff
-USER_NUTRITION=Benutzerdefinierte N\u00E4hrstoff
-MEAL=Mahlzeit
-SELECT_ITEM=Element w\u00E4hlen
-MEALS_FOODS_SELECTOR=Mahlzeiten- und Lebensmittelwahl
-MEAL_ADD=Mahlzeit hinzuf\u00FCgen
-MEAL_EDIT=Mahlzeit bearbeiten
-MEAL_NAME=Mahlzeitname
-AVAILABLE_NUTRITIONS=Verf\u00FCgbahre N\u00E4hrstoffe
-FOODS_MEALS_NUTRITIONS=Lebensmittel, Mahlzeiten und/oder N\u00E4hrstoffe
-MEAL_FOOD_ADD_DESC=Lebensmittel, Mahlzeit oder N\u00E4hrstoffe hinzuf\u00FCgen
-MEAL_FOOD_EDIT_DESC=Lebensmittel, Mahlzeit oder N\u00E4hrstoffe bearbeiten
-MEAL_FOOD_DELETE_DESC=Lebensmittel, Mahlzeit oder N\u00E4hrstoffe l\u00F6schen
-MEAL_TYPE=Typ
-DESCRIPTION=Beschreibung
-TRANSLATION_KEYWORD_MEAL=Schl\u00FCsselwort f\u00FCr die \u00DCbersetzung
-TRANSLATED_NAME_MEAL=\u00DCbersetzter Name
-GROUP=Gruppe
-WISH_TO_SAVE_NEW_MEAL=Sie haben eine neue Mahlzeit erstellt. Wollen Sie speichern?
-WISH_TO_SAVE_EDITED_MEAL=Sie haben eine Mahlzeit ge\u00E4ndert. Wollen Sie speichen?
-NEW_MEAL=Neue Mahlzeit
-CANT_SELECT_CIRCULAR_MEAL=Die Mahlzeit, die bearbeitet wird, kann nicht hinzugef\u00FCgt werden
-CANT_SELECT_CHILD_OR_GROUP=Diese Gruppe oder ein Kindelement dieser Gruppe kann nicht als Elternelement dieser Gruppe gew\u00E4hlt werden!
-MEAL_VIEW=Meal View
-MEALS_DATABASE=Mahlzeiten-Datenbank
-MEALS_DATABASE_DESC=<html><body>Die Mahlzeiten-Datenbank enth\u00E4lt komplette Gerichte, z.B. "McDonald's Big Mac Men\u00FC". Sie enth\u00E4lt einige Elemente der USDA-Datenbank, z.B. "Big Mac Hamburger" und "Coca-Cola".<br>Gerichte k\u00F6nnen Elemente aus allen Datenbanken enthalten.</body></html>
-ADD_MEAL=Mahlzeit hinzuf\u00FCgen
-
-#
-# Food (User) [1]
-#
-FOOD_EDIT=Lebensmittel bearbeiten
-SELECTED_NUTRITION=gew\u00E4hlter N\u00E4hrstoff
-SELECT_NUTRITION=N\u00E4hrstoff w\u00E4hlen
-SELECTED_HOME_WEIGHT=Selected Home Weight
-SELECT_HOME_WEIGHT=Select Home Weight
-NEW_NUTR_DEF=Neu
-WEIGHT_UNIT=Gew. Einheit
-TAG=Tag
-SELECTOR_NUTRITION_DEFINITION=Selector for Nutritions
-NUTRITION_NAME=N\u00E4hrstoffname
-NUTRITION_SELECTOR=Nutritions Selector
-HOME_WEIGHT_SELECTOR=Home Weight Selector
-WISH_TO_SAVE_NEW_FOOD=Sie haben ein neues Lebensmittel eingetragen. Wollen Sie speichern?
-WISH_TO_SAVE_EDITED_FOOD=Sie haben die Lebensmitteldaten ge\u00E4ndert. Wollen Sie speichern?
-NUTRITIONS=N\u00E4hrstoffe
-SELECTOR_HOME_WEIGHT=Selector for Home Weights
-NEW_HOME_WEIGHT=Neu
-HOME_WEIGHT_NAME=Home Weight Name
-USER_DEFINED=Benutzerdefiniert
-HOME_WEIGHT_ADD_DESC=Add Home Weight
-HOME_WEIGHT_EDIT_DESC=Edit Home Weight
-HOME_WEIGHT_DELETE_DESC=Delete Home Weight
-
-#
-# Daily Values and Foods [1]
-#
-WEIGHT_LBL2=Gewicht
-HOME_WEIGHTS_LBL=Home Weights
-WGHT_PER_AMOUNT=Gewicht/Menge
-WEIGHT_SHORT=Gew.
-
-#
-# Selector for Daily Value [1]
-#
-MEALS_FOODS_SELECTOR_DAILY=Mahlzeiten- und Lebensmittelwahl f\u00FCr den Eintrag
-NAME=Name
-HOME_WEIGHT=Home Weight
-NO_ITEM_SELECTED=Keine Auswahl.
-
-#
-# Printing Food menu [2]
-#
-PRINT_FOOD_DESC=Food Description
-DATE=Date
-TIME=Time
-FOOD_MENU_BASE=Food Menu Base (CH only)
-FOOD_MENU_EXT_I=Extended Food Menu I (CH,Ins)
-FOOD_MENU_EXT_II=Extended Food Menu II (CH,Ins,BG)
-FOOD_MENU_EXT_III=Extended Food Menu III (CH,Ins,BG,kJ)
-REPORT_FOOTER=This report is from \"GGC - GNU Gluco Control\", freely available at http://ggc.sourceforge.net
-TOGETHER=Together
-CH=CH
-INS=Ins
-BG=BG
-AMOUNT_SHORT=Am.
-
-#
-# Nutrients [3]
-#
-PROCNT=Eiwei\u00DF
-FAT=Lipide Gesamt (Fett)
-CHOCDF=Carbohydrate, by difference
-ASH=Asche
-ENERC_KCAL=Energie (kcal)
-STARCH=St\u00E4rke
-SUCS=R\u00FCbenzucker
-GLUS=Glukose (Dextrose)
-FRUS=Fruchtzucker
-LACS=Laktose
-MALS=Maltose
-ALC=Alkohol, \u00C4thyl
-WATER=Wasser
-CAFFN=Koffein
-GI=Glyk\u00E4mischer Index
-GL=Glycemic Load
-GI_MIN=Glyk\u00E4mischer Index (Min)
-GI_MAX=Glyk\u00E4mischer Index (Max)
-GL_MIN=Glycemic Load (Min)
-GL_MAX=Glycemic Load (Max)
-ENERC_KJ=Energie
-SUGAR=Sugars, total
-GALS=Galactose
-FIBTG=Fiber, total dietary
-CA=Kalzium, Ca
-FE=Eisen, Fe
-MG=Magnesium, Mg
-P=Phosphor, P
-K=Kalium, K
-NA=Natrium, Na
-ZN=Zink, Zn
-CU=Kupfer, Cu
-FLD=Fluorid, F
-MN=Mangan, Mn
-SE=Selen, Se
-VITA_IU=Vitamin A, IU
-VITA_RAE=Vitamin A, RAE
-CARTB=Karotin, beta
-CARTA=Karotin, alpha
-TOCPHA=Vitamin E (alpha-tocopherol)
-VITD-=Vitamin D
-VITB6A=Vitamin B6
-VITB12=Vitamin B12
-VITK=Vitamin K (phylloquinone)
-FAMS=Fetts\u00E4uren, einfach ges\u00E4ttigt
-FAPU=Fetts\u00E4uren, mehrfach ges\u00E4ttigt
-CHOLE=Cholesterin
-FATRN=Fatty acids, total trans
-FASAT=Fetts\u00E4uren, ges\u00E4ttigt
-FATRNM=Fatty acids, total trans-monoenoic
-FATRNP=Fatty acids, total trans-polyenoic
-
-#
-# Nutrients, not usually used [3]
-#
-FOL=Folate, total
-CHOLN=Choline, total
-THEBRN=Theobromine
-RETOL=Retinol
-CRYPX=Cryptoxanthin, beta
-LYCPN=Lycopene
-LUT+ZEA=Lutein + zeaxanthin
-TOCPHB=Tocopherol, beta
-TOCPHG=Tocopherol, gamma
-TOCPHD=Tocopherol, delta
-VITC=Vitamin C, total ascorbic acid
-THIA=Vitamin B1, Thiamin
-RIBF=Vitamin B2, Riboflavin
-NIA=Niacin
-PANTAC=Pantothenic acid
-FOLAC=Fols\u00E4ure
-FOLFD=Folate, food
-FOLDFE=Folate, DFE
-BETN=Betaine
-TRP_G=Tryptophan
-THR_G=Threonin
-ILE_G=Isoleucine
-LEU_G=Leucin
-LYS_G=Lysine
-MET_G=Methionin
-CYS_G=Cystine
-PHE_G=Phenylalanin
-TYR_G=Tyrosin
-VAL_G=Valin
-ARG_G=Arginin
-HISTN_G=Histidine
-ALA_G=Alanin
-ASP_G=Asparagins\u00E4ure
-GLU_G=Glutamic acid
-GLY_G=Glycine
-PRO_G=Prolin
-SER_G=Serin
-HYP=Hydroxyproline
-PHYSTR=Phytosterols
-STID7=Stigmasterol
-CAMD5=Campesterol
-SITSTR=Beta-sitosterol
-
-#
-# Home Weights - Translation [2]
-#
--TO-SERVE=to serve
-AFTER=after
-APPROX=approx
-AMOUNT=amount
-AVG.=avg.
-BLOCK=block
-BLOCKS=blocks
-BONE=Knochen
-BONELESS=boneless
-BOTTLE=Flasche
-BAG=bag
-BAR=bar
-BIG=big
-BOX=box
-CAN=Dose
-CHOPPED=chopped
-CHUNK=chunk
-CHUNKS=chunks
-CONTAINER=container
-CONTENTS=contents
-COOKED=gekocht
-COOKIE=cookie
-COOK=cook
-COOKING=cooking
-CRUMBLED=crumbled
-CRUSHED=crushed
-CUBED=gew\u00FCrfelt
-CUBIC=kubisch
-CUT=cut
-CUBE=W\u00FCrfel
-CUBES=W\u00FCrfel
-CUP=Tasse
-CUPCAKE=cupcake
-CUPS=cups
-CURD=curd
-DICED=diced
-DASH=dash
-DRAINED=drained
-DIA=Diameter
-DIA.=Diameter
-DIAM=Diameter
-DIAM.=Diameter
-DIAMETER=Diameter
-ENVELOPE=envelope
-EXTRA=extra
-FOR=for
-FROM=from
-FROZEN=frozen
-FRUIT=fruit
-FRUITS=fruits
-FL=fl
-FLUID=fluid
-GROUND=ground
-G=g
-HIGH=high
-IN=in
-IN.=in.
-INCH=inch
-INSTANT=instant
-ITEM=item
-ITEMS=items
-INDIVIDUAL=individual
-JAR=jar
-JUMBO=jumbo
-LARGE=large
-LEAVES=Bl\u00E4tter
-LONG=lang
-LB=lb
-MAKE=make
-MASHED=mashed
-MAKES=makes
-MEDIUM=medium
-MEAT=meat
-ML=ml
-MELTED=melted
-NOT=nicht
-NET=net
-OUNCE=ounce
-OZ=oz
-OZ.=oz.
-OR=oder
-PACK=pack
-PACKAGE=package
-PACKET=packet
-PACKAGES=packages
-PACKED=packed
-PAT=pat
-PATTY=patty
-PIECE=piece
-PIECES=pieces
-PKG.=pkg.
-POD=pod
-PODS=pods
-PORTION=portion
-POWDER=powder
-PRODUCT=product
-PREPARED=prepared
-QUART=quart
-RAW=raw
-READY=ready
-READY-TO=ready to
-READY-TO-COOK=ready to cook
-READY-TO-EAT=ready to eat
-READY-TO-SERVE=ready to serve
-RECIPE=recipe
-RECONSTITUTED=reconstituted
-REFRIGATED=refrigirated
-REFRIGERATED=refrigerated
-REFUSE=refuse
-REGULAR=regular
-REMOVED=removed
-ROLL=roll
-ROLLS=rolls
-SCOOP=scoop
-SERVING=serving
-SERVINGS=servings
-SHREDDED=shredded
-SHELLED=shelled
-SIFTED=sifted
-SIZE=size
-SMALL=klein
-SMALLER=smaller
-SKIN=skin
-SLICE=slice
-SLICED=sliced
-SLICES=slices
-SNACK=snack
-SNACK-SIZE=snack size
-SQ=sq
-SPRIG=sprig
-SPRIGS=sprigs
-SPOON=L\u00F6ffel
-STICK=stick
-STICKS=sticks
-TABLESPOON=table spoon
-TBSP=table spoon
-TBS=table spoon
-TEASPOON=Teel\u00F6ffel
-TO=zu
-TSP=tea spoon
-THAWED=getaut
-THICK=thick
-THIN=d\u00FCnn
-THICK.=thick.
-UNIT=unit
-UNPACKED=unpacked
-UNPEELED=unpeeled
-UNPREPARED=unprepared
-UNSIFTED=unsifted
-UNTHAWED=unthawed
-UNDILUTED=undiluted
-UNDRAINED=undrained
-UNHEATED=unheated
-WHOLE=whole
-WITH=mit
-WITHOUT=ohne
-WRAPPED=wrapped
-WEDGE=wedge
-WEDGES=wedges
-WHIPPED=geschlagen
-YIELD=yield
-YIELDS=yields
-X=x
-
-#
-# Food translations [3]
-#
-MILK=Milch
-EGG=Ei
-STEAK=Steak
-HEADS=K\u00F6pfe
Deleted: trunk/ggc-plugin_base/src/GGCPlugin_de.properties
===================================================================
--- trunk/ggc-plugin_base/src/GGCPlugin_de.properties 2014-09-02 17:11:19 UTC (rev 1298)
+++ trunk/ggc-plugin_base/src/GGCPlugin_de.properties 2014-09-02 20:49:50 UTC (rev 1299)
@@ -1,362 +0,0 @@
-#
-# ######################################################################
-# ### GNU Glucose Control ###
-# ######################################################################
-# ### Language: German ###
-# ### Created by: Reinhold Rumberger (ru...@us...)###
-# ### Version: 0.6.1 ###
-# ### Last change: 03.07.2011 1...
[truncated message content] |
|
From: <ru...@us...> - 2014-09-02 20:51:35
|
Revision: 1300
http://sourceforge.net/p/ggc/code/1300
Author: rumbi
Date: 2014-09-02 20:51:31 +0000 (Tue, 02 Sep 2014)
Log Message:
-----------
RR: re-adding to work around an SVN corruption
Added Paths:
-----------
trunk/ggc-core/src/GGC_de.properties
trunk/ggc-meter/src/GGCMeterTool_de.properties
trunk/ggc-nutri/src/GGC_Nutrition_de.properties
trunk/ggc-plugin_base/src/GGCPlugin_de.properties
trunk/ggc-pump/src/GGCPumpTool_de.properties
Added: trunk/ggc-core/src/GGC_de.properties
===================================================================
--- trunk/ggc-core/src/GGC_de.properties (rev 0)
+++ trunk/ggc-core/src/GGC_de.properties 2014-09-02 20:51:31 UTC (rev 1300)
@@ -0,0 +1,843 @@
+#
+# ######################################################################
+# ### GNU Glucose Control ###
+# ######################################################################
+# ### Language: German ###
+# ### Created by: Reinhold Rumberger (ru...@us...)###
+# ### Version: 0.5 ###
+# ### Last change: 20.10.2011 14:39:18 ###
+# ######################################################################
+#
+#
+# Translation status:
+# Words/expressions: 648
+# Not translated: 99 (15 %)
+# Need to be checked: 107 (16 %)
+#
+# Translated: 442 (68 %)
+#
+#
+#
+## GGC Core#
+# Collation Rules - In unicode we can create special rules for sorting where we specify
+# sorting order of special characters. This will be used by tree's and special tables.
+# For english this is left empty. For all other (that have non-standard, non english
+# charcters) we need to set this if we want sorting to be done correctly.
+#
+COLLATION_RULES=< 0 < 1 < 2 < 3 < 4 < 5 < 6 < 7 < 8 < 9 < a,A,\u00E4,\u00C4,\u00E1,\u00E0,\u00C1,\u00C0,\u00E2,\u00C2 < b,B < c,C < d,D < e,E,\u00E9,\u00E8,\u00EA,\u00C9,\u00C8,\u00CA < f,F < g,G < h,H < i,I < j,J < k,K < l,L < m,M < n,N < o,O,\u00F6,\u00D6 < p,P < q,Q < r,R < s,S,\u00DF < t,T < u,U,\u00FC,\u00DC < v,V < w,W < x,X < y,Y < z,Z
+
+#
+# GGC - Globally used [1]
+#
+DELETE=L\u00F6schen
+ADD=Hinzuf\u00FCgen
+EDIT=Bearbeiten
+NEW=Neu
+EDIT_DEL_SHORT=Bearb./L\u00F6schen
+FEATURE=Feature
+IMPLEMENTED_VERSION=wird in Version %s implementiert
+OR=oder
+INFORMATION=Information
+QUESTION=Frage
+YES=Ja
+NO=Nein
+COMMING_IN_VERSION=Kommt in Version %s
+NOT_WORKING_100PRO=Funktioniert noch nicht zu 100%
+NOT_TESTED_100PRO=Noch nicht zu 100% getestet
+NOT_USED=Nicht verwendet
+
+#
+# ggc.datamodels [1]
+#
+NO_NAME=Kein Name
+TIME=Zeit
+BG=BZ
+INS_1=Ins1
+INS_2=Ins2
+INS_3=Ins3
+INSULIN_1=Insulin 1
+INSULIN_2=Insulin 2
+INSULIN_3=Insulin 3
+BU=KH
+ACT=Ac.
+COMMENT=Kommentar
+DATE_MUST_BE_IN_FORMAT=Datum muss folgendes Format haben
+TIME_MUST_BE_IN_FORMAT=Zeit muss folgendes Format haben
+ERROR_PARSING_DATE=Fehler beim Einlesen des Datums
+DATETIME=Datum/Zeit
+PUMP_INSULIN=Pumpen-Insulin
+
+#
+# Main Frame (Info panels) & Other places [1]
+#
+
+# general
+BG_TARGET=BZ-Ziel
+
+# hba1c
+NO_EXPRESSIVENESS=Keine Aussagekraft
+LITTLE_EXPRESSIVENESS=Geringe Aussagekraft
+STANDARD_EXPRESSIVENESS=Mittlere Aussagekraft
+GOOD_EXPRESSIVENESS=Hohe Aussagekraft
+
+#
+# Daily Values Stats [1]
+#
+
+# main
+CH_LONG=Kohlehydrate
+ACTIVITY=Bewegung
+FOOD=Lebensmittel
+UPDATE_FROM_FOOD=KH aktualisieren
+EDIT_FOOD=Lebensmittel Db [1]
+DATE_TIME=Datum/Zeit
+FOOD_SET=Lebensmittelgruppe [%s]
+
+# meals
+FOOD_BY_DESCRIPTION=Beschreibung [2]
+FOOD_BY_DESCRIPTION_TITLE=Nahrungsmittel nach Beschreibung
+DESCRIBE_FOODS=<html><b>Beschreiben Sie Nahrungsmittel, die Sie gegessen haben</b> (wenn Sie KH in eckige Klammern [] einschließen, künnen KH automatisch errechnet werden)</html>
+CALCULATE=Berechnen
+NO_DESCRIPTIONS_WITH_CH=Es wurden keine Beschreibungen mit KH-Definitionen\nim Nahrungsbeschreibungsbereich gefunden.\nSollten Sie einen Fehler gemacht haben,\nbearbeiten Sie den Text noch einmal.\n
+CH=KH
+
+#
+# Main GUI Panels [1]
+#
+ADD_ROW=Neuer Eintrag
+EDIT_ROW=Eintrag \u00E4ndern
+CLOSE=Schlie\u00DFen
+COURSE_GRAPH=Verlaufsdiagramm
+SPREAD_GRAPH=Spread Graph
+TO_BE_DRAWN=Einzuzeichnen
+CONNECT_VALUES_FOR_ONE_DAY=Werte eines Tages verbinden
+SUM_BU=Summe KH
+SUM=Summe
+SUM_INSULIN=Summe IE
+AVG_BG_PER_DAY=mittlerer BZ pro Tag
+INS_PER_DAY=Ins. pro Tag
+MEALS=Mahlzeiten
+INS_SLASH_BU=Ins/KH
+DRAW=Zeichnen
+DAILYGRAPHFRAME=Tagesdiagramm
+DAILYSTATSFRAME=Tagesstatistiken
+SAVE=Speichern
+DELETE_ROW=Eintrag L\u00F6schen
+LOWEST=Niedrigster
+STD_DEV=Std. Abw.
+READINGS=Werte
+HIGHEST=H\u00F6chster
+AVG_BG=Mittl. BZ
+BLOOD_GLUCOSE=Blutzucker
+BREAD_UNITS=Broteinheiten
+AVG=Mittl.
+INSULIN=Insulin
+URINE=Urin
+DOSE=Dosis
+TOTAL=Summe
+AVG_INS=Mittl. IE
+DOSE_INS=Insulindosis
+CANCEL=Abbrechen
+OK=OK
+HELP=Hilfe
+ADD_NEW_VALUES=Neue Werte eintragen
+COURSEGRAPHFRAME=Verlaufsdiagramm
+FREQGRAPHFRAME=Frequency Graph
+GRAPH=Diagramm
+ADD_NEW_ROW_TO_TABLE=F\u00FCgt eine neue Wertereihe in die Tabelle ein.
+DELETE_SELECTED_ROWS=L\u00F6sche ausgew\u00E4hlte Zeilen.
+SELECT_ROW_FIRST=Bitte zuerst einen Eintrag ausw\u00E4hlen!
+READINGS_SLASH_DAY=Werte/Tag
+VALUATION=Wertung
+INIT=Initialisierung
+READY=Fertig
+UNKNOWN=Unbekannt
+COMMENTS=Anmerkungen
+ARE_YOU_SURE_DELETE=Wollen Sie diesen Eintrag wirklich l\u00F6schen?
+ARE_YOU_SURE_DELETE_ROW=Wollen Sie diesen Eintrag wirklich l\u00F6schen?
+
+#
+# GGC Little (GUI) [2]
+#
+DAILY_VALUES=Tageswerte
+SHOW_DAILY_GRAPH=Diagramm anzeigen
+DAILY_CONTROL=Daily Control
+MN_QUIT_LT_DESC=GGC Little beenden
+CURRENT_DATE_HAS_CHANGED=Das Datum hat sich ge\u00E4ndert! Ihre Aktion wird deshalb verworfen und die Tabelle aktualisiert!
+TB_ADD_ROW_DESC=Neuer Eintrag f\u00FCr diesen Tag
+TB_EDIT_ROW_DESC=Eintrag f\u00FCr diesen Tag bearbeiten
+TB_DELETE_ROW_DESC=Eintrag f\u00FCr diesen Tag l\u00F6schen
+TB_READ_METER_LT_DESC=Daten vom Me\u00DFger\u00E4t auslesen
+TB_ABOUT_DESC=\u00DCber GGC Little
+TB_SHOW_GRAPH_DESC=Diagramm f\u00FCr diesen Tag anzeigen
+GGC_LITTLE_TITLE=GNU Gluco Control Little
+TAB_CONTROL=Steuerung
+TAB_SCHEDULE=Terminplan
+TAB_PLUGIN=Plug-ins
+TAB_STOCKS=Bestand
+PLUGIN_IMPLEMENTED_VERSION=Dieses Plug-in wird in Version %s implementiert!
+METER_PLUGIN_PANEL=Me\u00DFger\u00E4te-Plug-in
+PUMP_PLUGIN_PANEL=Pumpen-Plug-in
+
+#
+# GGC Little (System Tray) [3]
+#
+SHOW_APP=Anzeigen
+SHOW_APP_DESC=GGC Little anzeigen
+HIDE_APP=Verstecken
+HIDE_APP_DESC=GGC Little verstecken
+EXIT_APP=Beenden
+EXIT_APP_DESC=GGC Little beenden
+
+#
+# Menus (BE CAREFUL about mnemonics used) Set mnemonic with & before mnemonic letter [1]
+#
+
+# main menus
+MN_FILE=&Datei
+MN_DATA=Pen/Spritze
+MN_DATA_GRAPH=Diagramme
+MN_DOCTOR=&Arzt
+MN_FOOD=&Ern\u00E4hrung
+MN_PRINTING=D&rucken
+MN_TOOLS=&Werkzeuge
+MN_HELP=&Hilfe
+
+# file
+MN_LOGIN=Ein&loggen
+MN_LOGIN_DESC=Patient einloggen
+MN_LOGOUT=Ausl&oggen
+MN_LOGOUT_DESC=Ausloggen
+MN_QUIT=B&eenden
+MN_QUIT_DESC=GGC beenden
+
+# data
+MN_DAILY=&Tages\u00FCbersicht
+MN_DAILY_DESC=Tagesstatistik betrachten
+MN_COURSE=&Verlauf
+MN_COURSE_DESC=Verlauf betrachten
+MN_SPREAD=Ver&teilung
+MN_SPREAD_DESC=Verteilung betrachten
+MN_FREQUENCY=&Frequenz
+MN_FREQUENCY_DESC=Wertefrequenz betrachten
+MN_HBA1C=&HbA1c
+MN_HBA1C_DESC=HbA1c betrachten
+MN_DATA_RATIO=Verh\u00E4ltnis
+MN_DATA_RATIO_DESC=Verh\u00E4ltnis-Einstellungen
+MN_RATIO_BASE=Basis
+MN_RATIO_BASE_DESC=Basisverh\u00E4ltniseinstellungen (1 pro Tag)
+MN_RATIO_EXTENDED=Erweitert
+MN_RATIO_EXTENDED_DESC=Erweiterte Verh\u00E4ltniseinstellungen (mehr als 1 pro Tag)
+MN_RATIO_CALC=&Verh\u00E4ltnisrechner
+MN_RATIO_CALC_DESC=Berechnet verschiedene Verh\u00E4ltnisse (Insulin/KH, ...)
+
+# tools
+MN_DB_MAINT=&Datenbank-Wartung
+MN_DB_MAINT_DESC=Funktionen f\u00FCr die Wartung der Datenbank
+MN_DB_BACKUP=Datenbank &sichern
+MN_DB_BACKUP_DESC=Sichert die GGC-Datenbank
+MN_DB_RESTORE=Datenbank &wiederherstellen
+MN_DB_RESTORE_DESC=Stellt die GGC-Datenbank anhand einer Sicherung wieder her
+MN_MISC_SYNCHRONIZE=&Synchronisierung
+MN_MISC_SYNCHRONIZE_DESC=Datenabgleich mit anderen GGC Instanzen
+MN_PREFERENCES=&Einstellungen
+MN_PREFERENCES_DESC=Einstellungen
+
+# help
+MN_ABOUT=\u00DC&ber
+MN_ABOUT_DESC=\u00DCber GGC
+MN_CHECK_FOR_UPDATE=Nach &Updates suchen
+MN_CHECK_FOR_UPDATE_DESC=Pr\u00FCft, ob eine neue Version verf\u00FCgbar ist
+
+# food
+MN_NUTRDB_USDB=N\u00E4hrstoff-DB (&USDA)
+MN_NUTRDB_USDB_DESC=Datenbank mit N\u00E4hrstoff-Informationen, ver\u00F6ffentlicht vom USDA
+MN_NUTRDB_USER=N\u00E4hrstoff-DB (&Benutzer)
+MN_NUTRDB_USER_DESC=N\u00E4hrstoff-Datenbank des Benutzers
+MN_MEALS=&Mahlzeiten-DB
+MN_MEALS_DESC=Datenbank mit vollst\u00E4ndigen Mahlzeiten
+
+# printing
+MN_REPORTS=&Data
+MN_REPORTS_DESC=Selbstkontrolldaten-Berichte
+MN_PDF_SIMPLE=&Einfach
+MN_PDF_SIMPLE_DESC=Einfacher PDF-Bericht (monatl.)
+MN_PDF_EXT=&Ausf\u00FChrlich
+MN_PDF_EXT_DESC=Ausf\u00FChrlicher PDF-Bericht (monatl.)
+
+# doctors
+MN_DOCS=\u00C4&rzte
+MN_DOCS_DESC=\u00C4rzte
+MN_APPOINT=&Termine
+MN_APPOINT_DESC=Termine f\u00FCr Arztbesuche
+MN_STOCKS=&Bestand
+MN_STOCKS_DESC=Bestand medizinischer Ausr\u00FCstung
+
+#
+# ggc.gui.calendar [2]
+#
+ENDING_DATE=Enddatum
+STARTING_DATE=Startdatum
+1_WEEK=1 Woche
+1_MONTH=1 Monat
+3_MONTHS=3 Monate
+CUSTOM=Benutzerdefiniert
+DATE_RANGE_SELECTOR=Wahl des Zeitraumes
+SU=So
+MO=Mo
+TU=Di
+WE=Mi
+TH=Do
+FR=Fr
+SA=Sa
+JANUARY=Januar
+FEBRUARY=Februar
+MARCH=M\u00E4rz
+APRIL=April
+MAY=Mai
+JUNE=Juni
+JULY=Juli
+AUGUST=August
+SEPTEMBER=September
+OCTOBER=Oktober
+NOVEMBER=November
+DECEMBER=Dezember
+
+#
+# Main GUI Panels [1]
+#
+GENERAL_INFORMATION=Allgemeine Informationen
+YOUR_NAME=Ihr Name
+BOLUS_INSULIN=Bolusinsulin
+BASAL_INSULIN=Basalinsulin
+GLUCOMETER=Messger\u00E4t
+BG_UNIT=Ma\u00DFeinheit
+HBA1C=HbA1c
+YOUR_CURRENT_HBA1C=Ihr aktueller HbA1c
+NO_READINGS=Keine Werte
+NO_DATASOURCE=Keine Datenquelle
+SCHEDULE=Terminplan
+YOUR_NEXT_APPOINTMENT=Ihr n\u00E4chster Termin
+APP_WILL_BE_FOUND_HERE=wird hier zu finden sein...
+STATISTICS_FOR_LAST_WEEK=Statistiken f\u00FCr vorige Woche
+BG_STATISTICS=BZ Statistiken
+BU_STATISTICS=KH Statistiken
+BU_PER_DAY=KH pro Tag
+AVG_MEAL_SIZE=KH pro Mahlzeit
+MEALS_PER_DAY=Mahlzeiten pro Tag
+STATISTICS=Statistiken
+PER_DAY=pro Tag
+AVG_DOSE_SIZE=Mittl. Dosis
+DOSES_PER_DAY=Dosen pro Tag
+OTHER_INFO=Sonstiges
+STOCK=Bestand
+STOCK_DATA_HERE=Daten zu Ihrer medizinischen Ausr\u00FCstung
+STO_WILL_BE_FOUND_HERE=wird hier zu finden sein...
+NOT_YET=BISHER NOCH NICHT!
+BOLUS_INSULIN_SHORT=Bolus
+BASAL_INSULIN_SHORT=Basal
+AVERAGE=Durchschnitt
+DOSES=Dosen
+
+#
+# Hba1c Dialog [1]
+#
+CALCULATED_HBA1C=Errechneter HbA1c
+
+#
+# Configuration [1]
+#
+APPLY=Anwenden
+ERROR=Fehler
+INVALID_NAME=Ung\u00FCltiger Name
+PREFERENCES=Einstellungen
+GENERAL=Allgemeines
+MEDICAL_DATA=Medizinische Daten
+COLORS_AND_FONTS=Farbe & Schrift
+RENDERING_QUALITY=Darstellungsqualit\u00E4t
+SOME_VALUES_CHANGED_LIKE_TO_SAVE=Einige Werte haben sich ge\u00E4ndert. Wollen Sie diese speichen?
+VALUES_CHANGED=Ge\u00E4nderte Werte
+CHOOSE_A_COLOR=W\u00E4hlen Sie eine Farbe
+BG_HIGH_ZONE=\u00DCberzuckerbereich
+BG_TARGET_ZONE=Zielbereich
+BG_LOW_ZONE=Unterzuckerbereich
+BG_AVERAGE=BZ Mittelwert
+INS_SLASH_BU_QUOTIENT=Ins/KH
+NAME=Name
+ABBR=Abk.
+HIGH_BG=\u00DCberzuckergrenze
+LOW_BG=Unterzuckergrenze
+TARGET_HIGH_BG=Obergrenze Zielbereich
+TARGET_LOW_BG=Untergrenze Zielbereich
+INSULIN_SETTINGS=Insulineinstellungen
+BLOOD_GLUCOSE_SETTINGS=Blutzuckereinstellungen
+BLOOD_GLUCOSE_UNIT_SETTING=BZ-Einheiteneinstellungen
+BLOOD_GLUCOSE_SETTINGS_1=BZ-Einstellungen (mg/dl)
+BLOOD_GLUCOSE_SETTINGS_2=BZ-Einstellungen (mmol/l)
+HOST=Host
+PORT=Port
+USERNAME=Benutzername
+PASSWORD=Passwort
+OPTIONS=Optionen
+ANTIALIASING=Kantengl\u00E4ttung
+COLOR_RENDERING=Farbdarstellung
+DITHERING=Dithering
+FRACTIONAL_METRICS=Fractional Metrics
+INTERPOLATION=Interpolation
+TEXT_ANTIALIASING=Kantengl\u00E4ttung Schrift
+RENDERING=Darstellung
+DE=Deutsch
+EN=Englisch
+SI=Slowenisch
+YOUR_LANGUAGE=Ihre Sprache
+COLOR_SCHEME_SELECT=Farbschemawahl
+SELECTED_COLOR_SCHEME=Gew\u00E4hltes Farbschema
+NEW_SCHEME=Neues Schema
+COLORS=Farben
+COLOR_SCHEME_PREDEFINED=Die Farbe eines vordefinierten Farbschemas kann nicht ver\u00E4ndert werden.
+USE_AS_TEMPLATE=Folgendes Schema als Vorlage benutzen
+CREATE_NEW_SCHEME=Neues Schema erstellen
+EDIT_DELETE_SCHEME=Schema Bearbeiten/L\u00F6schen
+TYPE_NAME_BEFORE=Geben Sie den Name ein und klicken Sie OK.
+SCHEME_NAME_ALREADY_USED=Dieses Schema existiert bereits!\nBitte w\u00E4hlen Sie einen anderen Namen.
+PREDEFINED_SCHEME_CANT_BE_CHANGED=Der Name eines vordefinierten Schemas kann nicht ge\u00E4ndert, und das Schema nicht gel\u00F6scht werden!
+EXECUTABLE_FILES=Ausf\u00FChrbare Dateien (*.exe)
+SELECT_PDF_VIEWER=Wahl des PDF-Betrachters
+COLOR_PREVIEW=Farbschema Vorschau
+ACTION=Aktion
+ACTION_DELETE=L\u00F6schen
+ACTION_EDIT=Bearbeiten
+SELECTED_SCHEME=Aktives Schema
+NEW_NAME=Neuer Name
+SELECT_ACTION_OR_CANCEL=Sie sollten eine Aktion oder 'Abbrechen' w\u00E4hlen
+GENERAL_SETTINGS=Allgemeine Einstellungen
+DATABASE_SETTINGS=Datenbank
+DATABASE_SETTINGS_DESC=<html><body><b><i>Warnung! \u00C4ndern Sie diese Einstellung nur wenn Sie wissen, was Sie tun!</i></b><br>Die meisten Daten und Einstellungen befinden sich in der Datenbank selbst. In der Konfigurationsdatei befinden sich nur Einstellungen zu Sprache, Datenbank und Look&Feel.<br><i>\u00C4nderungen werden sich erst nach einem Neustart auswirken.</i></body></html>
+SELECTED_DATABASE=Gew\u00E4hlte Datenbank
+LAF_SETTINGS=Look & Feel Einstellungen
+LAF_SETTINGS_DESC=<html><body><i>\u00C4nderungen werden sich erst nach einem Neustart von GGC auswirken.</i></body></html>
+SELECTED_LAF_TYPE_NAME=L&F w\u00E4hlen (Name)
+SELECTED_LAF_TYPE_CLASS=L&F w\u00E4hlen (Klasse)
+SELECTED_SKINLF_DEF=Gew\u00E4hlter Skin f\u00FCr SkinLF
+SELECT_SKINLF_SKIN=W\u00E4hlen Sie eine Oberfl\u00E4che f\u00FCr die Skin L&F-Bibliothek
+SELECT=Ausw\u00E4hlen...
+BASIC_SETTINGS=Grundeinstellungen
+EMPTY_VALUE=Leerer Wert
+PDF_VIEWER_SETTINGS=PDF-Betrachter Einstellungen
+PDF_VIEWER=PDF-Betrachter
+BROWSE=Ausw\u00E4hlen...
+LUNCH_START_TIME=Mittagszeit ab (hh:mm)
+DINNER_START_TIME=Abendszeit ab (hh:mm)
+NIGHT_START_TIME=Nacht ab (hh:mm)
+
+# Mode
+MODE=Modus
+APPLICATION_MODE=Anwendungsmodus
+PEN_INJECTION_MODE=Pen-/Spritzen-Modus
+PUMP_MODE=Pumpenmodus
+APPLICATION_MODE_DESC=<html><body>Der Modus unterbindet nicht die Verwendung von Teilen der Anwendung. Er w\u00E4hlt nur die richtigen Daten f\u00FCr die Anzeige der Statistiken und die richtigen Symbole f\u00FCr die Toolbar aus.</body></html>
+PEN_INJECTION_MODE_SETTINGS=Pen-/-Spritzmodus Einstellungen
+PUMP_MODE_SETTINGS=Pumpenmodus Einstellungen
+BASAL_PRECISSION=Basaldosis Genauigkeit
+BOLUS_PRECISSION=Bolusdosis Genauigkeit
+MAX_BASAL=Max. Basaldosis
+MAX_BOLUS=Max. Bolusdosis
+TBR_TYPE_SELECTOR=Tempor\u00E4rer Basalratentyp
+TBR_TYPE_BOTH=Beide
+TBR_TYPE_UNIT=Einheit (U)
+TBR_TYPE_PROC=Prozent (%)
+TBR_TYPE_CHOICE=Choice in GGC
+PROCENT_MIN=Prozent Min.
+UNIT_MIN=Einheit Min.
+TASK_MIN=Min
+TASK_MAX=Max
+TASK_STEP=Schritt
+
+# Language
+LANGUAGE=Sprache
+LANGPACK_VERSION=Sprachpaket
+LANG_WITH_HELP=Sprachen mit Hilfe
+LANG_WITHOUT_HELP=Sprachen ohne Hilfe
+SELECT_LANGUAGE=Sprachwahl
+NO_HELP_AVAILABLE=Keine Hilfe verf\u00FCgbar
+HELP_AVAILABLE=Hilfe verf\u00FCgbar
+LANG_DESC=<html><body>Die Übersetzung der Anwendung findet getrennt von deren Entwicklung statt, weshalb die Übersetzung meistens etwas veraltet ist. Übersetzungen werden vor allem von Freiwilligen außerhalb des Projekts gepflegt, deshalb sind wir nicht direkt für Fehler in der Übersetzung, oder wann die n\u00E4chste Übersetzung verfügbar ist verantwortlich. Wenn Sie Fehler finden, können Sie uns gerne kontaktieren und wir werden sie baldmöglichst beheben.<br>Wenn etwas noch nicht übersetzt wurde, wird der Ausdruck in der Standardsprache (Englisch) angezeigt.<br>Wenn Sie bei der Übersetzung helfen wollen, kontaktieren Sie uns bitte via E-Maill: gg...@at....</body></html>
+NOTE_RESTART=<html><body><b>Warnung:</b> Diese Einstellung wird erst nach dem nächsten Neustart der Anwendung wirksam.</body></html>
+NOTE_LANG_FEATURE_NOT_WORKING=<html><body><font color="red"><b>Warnung:</b>Dieses Feature ist noch nicht aktiviert. Bis auf weiteres verwenden Sie bitte die Sprachwahl im Allgemeines-Reiter. Wenn dieses Feature aktiviert wird, wird diese Warnung und die Sprachwahl im Allgemeines-Reiter entfernt.</font></body></html>
+
+#
+# ggc.util [6]
+#
+UNNAMED_USER=Unbekannter Benutzer
+THIS_FILE_WAS_AUTOMATICALY_GENERATED=Diese Datei wurde automatisch generiert.
+YOUR_VERSION=Ihre Version
+AVAILABLE_VERSION=Verf\u00FCgbare Version
+NO_NEW_VERSION=Keine aktuellere Version verf\u00FCgbar.
+CHECK_FOR_NEW_VERSION=Auf neue Version \u00FCberpr\u00FCfen
+HOST_UNAVAILABLE_INFO=Server nicht verf\u00FCgbar
+HOST_UNAVAILABLE_MSG=Konnte nicht mit ggc.sourceforge.net verbinden!
+
+#
+# Graphs [2]
+#
+DAYS_WITH_READINGS_0_1=Tage mit 0 oder 1 Messung
+DAYS_WITH_READINGS_2_3=Tage mit 2 oder 3 Messungen
+DAYS_WITH_READINGS_4_5=Tage mit 4 oder 5 Messungen
+DAYS_WITH_READINGS_6_7=Tage mit 6 oder 7 Messungen
+DAYS_WITH_READINGS_MORE_7=Tage mit 8+ Messungen
+AXIS_TIME_LABEL=Zeit (Std)
+AXIS_VALUE_LABEL=BZ (%s)
+FORMAT_DATE_DAYS=dd.MM.yyyy
+FORMAT_DATE_HOURS=HH:mm
+GRAPH_NO_DATA_AVAILABLE_CHANGE=Keine Daten verf\u00FCgbar. W\u00E4hlen Sie eine andere Zeitspanne und/oder zu zeichnende Elemente und klicken Sie "Zeichnen"!
+
+#
+# Database Tool [5]
+#
+DB_TOOL=Database Hibernate Tool
+DB_CONFIGURATION=Datenbankeinstellungen
+DB_PRESS_HELP=Klicken Sie auf den Hilfe-Knopf um detaillierte Informationen zu den Verbindungseinstellungen zu bekommen.
+DB_CONFIG_DESC=<html><head></head><body><p>This is for configuring your database to work with your application. Please set all settings correctly, and then try to connect to the database (you must have the database configured with the correct username, password and database name). If the connection is successful, your settings are OK.</p><p>Now you are ready to create tables with the help of hibernate. You must have all jars included in the classpath before you start the second option (Init Database). You must be careful. If you have the database already set up and filled, 'Init Database' will destroy all data.<p><body><html>
+DATABASE_TYPE=DB-Typ
+DATABASE_CLASSNAME=DB-Klasse
+HIBERNATE_DIALECT=Hibernate Dialekt
+JDBC_URL=JDBC URL
+HOSTNAME=Hostname
+DATABASE=Datenbank
+
+#
+# Printing - Base [2]
+#
+PRINTING=Drucken
+TYPE_OF_REPORT=Berichttyp
+SELECT_YEAR_AND_MONTH=Monat w\u00E4hlen
+REPORT_FOOTER=Dieser Bericht stammt von "GGC - GNU Gluco Control", frei verf\u00FCgbar unter http://ggc.sourceforge.net
+FOR=F\u00FCr
+PRINTING_SETTINGS_NOT_SET=<html>Druckeinstellungen (PDF-Anzeigeprogramm) nicht gesetzt oder inkorrekt.</html>
+PRINTING_SETTINGS_NOT_SET_SOL=<html>Gehen Sie zu Werkzeuge->Einstellungen->Drucken<br>und geben Sie den Pfad zum PDF-Anzeigeprogramm an.</html>
+PDF_VIEVER_RUN_ERROR=<html>Fehler beim Aufruf des PDF-Anzeigeprogramms:<br>Unbekannter Fehler</html>
+SELECT_STARTING_RANGE=Select starting range
+SELECT_ENDING_RANGE=Select ending range
+
+#
+# Printing [2]
+#
+INS_SHORT=Ins
+CH_SHORT=KH
+BREAKFAST=Fr\u00FChst\u00FCck
+LUNCH=Mittagessen
+DINNER=Abendessen
+NIGHT=Nacht
+SIMPLE_MONTHLY_REPORT=Einfacher Bericht (monatl.)
+EXTENDED_MONTHLY_REPORT=Ausf\u00FChrlicher Bericht (monatl.)
+FOOD_MENU_BASE=Food Menu Base (CH only)
+FOOD_MENU_EXT_I=Extended Food Menu I (CH,Ins)
+FOOD_MENU_EXT_II=Extended Food Menu II (CH,Ins,BG)
+FOOD_MENU_EXT_III=Extended Food Menu III (CH,Ins,BG,kJ)
+
+#
+# Stocks [5]
+#
+STOCKS=Bestand
+
+#
+# Appointments [5]
+#
+APPOINTMENTS=Arzttermine
+
+#
+# About [1]
+#
+SYSTEM_PROPERTIES=Systemeigenschaften
+ABOUT=\u00DCber
+PROPERTY=Eigenschaft
+VALUE=Wert
+LICENCE=Lizenz:
+CREDITS=Danksagungen
+LIBRARIES=Bibliotheken
+MAIN=Main
+ABOUT_GGC=\u00DCber GNU Gluco Control
+GGC_DEVELOPMENT_TEAM=GGC-Entwicklungsteam
+SEE_CREDITS=(siehe Danksagungen)
+GGC_TITLE=GNU Gluco Control
+CURRENT_DEVELOPERS=Aktive Entwickler
+PREVIOUS_DEVELOPERS=Ehemalige Entwickler
+
+#
+# Doctor types [5]
+#
+ADDICTION_MEDICINE=Addiction Medicine
+ADOLESCENT_MEDICINE=Adolescent Medicine
+AIDS_HIV_CARE=AIDS/HIV Care
+ANESTHESIOLOGY=Anesthesiology
+ASTHMA_ALLERGY_IMMUNOLOGY=Asthma, Allergy & Immunology
+BREAST_CANCER_SURGERY=Brustkrebschirurgie
+CARDIAC_SURGERY=Herzchirurgie
+CHILD_CARE=Child care (pediatrics)
+CARDIOLOGY=Kardiologie
+COLORECTAL_SURGERY=Colorectal Surgery
+COSMETIC_SURGERY=Cosmetic Surgery
+CRITICAL_CARE=Critical Care
+DENTAL_SPECIALTIES=Dental Specialties
+DERMATOLOGY=Dermatologie
+DIABETES=Diabetes
+EMERGENCY_MEDICINE=Emergency Medicine
+ENDOCRINOLOGY=Endokrinologie
+EPILEPSY=Epilepsie
+FAMILY_MEDICINE=Family Medicine
+GASTROENTEROLOGY=Gastroenterologie
+GENERAL_SURGERY=Allgemeine Chirurgie
+GENERAL_INTERNAL_MEDICINE=General Internal Medicine
+GERIATRICS=Geriatrics
+GYNECOLOGIC_ONCOLOGY=Gyn\u00E4kologische Onkologie
+GYNECOLOGY=Gyn\u00E4kologie
+HAND_SURGERY=Hand Surgery
+HEAD_AND_NECK_SURGERY=Head and Neck Surgery
+HEADACHE=Headache
+HEMATOLOGY=H\u00E4matologie
+HOSPITAL_INTERNAL_MEDICINE=Hospital Internal Medicine
+INFECTIOUS_DISEASES=Infectious Diseases
+INFERTILITY_MEDICINE=Infertility Medicine
+INTERNAL_MEDICINE=Internal Medicine
+LABORATORY_MEDICINE=Laboratory Medicine
+MIDWIFE=Midwife (CNM)
+MEDICAL_GENETICS=Medical Genetics
+METABOLISM=Stoffwechsel
+MOVEMENT_DISORDERS=Movement Disorders
+NEONATOLOGY=Neonatology
+NEPHROLOGY=Nephrologie
+NEUROLOGY=Neurologie
+NEURO_OPTHALMOLOGY=Neuro-ophthalmology
+NEUROSURGERY=Neurochirurgie
+NUCLEAR_MEDICINE=Nuclear Medicine
+NUTRITION_MEDICINE=Nutrition Medicine
+OBSTETRICS_AND_GYNECOLOGY=Geburtshilfe und Gyn\u00E4kologie
+ONCOLOGY_MEDICAL=Oncology Medical
+ONCOLOGY_RADIATION=Oncology Radiation
+OPTHALMOLOGY=Augenheilkunde
+ORAL_MAXILLOFACIAL_SURGERY=Oral/Maxillofacial Surgery
+ORTHOPEDIC_SURGERY=Orthopedic Surgery
+OTOLARYNGOLOGY=Otolaryngology (ENT)
+OTOLOGY=Otology
+PAIN_MANAGEMENT=Pain Management
+PATHOLOGY=Pathologie
+PEDIATRIC=Kinderheilkunde
+PEDIATRIC_SPECIALISTS=Pediatric Specialists
+PERINATOLOGY=Geburtshilfe
+PHYSIATRY=Physiatry
+PHYSICAL_REHABILITATION=Physical Rehabilitation
+PLASTIC_RECONSTRUCTIVE_SURGERY=Plastic/Reconstructive Surgery
+PODIATRY=Fu\u00DForthop\u00E4die
+PROSTATE_CARE=Prostate Care
+PSYCHIATRY=Psychiatrie
+PSYCHOLOGY=Psychologie
+PULMONARY_MEDICINE=Pulmonary Medicine
+RADIOLOGY=Radiologie
+RADIATION_ONCOLOGY=Radiation Oncology
+REPRODUCTIVE_ENDOCRINOLOGY_INFERTILITY=Reproductive Endocrinology and Infertility
+RHEUMATOLOGY=Rheumatologie
+SLEEP_DISOREDERS=Schlafst\u00F6rungen
+SPORTS_MEDICINE=Sportmedizin
+THORACIC_SURGERY=Thoracic Surgery
+TRANSPLANT=Transplantation
+UROLOGY=Urologie
+VASCULAR_SURGERY=Gef\u00E4\u00DFchirurgie
+
+#
+# Doctor [5]
+#
+DOCTORS=\u00C4rzte
+FILTER=Filter
+FILTER_VISIBLE=Sichtbare
+FILTER_ALL=Alle
+
+#
+# Ratio's: Base [1]
+#
+RATIO_BASE=Grundverh\u00E4ltnis
+INSULIN_CARB_RATIO=Insulin/KH-Verh\u00E4ltnis
+SENSITIVITY_FACTOR_LONG=<html>Empfindlichkeitsfaktor<br>(Insulin/BZ-Verh\u00E4ltnis)</html>
+FILL_RATIO_ENTRIES=<html>Bitte f¨llen Sie die ersten beiden Einträge dieses Formulars aus,<br>oder brechen Sie den Vorgang ab.</html>
+
+#
+# Ratio's: Extended [1]
+#
+RATIO_EXTENDED=Erweitertes Verh\u00E4ltnis
+RATIO_ENTRY_ADD=Neuer Verh\u00E4ltniseintrag
+RATIO_ENTRY_EDIT=Verh\u00E4ltniseintrag bearbeiten
+TIME_FROM=Von
+TIME_TILL=Bis
+PROCENT_OF_BASE=Prozent (der Basis)
+PROCENT_OF_BASE_SHORT=% der Basis
+CH_INSULIN_RATIO_SHORT=KH/Ins
+BG_INSULIN_RATIO_SHORT=BZ/Ins
+BG_OH_RATIO_SHORT=BZ/KH
+CHECK_RATIOEXTENDED_DATA_OK=<html><body>You filled all data about<br>extended ratio's for whole<br>day successfuly !<br></body></html>
+CHECK_RATIOEXTENDED_FAILED=<html><body>You filled data about extended<br>ratio's incorrectly. All minutes<br>of the day must be included (from<br>0:00 till 23:59)!<br></body></html>
+
+#
+# Ratio's: Calculator [4]
+#
+RATIO_CALCULATOR=Verh\u00E4ltnisrechner
+TYPE_SOURCE_DATA=Art der Quelldaten
+TYPE_SOURCE_MANUAL=Manuelle Daten
+TYPE_SOURCE_DB=Datenbank Daten
+TDD_FOR_CALCULATION=Total Daily Dose (TDD) For Calculation
+RATIO_TIME_SELECT_DESC=<html>Sie müssen einen Zeitraum für die Rechnung wählen. Sind Ihre Werte stabil (keine größeren Änderungen), dürfte ein größerer Zeitraum bessere Resultate liefern. Gibt es jedoch größere Änderungen, oder befinden Sie sich mitten in einer Bolus-/Basalratenneueinstellung, sollten Sie einen kleineren Zeitraum wählen.</html>
+2_WEEKS=2 Wochen
+3_WEEKS=3 Wochen
+DB_DATA_STATUS=Db Data Status
+DB_DATA_NOT_READY=Nicht bereit!
+DB_DATA_READY=Bereit
+GET_DATA=Daten abrufen
+RULE_500=500er-Regel (schnellwirkende Insuline)
+RULE_450=450er-Regel (Normalinsuline)
+RULE_300=300er-Regel (kleine Kinder)
+RULE_1800=1800er-Regel (schnellwirkende Insuline)
+RULE_1500=1500er-Regel (Normalinsuline)
+SELECT_RANGE=Zeitraum w\u00E4hlen
+SELECT_RULE=Regel w\u00E4hlen
+SENSITIVITY_FACTOR=Empfindlichkeitsfaktor
+CALCULATION=Rechnung
+INS_CH_RATIO_PROC=1E Insulin f\u00FCr %s g KH
+INS_BG_RATIO=Ins/BZ-Verh\u00E4ltnis
+INS_BG_RATIO_PROC=1E Insulin verringert den BZ um %s %s
+CH_BG_RATIO=KH/BZ-Verh\u00E4ltnis
+CH_BG_RATIO_PROC=1 %s Zunahme f\u00FCr %s g KH
+TDD_MUST_BE_GREATER_THAN_ZERO=<html><body>Total Daily Dose (TDD) must be greater than<br>zero. Recheck the value and start calculation<br>again.</body></html>
+RATIO_CALCULATOR_NOT_IMPLEMENTED=<html><body>This part of Ratio Calculator not implemented<br>yet.</body></html>
+RATIOS_NOT_DONE=<html><body>You never run calculation of Ratio's.<br>Either run it and click OK to transfer<br>calculated data, or use Cancel to exit.</body></html>
+RATIO_DB_IMPORT_NA=<html><body>Importing data from Db, doesn't work yet.<br>You can only enter data manually.</body></html>
+
+#
+# Bolus Helper [1]
+#
+BOLUS_HELPER=Bolus Helper
+READ_RATIOS=Read Ratios
+CH_INSULIN_RATIO=CH / Insulin Ratio
+BG_INSULIN_RATIO=BG / Insulin Ratio
+BG_OH_RATIO=BG / CH Ratio
+CORRECTION_DOSE=Correction Dose
+CARB_DOSE=Dose for covering CH
+TOGETHER=Together
+TOGETHER_ROUNDED=Together (rounded)
+NO_BG_MEASURE=No BG measurment.
+NO_CARBS_DEFINED=CH not set.
+UNIT_SHORT=U
+
+#
+# Tools [1]
+#
+METERS_PLUGIN=Messger\u00E4te Plug-in
+PUMPS_PLUGIN=Pumpen Plug-in
+CGMS_PLUGIN=CGMS Tool Plug-in
+NUTRITION_PLUGIN=Nutrition Tool Plug-in
+STATUS_NOT_INSTALLED=Nicht installiert
+STATUS_NOT_AVAILABLE=N/A (ab Version %s verf\u00FCgbar)
+STATUS_INSTALLED=Installiert (Version %s)
+PLUGIN_NOT_INSTALLED_OR_AVAILABLE=%s nicht installiert und/oder verf\u00FCgbar.
+
+#
+# Backup/Restore [1]
+#
+
+# backup
+BACKUP=Sicherung
+BACKUP_DB_TITLE=Sicherung der GGC-Datenbank
+BACKUP_DB_TITLE_SHORT=Datenbanksicherung
+SELECT_ELEMENTS_TO_BACKUP=W\u00E4hlen Sie die zu sichernden Elemente
+
+# progress
+TOTAL_PROGRESS=Fortschritt insgesamt
+BACKUP_NOT_STARTED_YET=Sicherung wurde noch nicht gestartet.
+CURRENT_TASK=Aktuelle Aufgabe
+NO_TASK_STARTED=Keine Aufgabe
+
+# elements
+GGC_BACKUP=GGC-Sicherung
+NUTRITION_OBJECTS=Nahrungsobjekte
+USER_FOOD_GROUPS=Benutzer-Nahrungsgruppen
+MEAL_GROUPS=Mahlzeit-Gruppen
+FOODS=Ern\u00E4hrung
+TASK=Aufgabe
+SETTINGS=Einstellungen
+CONFIGURATION=Configuration
+COLOR_SCHEMES=Color Schemes
+
+# restore
+RESTORE_DB_TITLE=Wiederherstellung der GGC-Datenbank
+RESTORE_DB_TITLE_SHORT=Datenbankwiederherstellung
+RESTORE=Wiederherstellen
+RESTORE_NOT_STARTED_YET=Wiederherstellung wurde noch nicht gestarted.
+RESTORE_SELECTOR_DESC=<html>Select file from which you wish to do restore. You can either select text file (which contains data for database) or you can select zip file containing several files (made by our 'Backup' option). In next dialog you can select which elements you wish to restore and any special options.<br><br><b>Notes:</b><br>1. Files will be not checked at this time. Check is on restore only.<br>2. Restore is full. This means that all previous data will be deleted. In some cases there is exception to this rule, but only when unlinked data is used (which is rare in itself). You will learn more about this exceptions (if there are any) on next dialog.</html>
+SELECT_ELEMENTS_TO_RESTORE=Elemente zum Wiederherstellen w\u00E4hlen:
+DAILY_VALUES_APPEND=<html>Wollen Sie diese Werte an die vorhandenen Tageswerte anhängen? Falls die Datenbank diese Einträge bereits enthält, könnten diese dadurch dupliziert werden. Neue Einträge werden ohne Vergleich mit bereits existierenden hinzugefügt.</html>
+FILE_FILTER_DBE=*.dbe - Datenbank Export Dateien
+FILE_FILTER_ZIP=*.zip - Archiv (sollte *.dbe enthalten)
+SELECT_FILE_TO_RESTORE=Wiederherzustellende Datei ausw\u00E4hlen
+NEXT_STEP=Weiter
+
+#
+# Update [1]
+#
+LEGEND=Legende
+NEWEST=Neueste Version
+NOT_UPDATED=Nicht aktualisiert
+NOT_UPDATABLE=Nicht aktualisierbar
+UNKNOWN_STATUS=Unbekannter Status
+CHECK_SERVER=Server \u00FCberpr\u00FCfen
+RUN_UPDATE=Aktualisieren!
+CURRENT_VERSION=Aktuelle Version
+SERVER_VERSION=Version auf dem Server
+UPDATEABLE=Aktualisierbarkeit
+UPDATE_APPLICATION=Aktualisierung der Anwendung
+UPDATE_SERVER_NA=<html><h2>Update Server</h2><br><br>Die Update-Server-Seite wurde noch nicht implementiert. Dieser Dialog existiert zur Zeit nur, damit die aktuelle Version der Bibliotheken überprüft werden kann.<br>Der Server sollte bis September 2008 fertig und betriebsbereit sein. Bitte sehen Sie auf http://ggc.sourceforge.net nach, ob eine neue Version verfügbar ist.<br></html>
+NO_UPDATE_FOUND=No update was found on server!
+UPDATE_FOR_HIGHER_DB_FOUND=<html><body>No update for current database was found !<br>But there is version of application (%s)<br>for higher version of database. Since we<br>don't support update of database yet, we<br>can't continue update.<br></body></html>
+UPDATE_FOUND_VERSION=<html><body>We found update (%s) for your<br>version of database.<br>Do you wish to continue?</body></html>
+UPDATE_FOUND_ALSO_HIGHER_DB=<html><body>We found two updates. One with higher version of<br>database (%s) and other with the same. Since we<br>don't support update of database yet, we can update<br>only to version %s.<br>Do you wish to continue?</body></html>
+STATUS_UPD_FAILED_DATA=Data problem.
+STATUS_UPD_FAILED_COMM_ERROR=Communication failed.
+STATUS_UPD_NO_VALID_UPDATE=No valid update found.
+STATUS_UPD_NO_UPDATE=No update found.
+STATUS_UPD_UPDATE_FOUND=Update found.
+SERVER_STATUS=Server status
+NO_STATUS=No status
+
+#
+# Db Check [1]
+#
+DB_ERROR_ON_LOAD=Fehler beim initialisieren der Datenbank
+DB_HEADER=<html>Das DB-Prüfwerkzeug hat festgestellt, dass Sie eine falsche Datenbankversion verwenden.<br><br>Aktuelle DB-Version: %s<br>Benötigte DB-Version: %s<br><br>%s<html>
+DB_VERSION_LOWER=Die gegenw\u00E4rtige Version ist kleiner als die ben\u00F6tigte. Das bedeutet,<br>dass Sie zu einer Version geupdated haben, die selbst geupdated werden muss.<br>Um diesen Fehler zu beheben, m\u00FCssen Sie das Verzechnis gehen, das die Sicherungskopie Ihres GGCs enh\u00E4lt<br>(wie in der Anleitung beschrieben), dieses ausf\u00FChren und eine Sicherung erstellen<br>(falls Sie das nicht schon gemacht haben). Danach m\u00FCssen Sie das init_db Skript ausf\u00FChren,<br>das die neue Version der Datenbank erstellen wird. Starten Sie GGC und stellen Sie die Datenbank<br>anhand der vorher erstellten Sicherungskopie wieder her.<br>Ihre Applikation sollte jetzt wieder alle Daten enthalten.<br>
+DB_VERSION_HIGHER=Die gegenw\u00E4rtige Version ist gr\u00F6\u00DFer als die ben\u00F6tigte. Dies kann zwei Gr\u00FCnde haben:<br><br>1. Es gabe ein Problem bei der Installation oder beim Update (Dateien fehlten oder das Update wurde unterbrochen).<br>Nach einem Teil-Update wurde die Datenbank geupdated. War dies der Fall, muss das Update wiederholt<br>(ALLE Dateien neu kopiert/installiert) und GGC erneut ausgef\u00FChrt werden.<br><br>2. Ein Downgrade wurde versucht. Dies wird nicht unterst\u00FCzt. Wollen Sie eine \u00E4ltere Version benutzen,<br>m\u00FCssen Sie eine komplette Sicherungskopie erstellen, die Anwendung in ein anderes Verzeichnis installieren und<br>die Daten wiederherstellen. Dieses Problem kann auch durch das Einspielen eines Updates behoben werden.<br>
+
+#
+# Error Dialog [1]
+#
+ERROR_DIALOG=Fehlerdialog
+DETAILS=Details
+ERROR_SOLUTION=L\u00F6sung
+EXCEPTION_LOG=Exception (Stacktrace)
+SEND_TO_SERVER=An den Server senden
+SENDING_TO_SERVER=Sende an den Server...
+SEND_TO_SERVER_TEXT=<html>Diese Funktionalität wurde noch nicht implementiert.<br>Später können Sie uns hiermit Fehlerberichte senden und<br>Lösungsvorschläge erhalten (falls welche existieren).<br></html>
+NO_SOLUTION_AVAILABLE=<html>Keine Lösung verfügbar.</html>
+
+#
+# Plug-In [1]
+#
+DEVICE_METER=Meter
+DEVICE_PUMP=Pump
+DEVICE_CGMS=CGMS
+PLUGIN_NOT_INSTALLED=Plugin nicht installiert.
+PLUGIN_NA=Plugin nicht verf\u00FCgbar.
+PLUGIN_NO_FUNCTIONALITY=Diese Funktionalit\u00E4t wird nicht unterst\u00FCtzt.
+DEVICES_USED=Verwendete Ger\u00E4te (eingerichtet)
+PLUGINS=Plug-ins
+PLUGIN_NOT_ACTIVE=%s ist nicht aktiv oder vorhanden, deshalb ist diese Operation nicht m\u00F6glich!
+
+#
+# File Import [2]
+#
+IMPORT_FILE=Datei importieren
Added: trunk/ggc-meter/src/GGCMeterTool_de.properties
===================================================================
--- trunk/ggc-meter/src/GGCMeterTool_de.properties (rev 0)
+++ trunk/ggc-meter/src/GGCMeterTool_de.properties 2014-09-02 20:51:31 UTC (rev 1300)
@@ -0,0 +1,154 @@
+#
+# ######################################################################
+# ### GNU Glucose Control ###
+# ######################################################################
+# ### Language: German ###
+# ### Created by: Reinhold Rumberger (ru...@us...)###
+# ### Version: 2.0.3 ###
+# ### Last change: 03.07.2011 14:30:06 ###
+# ######################################################################
+#
+#
+# Translation status:
+# Words/expressions: 67
+# Not translated: 58 (86 %)
+# Need to be checked: 0 (0 %)
+#
+# Translated: 9 (13 %)
+#
+#
+#
+##
+# Collation Rules - In unicode we can create special rules for sorting where we specify
+# sorting order of special characters. This will be used by tree's and special tables.
+# For english this is left empty. For all other (that have non-standard, non english
+# charcters) we need to set this if we want sorting to be done correctly.
+#
+COLLATION_RULES=< 0 < 1 < 2 < 3 < 4 < 5 < 6 < 7 < 8 < 9 < a,A,\u00E4,\u00C4,\u00E1,\u00E0,\u00C1,\u00C0,\u00E2,\u00C2 < b,B < c,C < d,D < e,E,\u00E9,\u00E8,\u00EA,\u00C9,\u00C8,\u00CA < f,F < g,G < h,H < i,I < j,J < k,K < l,L < m,M < n,N < o,O,\u00F6,\u00D6 < p,P < q,Q < r,R < s,S,\u00DF < t,T < u,U,\u00FC,\u00DC < v,V < w,W < x,X < y,Y < z,Z
+
+#
+# Plug-in Specific [1]
+#
+DEVICE_NAME_NORMAL=meter
+DEVICE_NAME_BIG=Meter
+DEVICE_FULL_NAME_WITH_PORT=%s auf %s
+DEVICE_FULL_NAME_WITHOUT_PORT=%s
+DEVICE_DEVICE=Meter device
+
+#
+# Menus [1]
+#
+MN_METERS=&Messger\u00E4te
+MN_METERS_READ=Messger\u00E4t &auslesen
+MN_METERS_READ_DESC=Daten des Messger\u00E4ts auslesen
+MN_METERS_LIST=Messger\u00E4te&liste
+MN_METERS_LIST_DESC=Liste der meisten verf\u00FCgbaren Messger\u00E4te
+MN_METERS_CONFIG=Messger\u00E4te-Plug-in &Einstellungen
+MN_METERS_CONFIG_DESC=Einstellungen zum Messger\u00E4te-Plug-in
+MN_METERS_ABOUT=About...
+MN_METERS_ABOUT_DESC=About Meter Plugin (copyright, features, credits,...)
+MN_METERS_READ_FILE=Read file
+MN_METERS_READ_FILE_DESC=Read data from meter/sw export file
+
+#
+# Configuration [1]
+#
+MY__=My
+NEW__=New
+DEVICE_CONFIGURATION=%s Configuration
+SELECT_X_DEVICE=Select %s Device
+SELECTED_X_DEVICE=Selected %s Device
+DEVICE_CUSTOM_NAME=%s Custom Name
+
+#
+# Meter Selector [1]
+#
+SELECTOR_DEVICE=%s Device Selector
+
+#
+# Instructions Dialog [1]
+#
+OOPS_DEVICE_NOT_CONFIGURED=Oops ! You forgot to configure your %s\nand currently there is no %s configured\nand/or selected. Please visit configuration\nand configure your %s.
+CONFIGURED_DEVICE_INSTRUCTIONS=Configured %s and Instructions
+DEVICE_ICON=%s picture
+DEVICE_INFO=%s Info
+
+#
+# Transfer display [1]
+#
+ERROR_CONTACTING_DEVICE=We had problem contacting Meter device.\nPlease recheck communication port settings\n(some of cables, can change their address,\nwhen reconnected). Run configuration again\nand problem should be solved!\n
+READ_DEVICE_DATA_TITLE=Read Meter Data [%s on %s]
+STATUS_READER_ERROR=Internal %s (or port) error
+
+# table (add new table items here)
+DATETIME=Date/Time
+BG_MMOLL=BG (mmol/L)
+BG_MGDL=BG (mg/dL)
+MULTIPLE=Multiple
+
+# extended type table
+URINE=Ketones
+BG=Blood Glucose
+ENTRY_TYPE=Type
+
+#
+# Export [1]
+#
+EXPORT_DEVICE_DATA=Export %s Data
+
+#
+# List [1]
+#
+DEVICE_LIST_WEB=%s List
+METERS_LIST_WEB_DESC=<html>Meters List is not list of all available Meters in the world, this is just list of some (mostly commonly used) Meters available. We add new devices here when our source page changes (www.diabetesnet.com) or if some user requests that their device is to be added. Meters in list are color coded, and color determines status of devices of selected company. Color coding description is shown at bottom of this page.<br></html>
+
+#
+# About [1]
+#
+DEVICE_PLUGIN=%s Plug-in
+DEVICE_PLUGIN_ABOUT=About %s Plug-in
+
+#
+# Meter Instructions [1]
+#
+
+# ascensia
+INSTRUCTIONS_ASCENSIA_BREEZE=<html>Instructions for meter download:<ul><li>Attach the meter cable to the selected PC<br> serial port</li><li>Plug the meter cable into the round meter port<br></li><li>Press the meter button to turn the meter ON</li></ul><br>Click "Start Download" to begin reading data from<br>your meter...</html>
+INSTRUCTIONS_ASCENSIA_CONTOUR=<html>Instructions for meter download:<ul><li>Attach the meter cable to the selected PC<br> serial port</li><li>Plug the meter cable into the round meter port<br></li><li>Press the meter button M to turn the meter ON</li></ul><br>Click "Start Download" to begin reading data from<br>your meter...</html>
+INSTRUCTIONS_ASCENSIA_ELITE_XL=<html>Instructions for meter download:<ul><li>Attach the meter cable to the selected PC<br> serial port</li><li>Plug the meter cable into the round meter<br>port<br></li><li>Press the meter button to turn the meter ON</li></ul><br>Click "Start Download" to begin reading data from<br>your meter...</html>
+INSTRUCTIONS_ASCENSIA_DEX=<html>Instructions for meter download:<ul><li>Attach the meter cable to the selected PC<br> serial port<br></li><li>Plug the meter cable into the port between<br> the two meter buttons<br></li><li>Slide the meter cover to turn the meter ON</li></ul><br>Click "Start Download" to begin reading data from<br>your meter...</html>
+
+# roche
+INSTRUCTIONS_ACCUCHEK_ACTIVE=<html><ul><li>Pix Device should be attached before program<br>is started</li><li>Place meter max. 10 cm from Pix device</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Keep button M (left) on Active pressed for more<br>than 3 seconds and download will start.</li></ul>Accu-Check Pix has sometimes problems with java, so<br>you might be forced to start downloading twice.</html>
+INSTRUCTIONS_ACCUCHEK_ADVANTAGE=<html><ul><li>Pix Device should be attached before program<br>is started</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Insert IR Key into meter and place meter max.<br>10 cm from Pix device and download will start.</li></ul>Accu-Check Pix has sometimes problems with java, so<br>you might be forced to start downloading twice.</html>
+INSTRUCTIONS_ACCUCHEK_AVIVA=<html><ul><li>Pix Device should be attached before program<br>is started</li><li>Place meter max. 10 cm from Pix device</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Keep both buttons on Aviva pressed for more<br>than 3 seconds and download will start.</li></ul>Accu-Check Pix has sometimes problems with java, so<br>you might be forced to start downloading twice.</html>
+INSTRUCTIONS_ACCUCHEK_COMFORT=<html><ul><li>Pix Device should be attached before program<br>is started</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Insert IR Key into meter and place meter max.<br>10 cm from Pix device and download will start.</li></ul>Accu-Check Pix has sometimes problems with java, so<br>you might be forced to start downloading twice.</html>
+INSTRUCTIONS_ACCUCHEK_COMPACT=<html><li>Pix Device should be attached before program<br>is started (it has sometimes problems with java,<br>so you might be forced to download twice)</li><li>Place meter max. 10 cm from Pix device</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Keep both SET and MEMO buttons pressed for<br>more than 3 seconds and download will start.</li></html>
+INSTRUCTIONS_ACCUCHEK_COMPACTPLUS=<html><li>Pix Device should be attached before program<br>is started (it has sometimes problems with java,<br>so you might be forced to download twice)</li><li>Place meter max. 10 cm from Pix device</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Keep both S and M buttons pressed for<br>more than 3 seconds and download will start.</li></html>
+INSTRUCTIONS_ACCUCHEK_GO=<html><ul><li>Pix Device should be attached before program<br>is started</li><li>Place meter max. 10 cm from Pix device</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Keep button M (left) on Active pressed for more<br>than 3 seconds and download will start.</li></ul>Accu-Check Pix has sometimes problems with java, so<br>you might be forced to start downloading twice.</html>
+INSTRUCTIONS_ACCUCHEK_INTEGRA=<html><li>Pix Device should be attached before program<br>is started (it has sometimes problems with java,<br>so you might be forced to download twice)</li><li>Place meter max. 10 cm from Pix device</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Keep both SET and MEMO buttons pressed for<br> more than 3 seconds and download will start.</li></html>
+INSTRUCTIONS_ACCUCHEK_PERFORMA=Performa not supported at this time.
+INSTRUCTIONS_ACCUCHEK_SENSOR=<html><ul><li>Pix Device should be attached before program<br>is started</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Insert IR Key into meter and place meter max.<br>10 cm from Pix device and download will start.</li></ul>Accu-Check Pix has sometimes problems with java, so<br>you might be forced to start downloading twice.</html>
+INSTRUCTIONS_ACCUCHEK_NANO=<html><ul><li>Pix Device should be attached before program<br>is started</li><li>Place meter max. 10 cm from Pix device</li><li>Click on "Start Download" to start and watch<br>status until it becomes 'Detecting devices'.</li><li>Keep Left and Right buttons on Aviva pressed<br>for more than 3 seconds and download will<br>start.</li></ul>Accu-Check Pix has sometimes problems with java, so<br>you might be forced to start downloading twice.</html>
+
+# lifescan
+INSTRUCTIONS_LIFESCAN_ON=<html>Instructions for meter download:<ul><li>Attach the meter cable to the selected PC<br> serial port</li><li>Plug the meter cable into the meter port<br></li><li>Make sure that meter is ON</li></ul><br>Click "Start Download" to begin reading data from<br>your meter...</html>
+INSTRUCTIONS_LIFESCAN_OFF=<html>Instructions for meter download:<ul><li>Attach the meter cable to the selected PC<br> serial port</li><li>Plug the meter cable into the meter port<br></li><li>Make sure that meter is OFF</li></ul><br>Click "Start Download" to begin reading data from<br>your meter...</html>
+
+# Abbott and also Menarini
+INSTRUCTIONS_ABBOTT_OPTIUMXCEED=<html>Instructions for meter download:<ul><li>Attach the meter cable to the selected PC<br> serial/USB port</li><li>Plug the meter cable into meter strip port<br></li></ul><br>Click "Start Download" to begin reading data from<br>your meter...</html>
+
+#
+# Devices [2]
+#
+
+# OT Ultra mini & OT Ultra (some)
+READING_SW_VERSION=Reading Sw version
+READING_SERIAL_NR=Read Serial number
+READING_DATA_COUNTER=Reading data counter
+READING_PROCESSING_ENTRY=Reading and processing entry #
+READING_SERIAL_NR_SETTINGS=Read Serial number & Settings
+
+# AccuChek Combo
+BG_UNIT=BG Unit
+TIME_ON_DEVICE=Time on device
Added: trunk/ggc-nutri/src/GGC_Nutrition_de.properties
===================================================================
--- trunk/ggc-nutri/src/GGC_Nutrition_de.properties (rev 0)
+++ trunk/ggc-nutri/src/GGC_Nutrition_de.properties 2014-09-02 20:51:31 UTC (rev 1300)
@@ -0,0 +1,507 @@
+#
+# ######################################################################
+# ### GNU Glucose Control ###
+# ######################################################################
+# ### Language: German ###
+# ### Created by: Reinhold Rumberger (ru...@us...)###
+# ### Version: 1.3.1 ###
+# ### Last change: 03.07.2011 14:12:02 ###
+# ######################################################################
+#
+#
+# Translation status:
+# Words/expressions: 418
+# Not translated: 215 (51 %)
+# Need to be checked: 21 (5 %)
+#
+# Translated: 182 (43 %)
+#
+#
+#
+##
+# Collation Rules - In unicode we can create special rules for sorting where we specify
+# sorting order of special characters. This will be used by tree's and special tables.
+# For english this is left empty. For all other (that have non-standard, non english
+# charcters) we need to set this if we want sorting to be done correctly.
+#
+COLLATION_RULES=< 0 < 1 < 2 < 3 < 4 < 5 < 6 < 7 < 8 < 9 < a,A,\u00E4,\u00C4,\u00E1,\u00E0,\u00C1,\u00C0,\u00E2,\u00C2 < b,B < c,C < d,D < e,E,\u00E9,\u00E8,\u00EA,\u00C9,\u00C8,\u00CA < f,F < g,G < h,H < i,I < j,J < k,K < l,L < m,M < n,N < o,O,\u00F6,\u00D6 < p,P < q,Q < r,R < s,S,\u00DF < t,T < u,U,\u00FC,\u00DC < v,V < w,W < x,X < y,Y < z,Z
+
+#
+# Global [1]
+#
+DELETE=L\u00F6schen
+ADD=Hinzuf\u00FCgen
+EDIT=Bearbeiten
+NEW=Neu
+INFORMATION=Information
+QUESTION=Frage
+YES=Ja
+NO=Nein
+OK=OK
+CANCEL=Abbrechen
+APPLY=Anwenden
+SELECT=W\u00E4hlen
+HELP=Hilfe
+ROOT=root
+
+#
+# Global Dialogs [1]
+#
+SELECT_ITEM_FIRST=W\u00E4hlen Sie bitte erst einen Eintrag und danach eine Aktion!
+ARE_YOU_SURE_DELETE=Wollen Sie dieses Element wirklich l\u00F6schen?
+TRANSLATED_NAME=\u00DCbersetzter Name (falls verf\u00FCgbar)
+ID=ID
+USDA_NUTRITION_DATABASE=N\u00E4hrstoff-Datenbank des USDA
+USER_NUTRITION_DATABASE=N\u00E4hrstoff-Datenbank des Benutzers
+USDA_NUTRITION_DATABASE_DESC=<html><body>Die USDA-DB ist die United States Department of Agriculture Datenbank, die viele in den USA erhältiche Lebensmittel enthält. Da diese Datenbank in der ganzen Welt genutzt wird, haben wir uns entschieden sie zu integrieren. Die Version, die sich in der Datenbank befindet, hängt von den Dateien ab, die importiert wurden. Erlaubt sind Versionen 18 und höher (getestet wurde SR-18).<br>In diesem Modul werden alle Einträge der Datenbank angezeigt und wenn es von bestimmten anderen Modulen (wie z.B. dem Mahlzeiten-Modul) aus aufgerufen wurde, können Lebensmittel zum Importieren ausgewählt werden.</body></html>
+USER_NUTRITION_DATABASE_DESC=<html><body>Dies ist die Nährstoff-Datenbank, zu der der Benutzer selbst Einträge hinzufügen kann. In Zukunft wird der Import fremder Nährstoff-Datenbanken unterstützt werden (die dann editierbar sein werden), damit Sie die Vorteile der erweiterten Ordnerstruktur (Ordner können Unterordner enthalten) genießen können. Wenn Sie beispielsweise in Deutschland wohnen, könnten Sie einen Ordner namens "Deutsche Nahrung" anlegen, in den Sie dann unterschiedliche Gruppen (z.B. "Zubereitung: Mikrowelle"), Nahrungstypen, usw. eintragen könnten.</body></html>
+USDA_NUTRITION_DB=USDA N\u00E4hrstoff-DB
+USER_NUTRITION_DB=Benutzer N\u00E4hrstoff-DB
+MEALS_DB=Mahlzeiten-DB
+NONE=Nichts
+NUTRITION=N\u00E4hrstoff
+AMOUNT_LBL=Menge
+
+#
+# Menus [0]
+#
+
+# main menus
+MN_FOOD=&Nahrungsmittel
+MN_NUTRDB_USDB=Nahrungsmittel-DB (USDA)
+MN_NUTRDB_USDB_DESC=Nahrungsmittel-Datenbank des USDA
+MN_NUTRDB_USER=Nahrungsmittel-DB (Benutzer)
+MN_NUTRDB_USER_DESC=Nahrungsmittel-Datenbank des Benutzers
+MN_MEALS=Mahlzeiten-DB
+MN_MEALS_DESC=Datenbank mit Mahlzeiten
+MN_FOODMENU=N&ahrungsmen\u00FC
+MN_FOODMENU_DESC=Reports for Food Menus
+MN_FOODMENU_SIMPLE=Einfach (nur KH)
+MN_FOODMENU_SIMPLE_DESC=Printing food menu (Simple)
+MN_FOODMENU_EXT1=Erweitert I (KH, Ins.)
+MN_FOODMENU_EXT1_DESC=Printing food menu (Extended - CH,Ins)
+MN_FOODMENU_EXT2=Erweitert II (KH, Ins., BZ)
+MN_FOODMENU_EXT2_DESC=Printing food menu (Extended - CH,Ins,BG)
+MN_FOODMENU_EXT3=Extended III (CH,Ins,BG,kJ)
+MN_FOODMENU_EXT3_DESC=Printing food menu (Extended - CH,Ins,BG,kJ)
+
+#
+# Popup Menu [1]
+#
+PM_NUT_VIEW=Anzeigen
+PM_NUT_CLOSE=Schlie\u00DFen
+PM_NUT_EDIT_GROUP=Gruppe bearbeiten
+PM_NUT_ADD_GROUP=Gruppe hinzuf\u00FCgen
+PM_NUT_ADD_FOOD_DESCRIPTION=Lebensmittelbeschreibung hinzuf\u00FCgen
+PM_NUT_EDIT_FOOD_DESCRIPTION=Lebensmittelbeschreibung bearbeiten
+PM_NUT_ADD_MEAL=Mahlzeit hinzuf\u00FCgen
+PM_NUT_EDIT_MEAL=Mahlzeit bearbeiten
+
+#
+# Backup Objects [1]
+#
+NUTRITION_OBJECTS=Nahrungsobjekte
+USER_FOOD_GROUPS=Benutzer-Nahrungsgruppen
+MEAL_GROUPS=Mahlzeitengruppen
+MEALS=Mahlzeiten
+FOODS=Ern\u00E4hrung
+
+#
+# Food [1]
+#
+NEW_FOOD=Neues Lebensmittel
+ADD_FOOD=Neues Lebensmittel hinzuf\u00FCgen
+FOOD_GROUP=Lebensmittelgruppe
+GROUP_NAME=Gruppenname
+FOOD_NAME=Name des Lebensmittels
+REFUSE_LBL=Ungenie\u00DFbarer Anteil
+NUTRITIONS_FOOD=N\u00E4hrstoffe
+FOOD_DESCRIPTION=Lebensmittel-Beschreibung
+HOME_WEIGHTS=Home weights (if defined)
+WEIGHT_TYPE=Weight Type
+AMOUNT_WEIGHT=Menge & Gewicht
+WEIGHT=Gewicht (in g)
+UNITS=Einheiten
+FOOD_GROUPS=Lebensmittelgruppen
+MEAL_GROUP=Mahlzeitengruppe
+SELECTED_GROUP=Gew\u00E4hlte Gruppe
+SELECT_GROUP=Gruppe w\u00E4hlen
+PARENT_GROUP=\u00DCbergeordnete Gruppe
+EDIT_MEAL_GROUP=Mahlzeitengruppe bearbeiten
+ADD_MEAL_GROUP=Neue Mahlzeitengruppe hinzuf\u00FCgen
+NEW_GROUP=Neue Gruppe
+TRANSLATION_KEYWORD=Schl\u00FCsselwort f\u00FCr die \u00DCbersetzung
+WISH_TO_SAVE_NEW_GROUP=Sie haben eine neue Gruppe erstellt. Wollen Sie speichern?
+WISH_TO_SAVE_EDITED_GROUP=Sie haben eine Gruppe ge\u00E4ndert. Wollen Sie speichern?
+ADD_FOOD_GROUP=Lebensmittelgruppe hinzuf\u00FCgen
+EDIT_FOOD_GROUP=Lebensmittelgruppe bearbeiten
+
+#
+# Meal [1]
+#
+NUTRITION_TYPE=N\u00E4hrstofftyp
+SELECTED_ITEM=gew\u00E4hltes Element
+NUTRITION_TYPE_FOR_SELECTOR=Nutrition type for selector
+SELECTOR=Selector
+USDA_NUTRITION=USDA N\u00E4hrstoff
+USER_NUTRITION=Benutzerdefinierte N\u00E4hrstoff
+MEAL=Mahlzeit
+SELECT_ITEM=Element w\u00E4hlen
+MEALS_FOODS_SELECTOR=Mahlzeiten- und Lebensmittelwahl
+MEAL_ADD=Mahlzeit hinzuf\u00FCgen
+MEAL_EDIT=Mahlzeit bearbeiten
+MEAL_NAME=Mahlzeitname
+AVAILABLE_NUTRITIONS=Verf\u00FCgbahre N\u00E4hrstoffe
+FOODS_MEALS_NUTRITIONS=Lebensmittel, Mahlzeiten und/oder N\u00E4hrstoffe
+MEAL_FOOD_ADD_DESC=Lebensmittel, Mahlzeit oder N\u00E4hrstoffe hinzuf\u00FCgen
+MEAL_FOOD_EDIT_DESC=Lebensmittel, Mahlzeit oder N\u00E4hrstoffe bearbeiten
+MEAL_FOOD_DELETE_DESC=Lebensmittel, Mahlzeit oder N\u00E4hrstoffe l\u00F6schen
+MEAL_TYPE=Typ
+DESCRIPTION=Beschreibung
+TRANSLATION_KEYWORD_MEAL=Schl\u00FCsselwort f\u00FCr die \u00DCbersetzung
+TRANSLATED_NAME_MEAL=\u00DCbersetzter Name
+GROUP=Gruppe
+WISH_TO_SAVE_NEW_MEAL=Sie haben eine neue Mahlzeit erstellt. Wollen Sie speichern?
+WISH_TO_SAVE_EDITED_MEAL=Sie haben eine Mahlzeit ge\u00E4ndert. Wollen Sie speichen?
+NEW_MEAL=Neue Mahlzeit
+CANT_SELECT_CIRCULAR_MEAL=Die Mahlzeit, die bearbeitet wird, kann nicht hinzugef\u00FCgt werden
+CANT_SELECT_CHILD_OR_GROUP=Diese Gruppe oder ein Kindelement dieser Gruppe kann nicht als Elternelement dieser Gruppe gew\u00E4hlt werden!
+MEAL_VIEW=Meal View
+MEALS_DATABASE=Mahlzeiten-Datenbank
+MEALS_DATABASE_DESC=<html><body>Die Mahlzeiten-Datenbank enth\u00E4lt komplette Gerichte, z.B. "McDonald's Big Mac Men\u00FC". Sie enth\u00E4lt einige Elemente der USDA-Datenbank, z.B. "Big Mac Hamburger" und "Coca-Cola".<br>Gerichte k\u00F6nnen Elemente aus allen Datenbanken enthalten.</body></html>
+ADD_MEAL=Mahlzeit hinzuf\u00FCgen
+
+#
+# Food (User) [1]
+#
+FOOD_EDIT=Lebensmittel bearbeiten
+SELECTED_NUTRITION=gew\u00E4hlter N\u00E4hrstoff
+SELECT_NUTRITION=N\u00E4hrstoff w\u00E4hlen
+SELECTED_HOME_WEIGHT=Selected Home Weight
+SELECT_HOME_WEIGHT=Select Home Weight
+NEW_NUTR_DEF=Neu
+WEIGHT_UNIT=Gew. Einheit
+TAG=Tag
+SELECTOR_NUTRITION_DEFINITION=Selector for Nutritions
+NUTRITION_NAME=N\u00E4hrstoffname
+NUTRITION_SELECTOR=Nutritions Selector
+HOME_WEIGHT_SELECTOR=Home Weight Selector
+WISH_TO_SAVE_NEW_FOOD=Sie haben ein neues Lebensmittel eingetragen. Wollen Sie speichern?
+WISH_TO_SAVE_EDITED_FOOD=Sie haben die Lebensmitteldaten ge\u00E4ndert. Wollen Sie speichern?
+NUTRITIONS=N\u00E4hrstoffe
+SELECTOR_HOME_WEIGHT=Selector for Home Weights
+NEW_HOME_WEIGHT=Neu
+HOME_WEIGHT_NAME=Home Weight Name
+USER_DEFINED=Benutzerdefiniert
+HOME_WEIGHT_ADD_DESC=Add Home Weight
+HOME_WEIGHT_EDIT_DESC=Edit Home Weight
+HOME_WEIGHT_DELETE_DESC=Delete Home Weight
+
+#
+# Daily Values and Foods [1]
+#
+WEIGHT_LBL2=Gewicht
+HOME_WEIGHTS_LBL=Home Weights
+WGHT_PER_AMOUNT=Gewicht/Menge
+WEIGHT_SHORT=Gew.
+
+#
+# Selector for Daily Value [1]
+#
+MEALS_FOODS_SELECTOR_DAILY=Mahlzeiten- und Lebensmittelwahl f\u00FCr den Eintrag
+NAME=Name
+HOME_WEIGHT=Home Weight
+NO_ITEM_SELECTED=Keine Auswahl.
+
+#
+# Printing Food menu [2]
+#
+PRINT_FOOD_DESC=Food Description
+DATE=Date
+TIME=Time
+FOOD_MENU_BASE=Food Menu Base (CH only)
+FOOD_MENU_EXT_I=Extended Food Menu I (CH,Ins)
+FOOD_MENU_EXT_II=Extended Food Menu II (CH,Ins,BG)
+FOOD_MENU_EXT_III=Extended Food Menu III (CH,Ins,BG,kJ)
+REPORT_FOOTER=This report is from \"GGC - GNU Gluco Control\", freely available at http://ggc.sourceforge.net
+TOGETHER=Together
+CH=CH
+INS=Ins
+BG=BG
+AMOUNT_SHORT=Am.
+
+#
+# Nutrients [3]
+#
+PROCNT=Eiwei\u00DF
+FAT=Lipide Gesamt (Fett)
+CHOCDF=Carbohydrate, by difference
+ASH=Asche
+ENERC_KCAL=Energie (kcal)
+STARCH=St\u00E4rke
+SUCS=R\u00FCbenzucker
+GLUS=Glukose (Dextrose)
+FRUS=Fruchtzucker
+LACS=Laktose
+MALS=Maltose
+ALC=Alkohol, \u00C4thyl
+WATER=Wasser
+CAFFN=Koffein
+GI=Glyk\u00E4mischer Index
+GL=Glycemic Load
+GI_MIN=Glyk\u00E4mischer Index (Min)
+GI_MAX=Glyk\u00E4mischer Index (Max)
+GL_MIN=Glycemic Load (Min)
+GL_MAX=Glycemic Load (Max)
+ENERC_KJ=Energie
+SUGAR=Sugars, total
+GALS=Galactose
+FIBTG=Fiber, total dietary
+CA=Kalzium, Ca
+FE=Eisen, Fe
+MG=Magnesium, Mg
+P=Phosphor, P
+K=Kalium, K
+NA=Natrium, Na
+ZN=Zink, Zn
+CU=Kupfer, Cu
+FLD=Fluorid, F
+MN=Mangan, Mn
+SE=Selen, Se
+VITA_IU=Vitamin A, IU
+VITA_RAE=Vitamin A, RAE
+CARTB=Karotin, beta
+CARTA=Karotin, alpha
+TOCPHA=Vitamin E (alpha-tocopherol)
+VITD-=Vitamin D
+VITB6A=Vitamin B6
+VITB12=Vitamin B12
+VITK=Vitamin K (phylloquinone)
+FAMS=Fetts\u00E4uren, einfach ges\u00E4ttigt
+FAPU=Fetts\u00E4uren, mehrfach ges\u00E4ttigt
+CHOLE=Cholesterin
+FATRN=Fatty acids, total trans
+FASAT=Fetts\u00E4uren, ges\u00E4ttigt
+FATRNM=Fatty acids, total trans-monoenoic
+FATRNP=Fatty acids, total trans-polyenoic
+
+#
+# Nutrients, not usually used [3]
+#
+FOL=Folate, total
+CHOLN=Choline, total
+THEBRN=Theobromine
+RETOL=Retinol
+CRYPX=Cryptoxanthin, beta
+LYCPN=Lycopene
+LUT+ZEA=Lutein + zeaxanthin
+TOCPHB=Tocopherol, beta
+TOCPHG=Tocopherol, gamma
+TOCPHD=Tocopherol, delta
+VITC=Vitamin C, total ascorbic acid
+THIA=Vitamin B1, Thiamin
+RIBF=Vitamin B2, Riboflavin
+NIA=Niacin
+PANTAC=Pantothenic acid
+FOLAC=Fols\u00E4ure
+FOLFD=Folate, food
+FOLDFE=Folate, DFE
+BETN=Betaine
+TRP_G=Tryptophan
+THR_G=Threonin
+ILE_G=Isoleucine
+LEU_G=Leucin
+LYS_G=Lysine
+MET_G=Methionin
+CYS_G=Cystine
+PHE_G=Phenylalanin
+TYR_G=Tyrosin
+VAL_G=Valin
+ARG_G=Arginin
+HISTN_G=Histidine
+ALA_G=Alanin
+ASP_G=Asparagins\u00E4ure
+GLU_G=Glutamic acid
+GLY_G=Glycine
+PRO_G=Prolin
+SER_G=Serin
+HYP=Hydroxyproline
+PHYSTR=Phytosterols
+STID7=Stigmasterol
+CAMD5=Campesterol
+SITSTR=Beta-sitosterol
+
+#
+# Home Weights - Translation [2]
+#
+-TO-SERVE=to serve
+AFTER=after
+APPROX=approx
+AMOUNT=amount
+AVG.=avg.
+BLOCK=block
+BLOCKS=blocks
+BONE=Knochen
+BONELESS=boneless
+BOTTLE=Flasche
+BAG=bag
+BAR=bar
+BIG=big
+BOX=box
+CAN=Dose
+CHOPPED=chopped
+CHUNK=chunk
+CHUNKS=chunks
+CONTAINER=container
+CONTENTS=contents
+COOKED=gekocht
+COOKIE=cookie
+COOK=cook
+COOKING=cooking
+CRUMBLED=crumbled
+CRUSHED=crushed
+CUBED=gew\u00FCrfelt
+CUBIC=kubisch
+CUT=cut
+CUBE=W\u00FCrfel
+CUBES=W\u00FCrfel
+CUP=Tasse
+CUPCAKE=cupcake
+CUPS=cups
+CURD=curd
+DICED=diced
+DASH=dash
+DRAINED=drained
+DIA=Diameter
+DIA.=Diameter
+DIAM=Diameter
+DIAM.=Diameter
+DIAMETER=Diameter
+ENVELOPE=envelope
+EXTRA=extra
+FOR=for
+FROM=from
+FROZEN=frozen
+FRUIT=fruit
+FRUITS=fruits
+FL=fl
+FLUID=fluid
+GROUND=ground
+G=g
+HIGH=high
+IN=in
+IN.=in.
+INCH=inch
+INSTANT=instant
+ITEM=item
+ITEMS=items
+INDIVIDUAL=individual
+JAR=jar
+JUMBO=jumbo
+LARGE=large
+LEAVES=Bl\u00E4tter
+LONG=lang
+LB=lb
+MAKE=make
+MASHED=mashed
+MAKES=makes
+MEDIUM=medium
+MEAT=meat
+ML=ml
+MELTED=melted
+NOT=nicht
+NET=net
+OUNCE=ounce
+OZ=oz
+OZ.=oz.
+OR=oder
+PACK=pack
+PACKAGE=package
+PACKET=packet
+PACKAGES=packages
+PACKED=packed
+PAT=pat
+PATTY=patty
+PIECE=piece
+PIECES=pieces
+PKG.=pkg.
+POD=pod
+PODS=pods
+PORTION=portion
+POWDER=powder
+PRODUCT=product
+PREPARED=prepared
+QUART=quart
+RAW=raw
+READY=ready
+READY-TO=ready to
+READY-TO-COOK=ready to cook
+READY-TO-EAT=ready to eat
+READY-TO-SERVE=ready to serve
+RECIPE=recipe
+RECONSTITUTED=reconstituted
+REFRIGATED=refrigirated
+REFRIGERATED=refrigerated
+REFUSE=refuse
+REGULAR=regular
+REMOVED=removed
+ROLL=roll
+ROLLS=rolls
+SCOOP=scoop
+SERVING=serving
+SERVINGS=servings
+SHREDDED=shredded
+SHELLED=shelled
+SIFTED=sifted
+SIZE=size
+SMALL=klein
+SMALLER=smaller
+SKIN=skin
+SLICE=slice
+SLICED=sliced
+SLICES=slices
+SNACK=snack
+SNACK-SIZE=snack size
+SQ=sq
+SPRIG=sprig
+SPRIGS=sprigs
+SPOON=L\u00F6ffel
+STICK=stick
+STICKS=sticks
+TABLESPOON=table spoon
+TBSP=table spoon
+TBS=table spoon
+TEASPOON=Teel\u00F6ffel
+TO=zu
+TSP=tea spoon
+THAWED=getaut
+THICK=thick
+THIN=d\u00FCnn
+THICK.=thick.
+UNIT=unit
+UNPACKED=unpacked
+UNPEELED=unpeeled
+UNPREPARED=unprepared
+UNSIFTED=unsifted
+UNTHAWED=unthawed
+UNDILUTED=undiluted
+UNDRAINED=undrained
+UNHEATED=unheated
+WHOLE=whole
+WITH=mit
+WITHOUT=ohne
+WRAPPED=wrapped
+WEDGE=wedge
+WEDGES=wedges
+WHIPPED=geschlagen
+YIELD=yield
+YIELDS=yields
+X=x
+
+#
+# Food translations [3]
+#
+MILK=Milch
+EGG=Ei
+STEAK=Steak
+HEADS=K\u00F6pfe
Added: trunk/ggc-plugin_base/src/GGCPlugin_de.properties
===================================================================
--- trunk/ggc-plugin_base/src/GGCPlugin_de.properties (rev 0)
+++ trunk/ggc-plugin_base/src/GGCPlugin_de.properties 2014-09-02 20:51:31 UTC (rev 1300)
@@ -0,0 +1,362 @@
+#
+# ######################################################################
+# ### GNU Glucose Control ###
+# ######################################################################
+# ### Language: German ###
+# ### Created by: Reinhold Rumberger (ru...@us...)###
+# ### Version: 0.6.1 ###
+# ### Last change: 03.07.2011 14:41:33 ...
[truncated message content] |
|
From: <ru...@us...> - 2014-09-05 14:36:56
|
Revision: 1302
http://sourceforge.net/p/ggc/code/1302
Author: rumbi
Date: 2014-09-05 14:36:46 +0000 (Fri, 05 Sep 2014)
Log Message:
-----------
RR:
- better translations for a string
- not all settings should be shared - remove and exclude the ones that shouldn't
Modified Paths:
--------------
trunk/ggc-meter/.settings/org.eclipse.core.resources.prefs
trunk/ggc-pump/src/GGCPumpTool_de.properties
Added Paths:
-----------
trunk/ggc-cgm/.settings/org.eclipse.core.resources.prefs
trunk/ggc-desktop/.settings/org.eclipse.core.resources.prefs
trunk/ggc-master-pom/.settings/
trunk/ggc-master-pom/.settings/org.eclipse.core.resources.prefs
trunk/ggc-nutri/.settings/org.eclipse.core.resources.prefs
trunk/ggc-plugin_base/.settings/org.eclipse.core.resources.prefs
trunk/ggc-pump/.settings/org.eclipse.core.resources.prefs
Removed Paths:
-------------
trunk/ggc-cgm/.settings/org.eclipse.core.runtime.prefs
trunk/ggc-cgm/.settings/org.eclipse.jdt.core.prefs
trunk/ggc-desktop/.settings/org.eclipse.core.runtime.prefs
trunk/ggc-desktop/.settings/org.eclipse.jdt.core.prefs
trunk/ggc-meter/.settings/org.eclipse.core.runtime.prefs
trunk/ggc-meter/.settings/org.eclipse.jdt.core.prefs
trunk/ggc-nutri/.settings/org.eclipse.jdt.core.prefs
trunk/ggc-plugin_base/.settings/org.eclipse.jdt.core.prefs
trunk/ggc-pump/.settings/org.eclipse.core.runtime.prefs
trunk/ggc-pump/.settings/org.eclipse.jdt.core.prefs
Property Changed:
----------------
trunk/ggc-cgm/.settings/
trunk/ggc-desktop/.settings/
trunk/ggc-meter/.settings/
trunk/ggc-nutri/.settings/
trunk/ggc-plugin_base/.settings/
trunk/ggc-pump/.settings/
Index: trunk/ggc-cgm/.settings
===================================================================
--- trunk/ggc-cgm/.settings 2014-09-03 21:42:02 UTC (rev 1301)
+++ trunk/ggc-cgm/.settings 2014-09-05 14:36:46 UTC (rev 1302)
Property changes on: trunk/ggc-cgm/.settings
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+org.eclipse.m2e.core.prefs
Added: trunk/ggc-cgm/.settings/org.eclipse.core.resources.prefs
===================================================================
--- trunk/ggc-cgm/.settings/org.eclipse.core.resources.prefs (rev 0)
+++ trunk/ggc-cgm/.settings/org.eclipse.core.resources.prefs 2014-09-05 14:36:46 UTC (rev 1302)
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
+encoding/src=UTF-8
Deleted: trunk/ggc-cgm/.settings/org.eclipse.core.runtime.prefs
===================================================================
--- trunk/ggc-cgm/.settings/org.eclipse.core.runtime.prefs 2014-09-03 21:42:02 UTC (rev 1301)
+++ trunk/ggc-cgm/.settings/org.eclipse.core.runtime.prefs 2014-09-05 14:36:46 UTC (rev 1302)
@@ -1,3 +0,0 @@
-#Fri Jul 04 21:33:37 CEST 2008
-eclipse.preferences.version=1
-line.separator=\n
Deleted: trunk/ggc-cgm/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/ggc-cgm/.settings/org.eclipse.jdt.core.prefs 2014-09-03 21:42:02 UTC (rev 1301)
+++ trunk/ggc-cgm/.settings/org.eclipse.jdt.core.prefs 2014-09-05 14:36:46 UTC (rev 1302)
@@ -1,15 +0,0 @@
-#Sat Aug 23 01:16:56 GMT 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
-org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL,LOW
-org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,RUMBI
Index: trunk/ggc-desktop/.settings
===================================================================
--- trunk/ggc-desktop/.settings 2014-09-03 21:42:02 UTC (rev 1301)
+++ trunk/ggc-desktop/.settings 2014-09-05 14:36:46 UTC (rev 1302)
Property changes on: trunk/ggc-desktop/.settings
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+org.eclipse.m2e.core.prefs
Added: trunk/ggc-desktop/.settings/org.eclipse.core.resources.prefs
===================================================================
--- trunk/ggc-desktop/.settings/org.eclipse.core.resources.prefs (rev 0)
+++ trunk/ggc-desktop/.settings/org.eclipse.core.resources.prefs 2014-09-05 14:36:46 UTC (rev 1302)
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
+encoding/src=UTF-8
Deleted: trunk/ggc-desktop/.settings/org.eclipse.core.runtime.prefs
===================================================================
--- trunk/ggc-desktop/.settings/org.eclipse.core.runtime.prefs 2014-09-03 21:42:02 UTC (rev 1301)
+++ trunk/ggc-desktop/.settings/org.eclipse.core.runtime.prefs 2014-09-05 14:36:46 UTC (rev 1302)
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-line.separator=\n
Deleted: trunk/ggc-desktop/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/ggc-desktop/.settings/org.eclipse.jdt.core.prefs 2014-09-03 21:42:02 UTC (rev 1301)
+++ trunk/ggc-desktop/.settings/org.eclipse.jdt.core.prefs 2014-09-05 14:36:46 UTC (rev 1302)
@@ -1,5 +0,0 @@
-#Tue Jun 17 20:43:29 CEST 2014
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
Index: trunk/ggc-master-pom/.settings
===================================================================
--- trunk/ggc-master-pom/.settings 2014-09-03 21:42:02 UTC (rev 1301)
+++ trunk/ggc-master-pom/.settings 2014-09-05 14:36:46 UTC (rev 1302)
Property changes on: trunk/ggc-master-pom/.settings
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+org.eclipse.m2e.core.prefs
Added: trunk/ggc-master-pom/.settings/org.eclipse.core.resources.prefs
===================================================================
--- trunk/ggc-master-pom/.settings/org.eclipse.core.resources.prefs (rev 0)
+++ trunk/ggc-master-pom/.settings/org.eclipse.core.resources.prefs 2014-09-05 14:36:46 UTC (rev 1302)
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
Index: trunk/ggc-meter/.settings
===================================================================
--- trunk/ggc-meter/.settings 2014-09-03 21:42:02 UTC (rev 1301)
+++ trunk/ggc-meter/.settings 2014-09-05 14:36:46 UTC (rev 1302)
Property changes on: trunk/ggc-meter/.settings
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+org.eclipse.m2e.core.prefs
Modified: trunk/ggc-meter/.settings/org.eclipse.core.resources.prefs
===================================================================
--- trunk/ggc-meter/.settings/org.eclipse.core.resources.prefs 2014-09-03 21:42:02 UTC (rev 1301)
+++ trunk/ggc-meter/.settings/org.eclipse.core.resources.prefs 2014-09-05 14:36:46 UTC (rev 1302)
@@ -1,2 +1,4 @@
eclipse.preferences.version=1
encoding//docs/Accu\ Chek\ Instructions.txt=cp1252
+encoding/<project>=UTF-8
+encoding/src=UTF-8
Deleted: trunk/ggc-meter/.settings/org.eclipse.core.runtime.prefs
===================================================================
--- trunk/ggc-meter/.settings/org.eclipse.core.runtime.prefs 2014-09-03 21:42:02 UTC (rev 1301)
+++ trunk/ggc-meter/.settings/org.eclipse.core.runtime.prefs 2014-09-05 14:36:46 UTC (rev 1302)
@@ -1,3 +0,0 @@
-#Fri Jul 04 21:33:28 CEST 2008
-eclipse.preferences.version=1
-line.separator=\n
Deleted: trunk/ggc-meter/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/ggc-meter/.settings/org.eclipse.jdt.core.prefs 2014-09-03 21:42:02 UTC (rev 1301)
+++ trunk/ggc-meter/.settings/org.eclipse.jdt.core.prefs 2014-09-05 14:36:46 UTC (rev 1302)
@@ -1,15 +0,0 @@
-#Sat Aug 23 01:16:36 GMT 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
-org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL,LOW
-org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,RUMBI
Index: trunk/ggc-nutri/.settings
===================================================================
--- trunk/ggc-nutri/.settings 2014-09-03 21:42:02 UTC (rev 1301)
+++ trunk/ggc-nutri/.settings 2014-09-05 14:36:46 UTC (rev 1302)
Property changes on: trunk/ggc-nutri/.settings
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+org.eclipse.m2e.core.prefs
Added: trunk/ggc-nutri/.settings/org.eclipse.core.resources.prefs
===================================================================
--- trunk/ggc-nutri/.settings/org.eclipse.core.resources.prefs (rev 0)
+++ trunk/ggc-nutri/.settings/org.eclipse.core.resources.prefs 2014-09-05 14:36:46 UTC (rev 1302)
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
+encoding/src=UTF-8
Deleted: trunk/ggc-nutri/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/ggc-nutri/.settings/org.eclipse.jdt.core.prefs 2014-09-03 21:42:02 UTC (rev 1301)
+++ trunk/ggc-nutri/.settings/org.eclipse.jdt.core.prefs 2014-09-05 14:36:46 UTC (rev 1302)
@@ -1,5 +0,0 @@
-#Tue Jun 17 19:24:10 CEST 2014
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
Index: trunk/ggc-plugin_base/.settings
===================================================================
--- trunk/ggc-plugin_base/.settings 2014-09-03 21:42:02 UTC (rev 1301)
+++ trunk/ggc-plugin_base/.settings 2014-09-05 14:36:46 UTC (rev 1302)
Property changes on: trunk/ggc-plugin_base/.settings
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+org.eclipse.m2e.core.prefs
Added: trunk/ggc-plugin_base/.settings/org.eclipse.core.resources.prefs
===================================================================
--- trunk/ggc-plugin_base/.settings/org.eclipse.core.resources.prefs (rev 0)
+++ trunk/ggc-plugin_base/.settings/org.eclipse.core.resources.prefs 2014-09-05 14:36:46 UTC (rev 1302)
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
+encoding/src=UTF-8
Deleted: trunk/ggc-plugin_base/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/ggc-plugin_base/.settings/org.eclipse.jdt.core.prefs 2014-09-03 21:42:02 UTC (rev 1301)
+++ trunk/ggc-plugin_base/.settings/org.eclipse.jdt.core.prefs 2014-09-05 14:36:46 UTC (rev 1302)
@@ -1,12 +0,0 @@
-#Sat Aug 23 01:16:20 GMT 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
Index: trunk/ggc-pump/.settings
===================================================================
--- trunk/ggc-pump/.settings 2014-09-03 21:42:02 UTC (rev 1301)
+++ trunk/ggc-pump/.settings 2014-09-05 14:36:46 UTC (rev 1302)
Property changes on: trunk/ggc-pump/.settings
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+org.eclipse.m2e.core.prefs
Added: trunk/ggc-pump/.settings/org.eclipse.core.resources.prefs
===================================================================
--- trunk/ggc-pump/.settings/org.eclipse.core.resources.prefs (rev 0)
+++ trunk/ggc-pump/.settings/org.eclipse.core.resources.prefs 2014-09-05 14:36:46 UTC (rev 1302)
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
+encoding/src=UTF-8
Deleted: trunk/ggc-pump/.settings/org.eclipse.core.runtime.prefs
===================================================================
--- trunk/ggc-pump/.settings/org.eclipse.core.runtime.prefs 2014-09-03 21:42:02 UTC (rev 1301)
+++ trunk/ggc-pump/.settings/org.eclipse.core.runtime.prefs 2014-09-05 14:36:46 UTC (rev 1302)
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-line.separator=\n
Deleted: trunk/ggc-pump/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/ggc-pump/.settings/org.eclipse.jdt.core.prefs 2014-09-03 21:42:02 UTC (rev 1301)
+++ trunk/ggc-pump/.settings/org.eclipse.jdt.core.prefs 2014-09-05 14:36:46 UTC (rev 1302)
@@ -1,15 +0,0 @@
-#Sat Aug 23 01:16:02 GMT 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
-org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL,LOW
-org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,RUMBI
Modified: trunk/ggc-pump/src/GGCPumpTool_de.properties
===================================================================
--- trunk/ggc-pump/src/GGCPumpTool_de.properties 2014-09-03 21:42:02 UTC (rev 1301)
+++ trunk/ggc-pump/src/GGCPumpTool_de.properties 2014-09-05 14:36:46 UTC (rev 1302)
@@ -5,16 +5,16 @@
# ### Language: German ###
# ### Created by: Reinhold Rumberger (ru...@us...)###
# ### Version: 1.2.2 ###
-# ### Last change: 03.07.2011 14:26:01 ###
+# ### Last change: 10.08.2014 04:32:31 ###
# ######################################################################
#
#
# Translation status:
# Words/expressions: 264
-# Not translated: 262 (99 %)
-# Need to be checked: 0 (0 %)
+# Not translated: 195 (74 %)
+# Need to be checked: 67 (25 %)
#
-# Translated: 2 (0 %)
+# Translated: 2 (1 %)
#
#
#
@@ -29,93 +29,93 @@
#
# Plug-in Specific [1]
#
-DEVICE_NAME_NORMAL=pump
-DEVICE_NAME_BIG=Pump
+DEVICE_NAME_NORMAL=Pumpe
+DEVICE_NAME_BIG=Pumpe
DEVICE_FULL_NAME_WITHOUT_PORT=%s
-DEVICE_FULL_NAME_WITH_PORT=%s on %s
+DEVICE_FULL_NAME_WITH_PORT=%s an %s
#
# About [1]
#
-DEVICE_PLUGIN=%s Plug-in
-DEVICE_PLUGIN_ABOUT=About %s Plug-in
+DEVICE_PLUGIN=%s-Plug-in
+DEVICE_PLUGIN_ABOUT=\u00DCber %s-Plug-in
#
# Configuration [1]
#
-MY__=My
-NEW__=New
-DEVICE_CONFIGURATION=%s Configuration
-SELECT_X_DEVICE=Select %s Device
-SELECTED_X_DEVICE=Selected %s Device
-DEVICE_CUSTOM_NAME=%s Custom Name
+MY__=Mein
+NEW__=Neu
+DEVICE_CONFIGURATION=%s Konfiguration
+SELECT_X_DEVICE=Ger\u00E4t %s ausw\u00E4hlen
+SELECTED_X_DEVICE=Ger\u00E4t %s ausgew\u00E4hlt
+DEVICE_CUSTOM_NAME=%s benutzerdefinierter Name
DEVICE_DOWNLOAD=DL
-DEVICE_SETTINGS=Sett.
+DEVICE_SETTINGS=Einst.
#
# Menus [1]
#
-MN_PUMPS=Pumps
-MN_PUMPS_READ=Pump Read
-MN_PUMPS_READ_DESC=Read data from pump
-MN_PUMPS_LIST=Pumps List
-MN_PUMPS_LIST_DESC=List of most pumps available
-MN_PUMPS_CONFIG=Configure...
-MN_PUMPS_CONFIG_DESC=Configuration of the Pump plug-in
-MN_PUMP_PROFILES=Profiles
-MN_PUMP_PROFILES_DESC=Basal profiles
-MN_PUMPS_MANUAL_ENTRY=Manual entry
-MN_PUMPS_MANUAL_ENTRY_DESC=Manual entry of data (if your device is not supported)
-MN_PUMPS_ADDITIONAL_DATA=Additional data
-MN_PUMPS_ADDITIONAL_DATA_DESC=Additional data entry (BG, Activity, ...)
-MN_PUMPS_ABOUT=About...
-MN_PUMPS_ABOUT_DESC=About Pump Plugin (copyright, features, credits,...)
-MN_PUMPS_READ_DATA=Read data
-MN_PUMPS_READ_DATA_DESC=Read data from pump
-MN_PUMPS_READ_CONFIG=Read configuration
-MN_PUMPS_READ_CONFIG_DESC=Read configuration from pump
-MN_PUMPS_READ_FILE=Read file
-MN_PUMPS_READ_FILE_DESC=Read data from pump/sw export file
+MN_PUMPS=Pumpen
+MN_PUMPS_READ=Pumpe Auslesen
+MN_PUMPS_READ_DESC=Die Daten der Pumpe auslesen
+MN_PUMPS_LIST=Pumpenliste
+MN_PUMPS_LIST_DESC=Eine Liste der meisten verf\u00FCgbaren Pumpen
+MN_PUMPS_CONFIG=Einstellungen...
+MN_PUMPS_CONFIG_DESC=Einstellungen des Pumpen-Plugins
+MN_PUMP_PROFILES=Profile
+MN_PUMP_PROFILES_DESC=Basal-Profile
+MN_PUMPS_MANUAL_ENTRY=Manueller Eintrag
+MN_PUMPS_MANUAL_ENTRY_DESC=Manuelle Dateneintragung (falls Ihr Ger\u00E4t nicht unterst\u00FCtzt wird)
+MN_PUMPS_ADDITIONAL_DATA=Zus\u00E4tzliche Daten
+MN_PUMPS_ADDITIONAL_DATA_DESC=Eintragung zus\u00E4tzlicher Daten (BZ, Sport, ...)
+MN_PUMPS_ABOUT=\u00DCber...
+MN_PUMPS_ABOUT_DESC=\u00DCber das Pumpen-Plugin (Copyright, Funktionen, Mitwirkende,...)
+MN_PUMPS_READ_DATA=Daten auslesen
+MN_PUMPS_READ_DATA_DESC=Daten von der Pumpe auslesen
+MN_PUMPS_READ_CONFIG=Einstellungen auslesen
+MN_PUMPS_READ_CONFIG_DESC=Einstellungen der Pumpe auslesen
+MN_PUMPS_READ_FILE=Datei einlesen
+MN_PUMPS_READ_FILE_DESC=Daten von einer Pumpen-/Programm-Export-Datei
#
# Device Selector [1]
#
-SELECTOR_DEVICE=%s Device Selector
+SELECTOR_DEVICE=%s Ger\u00E4teauswahl
#
# Instructions Dialog [1]
#
-OOPS_DEVICE_NOT_CONFIGURED=Oops ! You forgot to configure your %s\nand currently there is no %s configured\nand/or selected. Please visit configuration\nand configure your %s.
-CONFIGURED_DEVICE_INSTRUCTIONS=Configured %s and Instructions
-DEVICE_ICON=%s picture
-BASE_TYPE_SH=Base
+OOPS_DEVICE_NOT_CONFIGURED=Ups! Sie haben vergessen, Ihre %s zu konfigurieren,\nund es ist augenblicklich keine %s konfiguriert\nund/oder ausgew\u00E4hlt. Bitte \u00F6ffnen Sie die Einstellungen\nund konfigurieren Sie Ihre %s.
+CONFIGURED_DEVICE_INSTRUCTIONS=%s und Anleitung konfiguriert
+DEVICE_ICON=%s Bild
+BASE_TYPE_SH=Basis
EXT_TYPE_SH=Ext.
-PROFILE_TYPE_SH=Profile
-CONFIGURED_DEVICE=Configured Pump
-STATUS_READER_ERROR=Internal %s (or port) error
-ERROR_CONTACTING_DEVICE=We had problem contacting Meter device.\nPlease recheck communication port settings\n(some of cables, can change their address,\nwhen reconnected). Run configuration again\nand problem should be solved!\n
+PROFILE_TYPE_SH=Profil
+CONFIGURED_DEVICE=Pumpe konfiguriert
+STATUS_READER_ERROR=Interner %s (oder Anschluss)-Fehler
+ERROR_CONTACTING_DEVICE=Es ist ein Problem beim Kontaktieren des Messger\u00E4tes aufgetreten.\nBitte pr\u00FCfen Sie die Einstellungen zum Kommunikationsanschluss\n(manche Kabel \u00E4ndern ihre Adresse, wenn sie erneut eingesteckt werden).\nSto\u00DFen Sie dann die Konfiguration erneut an und das Problem sollte behoben sein.
DEVICE_INFO=%s Info
#
# Download [1]
#
-READ_DEVICE_DATA_TITLE=Read Pump Data [%s on %s]
+READ_DEVICE_DATA_TITLE=Pumpendaten auslesen [%s an %s]
#
# Device Configuration [1]
#
-READ_DEVICE_CONFIG_TITLE=Read Pump Configuration [%s on %s]
+READ_DEVICE_CONFIG_TITLE=Pumpeneinstellungen auslesen [%s an %s]
SETTING_GROUP=Setting / Group
#
# Export [1]
#
-EXPORT_DEVICE_DATA=Export %s Data
+EXPORT_DEVICE_DATA=%s Daten exportieren
#
# List [1]
#
-DEVICE_LIST_WEB=Pumps List
+DEVICE_LIST_WEB=Pumpenliste
DEVICE_LIST_WEB_DESC=<html>Pumps list contains most of Pumps (even most of models). For each of this pumps, there is configuration entry, which contains only basic settings for device (profile names, TBR settings, etc). Devices which support download have that shown in selector (DL column). Pumps in list are color coded, and color determines status of devices of selected company. Color coding description is shown at bottom of this page.<br></html>
#
@@ -135,43 +135,43 @@
# Manual Entry [1]
#
NOT_ALL_REQUIRED_VALUES_SET=Not all required entries are selected\nand/or filled in for this type of entry.\nPlease recheck everything and try again.\n
-AVG_BG=Avg BG
-BLOOD_GLUCOSE=Blood Glucose
-BREAD_UNITS=Carbohydrate Units
+AVG_BG=Durchsch. BZ
+BLOOD_GLUCOSE=Blutzucker
+BREAD_UNITS=Kohlenhydrateinheiten
AVG=Avg
INSULIN=Insulin
-TOTAL=Total
+TOTAL=Summe
AVG_INS=Avg Ins
-DOSE_INS=Dose Ins
+DOSE_INS=Dosis Ins
BOLUS=Bolus
BASAL=Basal
-MEALS=Meals
-LOWEST=Lowest
+MEALS=Mahlzeiten
+LOWEST=Niedrigster
STD_DEV=Std Dev
-READINGS=Readings
+READINGS=Messungen
HIGHEST=Highest
DOSE=Dose
-SUM=Sum
+SUM=Summe
FOOD=Food
IMMEDIATE_AMOUNT=Immediate Amount
PUMP_DAILY_OVERVIEW=Pump Daily Stats
-DATE=Date
-TIME=Time
-ADD_ROW=Add Pump Data
-EDIT_ROW=Edit Pump Data
+DATE=Datum
+TIME=Zeit
+ADD_ROW=Pumpendaten hinzuf\u00FCgen
+EDIT_ROW=Pumpendaten \u00E4ndern
DELETE_MANY_ADDITIONAL_DATA=<html>There are many additional data entries under<br>this item. Are you sure you want to delete<br>them all?<br></html>
# table
BASE_TYPE=Base Type
-SUB_TYPE=Sub-Type
+SUB_TYPE=Untertyp
ADDITIONAL=Additional
# parametes
ADD_DATA_ACTIVITY=Activity
ADD_DATA_COMMENT=Comment
ADD_DATA_BG=Blood Glucose
-ADD_DATA_URINE=Urine
-ADD_DATA_CH=Carbohydrates
+ADD_DATA_URINE=Urin
+ADD_DATA_CH=Kohlenhydrate
ADD_DATA_FOOD_DB=Food from Db (and CH)
ADD_DATA_FOOD_DESC=Food by Description (and CH)
SELECT_SUBTYPE=Select Sub-type
@@ -220,9 +220,9 @@
# parameters
ACTIVITY=Activity
-COMMENT=Comment
-URINE=Urine
-CH_LONG=Carbohydrates
+COMMENT=Kommentar
+URINE=Urin
+CH_LONG=Kohlenhydrate
#
# Pump Basal [1]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ru...@us...> - 2014-09-05 14:43:43
|
Revision: 1303
http://sourceforge.net/p/ggc/code/1303
Author: rumbi
Date: 2014-09-05 14:43:39 +0000 (Fri, 05 Sep 2014)
Log Message:
-----------
RR:
- better translations for a string
- not all settings should be shared - remove and exclude the ones that shouldn't
Modified Paths:
--------------
trunk/ggc-core/src/GGC_de.properties
trunk/ggc-language_tool/active_translations/de/GGCPumpTool_de.properties
trunk/ggc-language_tool/active_translations/de/GGC_de.properties
Added Paths:
-----------
trunk/ggc-core/.settings/org.eclipse.core.resources.prefs
Removed Paths:
-------------
trunk/ggc-core/.settings/org.eclipse.core.runtime.prefs
trunk/ggc-core/.settings/org.eclipse.jdt.core.prefs
Property Changed:
----------------
trunk/ggc-core/.settings/
Index: trunk/ggc-core/.settings
===================================================================
--- trunk/ggc-core/.settings 2014-09-05 14:36:46 UTC (rev 1302)
+++ trunk/ggc-core/.settings 2014-09-05 14:43:39 UTC (rev 1303)
Property changes on: trunk/ggc-core/.settings
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+org.eclipse.m2e.core.prefs
Added: trunk/ggc-core/.settings/org.eclipse.core.resources.prefs
===================================================================
--- trunk/ggc-core/.settings/org.eclipse.core.resources.prefs (rev 0)
+++ trunk/ggc-core/.settings/org.eclipse.core.resources.prefs 2014-09-05 14:43:39 UTC (rev 1303)
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
+encoding/src=UTF-8
Deleted: trunk/ggc-core/.settings/org.eclipse.core.runtime.prefs
===================================================================
--- trunk/ggc-core/.settings/org.eclipse.core.runtime.prefs 2014-09-05 14:36:46 UTC (rev 1302)
+++ trunk/ggc-core/.settings/org.eclipse.core.runtime.prefs 2014-09-05 14:43:39 UTC (rev 1303)
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-line.separator=\n
Deleted: trunk/ggc-core/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/ggc-core/.settings/org.eclipse.jdt.core.prefs 2014-09-05 14:36:46 UTC (rev 1302)
+++ trunk/ggc-core/.settings/org.eclipse.jdt.core.prefs 2014-09-05 14:43:39 UTC (rev 1303)
@@ -1,5 +0,0 @@
-#Tue Jun 10 20:23:38 CEST 2014
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
Modified: trunk/ggc-core/src/GGC_de.properties
===================================================================
--- trunk/ggc-core/src/GGC_de.properties 2014-09-05 14:36:46 UTC (rev 1302)
+++ trunk/ggc-core/src/GGC_de.properties 2014-09-05 14:43:39 UTC (rev 1303)
@@ -5,14 +5,14 @@
# ### Language: German ###
# ### Created by: Reinhold Rumberger (ru...@us...)###
# ### Version: 0.5 ###
-# ### Last change: 20.10.2011 14:39:18 ###
+# ### Last change: 02.05.2013 11:05:20 ###
# ######################################################################
#
#
# Translation status:
# Words/expressions: 648
-# Not translated: 99 (15 %)
-# Need to be checked: 107 (16 %)
+# Not translated: 96 (15 %)
+# Need to be checked: 110 (17 %)
#
# Translated: 442 (68 %)
#
@@ -142,7 +142,7 @@
HELP=Hilfe
ADD_NEW_VALUES=Neue Werte eintragen
COURSEGRAPHFRAME=Verlaufsdiagramm
-FREQGRAPHFRAME=Frequency Graph
+FREQGRAPHFRAME=Frequenzdiagramm
GRAPH=Diagramm
ADD_NEW_ROW_TO_TABLE=F\u00FCgt eine neue Wertereihe in die Tabelle ein.
DELETE_SELECTED_ROWS=L\u00F6sche ausgew\u00E4hlte Zeilen.
@@ -497,7 +497,7 @@
DB_TOOL=Database Hibernate Tool
DB_CONFIGURATION=Datenbankeinstellungen
DB_PRESS_HELP=Klicken Sie auf den Hilfe-Knopf um detaillierte Informationen zu den Verbindungseinstellungen zu bekommen.
-DB_CONFIG_DESC=<html><head></head><body><p>This is for configuring your database to work with your application. Please set all settings correctly, and then try to connect to the database (you must have the database configured with the correct username, password and database name). If the connection is successful, your settings are OK.</p><p>Now you are ready to create tables with the help of hibernate. You must have all jars included in the classpath before you start the second option (Init Database). You must be careful. If you have the database already set up and filled, 'Init Database' will destroy all data.<p><body><html>
+DB_CONFIG_DESC=<html><head></head><body><p>Dieses Tool ist daf\u00FCr da, Ihre Datenbank f\u00FCr diese Anwendung zu konfigurieren. Bitte setzen Sie alle Einstellungsmöglichkeiten korrekt und versuchen Sie dann, eine Verbindung mit der Datenbank herzustellen (Benutzername, Passwort und Datenbank Name müssen korrekt sein). Ist der Verbindungsversuch erfolgreich, stimmen die Einstellungen.</p><p>Jetzt sind Sie bereit, Tabellen mit Hilfe von Hibernate zu erstellen.. Sie müssen alle JARs zum Classpath hinzufügen, bevor Sie die zweite Option (Datenbank initialisieren) starten. Sie müssen vorsichtig sein! Wenn Sie die Datenbank bereits eingerichtet und mit Daten befüllt haben, wird "Datenbank initialisieren" alle Daten zerstören.<p><body><html>
DATABASE_TYPE=DB-Typ
DATABASE_CLASSNAME=DB-Klasse
HIBERNATE_DIALECT=Hibernate Dialekt
@@ -553,12 +553,12 @@
PROPERTY=Eigenschaft
VALUE=Wert
LICENCE=Lizenz:
-CREDITS=Danksagungen
+CREDITS=Mitwirkende
LIBRARIES=Bibliotheken
MAIN=Main
ABOUT_GGC=\u00DCber GNU Gluco Control
GGC_DEVELOPMENT_TEAM=GGC-Entwicklungsteam
-SEE_CREDITS=(siehe Danksagungen)
+SEE_CREDITS=(siehe Mitwirkende)
GGC_TITLE=GNU Gluco Control
CURRENT_DEVELOPERS=Aktive Entwickler
PREVIOUS_DEVELOPERS=Ehemalige Entwickler
@@ -728,8 +728,8 @@
#
# Tools [1]
#
-METERS_PLUGIN=Messger\u00E4te Plug-in
-PUMPS_PLUGIN=Pumpen Plug-in
+METERS_PLUGIN=Messger\u00E4te-Plug-in
+PUMPS_PLUGIN=Pumpen-Plug-in
CGMS_PLUGIN=CGMS Tool Plug-in
NUTRITION_PLUGIN=Nutrition Tool Plug-in
STATUS_NOT_INSTALLED=Nicht installiert
@@ -828,7 +828,7 @@
# Plug-In [1]
#
DEVICE_METER=Meter
-DEVICE_PUMP=Pump
+DEVICE_PUMP=Pumpe
DEVICE_CGMS=CGMS
PLUGIN_NOT_INSTALLED=Plugin nicht installiert.
PLUGIN_NA=Plugin nicht verf\u00FCgbar.
Modified: trunk/ggc-language_tool/active_translations/de/GGCPumpTool_de.properties
===================================================================
--- trunk/ggc-language_tool/active_translations/de/GGCPumpTool_de.properties 2014-09-05 14:36:46 UTC (rev 1302)
+++ trunk/ggc-language_tool/active_translations/de/GGCPumpTool_de.properties 2014-09-05 14:43:39 UTC (rev 1303)
@@ -69,7 +69,7 @@
MN_PUMPS_ADDITIONAL_DATA=Zus\u00E4tzliche Daten
MN_PUMPS_ADDITIONAL_DATA_DESC=Eintragung zus\u00E4tzlicher Daten (BZ, Sport, ...)
MN_PUMPS_ABOUT=\u00DCber...
-MN_PUMPS_ABOUT_DESC=\u00DCber das Pumpen-Plugin (Copyright, Funktionen, Danksagungen,...)
+MN_PUMPS_ABOUT_DESC=\u00DCber das Pumpen-Plugin (Copyright, Funktionen, Mitwirkende,...)
MN_PUMPS_READ_DATA=Daten auslesen
MN_PUMPS_READ_DATA_DESC=Daten von der Pumpe auslesen
MN_PUMPS_READ_CONFIG=Einstellungen auslesen
Modified: trunk/ggc-language_tool/active_translations/de/GGC_de.properties
===================================================================
--- trunk/ggc-language_tool/active_translations/de/GGC_de.properties 2014-09-05 14:36:46 UTC (rev 1302)
+++ trunk/ggc-language_tool/active_translations/de/GGC_de.properties 2014-09-05 14:43:39 UTC (rev 1303)
@@ -553,12 +553,12 @@
PROPERTY=Eigenschaft
VALUE=Wert
LICENCE=Lizenz:
-CREDITS=Danksagungen
+CREDITS=Mitwirkende
LIBRARIES=Bibliotheken
MAIN=Main
ABOUT_GGC=\u00DCber GNU Gluco Control
GGC_DEVELOPMENT_TEAM=GGC-Entwicklungsteam
-SEE_CREDITS=(siehe Danksagungen)
+SEE_CREDITS=(siehe Mitwirkende)
GGC_TITLE=GNU Gluco Control
CURRENT_DEVELOPERS=Aktive Entwickler
PREVIOUS_DEVELOPERS=Ehemalige Entwickler
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ru...@us...> - 2014-09-05 14:46:50
|
Revision: 1304
http://sourceforge.net/p/ggc/code/1304
Author: rumbi
Date: 2014-09-05 14:46:42 +0000 (Fri, 05 Sep 2014)
Log Message:
-----------
RR: not all settings should be shared - remove and exclude the ones that shouldn't
Property Changed:
----------------
trunk/ggc-cgm/.settings/
trunk/ggc-desktop/.settings/
trunk/ggc-meter/.settings/
trunk/ggc-nutri/.settings/
trunk/ggc-plugin_base/.settings/
trunk/ggc-pump/.settings/
Index: trunk/ggc-cgm/.settings
===================================================================
--- trunk/ggc-cgm/.settings 2014-09-05 14:43:39 UTC (rev 1303)
+++ trunk/ggc-cgm/.settings 2014-09-05 14:46:42 UTC (rev 1304)
Property changes on: trunk/ggc-cgm/.settings
___________________________________________________________________
Modified: svn:ignore
## -1 +1,3 ##
org.eclipse.m2e.core.prefs
+org.eclipse.core.runtime.prefs
+org.eclipse.jdt.core.prefs
Index: trunk/ggc-desktop/.settings
===================================================================
--- trunk/ggc-desktop/.settings 2014-09-05 14:43:39 UTC (rev 1303)
+++ trunk/ggc-desktop/.settings 2014-09-05 14:46:42 UTC (rev 1304)
Property changes on: trunk/ggc-desktop/.settings
___________________________________________________________________
Modified: svn:ignore
## -1 +1,3 ##
org.eclipse.m2e.core.prefs
+org.eclipse.core.runtime.prefs
+org.eclipse.jdt.core.prefs
Index: trunk/ggc-meter/.settings
===================================================================
--- trunk/ggc-meter/.settings 2014-09-05 14:43:39 UTC (rev 1303)
+++ trunk/ggc-meter/.settings 2014-09-05 14:46:42 UTC (rev 1304)
Property changes on: trunk/ggc-meter/.settings
___________________________________________________________________
Modified: svn:ignore
## -1 +1,3 ##
org.eclipse.m2e.core.prefs
+org.eclipse.core.runtime.prefs
+org.eclipse.jdt.core.prefs
Index: trunk/ggc-nutri/.settings
===================================================================
--- trunk/ggc-nutri/.settings 2014-09-05 14:43:39 UTC (rev 1303)
+++ trunk/ggc-nutri/.settings 2014-09-05 14:46:42 UTC (rev 1304)
Property changes on: trunk/ggc-nutri/.settings
___________________________________________________________________
Modified: svn:ignore
## -1 +1,2 ##
org.eclipse.m2e.core.prefs
+org.eclipse.jdt.core.prefs
Index: trunk/ggc-plugin_base/.settings
===================================================================
--- trunk/ggc-plugin_base/.settings 2014-09-05 14:43:39 UTC (rev 1303)
+++ trunk/ggc-plugin_base/.settings 2014-09-05 14:46:42 UTC (rev 1304)
Property changes on: trunk/ggc-plugin_base/.settings
___________________________________________________________________
Modified: svn:ignore
## -1 +1,2 ##
org.eclipse.m2e.core.prefs
+org.eclipse.jdt.core.prefs
Index: trunk/ggc-pump/.settings
===================================================================
--- trunk/ggc-pump/.settings 2014-09-05 14:43:39 UTC (rev 1303)
+++ trunk/ggc-pump/.settings 2014-09-05 14:46:42 UTC (rev 1304)
Property changes on: trunk/ggc-pump/.settings
___________________________________________________________________
Modified: svn:ignore
## -1 +1,3 ##
org.eclipse.m2e.core.prefs
+org.eclipse.core.runtime.prefs
+org.eclipse.jdt.core.prefs
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2014-09-18 20:28:16
|
Revision: 1310
http://sourceforge.net/p/ggc/code/1310
Author: andyrozman
Date: 2014-09-18 20:28:11 +0000 (Thu, 18 Sep 2014)
Log Message:
-----------
- Fix Combo implementation (TBR CANCELED)
- added temporary pom entries for Xml Parser
Modified Paths:
--------------
trunk/ggc-plugin_base/pom.xml
trunk/ggc-pump/pom.xml
trunk/ggc-pump/src/ggc/pump/device/accuchek/AccuChekSmartPixPump.java
trunk/ggc-pump/src/ggc/pump/test/PumpConsoleTester.java
Modified: trunk/ggc-plugin_base/pom.xml
===================================================================
--- trunk/ggc-plugin_base/pom.xml 2014-09-14 17:59:07 UTC (rev 1309)
+++ trunk/ggc-plugin_base/pom.xml 2014-09-18 20:28:11 UTC (rev 1310)
@@ -79,8 +79,14 @@
<version>3.9.3</version>
</dependency>
+<dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ <version>1.1.6</version>
+</dependency>
+
</dependencies>
Modified: trunk/ggc-pump/pom.xml
===================================================================
--- trunk/ggc-pump/pom.xml 2014-09-14 17:59:07 UTC (rev 1309)
+++ trunk/ggc-pump/pom.xml 2014-09-18 20:28:11 UTC (rev 1310)
@@ -91,6 +91,14 @@
</dependency>
+<dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ <version>1.1.6</version>
+</dependency>
+
+
+
</dependencies>
Modified: trunk/ggc-pump/src/ggc/pump/device/accuchek/AccuChekSmartPixPump.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/device/accuchek/AccuChekSmartPixPump.java 2014-09-14 17:59:07 UTC (rev 1309)
+++ trunk/ggc-pump/src/ggc/pump/device/accuchek/AccuChekSmartPixPump.java 2014-09-18 20:28:11 UTC (rev 1310)
@@ -27,9 +27,9 @@
import java.io.File;
import java.util.ArrayList;
+import java.util.Calendar;
import java.util.Collections;
import java.util.Enumeration;
-import java.util.GregorianCalendar;
import java.util.Hashtable;
import java.util.List;
@@ -39,52 +39,51 @@
import org.dom4j.Element;
import org.dom4j.Node;
+import com.atech.utils.ATDataAccessAbstract;
import com.atech.utils.data.ATechDate;
/**
- * Application: GGC - GNU Gluco Control
- * Plug-in: Pump Tool (support for Pump devices)
+ * Application: GGC - GNU Gluco Control Plug-in: Pump Tool (support for Pump
+ * devices)
*
- * See AUTHORS for copyright information.
+ * See AUTHORS for copyright information.
*
- * 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 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.
+ * 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
+ * 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
*
- * Filename: AccuChekSmartPixPump
- * Description: Accu-Chek SmartPix Processor for Pumps
+ * Filename: AccuChekSmartPixPump Description: Accu-Chek SmartPix Processor for
+ * Pumps
*
- * Author: Andy {an...@at...}
+ * Author: Andy {an...@at...}
*/
-
public abstract class AccuChekSmartPixPump extends AccuChekSmartPix implements PumpInterface //extends AbstractXmlMeter //mlProtocol //implements SelectableInterface
{
-
+
private static Log log = LogFactory.getLog(AccuChekSmartPixPump.class);
-
- private Hashtable<String,Integer> alarm_mappings = null;
- private Hashtable<String,Integer> event_mappings = null;
- private Hashtable<String,Integer> error_mappings = null;
- private Hashtable<String,Integer> bolus_mappings = null;
- private Hashtable<String,Integer> report_mappings = null;
- private Hashtable<String,Integer> basal_mappings = null;
-
-
+
+ private Hashtable<String, Integer> alarm_mappings = null;
+ private Hashtable<String, Integer> event_mappings = null;
+ private Hashtable<String, Integer> error_mappings = null;
+ private Hashtable<String, Integer> bolus_mappings = null;
+ private Hashtable<String, Integer> report_mappings = null;
+ private Hashtable<String, Integer> basal_mappings = null;
+
/**
* Constructor
*
- * @param cmp
+ * @param cmp
*/
public AccuChekSmartPixPump(AbstractDeviceCompany cmp)
{
@@ -92,9 +91,7 @@
this.loadPumpSpecificValues();
this.setDeviceType(cmp.getName(), getName(), DeviceAbstract.DEVICE_TYPE_PUMP);
}
-
-
-
+
/**
* Constructor
*
@@ -105,27 +102,23 @@
{
this(conn_parameter, writer, DataAccessPump.getInstance());
}
-
-
+
/**
* Constructor
*
* @param conn_parameter
* @param writer
- * @param da
+ * @param da
*/
public AccuChekSmartPixPump(String conn_parameter, OutputWriter writer, DataAccessPlugInBase da)
{
- super(conn_parameter, writer, da);
+ super(conn_parameter, writer, da);
loadPumpSpecificValues();
this.setDeviceType("Accu-Chek/Roche", getName(), DeviceAbstract.DEVICE_TYPE_PUMP);
}
-
-
-
-
+
/**
- * getDeviceId - Get Device Id
+ * getDeviceId - Get Device Id
*
* @return id of device
*/
@@ -134,11 +127,8 @@
return PumpDevicesIds.ROCHE_SMARTPIX_DEVICE;
}
-
-
-
/**
- * getCompanyId - Get Company Id
+ * getCompanyId - Get Company Id
*
* @return id of company
*/
@@ -146,17 +136,13 @@
{
return PumpDevicesIds.COMPANY_ROCHE;
}
-
-
-
-
-
+
Document document;
-
/**
* Process Xml
*/
+ @Override
public void processXml(File file)
{
try
@@ -167,66 +153,58 @@
getPumpDeviceInfo();
this.output_writer.writeDeviceIdentification();
-
+
readPumpData();
}
- catch(Exception ex)
+ catch (Exception ex)
{
System.out.println("Exception on testXml: " + ex);
ex.printStackTrace();
-
+
}
}
-
-
-
-
-
-
/**
- * Letter with which report starts (I for insulin pumps, G for glucose meters)
+ * Letter with which report starts (I for insulin pumps, G for glucose
+ * meters)
*
* @return
*/
+ @Override
public String getFirstLetterForReport()
{
return "I";
}
-
-
-
+
/**
- * Get Pix Device Info
+ * Get Pix Device Info
*/
private void getPixDeviceInfo()
{
DeviceIdentification di = this.output_writer.getDeviceIdentification();
-
+
Node nd = getNode("IMPORT/ACSPIX");
-
+
StringBuffer sb = new StringBuffer();
-
- Element e = (Element)nd;
-
+
+ Element e = (Element) nd;
+
String s = "Accu-Chek Smart Pix Device [" + e.attributeValue("Type") + "]";
sb.append(s + "\n");
di.company = s;
-
+
StringBuilder sb2 = new StringBuilder();
-
+
sb2.append("Version v" + e.attributeValue("Ver"));
sb2.append(" [S/N=" + e.attributeValue("SN") + "]");
-
di.device_selected = sb2.toString();
-
+
sb.append(di.device_selected);
-
+
}
-
private void getPumpDeviceInfo()
{
DeviceIdentification di = this.output_writer.getDeviceIdentification();
@@ -234,18 +212,15 @@
Element el = getElement("IMPORT/IP");
StringBuffer sb = new StringBuffer();
-
+
sb.append("Pump Device: Accu-Chek " + el.attributeValue("Name"));
sb.append("\nS/N=" + el.attributeValue("SN")); // + ", BG Unit: ");
sb.append(", Time on device: " + el.attributeValue("Tm") + " " + el.attributeValue("Dt"));
di.device_identified = sb.toString();
-
+
}
-
-
-
private void readPumpData()
{
ArrayList<PumpValuesEntry> list = new ArrayList<PumpValuesEntry>();
@@ -253,7 +228,7 @@
//log.info(" -- Basals --");
list.addAll(getBasals());
//System.out.println("Basals: " + list.size());
-
+
//log.info(" -- Boluses --");
list.addAll(getBoluses());
//System.out.println("Boluses: " + list.size());
@@ -265,30 +240,29 @@
//log.info(" -- Profiles --");
//list.addAll(this.getPumpProfiles());
ArrayList<PumpValuesEntryProfile> list_profiles = this.getPumpProfiles();
-
+
/*
- System.out.println(" -- Basals (run 2) --");
- list.addAll(getSpecificElements2("BASAL"));
- System.out.println("Basals2: " + list.size());
- */
- if (first_basal !=null)
+ * System.out.println(" -- Basals (run 2) --");
+ * list.addAll(getSpecificElements2("BASAL"));
+ * System.out.println("Basals2: " + list.size());
+ */
+ if (first_basal != null)
+ {
list.add(first_basal);
-
-
- for(int i=0; i<list.size(); i++)
+ }
+
+ for (int i = 0; i < list.size(); i++)
{
this.output_writer.writeData(list.get(i));
}
-
-
- for(int i=0; i<list_profiles.size(); i++)
+
+ for (int i = 0; i < list_profiles.size(); i++)
{
this.output_writer.writeData(list_profiles.get(i));
}
-
+
}
-
/**
* Main method for reading Profile Pattern/Event entries
*/
@@ -296,103 +270,103 @@
private ArrayList<PumpValuesEntryProfile> getPumpProfiles()
{
List<Node> nodelist;
-
+
//boolean was_broken = true;
log.info("Profile processing - START");
-
- Element id = (Element)this.getNode("IMPORT/IP");
-// System.out.println("" + id.attributeValue("Dt") + id.attributeValue("Tm"));
+
+ Element id = (Element) this.getNode("IMPORT/IP");
+ // System.out.println("" + id.attributeValue("Dt") + id.attributeValue("Tm"));
ATechDate dt = this.getDateTime(id.attributeValue("Dt"), id.attributeValue("Tm"));
-
// 1. read initial
log.info("STEP 1 - Read inital profiles");
- Hashtable<String,Profile> original_profiles = new Hashtable<String,Profile>();
+ Hashtable<String, Profile> original_profiles = new Hashtable<String, Profile>();
nodelist = getSpecificDataChildren("IMPORT/IP/IPPROFILE");
-
+
//System.out.println("Length: "+ nodelist.size());
-
- for(int i=0; i<nodelist.size(); i++)
+
+ for (int i = 0; i < nodelist.size(); i++)
{
- Element n = (Element)nodelist.get(i);
-
+ Element n = (Element) nodelist.get(i);
+
Profile profile = new Profile();
profile.profile_id = n.attributeValue("Name");
-
- List<Node> nlist2 = (List<Node>)n.elements();
-
- for(int j=0; j<nlist2.size(); j++)
+
+ List<Node> nlist2 = n.elements();
+
+ for (int j = 0; j < nlist2.size(); j++)
{
- Element n2 = (Element)nlist2.get(j);
-
+ Element n2 = (Element) nlist2.get(j);
+
ProfileSubPattern psp = new ProfileSubPattern();
int num = Integer.parseInt(n2.attributeValue("Number"));
-
- psp.time_start = (num-1) * 100;
- psp.time_end = ((num-1) * 100) + 59;
+
+ psp.time_start = (num - 1) * 100;
+ psp.time_end = ((num - 1) * 100) + 59;
psp.amount = Float.parseFloat(n2.attributeValue("IU"));
-
+
profile.add(psp);
}
-
+
profile.packProfiles();
profile.isCompleteProfile();
-
+
original_profiles.put(profile.profile_id, profile);
}
-
-
+
// 2. read all basal entries (we don't sort them now, we just put them all together, also events)
log.info("STEP 2 - Reading profile data");
-
- List<Node> lst = getSpecificDataChildren("IMPORT/IPDATA/BASAL" );
-
- Hashtable<Long,Profile> profiles_raw = new Hashtable<Long,Profile>();
-
-
- for(int i=0; i<lst.size(); i++)
+
+ List<Node> lst = getSpecificDataChildren("IMPORT/IPDATA/BASAL");
+
+ Hashtable<Long, Profile> profiles_raw = new Hashtable<Long, Profile>();
+
+ for (int i = 0; i < lst.size(); i++)
{
- Element el = (Element)lst.get(i);
-
+ Element el = (Element) lst.get(i);
+
ProfileSubEntry pse = this.resolveBasalProfilePatterns(el);
- if ((pse==null) || (pse.profile_id==null))
+ if ((pse == null) || (pse.profile_id == null))
+ {
continue;
-
- long dt_current = this.getDateFromDT(this.getDateTime(el.attributeValue("Dt"), el.attributeValue("Tm")).getATDateTimeAsLong());
-
+ }
+
+ long dt_current = this.getDateFromDT(this.getDateTime(el.attributeValue("Dt"), el.attributeValue("Tm"))
+ .getATDateTimeAsLong());
+
if (!profiles_raw.containsKey(dt_current))
{
Profile p = new Profile();
p.date_at = dt_current;
p.profile_id = pse.profile_id;
p.add(pse);
-
+
profiles_raw.put(dt_current, p);
}
else
+ {
profiles_raw.get(dt_current).add(pse);
+ }
}
-
-
+
// 3. sort profile_entries into different profiles and patterns
log.info("STEP 3 - Remove incompletes and group profiles by name");
-
+
// remove incomplete profiles, and group profiles by name
-
- Hashtable<String,ArrayList<Profile>> profiles_sorted = new Hashtable<String,ArrayList<Profile>>();
+
+ Hashtable<String, ArrayList<Profile>> profiles_sorted = new Hashtable<String, ArrayList<Profile>>();
ArrayList<ProfileSubOther> profile_changes = new ArrayList<ProfileSubOther>();
-
- for(Enumeration<Long> en = profiles_raw.keys(); en.hasMoreElements(); )
+
+ for (Enumeration<Long> en = profiles_raw.keys(); en.hasMoreElements();)
{
Long key = en.nextElement();
Profile profile = profiles_raw.get(key);
profile.fillEndTimes();
-
+
profile_changes.addAll(profile.other_entries);
-
-
+
if (profile.isCompleteProfile())
{
//System.out.println("Profile id: " + profile.profile_id);
@@ -408,19 +382,18 @@
}
}
}
-
-
-
+
// 4 - Create changes list
log.info("STEP 4 - Create changes list");
- Hashtable<Long,ArrayList<ProfileSubOther>> profile_changes_v2 = new Hashtable<Long,ArrayList<ProfileSubOther>>();
-
- for(int i=0; i<profile_changes.size(); i++)
+ Hashtable<Long, ArrayList<ProfileSubOther>> profile_changes_v2 = new Hashtable<Long, ArrayList<ProfileSubOther>>();
+
+ for (int i = 0; i < profile_changes.size(); i++)
{
ProfileSubOther pchan = profile_changes.get(i);
- long date = ATechDate.convertATDate(pchan.time_event, ATechDate.FORMAT_DATE_AND_TIME_S, ATechDate.FORMAT_DATE_ONLY);
-
+ long date = ATechDate.convertATDate(pchan.time_event, ATechDate.FORMAT_DATE_AND_TIME_S,
+ ATechDate.FORMAT_DATE_ONLY);
+
if (profile_changes_v2.containsKey(date))
{
profile_changes_v2.get(date).add(pchan);
@@ -434,15 +407,14 @@
}
profile_changes = null;
- Hashtable<Long,ProfileSubOther> profile_changes_v3 = new Hashtable<Long,ProfileSubOther>();
-
-
- for(Enumeration<Long> en = profile_changes_v2.keys(); en.hasMoreElements(); )
+ Hashtable<Long, ProfileSubOther> profile_changes_v3 = new Hashtable<Long, ProfileSubOther>();
+
+ for (Enumeration<Long> en = profile_changes_v2.keys(); en.hasMoreElements();)
{
long key = en.nextElement();
-
- if (profile_changes_v2.get(key).size()==1)
+
+ if (profile_changes_v2.get(key).size() == 1)
{
profile_changes_v3.put(key, profile_changes_v2.get(key).get(0));
}
@@ -453,78 +425,77 @@
profile_changes_v3.put(key, al.get(0));
}
}
-
+
profile_changes_v2 = null;
-
// 5 - Create actual profile list and export it
log.info("STEP 5 - Create actual active profile list");
-
-
+
ArrayList<Profile> active_profiles = new ArrayList<Profile>();
- Hashtable<String,Profile> current_profiles = new Hashtable<String,Profile>();
-
- for(Enumeration<String> en = profiles_sorted.keys(); en.hasMoreElements(); )
+ Hashtable<String, Profile> current_profiles = new Hashtable<String, Profile>();
+
+ for (Enumeration<String> en = profiles_sorted.keys(); en.hasMoreElements();)
{
String key = en.nextElement();
current_profiles.put(key, original_profiles.get(key));
}
-
+
m_da.setSortSetting("Profile", "DESC");
-
- for(Enumeration<String> en = current_profiles.keys(); en.hasMoreElements(); )
+
+ for (Enumeration<String> en = current_profiles.keys(); en.hasMoreElements();)
{
String key = en.nextElement();
ArrayList<Profile> profiles = profiles_sorted.get(key);
-
+
Collections.sort(profiles);
-
-
- for(int i=0; i<profiles.size(); i++)
+
+ for (int i = 0; i < profiles.size(); i++)
{
Profile p_curr = profiles.get(i);
-
- if (i==0)
+
+ if (i == 0)
{
- if (p_curr.date_at==ATechDate.convertATDate(dt.getATDateTimeAsLong(), ATechDate.FORMAT_DATE_AND_TIME_S, ATechDate.FORMAT_DATE_ONLY))
+ if (p_curr.date_at == ATechDate.convertATDate(dt.getATDateTimeAsLong(),
+ ATechDate.FORMAT_DATE_AND_TIME_S, ATechDate.FORMAT_DATE_ONLY))
+ {
continue;
+ }
}
-
+
if (current_profiles.get(p_curr.profile_id).equals(p_curr))
{
- current_profiles.get(p_curr.profile_id).profile_active_from = (p_curr.date_at * 1000000);
+ current_profiles.get(p_curr.profile_id).profile_active_from = (p_curr.date_at * 1000000);
}
else
{
active_profiles.add(current_profiles.get(p_curr.profile_id));
current_profiles.remove(p_curr.profile_id);
current_profiles.put(p_curr.profile_id, p_curr);
- current_profiles.get(p_curr.profile_id).profile_active_till = ((p_curr.date_at * 1000000) + 235900);
- current_profiles.get(p_curr.profile_id).profile_active_from = (p_curr.date_at * 1000000);
+ current_profiles.get(p_curr.profile_id).profile_active_till = ((p_curr.date_at * 1000000) + 235900);
+ current_profiles.get(p_curr.profile_id).profile_active_from = (p_curr.date_at * 1000000);
}
}
}
-
// 6 - Profile changes
log.info("STEP 6 - Check profiles (dates) and save (export) data");
-
-
- for(int j=0; j<active_profiles.size(); j++)
+
+ for (int j = 0; j < active_profiles.size(); j++)
{
Profile p_curr = active_profiles.get(j);
-
- long date = ATechDate.convertATDate(p_curr.profile_active_till, ATechDate.FORMAT_DATE_AND_TIME_S, ATechDate.FORMAT_DATE_ONLY);
-
+
+ long date = ATechDate.convertATDate(p_curr.profile_active_till, ATechDate.FORMAT_DATE_AND_TIME_S,
+ ATechDate.FORMAT_DATE_ONLY);
+
if (profile_changes_v3.containsKey(date))
{
- ProfileSubOther chan = profile_changes_v3.get(date);
+ ProfileSubOther chan = profile_changes_v3.get(date);
p_curr.profile_active_from = chan.time_event;
-
- if (j!=(active_profiles.size()-1))
+
+ if (j != (active_profiles.size() - 1))
{
ATechDate aat = new ATechDate(ATechDate.FORMAT_DATE_AND_TIME_S, chan.time_event);
- aat.add(GregorianCalendar.MINUTE, -1);
+ aat.add(Calendar.MINUTE, -1);
int k = j + 1;
active_profiles.get(k).profile_active_till = aat.getATDateTimeAsLong();
j++;
@@ -534,124 +505,111 @@
// 7 - Profile export
log.info("STEP 7 - Profile export");
-
+
ArrayList<PumpValuesEntryProfile> pvep = new ArrayList<PumpValuesEntryProfile>();
- for(int i=0; i<active_profiles.size(); i++)
+ for (int i = 0; i < active_profiles.size(); i++)
{
Profile p = active_profiles.get(i);
-
-// p.profile_active_from = ATechDate.convertATDate(p.profile_active_from, ATechDate.FORMAT_DATE_AND_TIME_S, ATechDate.FORMAT_DATE_AND_TIME_MIN);
-// p.profile_active_till = ATechDate.convertATDate(p.profile_active_till, ATechDate.FORMAT_DATE_AND_TIME_S, ATechDate.FORMAT_DATE_AND_TIME_MIN);
-
+
+ // p.profile_active_from = ATechDate.convertATDate(p.profile_active_from, ATechDate.FORMAT_DATE_AND_TIME_S, ATechDate.FORMAT_DATE_AND_TIME_MIN);
+ // p.profile_active_till = ATechDate.convertATDate(p.profile_active_till, ATechDate.FORMAT_DATE_AND_TIME_S, ATechDate.FORMAT_DATE_AND_TIME_MIN);
+
pvep.add(p.createDbObject());
}
-
+
log.info("Profile processing - END");
-
return pvep;
-
+
}
-
-
-
+
/*
- private void readPumpDataTest()
- {
- ArrayList<PumpValuesEntry> list = new ArrayList<PumpValuesEntry>();
-
- //System.out.println(" -- Basals --");
- //list.addAll(getBasals());
-
-
- list.addAll(getProfileElements());
-
- if (first_basal !=null)
- list.add(first_basal);
-
- }*/
-
-
-
-
+ * private void readPumpDataTest() { ArrayList<PumpValuesEntry> list = new
+ * ArrayList<PumpValuesEntry>();
+ *
+ * //System.out.println(" -- Basals --"); //list.addAll(getBasals());
+ *
+ *
+ * list.addAll(getProfileElements());
+ *
+ * if (first_basal !=null) list.add(first_basal);
+ *
+ * }
+ */
+
private ArrayList<PumpValuesEntry> getBoluses()
{
return getSpecificElements("BOLUS", AccuChekSmartPixPump.TAG_BOLUS);
}
-
private ArrayList<PumpValuesEntry> getBasals()
{
return getSpecificElements("BASAL", AccuChekSmartPixPump.TAG_BASAL);
}
-
-
+
private ArrayList<PumpValuesEntry> getEvents()
{
return getSpecificElements("EVENT", AccuChekSmartPixPump.TAG_EVENT);
}
-
- /**
+ /**
* test
*/
+ @Override
public void test()
{
//readPumpDataTest();
getPumpProfiles();
}
-
-
+
/**
* Tag: Basal
*/
public static final int TAG_BASAL = 1;
-
+
/**
* Tag: Bolus
*/
public static final int TAG_BOLUS = 2;
-
+
/**
* Tag: Event
*/
public static final int TAG_EVENT = 3;
-
-
+
String[] type_desc = { "", "Basal", "Bolus", "Events" };
-
+
private ArrayList<PumpValuesEntry> getSpecificElements(String element, int type)
{
List<Node> lst = getSpecificDataChildren("IMPORT/IPDATA/" + element);
ArrayList<PumpValuesEntry> lst_out = new ArrayList<PumpValuesEntry>();
boolean add = false;
-
+
log.info("Process " + type_desc[type] + " data - START");
-
- for(int i=0; i<lst.size(); i++)
+
+ for (int i = 0; i < lst.size(); i++)
{
- Element el = (Element)lst.get(i);
-
+ Element el = (Element) lst.get(i);
+
PumpValuesEntry pve = new PumpValuesEntry(this.getDeviceSourceName());
pve.setDateTimeObject(this.getDateTime(el.attributeValue("Dt"), el.attributeValue("Tm")));
add = false;
-
- if (type==AccuChekSmartPixPump.TAG_BASAL)
+
+ if (type == AccuChekSmartPixPump.TAG_BASAL)
{
- add = this.resolveBasalBase(pve, el);
+ add = this.resolveBasalBase(pve, el);
}
- else if (type==AccuChekSmartPixPump.TAG_EVENT)
+ else if (type == AccuChekSmartPixPump.TAG_EVENT)
{
add = this.resolveEvent(pve, el);
}
- else if (type==AccuChekSmartPixPump.TAG_BOLUS)
+ else if (type == AccuChekSmartPixPump.TAG_BOLUS)
{
add = this.resolveBolus(pve, el);
}
-
-
+
if (add)
{
// testing only
@@ -662,80 +620,67 @@
}
log.info("Process " + type_desc[type] + " data - END");
-
+
return lst_out;
-
+
}
-
/*
- private ArrayList<PumpValuesEntry> getSpecificElements2(String element)
- {
- List<Node> lst = getSpecificDataChildren("IMPORT/IPDATA/" + element);
- ArrayList<PumpValuesEntry> lst_out = new ArrayList<PumpValuesEntry>();
- boolean add = false;
-
-
- Hashtable<Long,Profile> lst_spec = new Hashtable<Long,Profile>();
-
-
- for(int i=0; i<lst.size(); i++)
- {
- Element el = (Element)lst.get(i);
-
- PumpValuesEntry pve = new PumpValuesEntry(this.getDeviceSourceName());
- pve.setDateTimeObject(this.getDateTime(el.attributeValue("Dt"), el.attributeValue("Tm")));
+ * private ArrayList<PumpValuesEntry> getSpecificElements2(String element) {
+ * List<Node> lst = getSpecificDataChildren("IMPORT/IPDATA/" + element);
+ * ArrayList<PumpValuesEntry> lst_out = new ArrayList<PumpValuesEntry>();
+ * boolean add = false;
+ *
+ *
+ * Hashtable<Long,Profile> lst_spec = new Hashtable<Long,Profile>();
+ *
+ *
+ * for(int i=0; i<lst.size(); i++) { Element el = (Element)lst.get(i);
+ *
+ * PumpValuesEntry pve = new PumpValuesEntry(this.getDeviceSourceName());
+ * pve.setDateTimeObject(this.getDateTime(el.attributeValue("Dt"),
+ * el.attributeValue("Tm")));
+ *
+ * add = this.resolveBasalProfile(pve, el);
+ *
+ * if (add) { // testing only this.output_writer.writeData(pve);
+ *
+ * lst_out.add(pve); } }
+ *
+ * System.out.println("Profiles: " + lst_out.size());
+ *
+ * return lst_out;
+ *
+ * }
+ */
- add = this.resolveBasalProfile(pve, el);
-
- if (add)
- {
- // testing only
- this.output_writer.writeData(pve);
-
- lst_out.add(pve);
- }
- }
-
- System.out.println("Profiles: " + lst_out.size());
-
- return lst_out;
-
- }*/
-
/*
- private ArrayList<PumpValuesEntry> getProfileElements()
- {
- List<Node> lst = getSpecificDataChildren("IMPORT/IPDATA/BASAL"); // + element);
- ArrayList<PumpValuesEntry> lst_out = new ArrayList<PumpValuesEntry>();
- boolean add = false;
-
- for(int i=0; i<lst.size(); i++)
- {
- Element el = (Element)lst.get(i);
-
- PumpValuesEntry pve = new PumpValuesEntry(this.getDeviceSourceName());
- pve.setDateTimeObject(this.getDateTime(el.attributeValue("Dt"), el.attributeValue("Tm")));
+ * private ArrayList<PumpValuesEntry> getProfileElements() { List<Node> lst
+ * = getSpecificDataChildren("IMPORT/IPDATA/BASAL"); // + element);
+ * ArrayList<PumpValuesEntry> lst_out = new ArrayList<PumpValuesEntry>();
+ * boolean add = false;
+ *
+ * for(int i=0; i<lst.size(); i++) { Element el = (Element)lst.get(i);
+ *
+ * PumpValuesEntry pve = new PumpValuesEntry(this.getDeviceSourceName());
+ * pve.setDateTimeObject(this.getDateTime(el.attributeValue("Dt"),
+ * el.attributeValue("Tm")));
+ *
+ * // add = this.resolveBasalProfilePatterns(pve, el);
+ *
+ * if (add) { // testing only // this.output_writer.writeData(pve);
+ *
+ * lst_out.add(pve); } }
+ *
+ * System.out.println("Profiles patterns: " + lst_out.size());
+ *
+ * return lst_out;
+ *
+ * }
+ */
-// add = this.resolveBasalProfilePatterns(pve, el);
-
- if (add)
- {
- // testing only
-// this.output_writer.writeData(pve);
+ private static String PUMP_STOP = "Stop";
- lst_out.add(pve);
- }
- }
-
- System.out.println("Profiles patterns: " + lst_out.size());
-
- return lst_out;
-
- }*/
-
-
-
private boolean resolveBasalBase(PumpValuesEntry pve, Element el)
{
String remark = el.attributeValue("remark");
@@ -743,19 +688,23 @@
String tbrinc = el.attributeValue("TBRinc");
String cbrf = el.attributeValue("cbrf");
String profile = el.attributeValue("profile");
-
+
//System.out.println(el);
-
+
if ((isSet(tbrdec)) || (isSet(tbrinc)))
{
- if ((remark==null) || (remark.trim().length()==0))
+ if ((remark == null) || (remark.trim().length() == 0))
+ {
return false;
-
+ }
+
+ //System.out.println(el);
+
pve.setBaseType(PumpBaseType.PUMP_DATA_BASAL);
pve.setSubType(PumpBasalSubType.PUMP_BASAL_TEMPORARY_BASAL_RATE);
-
+
String v = "";
-
+
if (isSet(tbrdec))
{
v = tbrdec.trim();
@@ -764,17 +713,24 @@
{
v = tbrinc.trim();
}
-
+
// dur 00:01 h
-
- String[] dr = remark.split(" ");
-
- pve.setValue(String.format("DURATION=%s;VALUE=%s",
- dr[1],
- v));
-
+
+ if (PUMP_STOP.equals(remark))
+ {
+ pve.setSubType(PumpBasalSubType.PUMP_BASAL_TEMPORARY_BASAL_RATE_CANCELED);
+ }
+ else
+ {
+ String[] dr = remark.split(" ");
+
+ pve.setValue(String.format("DURATION=%s;VALUE=%s", //
+ dr[1], //
+ v));
+ }
+
//System.out.println("Unknown TBR Event. [remark=" + remark + ",tbrdec=" + tbrdec + ",tbrinc=" + tbrinc + ",value=" + cbrf + "]");
-
+
return true;
}
else if (isSet(remark))
@@ -800,17 +756,20 @@
pve.setSubType(this.getBasalMappings().get(remark));
//System.out.println("Basal Event Unknown [remark=" + remark + "]");
return true;
-
+
}
else
{
if (!remark.contains(" - "))
- System.out.println("Unknown Basal Event. [remark=" + remark + ",tbrdec=" + tbrdec + ",tbrinc=" + tbrinc + ",value=" + cbrf + "]");
+ {
+ System.out.println("Unknown Basal Event. [remark=" + remark + ",tbrdec=" + tbrdec + ",tbrinc="
+ + tbrinc + ",value=" + cbrf + "]");
+ }
return false;
}
}
-
+
//System.out.println("Remark:" + remark);
}
else
@@ -821,69 +780,66 @@
{
}
else
+ {
log.error("Basal Unknown [tbrdec=" + tbrdec + ",tbrinc=" + tbrinc + ",value=" + cbrf + "]");
+ }
}
return false;
-
+
}
-
+
}
-
PumpValuesEntry first_basal = null;
-
-
-
-
- private ProfileSubEntry resolveBasalProfilePatterns(/*PumpValuesEntry pve,*/ Element el)
+
+ private ProfileSubEntry resolveBasalProfilePatterns(/* PumpValuesEntry pve, */Element el)
{
//pve.setDateTimeObject(this.getDateTime(el.attributeValue("Dt"), el.attributeValue("Tm")));
-
+
long dt = this.getDateTime(el.attributeValue("Dt"), el.attributeValue("Tm")).getATDateTimeAsLong();
-
+
String remark = el.attributeValue("remark");
String tbrdec = el.attributeValue("TBRdec");
String tbrinc = el.attributeValue("TBRinc");
String cbrf = el.attributeValue("cbrf");
String profile = el.attributeValue("profile");
-
- /*if ((isSet(tbrdec)) || (isSet(tbrinc)))
- {
- //System.out.println("TBR");
- //System.out.println("" + el);
- return null;
- }
- else*/
-
+
+ /*
+ * if ((isSet(tbrdec)) || (isSet(tbrinc))) {
+ * //System.out.println("TBR"); //System.out.println("" + el); return
+ * null; } else
+ */
+
if (isSet(remark))
{
// all that are special should be removed, all other are checked over events
if (remark.contains("changed"))
{
ProfileSubOther pso = new ProfileSubOther();
-
- pso.time_event = dt;
- pso.event_type = ProfileSubOther.EVENT_PATTERN_CHANGED;
+
+ pso.time_event = dt;
+ pso.event_type = ProfileSubOther.EVENT_PATTERN_CHANGED;
pso.profile_id = profile;
- pso.time_start = (int)ATechDate.convertATDate(dt, ATechDate.FORMAT_DATE_AND_TIME_S, ATechDate.FORMAT_TIME_ONLY_MIN);
-
+ pso.time_start = (int) ATechDate.convertATDate(dt, ATechDate.FORMAT_DATE_AND_TIME_S,
+ ATechDate.FORMAT_TIME_ONLY_MIN);
+
String chh = remark.substring(remark.indexOf("changed") + "changed".length());
chh = chh.trim();
-
+
pso.profile_id = chh;
-
+
//System.out.println("Profile changed : " + chh);
-
+
// TODO: Changed profile
//System.out.println("Basal Changed Unknown [remark=" + remark + "]");
//System.out.println("Basal Rate Changed [datetime=" + pve.getDateTimeObject() + ",remark=" + remark + ",tbrdec=" + tbrdec + ",tbrinc=" + tbrinc + ",value=" + cbrf + "]");
-
+
return pso;
- }
+ }
}
else
{
-
+
if ((isSet(tbrdec)) || (isSet(tbrinc)))
{
return null;
@@ -892,116 +848,81 @@
{
ProfileSubPattern psp = new ProfileSubPattern();
psp.dt_start = dt;
- psp.time_start = (int)ATechDate.convertATDate(dt, ATechDate.FORMAT_DATE_AND_TIME_S, ATechDate.FORMAT_TIME_ONLY_MIN);
-
+ psp.time_start = (int) ATechDate.convertATDate(dt, ATechDate.FORMAT_DATE_AND_TIME_S,
+ ATechDate.FORMAT_TIME_ONLY_MIN);
+
//System.out.println(psp.time_start);
-
-
+
psp.profile_id = profile;
- psp.amount = Float.parseFloat(cbrf);
+ psp.amount = Float.parseFloat(cbrf);
return psp;
-
+
}
-
-
+
//System.out.println("non TBR");
//System.out.println("" + el);
-
+
/*
- if (isSet(remark))
- {
- if ((!remark.contains("TBR")) && (!remark.contains("Run")) && (!remark.contains("Stop")) && (!remark.contains("power"))
- )
- {
- System.out.println(pve.getDateTimeObject().toString() + ",value=" + cbrf + ", profile=" + profile+",remark=" + remark);
- }
- }
- else
- System.out.println(pve.getDateTimeObject().toString() + ",value=" + cbrf + ", profile=" + profile);
-*/
+ * if (isSet(remark)) { if ((!remark.contains("TBR")) &&
+ * (!remark.contains("Run")) && (!remark.contains("Stop")) &&
+ * (!remark.contains("power")) ) {
+ * System.out.println(pve.getDateTimeObject().toString() + ",value="
+ * + cbrf + ", profile=" + profile+",remark=" + remark); } } else
+ * System.out.println(pve.getDateTimeObject().toString() + ",value="
+ * + cbrf + ", profile=" + profile);
+ */
//return null;
}
return null;
-
-/*
- // all that are special should be removed, all other are checked over events
- if (remark.contains("changed"))
- {
- // TODO: Changed profile
-// System.out.println("Basal Changed Unknown [remark=" + remark + "]");
- //System.out.println("Basal Rate Changed [datetime=" + pve.getDateTimeObject() + ",remark=" + remark + ",tbrdec=" + tbrdec + ",tbrinc=" + tbrinc + ",value=" + cbrf + "]");
-
- return false;
- }
- else
- {
- if ((this.getEventMappings().containsKey(remark)) ||
- (this.getBasalMappings().containsKey(remark)))
- {
- return false;
- }
- else
- {
- if (remark.contains(" - "))
- {
- pve.setBaseType(PumpBaseType.PUMP_DATA_BASAL);
- pve.setSubType(PumpBasalSubType.PUMP_BASAL_PROFILE);
- pve.setValue(remark.substring(remark.indexOf(" - ")+ 3));
-// System.out.println("Profile changed: " + remark.substring(remark.indexOf(" - ")+ 3));
-// System.out.println("Unknown Profile Event. [remark=" + remark + ",tbrdec=" + tbrdec + ",tbrinc=" + tbrinc + ",value=" + cbrf + "]");
- return true;
- }
- else
- return false;
- }
- }
-
- }
- else
- {
- if (!isSet(profile))
- {
- //System.out.println("tbrdec=" + isSet(tbrdec) + "tbrinc=" + isSet(tbrinc));
- if ((!isSet(tbrdec)) && (!isSet(tbrinc)) && (cbrf.equals("0.00")))
- {
- //System.out.println("tbrdec=" + isSet(tbrdec) + "tbrinc=" + isSet(tbrinc));
- return false;
- }
- else
- {
- log.error("Basal Unknown [tbrdec=" + tbrdec + ",tbrinc=" + tbrinc + ",value=" + cbrf + "]");
- return false;
- }
- }
- else
- {
- // profile used
- pve.setBaseType(PumpBaseType.PUMP_DATA_BASAL);
- pve.setSubType(PumpBasalSubType.PUMP_BASAL_PROFILE);
- pve.setValue(profile);
-
- first_basal = pve;
+ /*
+ * // all that are special should be removed, all other are checked over
+ * events if (remark.contains("changed")) { // TODO: Changed profile //
+ * System.out.println("Basal Changed Unknown [remark=" + remark + "]");
+ * //System.out.println("Basal Rate Changed [datetime=" +
+ * pve.getDateTimeObject() + ",remark=" + remark + ",tbrdec=" + tbrdec +
+ * ",tbrinc=" + tbrinc + ",value=" + cbrf + "]");
+ *
+ * return false; } else { if
+ * ((this.getEventMappings().containsKey(remark)) ||
+ * (this.getBasalMappings().containsKey(remark))) { return false; } else
+ * { if (remark.contains(" - ")) {
+ * pve.setBaseType(PumpBaseType.PUMP_DATA_BASAL);
+ * pve.setSubType(PumpBasalSubType.PUMP_BASAL_PROFILE);
+ * pve.setValue(remark.substring(remark.indexOf(" - ")+ 3)); //
+ * System.out.println("Profile changed: " +
+ * remark.substring(remark.indexOf(" - ")+ 3)); //
+ * System.out.println("Unknown Profile Event. [remark=" + remark +
+ * ",tbrdec=" + tbrdec + ",tbrinc=" + tbrinc + ",value=" + cbrf + "]");
+ * return true; } else return false; } }
+ *
+ * } else { if (!isSet(profile)) { //System.out.println("tbrdec=" +
+ * isSet(tbrdec) + "tbrinc=" + isSet(tbrinc));
+ *
+ * if ((!isSet(tbrdec)) && (!isSet(tbrinc)) && (cbrf.equals("0.00"))) {
+ * //System.out.println("tbrdec=" + isSet(tbrdec) + "tbrinc=" +
+ * isSet(tbrinc)); return false; } else {
+ * log.error("Basal Unknown [tbrdec=" + tbrdec + ",tbrinc=" + tbrinc +
+ * ",value=" + cbrf + "]"); return false; } } else { // profile used
+ * pve.setBaseType(PumpBaseType.PUMP_DATA_BASAL);
+ * pve.setSubType(PumpBasalSubType.PUMP_BASAL_PROFILE);
+ * pve.setValue(profile);
+ *
+ * first_basal = pve;
+ *
+ * //log.error("Basal Unknown [tbrdec=" + tbrdec + ",tbrinc=" + tbrinc +
+ * ",value=" + cbrf + "]");
+ *
+ * if (pve.getDateTimeObject().getTimeString().equals("00:00:00")) {
+ * //System.out.println("Profile used: " + pve.getValue()); first_basal
+ * = null; return true; } else return false; } }
+ */
- //log.error("Basal Unknown [tbrdec=" + tbrdec + ",tbrinc=" + tbrinc + ",value=" + cbrf + "]");
-
- if (pve.getDateTimeObject().getTimeString().equals("00:00:00"))
- {
- //System.out.println("Profile used: " + pve.getValue());
- first_basal = null;
- return true;
- }
- else
- return false;
- }
- } */
-
//return null;
-
+
}
-
/**
* Resolve Bolus Data
@@ -1015,10 +936,11 @@
String type = el.attributeValue("type");
String amount = el.attributeValue("amount");
String remark = el.attributeValue("remark");
-
- if (remark!=null)
+
+ if (remark != null)
+ {
remark = remark.trim();
-
+ }
if (isSet(type))
{
@@ -1026,43 +948,40 @@
{
pve.setBaseType(PumpBaseType.PUMP_DATA_BOLUS);
pve.setSubType(this.getBolusMappings().get(type));
-
- if ((pve.getSubType()==PumpBolusType.PUMP_BOLUS_STANDARD) ||
- (pve.getSubType()==PumpBolusType.PUMP_BOLUS_AUDIO_SCROLL))
+
+ if ((pve.getSubType() == PumpBolusType.PUMP_BOLUS_STANDARD)
+ || (pve.getSubType() == PumpBolusType.PUMP_BOLUS_AUDIO_SCROLL))
{
pve.setSubType(PumpBolusType.PUMP_BOLUS_STANDARD);
pve.setValue(amount);
}
- else if (pve.getSubType()==PumpBolusType.PUMP_BOLUS_SQUARE)
+ else if (pve.getSubType() == PumpBolusType.PUMP_BOLUS_SQUARE)
{
String e = remark.substring(0, remark.indexOf(" h"));
pve.setValue("AMOUNT_SQUARE=" + amount + ";DURATION=" + e);
}
- else if (pve.getSubType()==PumpBolusType.PUMP_BOLUS_MULTIWAVE)
+ else if (pve.getSubType() == PumpBolusType.PUMP_BOLUS_MULTIWAVE)
{
- if (remark!=null)
+ if (remark != null)
{
String[] str = new String[4];
-
+
str[0] = remark.substring(0, remark.indexOf(" / "));
- str[1] = remark.substring(remark.indexOf(" / ")+3);
-
+ str[1] = remark.substring(remark.indexOf(" / ") + 3);
+
str[2] = str[1].substring(0, str[1].indexOf(" "));
- str[3] = str[1].substring(str[1].indexOf(" ")+2);
-
+ str[3] = str[1].substring(str[1].indexOf(" ") + 2);
+
str[3] = str[3].substring(0, str[3].indexOf(" h"));
-
- pve.setValue(String.format("AMOUNT=%s;AMOUNT_SQUARE=%s;DURATION=%s",
- str[0],
- str[2],
- str[3]));
+
+ pve.setValue(String.format("AMOUNT=%s;AMOUNT_SQUARE=%s;DURATION=%s", str[0], str[2], str[3]));
}
}
else
{
- log.error("AccuChekSmartPixPump: Unknown Bolus Type [" + type +"]");
+ log.error("AccuChekSmartPixPump: Unknown Bolus Type [" + type + "]");
}
-
+
}
else
{
@@ -1082,12 +1001,10 @@
log.error("Unknown Pump Bolus Info [info=" + type + ",desc=" + amount + ",remark=" + remark + "]");
}
}
-
-
+
return true;
- }
-
-
+ }
+
/**
* Resolve Events
*
@@ -1099,7 +1016,7 @@
{
String info = el.attributeValue("shortinfo");
String desc = el.attributeValue("description");
-
+
if (isSet(info))
{
if (info.startsWith("A"))
@@ -1125,7 +1042,7 @@
{
log.error("Unknown Pump Error [info=" + info + ",desc=" + desc + "]");
}
-
+
}
else if (info.startsWith("W"))
{
@@ -1143,7 +1060,6 @@
else
{
-
if (this.getEventMappings().containsKey(desc))
{
pve.setBaseType(PumpBaseType.PUMP_DATA_EVENT);
@@ -1155,7 +1071,7 @@
log.error("Unknown Pump Event [info=" + info + ",desc=" + desc + "]");
}
}
-
+
}
else
{
@@ -1169,19 +1085,16 @@
log.error("Unknown Pump Event [info=" + info + ",desc=" + desc + "]");
}
}
-
+
//pve.setEntryType(PumpDataType.PUMP_DATA_EVENT);
-
-
+
return true;
-
+
}
-
-
private boolean isSet(String str)
{
- if ((str==null) || (str.trim().length()==0))
+ if ((str == null) || (str.trim().length() == 0))
{
return false;
}
@@ -1190,18 +1103,15 @@
return true;
}
}
-
-
private List<Node> getSpecificDataChildren(String child_path)
{
- return getNodes(child_path); // /BOLUS
+ return getNodes(child_path); // /BOLUS
}
-
-
+
/**
- * Pump tool, requires dates to be in seconds, so we need to return value is second, eventhough
- * pix returns it in minutes.
+ * Pump tool, requires dates to be in seconds, so we need to return value is
+ * second, eventhough pix returns it in minutes.
*
* @param date
* @param time
@@ -1209,64 +1119,61 @@
*/
private ATechDate getDateTime(String date, String time)
{
- String o = DataAccessPump.replaceExpression(date, "-", "");
-
- if ((time==null) || (time.length()==0))
+ String o = ATDataAccessAbstract.replaceExpression(date, "-", "");
+
+ if ((time == null) || (time.length() == 0))
{
o += "0000";
}
else
{
- o += DataAccessPump.replaceExpression(time, ":", "");
+ o += ATDataAccessAbstract.replaceExpression(time, ":", "");
}
-
+
o += "00"; // seconds
-
+
return new ATechDate(ATechDate.FORMAT_DATE_AND_TIME_S, Long.parseLong(o));
}
-
/**
* Get Date from AtechDate long format
+ *
* @param inp
* @return
*/
public long getDateFromDT(long inp)
{
- return (long)(inp/1000000);
+ return inp / 1000000;
}
-
-
-
+
@SuppressWarnings("unused")
private long getDate(String date)
{
- String o = DataAccessPump.replaceExpression(date, "-", "");
+ String o = ATDataAccessAbstract.replaceExpression(date, "-", "");
ATechDate at = new ATechDate(ATechDate.FORMAT_DATE_ONLY, Long.parseLong(o));
return at.getATDateTimeAsLong();
}
-
-
+
/**
* Get Connection Protocol
*/
+ @Override
public int getConnectionProtocol()
{
return ConnectionProtocols.PROTOCOL_MASS_STORAGE_XML;
}
-
-
-
+
/**
- * loadPumpSpecificValues - should be called from constructor of any AbstractPump classes and should
- * create, AlarmMappings and EventMappings and any other pump constants.
+ * loadPumpSpecificValues - should be called from constructor of any
+ * AbstractPump classes and should create, AlarmMappings and EventMappings
+ * and any other pump constants.
*/
public void loadPumpSpecificValues()
{
//m_da = DataAccessPump.getInstance();
-
+
// alarm mappings
- this.alarm_mappings = new Hashtable<String,Integer>();
+ this.alarm_mappings = new Hashtable<String, Integer>();
this.alarm_mappings.put("A1", new Integer(PumpAlarms.PUMP_ALARM_CARTRIDGE_LOW));
this.alarm_mappings.put("A2", new Integer(PumpAlarms.PUMP_ALARM_BATTERY_LOW));
this.alarm_mappings.put("A3", new Integer(PumpAlarms.PUMP_ALARM_REVIEW_DATETIME));
@@ -1275,8 +1182,8 @@
this.alarm_mappings.put("A6", new Integer(PumpAlarms.PUMP_ALARM_TEMPORARY_BASAL_RATE_CANCELED));
this.alarm_mappings.put("A7", new Integer(PumpAlarms.PUMP_ALARM_TEMPORARY_BASAL_RATE_OVER));
this.alarm_mappings.put("A8", new Integer(PumpAlarms.PUMP_ALARM_BOLUS_CANCELED));
-
- this.event_mappings = new Hashtable<String,Integer>();
+
+ this.event_mappings = new Hashtable<String, Integer>();
this.event_mappings.put("prime infusion set", new Integer(PumpEvents.PUMP_EVENT_PRIME_INFUSION_SET));
this.event_mappings.put("cartridge changed", new Integer(PumpEvents.PUMP_EVENT_CARTRIDGE_CHANGED));
this.event_mappings.put("Run", new Integer(PumpEvents.PUMP_EVENT_BASAL_RUN));
@@ -1289,9 +1196,8 @@
this.event_mappings.put("W1", PumpEvents.PUMP_EVENT_RESERVOIR_LOW);
this.event_mappings.put("W8", PumpEvents.PUMP_EVENT_BOLUS_CANCELLED);
this.event_mappings.put("W2", PumpEvents.PUMP_EVENT_BATERRY_LOW);
-
-
- this.error_mappings = new Hashtable<String,Integer>();
+
+ this.error_mappings = new Hashtable<String, Integer>();
this.error_mappings.put("E1", new Integer(PumpErrors.PUMP_ERROR_CARTRIDGE_EMPTY));
this.error_mappings.put("E2", new Integer(PumpErrors.PUMP_ERROR_BATTERY_DEPLETED));
this.error_mappings.put("E3", new Integer(PumpErrors.PUMP_ERROR_AUTOMATIC_OFF));
@@ -1305,103 +1211,99 @@
this.error_mappings.put("E12", new Integer(PumpErrors.PUMP_ERROR_DATA_INTERRUPTED));
this.error_mappings.put("E13", new Integer(PumpErrors.PUMP_ERROR_LANGUAGE_ERROR));
this.error_mappings.put("E14", new Integer(PumpErrors.PUMP_ERROR_INSULIN_CHANGED));
-
-
- this.bolus_mappings = new Hashtable<String,Integer>();
+
+ this.bolus_mappings = new Hashtable<String, Integer>();
this.bolus_mappings.put("Std", new Integer(PumpBolusType.PUMP_BOLUS_STANDARD));
this.bolus_mappings.put("Scr", new Integer(PumpBolusType.PUMP_BOLUS_AUDIO_SCROLL));
this.bolus_mappings.put("Ext", new Integer(PumpBolusType.PUMP_BOLUS_SQUARE));
this.bolus_mappings.put("Mul", new Integer(PumpBolusType.PUMP_BOLUS_MULTIWAVE));
-
+
// report
- this.report_mappings = new Hashtable<String,Integer>();
+ this.report_mappings = new Hashtable<String, Integer>();
this.report_mappings.put("Bolus Total", new Integer(PumpReport.PUMP_REPORT_BOLUS_TOTAL_DAY));
this.report_mappings.put("Bolus+Basal Total", new Integer(PumpReport.PUMP_REPORT_INSULIN_TOTAL_DAY));
-
-
- this.basal_mappings = new Hashtable<String,Integer>();
+
+ this.basal_mappings = new Hashtable<String, Integer>();
this.basal_mappings.put("TBR End (cancelled)", PumpBasalSubType.PUMP_BASAL_TEMPORARY_BASAL_RATE_CANCELED);
this.basal_mappings.put("TBR End", PumpBasalSubType.PUMP_BASAL_TEMPORARY_BASAL_RATE_ENDED);
-
}
-
-
+
/**
* Map pump specific alarms to PumpTool specific alarm codes
+ *
* @return
*/
- public Hashtable<String,Integer> getAlarmMappings()
+ public Hashtable<String, Integer> getAlarmMappings()
{
return this.alarm_mappings;
}
-
-
+
/**
* Map pump specific events to PumpTool specific event codes
+ *
* @return
*/
- public Hashtable<String,Integer> getEventMappings()
+ public Hashtable<String, Integer> getEventMappings()
{
return this.event_mappings;
}
-
/**
- * Get Error Mappings - Map pump specific errors to Pump Tool specific
- * event codes
+ * Get Error Mappings - Map pump specific errors to Pump Tool specific event
+ * codes
+ *
* @return
*/
- public Hashtable<String,Integer> getErrorMappings()
+ public Hashtable<String, Integer> getErrorMappings()
{
return this.error_mappings;
}
-
/**
- * Get Bolus Mappings - Map pump specific bolus to Pump Tool specific
- * event codes
+ * Get Bolus Mappings - Map pump specific bolus to Pump Tool specific event
+ * codes
+ *
* @return
*/
- public Hashtable<String,Integer> getBolusMappings()
+ public Hashtable<String, Integer> getBolusMappings()
{
return this.bolus_mappings;
}
-
- /**
- * Get Basal Mappings - Map pump specific basal to Pump Tool specific
- * event codes
+ /**
+ * Get Basal Mappings - Map pump specific basal to Pump Tool specific event
+ * codes
+ *
* @return
*/
- public Hashtable<String,Integer> getBasalMappings()
+ public Hashtable<String, Integer> getBasalMappings()
{
return this.basal_mappings;
}
-
-
+
/**
- * Get Report Mappings - Map pump specific reports to Pump Tool specific
- * event codes
+ * Get Report Mappings - Map pump specific reports to Pump Tool specific
+ * event codes
+ *
* @return
*/
- public Hashtable<String,Integer> getReportMappings()
+ public Hashtable<String, Integer> getReportMappings()
{
return this.report_mappings;
}
-
-
+
/**
* Get Download Support Type
*
* @return
*/
+ @Override
public int getDownloadSupportType()
{
return DownloadSupportType.DOWNLOAD_FROM_DEVICE + DownloadSupportType.DOWNLOAD_FROM_DEVICE_FILE;
}
-
-
+
/**
* Are Pump Settings Set
*
@@ -1411,8 +1313,7 @@
{
return false;
}
-
-
+
/**
* How Many Months Of Data Stored
*
@@ -1422,6 +1323,5 @@
{
return 6;
}
-
-
+
}
\ No newline at end of file
Modified: trunk/ggc-pump/src/ggc/pump/test/PumpConsoleTester.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/test/PumpConsoleTester.java 2014-09-14 17:59:07 UTC (rev 1309)
+++ trunk/ggc-pump/src/ggc/pump/test/PumpConsoleTester.java 2014-09-18 20:28:11 UTC (rev 1310)
@@ -4,6 +4,7 @@
import ggc.core.util.DataAccess;
import ggc.core.util.GGCLanguageManagerRunner;
import ggc.plugin.device.DownloadSupportType;
+import ggc.plugin.device.impl.minimed.file.MinimedCareLink;
import ggc.plugin.output.ConsoleOutputWriter;
import ggc.plugin.protocol.SerialProtocol;
import ggc.pump.device.accuchek.AccuChekCombo;
@@ -21,43 +22,40 @@
// TODO: Auto-generated Javadoc
/**
- * Application: GGC - GNU Gluco Control
- * Plug-in: Pump Tool (support for Pump devices)
+ * Application: GGC - GNU Gluco Control Plug-in: Pump Tool (support for Pump
+ * devices)
*
- * See AUTHORS for copyright information.
+ * See AUTHORS for copyright information.
*
- * 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 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.
+ * 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
+ * You should have received a copy...
[truncated message content] |
|
From: <ru...@us...> - 2014-09-19 12:54:06
|
Revision: 1311
http://sourceforge.net/p/ggc/code/1311
Author: rumbi
Date: 2014-09-19 12:53:56 +0000 (Fri, 19 Sep 2014)
Log Message:
-----------
RR: more pump tool translations, some corrections to the english original
Modified Paths:
--------------
trunk/ggc-language_tool/active_translations/de/GGCPumpTool_de.config
trunk/ggc-language_tool/active_translations/de/GGCPumpTool_de.properties
trunk/ggc-pump/src/GGCPumpTool_de.properties
trunk/ggc-pump/src/GGCPumpTool_en.properties
Added Paths:
-----------
trunk/ggc-cgm/src/GGC_CGMSTool_de.properties
Added: trunk/ggc-cgm/src/GGC_CGMSTool_de.properties
===================================================================
--- trunk/ggc-cgm/src/GGC_CGMSTool_de.properties (rev 0)
+++ trunk/ggc-cgm/src/GGC_CGMSTool_de.properties 2014-09-19 12:53:56 UTC (rev 1311)
@@ -0,0 +1,162 @@
+#
+# ######################################################################
+# ### GNU Glucose Control ###
+# ######################################################################
+# ### Language: German ###
+# ### Created by: Reinhold Rumberger (ru...@us...)###
+# ### Version: 1.0.2 ###
+# ### Last change: 03.07.2011 14:44:12 ###
+# ######################################################################
+#
+#
+# Translation status:
+# Words/expressions: 63
+# Not translated: 57 (90 %)
+# Need to be checked: 0 (0 %)
+#
+# Translated: 6 (9 %)
+#
+#
+#
+##
+# Collation Rules - In unicode we can create special rules for sorting where we specify
+# sorting order of special characters. This will be used by tree's and special tables.
+# For english this is left empty. For all other (that have non-standard, non english
+# charcters) we need to set this if we want sorting to be done correctly.
+#
+COLLATION_RULES=< 0 < 1 < 2 < 3 < 4 < 5 < 6 < 7 < 8 < 9 < a,A,\u00E4,\u00C4,\u00E1,\u00E0,\u00C1,\u00C0,\u00E2,\u00C2 < b,B < c,C < d,D < e,E,\u00E9,\u00E8,\u00EA,\u00C9,\u00C8,\u00CA < f,F < g,G < h,H < i,I < j,J < k,K < l,L < m,M < n,N < o,O,\u00F6,\u00D6 < p,P < q,Q < r,R < s,S,\u00DF < t,T < u,U,\u00FC,\u00DC < v,V < w,W < x,X < y,Y < z,Z
+
+#
+# Plug-in Specific [1]
+#
+DEVICE_NAME_NORMAL=CGMS
+DEVICE_NAME_BIG=CGMS
+DEVICE_FULL_NAME_WITHOUT_PORT=%s
+DEVICE_FULL_NAME_WITH_PORT=%s on %s
+
+#
+# Menus [1]
+#
+MN_CGMS=CGMS
+MN_CGMS_READ=CGMS &auslesen
+MN_CGMS_READ_DESC=Die Daten des CGMS auslesen
+MN_CGMS_LIST=CGMS-&Liste
+MN_CGMS_LIST_DESC=Liste der verf\u00FCgbaren CGMS-Ger\u00E4te
+MN_CGMS_CONFIG=&Einstellungen
+MN_CGMS_CONFIG_DESC=Einstellungen des CGMS-Plug-ins
+MN_CGMS_ABOUT=About
+MN_CGMS_ABOUT_DESC=About CGMS Plugin (copyright, features, credits,...)
+MN_CGMS_VIEW_DATA=View Data
+MN_CGMS_VIEW_DATA_DESC=View data read from device(s)
+MN_CGMS_READ_FILE=Read file
+MN_CGMS_READ_FILE_DESC=Read data from CGMS/sw export file
+
+#
+# About [1]
+#
+DEVICE_PLUGIN=%s Plug-in
+DEVICE_PLUGIN_ABOUT=About %s Plug-in
+
+#
+# Configuration [1]
+#
+MY__=My
+NEW__=New
+DEVICE_CONFIGURATION=%s Configuration
+SELECT_X_DEVICE=Select %s Device
+SELECTED_X_DEVICE=Selected %s Device
+DEVICE_CUSTOM_NAME=%s Custom Name
+DEVICE_DOWNLOAD=DL
+DEVICE_SETTINGS=Sett.
+
+#
+# Device Selector [1]
+#
+SELECTOR_DEVICE=%s Device Selector
+
+#
+# Instructions Dialog [1]
+#
+OOPS_DEVICE_NOT_CONFIGURED=Oops ! You forgot to configure your %s\nand currently there is no %s configured\nand/or selected. Please visit configuration\nand configure your %s.
+CONFIGURED_DEVICE_INSTRUCTIONS=Configured %s and Instructions
+DEVICE_ICON=%s picture
+STATUS_READER_ERROR=Internal %s (or port) error
+ERROR_CONTACTING_DEVICE=We had problem contacting CGMS device.\nPlease recheck communication port settings\n(some of cables, can change their address,\nwhen reconnected). Run configuration again\nand problem should be solved!\n
+DEVICE_INFO=%s Info
+
+#
+# Download [1]
+#
+READ_DEVICE_DATA_TITLE=Read CGMS Data [%s on %s]
+
+#
+# Device Configuration [1]
+#
+READ_DEVICE_CONFIG_TITLE=Read CGMS Configuration [%s on %s]
+SETTING_GROUP=Setting / Group
+
+#
+# Export [1]
+#
+EXPORT_DEVICE_DATA=Export %s Data
+
+#
+# List [1]
+#
+DEVICE_LIST_WEB=CGMS List
+DEVICE_LIST_WEB_DESC=<html>Pumps list contains most of Pumps (even most of models). For each of this pumps, there is configuration entry, which contains only basic settings for device (profile names, TBR settings, etc). Devices which support download have that shown in selector (DL column). Pumps in list are color coded, and color determines status of devices of selected company. Color coding description is shown at bottom of this page.<br></html>
+
+#
+# CGMS companies descriptions [1]
+#
+
+#
+# CGMS Instructions [1]
+#
+
+#
+# Manual Entry [1]
+#
+AVG_BG=Avg BG
+BLOOD_GLUCOSE_CGMS=Blood Glucose (CGMS)
+BLOOD_GLUCOSE_CALIB=Blood Glucose (Calibration)
+AVG=Avg
+TOTAL=Total
+LOWEST=Lowest
+STD_DEV=Std Dev
+READINGS=Readings
+HIGHEST=Highest
+SUM=Sum
+READING=Reading
+CGMS_DAILY_OVERVIEW=CGMS Daily Stats
+
+# table
+ENTRY_TYPE=Entry Type
+COMMENT=Comment
+
+# types
+ENTRY_BG_READING=Reading
+ENTRY_BG_CALIBRATION=Calibration
+
+#
+# Devices [1]
+#
+
+#
+# Backup/Restore [1]
+#
+CGMS_TOOL=CGMS Tool
+CGMS_DATA=CGMS Data
+CGMS_DATA_EXTENDED=CGMS Data Extended
+
+#
+# Types [1]
+#
+CGMS_READINGS=CGMS Readings
+CALIBRATION_READINGS=Calibration
+CGMS_READING=CGMS Reading
+
+#
+# Meter Instructions [1]
+#
+INSTRUCTIONS_DEXCOM=<html>Instructions for CGMS reading:<br><ul><li>We currently support only import of Dexcom 3<br>application export files (TXT or XML).</li><li>Reading from device, might or might not be<br>supported in future (depending on company <br>support).</li><li>Select correct file and file type in next<br>screens and import will start.</li></ul></html>
Modified: trunk/ggc-language_tool/active_translations/de/GGCPumpTool_de.config
===================================================================
--- trunk/ggc-language_tool/active_translations/de/GGCPumpTool_de.config 2014-09-18 20:28:11 UTC (rev 1310)
+++ trunk/ggc-language_tool/active_translations/de/GGCPumpTool_de.config 2014-09-19 12:53:56 UTC (rev 1311)
@@ -10,7 +10,7 @@
SELECT_X_DEVICE__STATUS=1
SELECTED_X_DEVICE__STATUS=1
DEVICE_CUSTOM_NAME__STATUS=1
-DEVICE_DOWNLOAD__STATUS=0
+DEVICE_DOWNLOAD__STATUS=1
DEVICE_SETTINGS__STATUS=1
MN_PUMPS__STATUS=1
MN_PUMPS_READ__STATUS=1
@@ -49,10 +49,10 @@
SETTING_GROUP__STATUS=0
EXPORT_DEVICE_DATA__STATUS=1
DEVICE_LIST_WEB__STATUS=1
-DEVICE_LIST_WEB_DESC__STATUS=0
-ROCHE_DESC__STATUS=0
-MINIMED_DESC__STATUS=0
-ANIMAS_DESC__STATUS=0
+DEVICE_LIST_WEB_DESC__STATUS=1
+ROCHE_DESC__STATUS=1
+MINIMED_DESC__STATUS=1
+ANIMAS_DESC__STATUS=1
INSTRUCTIONS_DANA_III_R__STATUS=0
INSTRUCTIONS_ACCUCHEK_SPIRIT__STATUS=0
NOT_ALL_REQUIRED_VALUES_SET__STATUS=0
@@ -75,23 +75,23 @@
SUM__STATUS=1
FOOD__STATUS=0
IMMEDIATE_AMOUNT__STATUS=0
-PUMP_DAILY_OVERVIEW__STATUS=0
+PUMP_DAILY_OVERVIEW__STATUS=1
DATE__STATUS=1
TIME__STATUS=1
ADD_ROW__STATUS=1
EDIT_ROW__STATUS=1
DELETE_MANY_ADDITIONAL_DATA__STATUS=0
-BASE_TYPE__STATUS=0
+BASE_TYPE__STATUS=1
SUB_TYPE__STATUS=1
-ADDITIONAL__STATUS=0
-ADD_DATA_ACTIVITY__STATUS=0
-ADD_DATA_COMMENT__STATUS=0
-ADD_DATA_BG__STATUS=0
+ADDITIONAL__STATUS=1
+ADD_DATA_ACTIVITY__STATUS=1
+ADD_DATA_COMMENT__STATUS=1
+ADD_DATA_BG__STATUS=1
ADD_DATA_URINE__STATUS=1
ADD_DATA_CH__STATUS=1
ADD_DATA_FOOD_DB__STATUS=0
ADD_DATA_FOOD_DESC__STATUS=0
-SELECT_SUBTYPE__STATUS=0
+SELECT_SUBTYPE__STATUS=1
ENTRY_TYPE__STATUS=0
ADD_PARAMETER__STATUS=0
SELECT_ADDITONAL_DATA__STATUS=0
@@ -104,121 +104,121 @@
FOOD_SET_DB__STATUS=0
FOOD_SET_DESC__STATUS=0
SELECT_ITEM__STATUS=0
-BASAL_DOSE__STATUS=0
-BOLUS_DOSE__STATUS=0
-EVENT__STATUS=0
-ALARM__STATUS=0
-ERROR__STATUS=0
+BASAL_DOSE__STATUS=1
+BOLUS_DOSE__STATUS=1
+EVENT__STATUS=1
+ALARM__STATUS=1
+ERROR__STATUS=1
REPORT__STATUS=0
PEN_INJECTION_BASAL__STATUS=0
PEN_INJECTION_BOLUS__STATUS=0
ADDITIONAL_DATA__STATUS=0
-BOLUS_INSULIN__STATUS=0
-BASAL_INSULIN__STATUS=0
-TEMPORARY_BASAL_RATE__STATUS=0
-BASAL_TEMPORARY_BASAL_RATE__STATUS=0
+BOLUS_INSULIN__STATUS=1
+BASAL_INSULIN__STATUS=1
+TEMPORARY_BASAL_RATE__STATUS=1
+BASAL_TEMPORARY_BASAL_RATE__STATUS=2
BASAL_TEMPORARY_BASAL_RATE_PROFILE__STATUS=0
-TEMPORARY_BASAL_RATE_SHORT__STATUS=0
-TBR_TYPE_UNIT__STATUS=0
-TBR_TYPE_PROC__STATUS=0
-PROFILE__STATUS=0
+TEMPORARY_BASAL_RATE_SHORT__STATUS=2
+TBR_TYPE_UNIT__STATUS=1
+TBR_TYPE_PROC__STATUS=1
+PROFILE__STATUS=1
NOT_SELECTED__STATUS=0
-BASAL_PROFILE__STATUS=0
-ACTIVITY__STATUS=0
+BASAL_PROFILE__STATUS=1
+ACTIVITY__STATUS=1
COMMENT__STATUS=1
URINE__STATUS=1
CH_LONG__STATUS=1
BASAL_TYPE__STATUS=0
SELECT_BASAL_TYPE__STATUS=0
-BASAL_VALUE__STATUS=0
-BASAL_PUMP_STATUS__STATUS=0
-ON__STATUS=0
-OFF__STATUS=0
+BASAL_VALUE__STATUS=1
+BASAL_PUMP_STATUS__STATUS=1
+ON__STATUS=1
+OFF__STATUS=1
SUSPENDED__STATUS=0
-PUMP_STATUS__STATUS=0
-BASAL_TEMPORARY_BASAL_RATE_ENDED__STATUS=0
-BASAL_TEMPORARY_BASAL_RATE_CANCELED__STATUS=0
+PUMP_STATUS__STATUS=1
+BASAL_TEMPORARY_BASAL_RATE_ENDED__STATUS=1
+BASAL_TEMPORARY_BASAL_RATE_CANCELED__STATUS=1
BOLUS_TYPE__STATUS=0
SELECT_BOLUS_TYPE__STATUS=0
-BOLUS_STANDARD__STATUS=0
+BOLUS_STANDARD__STATUS=1
BOLUS_AUDIO__STATUS=0
-BOLUS_SQUARE__STATUS=0
+BOLUS_SQUARE__STATUS=1
BOLUS_MULTIWAVE__STATUS=0
-AMOUNT__STATUS=0
-AMOUNT_MW_1__STATUS=0
-AMOUNT_MW_2__STATUS=0
-DURATION_SHORT__STATUS=0
+AMOUNT__STATUS=1
+AMOUNT_MW_1__STATUS=1
+AMOUNT_MW_2__STATUS=1
+DURATION_SHORT__STATUS=1
SQUARE_AMOUNT__STATUS=0
-DURATION__STATUS=0
+DURATION__STATUS=1
ALARM_TYPE__STATUS=0
-ALARM_CARTRIDGE_LOW__STATUS=0
-ALARM_BATTERY_LOW__STATUS=0
+ALARM_CARTRIDGE_LOW__STATUS=1
+ALARM_BATTERY_LOW__STATUS=1
ALARM_REVIEW_DATETIME__STATUS=0
ALARM_ALARM_CLOCK__STATUS=0
ALARM_PUMP_TIMER__STATUS=0
-ALARM_TEMPORARY_BASAL_RATE_CANCELED__STATUS=0
-ALARM_TEMPORARY_BASAL_RATE_OVER__STATUS=0
-ALARM_BOLUS_CANCELED__STATUS=0
-ERROR_TYPE__STATUS=0
-ERROR_UNKNOWN_ERROR__STATUS=0
-ERROR_CARTRIDGE_EMPTY__STATUS=0
-ERROR_BATTERY_DEPLETED__STATUS=0
+ALARM_TEMPORARY_BASAL_RATE_CANCELED__STATUS=1
+ALARM_TEMPORARY_BASAL_RATE_OVER__STATUS=1
+ALARM_BOLUS_CANCELED__STATUS=1
+ERROR_TYPE__STATUS=1
+ERROR_UNKNOWN_ERROR__STATUS=1
+ERROR_CARTRIDGE_EMPTY__STATUS=1
+ERROR_BATTERY_DEPLETED__STATUS=1
ERROR_AUTOMATIC_OFF__STATUS=0
-ERROR_NO_DELIVERY__STATUS=0
+ERROR_NO_DELIVERY__STATUS=1
ERROR_END_OF_OPERATION__STATUS=0
-ERROR_MECHANICAL_ERROR__STATUS=0
-ERROR_ELECTRONIC_ERROR__STATUS=0
-ERROR_POWER_INTERRUPT__STATUS=0
-ERROR_CARTRIDGE_ERROR__STATUS=0
-ERROR_SET_NOT_PRIMED__STATUS=0
+ERROR_MECHANICAL_ERROR__STATUS=1
+ERROR_ELECTRONIC_ERROR__STATUS=1
+ERROR_POWER_INTERRUPT__STATUS=1
+ERROR_CARTRIDGE_ERROR__STATUS=1
+ERROR_SET_NOT_PRIMED__STATUS=1
ERROR_DATA_INTERRUPTED__STATUS=0
-ERROR_LANGUAGE_ERROR__STATUS=0
-ERROR_INSULIN_CHANGED__STATUS=0
+ERROR_LANGUAGE_ERROR__STATUS=1
+ERROR_INSULIN_CHANGED__STATUS=1
EVENT_TYPE__STATUS=0
-EVENT_PRIME_INFUSION_SET__STATUS=0
-EVENT_CARTRIDGE_CHANGED__STATUS=0
+EVENT_PRIME_INFUSION_SET__STATUS=1
+EVENT_CARTRIDGE_CHANGED__STATUS=1
EVENT_BASAL_RUN__STATUS=0
EVENT_BASAL_STOP__STATUS=0
EVENT_POWER_DOWN__STATUS=0
EVENT_POWER_UP__STATUS=0
-EVENT_DATETIME_SET__STATUS=0
-EVENT_DATETIME_CORRECT__STATUS=0
+EVENT_DATETIME_SET__STATUS=1
+EVENT_DATETIME_CORRECT__STATUS=1
EVENT_DATETIME_CORRECT_TIME_SHIFT_BACK__STATUS=0
EVENT_DATETIME_CORRECT_TIME_SHIFT_FORWARD__STATUS=0
-EVENT_SET_MAX_BASAL__STATUS=0
-EVENT_SET_MAX_BOLUS__STATUS=0
-EVENT_BATERRY_REMOVED__STATUS=0
-EVENT_BATERRY_REPLACED__STATUS=0
-EVENT_BATERRY_LOW__STATUS=0
-EVENT_BATERRY_LOW_DESC__STATUS=0
-EVENT_BG_FROM_METER__STATUS=0
-EVENT_RESERVOIR_LOW__STATUS=0
-EVENT_RESERVOIR_LOW_DESC__STATUS=0
+EVENT_SET_MAX_BASAL__STATUS=1
+EVENT_SET_MAX_BOLUS__STATUS=1
+EVENT_BATERRY_REMOVED__STATUS=1
+EVENT_BATERRY_REPLACED__STATUS=1
+EVENT_BATERRY_LOW__STATUS=1
+EVENT_BATERRY_LOW_DESC__STATUS=1
+EVENT_BG_FROM_METER__STATUS=2
+EVENT_RESERVOIR_LOW__STATUS=1
+EVENT_RESERVOIR_LOW_DESC__STATUS=1
EVENT_SET_TEMPORARY_BASAL_RATE_TYPE__STATUS=0
EVENT_SET_BASAL_PATTERN__STATUS=0
-EVENT_SELF_TEST__STATUS=0
-EVENT_DOWNLOAD__STATUS=0
+EVENT_SELF_TEST__STATUS=1
+EVENT_DOWNLOAD__STATUS=1
REPORT_TYPE__STATUS=0
REPORT_TEXT__STATUS=0
REPORT_MISC__STATUS=0
-REPORT_BOLUS_TOTAL_DAY__STATUS=0
-REPORT_BASAL_TOTAL_DAY__STATUS=0
-REPORT_INSULIN_TOTAL_DAY__STATUS=0
+REPORT_BOLUS_TOTAL_DAY__STATUS=1
+REPORT_BASAL_TOTAL_DAY__STATUS=1
+REPORT_INSULIN_TOTAL_DAY__STATUS=1
PROFILE_SELECTOR__STATUS=0
-NEW__STATUS=0
+NEW__STATUS=1
PROFILE_BASAL_ENTRY__STATUS=0
TIME_FROM__STATUS=0
-TIME_TILL__STATUS=0
+TIME_TILL__STATUS=2
BASAL_AMOUNT__STATUS=0
PROFILE_EDITOR__STATUS=0
DATE_FROM__STATUS=0
DATE_TILL__STATUS=0
BASE_BASAL__STATUS=0
-NAME__STATUS=0
+NAME__STATUS=1
FROM__STATUS=0
TILL__STATUS=0
-NEW__PROFILE__STATUS=0
-NAME_OF_PROFILE__STATUS=0
+NEW__PROFILE__STATUS=1
+NAME_OF_PROFILE__STATUS=1
PUMP_PROFILE_SELECTOR__STATUS=0
ADD_BASAL_SUB_ENTRY__STATUS=0
EDIT_BASAL_SUB_ENTRY__STATUS=0
@@ -232,33 +232,33 @@
PUMP_PROFILE__STATUS=0
MN_PUMP__STATUS=0
MN_PUMP_PRINT_DESC__STATUS=0
-MN_PUMP_PRINT_SIMPLE__STATUS=0
+MN_PUMP_PRINT_SIMPLE__STATUS=1
MN_PUMP_PRINT_SIMPLE_DESC__STATUS=0
-MN_PUMP_PRINT_EXT__STATUS=0
+MN_PUMP_PRINT_EXT__STATUS=1
MN_PUMP_PRINT_EXT_DESC__STATUS=0
-VALUE_SHORT__STATUS=0
-OTHER_DATA__STATUS=0
+VALUE_SHORT__STATUS=1
+OTHER_DATA__STATUS=1
OTHER_DATA_FOOD__STATUS=0
PUMP_DATA_BASE__STATUS=0
PUMP_DATA_EXT__STATUS=0
FOOD_DB_PRINT__STATUS=0
FOOD_DESC_PRINT__STATUS=0
-FOOD_DESC_PRINT_NOT_YET__STATUS=0
+FOOD_DESC_PRINT_NOT_YET__STATUS=2
PCFG_BASAL_INCREMENT__STATUS=0
PCFG_BOLUS_INCREMENT__STATUS=0
PCFG_BOLUS_PRESET__STATUS=0
PCFG_BOLUS_ALARM__STATUS=0
PCFG_BOLUS_BLOCK__STATUS=0
PCFG_BASAL_UNIT__STATUS=0
-UNIT_PER_HOUR__STATUS=0
-UNIT_PER_DAY__STATUS=0
-PCFG_MAX_BOLUS__STATUS=0
-PCFG_MAX_BASAL__STATUS=0
-PCFG_MAX_DAILY__STATUS=0
-PCFG_GLUCOSE_UNIT__STATUS=0
+UNIT_PER_HOUR__STATUS=1
+UNIT_PER_DAY__STATUS=1
+PCFG_MAX_BOLUS__STATUS=1
+PCFG_MAX_BASAL__STATUS=1
+PCFG_MAX_DAILY__STATUS=1
+PCFG_GLUCOSE_UNIT__STATUS=1
PCFG_EASY_MODE__STATUS=0
PCFG_ACTIVE_INSULIN_DECREMENT_RATIO__STATUS=0
-PCFG_CH_INS_RATIO__STATUS=0
-PCFG_BG_INS_RATIO__STATUS=0
-PCFG_TARGET_BG__STATUS=0
+PCFG_CH_INS_RATIO__STATUS=1
+PCFG_BG_INS_RATIO__STATUS=1
+PCFG_TARGET_BG__STATUS=1
PCFG_ACTIVE_INSULIN_RATE__STATUS=0
Modified: trunk/ggc-language_tool/active_translations/de/GGCPumpTool_de.properties
===================================================================
--- trunk/ggc-language_tool/active_translations/de/GGCPumpTool_de.properties 2014-09-18 20:28:11 UTC (rev 1310)
+++ trunk/ggc-language_tool/active_translations/de/GGCPumpTool_de.properties 2014-09-19 12:53:56 UTC (rev 1311)
@@ -5,16 +5,16 @@
# ### Language: German ###
# ### Created by: Reinhold Rumberger (ru...@us...)###
# ### Version: 1.2.2 ###
-# ### Last change: 10.08.2014 04:32:31 ###
+# ### Last change: 19.09.2014 14:50:54 ###
# ######################################################################
#
#
# Translation status:
# Words/expressions: 264
-# Not translated: 195 (74 %)
-# Need to be checked: 67 (25 %)
+# Not translated: 100 (38 %)
+# Need to be checked: 157 (59 %)
#
-# Translated: 2 (1 %)
+# Translated: 7 (3 %)
#
#
#
@@ -49,7 +49,7 @@
SELECT_X_DEVICE=Ger\u00E4t %s ausw\u00E4hlen
SELECTED_X_DEVICE=Ger\u00E4t %s ausgew\u00E4hlt
DEVICE_CUSTOM_NAME=%s benutzerdefinierter Name
-DEVICE_DOWNLOAD=DL
+DEVICE_DOWNLOAD=AUSL
DEVICE_SETTINGS=Einst.
#
@@ -116,14 +116,14 @@
# List [1]
#
DEVICE_LIST_WEB=Pumpenliste
-DEVICE_LIST_WEB_DESC=<html>Pumps list contains most of Pumps (even most of models). For each of this pumps, there is configuration entry, which contains only basic settings for device (profile names, TBR settings, etc). Devices which support download have that shown in selector (DL column). Pumps in list are color coded, and color determines status of devices of selected company. Color coding description is shown at bottom of this page.<br></html>
+DEVICE_LIST_WEB_DESC=<html>Die Pumpenliste enth\u00E4lt die meisten Pumpen (auch die meisten Modelle). F\u00FCr jede dieser Pumpen gibt es einen Konfigurations-Eintrag, der nur die Grundeinstellungen des Ger\u00E4ts (Profilnamen, TBR-Einstellungen) enth\u00E4lt. Ger\u00E4te, die ausgelesen werden k\u00F6nnen, werden in der Auswahl markiert ("AUSL"-Spalte). Die Pumpen in der Liste sind farbcodiert, wobei die Farbe den Status der Ger\u00E4te des ausgew\u00E4hlten Unternehmens festlegt. Eine Beschreibung der Farbcodierung befindet sich am Ende dieser Seite.<br></html>
#
# Pump companies desc. (this is not description of company, but about our connection with company) [2]
#
-ROCHE_DESC=We got full support from Roche and implementation is planned to start in March 2009.
-MINIMED_DESC=We got partitial support from company and implementation will start in December 2008.
-ANIMAS_DESC=No support from company so far. Implementation not planned at this time.
+ROCHE_DESC=Wir haben die volle Unterst\u00FCtzunge Roches und die Implementierung sollte im M\u00E4rz 2009 gestartet werden.
+MINIMED_DESC=Wir haben eine unvollst\u00E4ndige Unterst\u00FCtzung dieses Unternehmens, und die Implementierung sollte im Dezember 2008 gestartet werden.
+ANIMAS_DESC=Keine Unterst\u00FCtzung dieses Unternehmens. Bisher ist keine Implementierung geplant.
#
# Pump Instructions [2]
@@ -154,7 +154,7 @@
SUM=Summe
FOOD=Food
IMMEDIATE_AMOUNT=Immediate Amount
-PUMP_DAILY_OVERVIEW=Pump Daily Stats
+PUMP_DAILY_OVERVIEW=T\u00E4gliche Pumpenstatistiken
DATE=Datum
TIME=Zeit
ADD_ROW=Pumpendaten hinzuf\u00FCgen
@@ -162,19 +162,19 @@
DELETE_MANY_ADDITIONAL_DATA=<html>There are many additional data entries under<br>this item. Are you sure you want to delete<br>them all?<br></html>
# table
-BASE_TYPE=Base Type
+BASE_TYPE=Grundtyp
SUB_TYPE=Untertyp
-ADDITIONAL=Additional
+ADDITIONAL=Zus\u00E4tzlich
# parametes
-ADD_DATA_ACTIVITY=Activity
-ADD_DATA_COMMENT=Comment
-ADD_DATA_BG=Blood Glucose
+ADD_DATA_ACTIVITY=Aktivit\u00E4t
+ADD_DATA_COMMENT=Kommentar
+ADD_DATA_BG=Blutzucker
ADD_DATA_URINE=Urin
ADD_DATA_CH=Kohlenhydrate
ADD_DATA_FOOD_DB=Food from Db (and CH)
ADD_DATA_FOOD_DESC=Food by Description (and CH)
-SELECT_SUBTYPE=Select Sub-type
+SELECT_SUBTYPE=Untertyp w\u00E4hlen
ENTRY_TYPE=Type Of Entry
# parameters add wizard 1
@@ -191,35 +191,35 @@
# entry types
SELECT_ITEM=Select Item
-BASAL_DOSE=Basal Dose
-BOLUS_DOSE=Bolus Dose
-EVENT=Event
-ALARM=Alarm
-ERROR=Error
+BASAL_DOSE=Basal-Dosis
+BOLUS_DOSE=Bolus-Dosis
+EVENT=Ereignis
+ALARM=Warnung
+ERROR=Fehler
REPORT=Report
PEN_INJECTION_BASAL=Pen/Injection Basal
PEN_INJECTION_BOLUS=Pen/Injection Bolus
ADDITIONAL_DATA=Additional Data
# pen/injection
-BOLUS_INSULIN=Bolus Insulin
-BASAL_INSULIN=Basal Insulin
+BOLUS_INSULIN=Bolusinsulin
+BASAL_INSULIN=Basalinsulin
# tbr
-TEMPORARY_BASAL_RATE=Temporary Basal Rate
-BASAL_TEMPORARY_BASAL_RATE=Temporary Basal Rate
+TEMPORARY_BASAL_RATE=Tempor\u00E4re Basalrate
+BASAL_TEMPORARY_BASAL_RATE=Tempor\u00E4re Basalrate
BASAL_TEMPORARY_BASAL_RATE_PROFILE=Temp. Basal Rate + Profile
TEMPORARY_BASAL_RATE_SHORT=TBR
-TBR_TYPE_UNIT=Unit (U)
-TBR_TYPE_PROC=Procent (%)
+TBR_TYPE_UNIT=Einheit (U)
+TBR_TYPE_PROC=Prozent (%)
# profile
-PROFILE=Profile
+PROFILE=Profil
NOT_SELECTED=Not Selected.
-BASAL_PROFILE=Profile
+BASAL_PROFILE=Profil
# parameters
-ACTIVITY=Activity
+ACTIVITY=Aktivit\u00E4t
COMMENT=Kommentar
URINE=Urin
CH_LONG=Kohlenhydrate
@@ -229,14 +229,14 @@
#
BASAL_TYPE=Basal Type
SELECT_BASAL_TYPE=Select Basal Type
-BASAL_VALUE=Value
-BASAL_PUMP_STATUS=Pump Status
-ON=On (Running)
-OFF=Off (Stopped)
+BASAL_VALUE=Wert
+BASAL_PUMP_STATUS=Pumpenstatus
+ON=An (L\u00E4uft)
+OFF=Aus (Gestoppt)
SUSPENDED=Suspended
-PUMP_STATUS=Pump Status
-BASAL_TEMPORARY_BASAL_RATE_ENDED=Temporary Basal Rate Ended
-BASAL_TEMPORARY_BASAL_RATE_CANCELED=Temporary Basal Rate Canceled
+PUMP_STATUS=Pumpenstatus
+BASAL_TEMPORARY_BASAL_RATE_ENDED=Tempor\u00E4re Basalrate beendet
+BASAL_TEMPORARY_BASAL_RATE_CANCELED=Tempor\u00E4re Basalrate abgebrochen
#
# Pump Bolus [1]
@@ -245,74 +245,74 @@
SELECT_BOLUS_TYPE=Select Bolus Type
BOLUS_STANDARD=Standard
BOLUS_AUDIO=Audio / Scroll
-BOLUS_SQUARE=Square
+BOLUS_SQUARE=Verz\u00F6gerung
BOLUS_MULTIWAVE=MultiWave
-AMOUNT=Amount
-AMOUNT_MW_1=Amount #1
-AMOUNT_MW_2=Amount #2
-DURATION_SHORT=Duration
+AMOUNT=Menge
+AMOUNT_MW_1=Menge #1
+AMOUNT_MW_2=Menge #2
+DURATION_SHORT=Dauer
SQUARE_AMOUNT=Square Amount
-DURATION=Duration
+DURATION=Dauer
#
# Pump Alarms [2]
#
ALARM_TYPE=Alarm Type
-ALARM_CARTRIDGE_LOW=Cartridge Low
-ALARM_BATTERY_LOW=Baterry Low
+ALARM_CARTRIDGE_LOW=Ampulle fast leer
+ALARM_BATTERY_LOW=Batterie niedrig
ALARM_REVIEW_DATETIME=Review Date/Time
ALARM_ALARM_CLOCK=Alarm Clock
ALARM_PUMP_TIMER=Pump Timer
-ALARM_TEMPORARY_BASAL_RATE_CANCELED=Temporary Basal Rate Canceled
-ALARM_TEMPORARY_BASAL_RATE_OVER=Temporary Basal Rate Over
-ALARM_BOLUS_CANCELED=Bolus Canceled
+ALARM_TEMPORARY_BASAL_RATE_CANCELED=Tempor\u00E4re Basalrate abgebrochen
+ALARM_TEMPORARY_BASAL_RATE_OVER=Tempor\u00E4re Basalrate abgelaufen
+ALARM_BOLUS_CANCELED=Bolus abgebrochen
#
# Pump Errors [2]
#
-ERROR_TYPE=Error Type
-ERROR_UNKNOWN_ERROR=Unknown Error
-ERROR_CARTRIDGE_EMPTY=Cartridge Empty
-ERROR_BATTERY_DEPLETED=Battery Depleted
+ERROR_TYPE=Fehlertyp
+ERROR_UNKNOWN_ERROR=Unbekannter Fehler
+ERROR_CARTRIDGE_EMPTY=Ampulle leer
+ERROR_BATTERY_DEPLETED=Batterie leer
ERROR_AUTOMATIC_OFF=Automatic Off
-ERROR_NO_DELIVERY=No Delivery (Occlussion)
+ERROR_NO_DELIVERY=No Delivery (Verstopfung)
ERROR_END_OF_OPERATION=End Of Operation
-ERROR_MECHANICAL_ERROR=Mechanical Error
-ERROR_ELECTRONIC_ERROR=Electronic Error
-ERROR_POWER_INTERRUPT=Power Interrupt
-ERROR_CARTRIDGE_ERROR=Cartridge Error
-ERROR_SET_NOT_PRIMED=Set Not Primed
+ERROR_MECHANICAL_ERROR=Mechanischer Fehler
+ERROR_ELECTRONIC_ERROR=Elektronischer Fehler
+ERROR_POWER_INTERRUPT=Stromzufuhr unterbrochen
+ERROR_CARTRIDGE_ERROR=Ampullenfehler
+ERROR_SET_NOT_PRIMED=Infusionsset nicht gef\u00FCllt
ERROR_DATA_INTERRUPTED=Data Interrupted
-ERROR_LANGUAGE_ERROR=Language Error
-ERROR_INSULIN_CHANGED=Insulin Changed
+ERROR_LANGUAGE_ERROR=Sprachfehler
+ERROR_INSULIN_CHANGED=Insulin ge\u00E4ndert
#
# Pump Events [2]
#
EVENT_TYPE=Event Type
-EVENT_PRIME_INFUSION_SET=Prime Infusion Set
-EVENT_CARTRIDGE_CHANGED=Cartridge changed
+EVENT_PRIME_INFUSION_SET=Infusionsset f\u00FCllen
+EVENT_CARTRIDGE_CHANGED=Ampulle gewechselt
EVENT_BASAL_RUN=Basal Run
EVENT_BASAL_STOP=Basal Stop
EVENT_POWER_DOWN=Power Down
EVENT_POWER_UP=Power Up
-EVENT_DATETIME_SET=Date/Time Set
-EVENT_DATETIME_CORRECT=Date/Time Corrected
+EVENT_DATETIME_SET=Datum/Zeit gestellt
+EVENT_DATETIME_CORRECT=Datum/Zeit korrigiert
EVENT_DATETIME_CORRECT_TIME_SHIFT_BACK=Date/Time Shift Back
EVENT_DATETIME_CORRECT_TIME_SHIFT_FORWARD=Date/Time Shift Forward
-EVENT_SET_MAX_BASAL=Set Max Basal
-EVENT_SET_MAX_BOLUS=Set Max Bolus
-EVENT_BATERRY_REMOVED=Baterry removed
-EVENT_BATERRY_REPLACED=Baterry replaced
-EVENT_BATERRY_LOW=Baterry low
-EVENT_BATERRY_LOW_DESC=Baterry low (%s)
-EVENT_BG_FROM_METER=BG From Meter
-EVENT_RESERVOIR_LOW=Reservoir low
-EVENT_RESERVOIR_LOW_DESC=Reservoir low (%s)
+EVENT_SET_MAX_BASAL=Max. Basal festlegen
+EVENT_SET_MAX_BOLUS=Max. Bolus festlegen
+EVENT_BATERRY_REMOVED=Batterie entfernt
+EVENT_BATERRY_REPLACED=Batterie gewechselt
+EVENT_BATERRY_LOW=Batterie fast leer
+EVENT_BATERRY_LOW_DESC=Batterie fast leer (%s)
+EVENT_BG_FROM_METER=BZ From Meter
+EVENT_RESERVOIR_LOW=Reservoir fast leer
+EVENT_RESERVOIR_LOW_DESC=Reservoir fast leer (%s)
EVENT_SET_TEMPORARY_BASAL_RATE_TYPE=Set temporary basal rate type
EVENT_SET_BASAL_PATTERN=Set basal pattern
-EVENT_SELF_TEST=Pump Self-test
-EVENT_DOWNLOAD=Pump data download
+EVENT_SELF_TEST=Pumpen-Selbsttest
+EVENT_DOWNLOAD=Pump Daten\u00FCbertragung
#
# Pump Reports [2]
@@ -320,18 +320,18 @@
REPORT_TYPE=Report Type
REPORT_TEXT=Report Text (Value)
REPORT_MISC=Misc (undefined)
-REPORT_BOLUS_TOTAL_DAY=Daily Bolus Total
-REPORT_BASAL_TOTAL_DAY=Daily Basal Total
-REPORT_INSULIN_TOTAL_DAY=Daily Insulin Total
+REPORT_BOLUS_TOTAL_DAY=Bolussumme (Tag)
+REPORT_BASAL_TOTAL_DAY=Basalsumme (Tag)
+REPORT_INSULIN_TOTAL_DAY=Insulin gesamt (Tag)
#
# Profiles [1]
#
PROFILE_SELECTOR=Profile Selector
-NEW=New
+NEW=Neu
PROFILE_BASAL_ENTRY=Profile Basal Entry
TIME_FROM=Time From
-TIME_TILL=TIme Till
+TIME_TILL=Time Until
BASAL_AMOUNT=Basal Amount
PROFILE_EDITOR=Profile Editor
DATE_FROM=Date From
@@ -340,8 +340,8 @@
NAME=Name
FROM=From
TILL=Till
-NEW__PROFILE=New
-NAME_OF_PROFILE=Name of Profile
+NEW__PROFILE=Neu
+NAME_OF_PROFILE=Profilname
PUMP_PROFILE_SELECTOR=Profile Selector (Pump)
ADD_BASAL_SUB_ENTRY=Add Basal Time Entry
EDIT_BASAL_SUB_ENTRY=Edit Basal Time Entry
@@ -367,18 +367,18 @@
#
MN_PUMP=Pump
MN_PUMP_PRINT_DESC=Report for Pumps Data
-MN_PUMP_PRINT_SIMPLE=Simple
+MN_PUMP_PRINT_SIMPLE=Einfach
MN_PUMP_PRINT_SIMPLE_DESC=Simple Report for Pump data
-MN_PUMP_PRINT_EXT=Extended
+MN_PUMP_PRINT_EXT=Erweitert
MN_PUMP_PRINT_EXT_DESC=Extended Report for Pump data (Simple + Foods)
-VALUE_SHORT=Value
-OTHER_DATA=Other Data
+VALUE_SHORT=Wert
+OTHER_DATA=Andere Daten
OTHER_DATA_FOOD=Other Data (with Food)
PUMP_DATA_BASE=Simple Pump Report
PUMP_DATA_EXT=Extended Pump Report
FOOD_DB_PRINT=Food (Db)
FOOD_DESC_PRINT=Food (Desc.)
-FOOD_DESC_PRINT_NOT_YET=Display of Food Db data not implemented yet!
+FOOD_DESC_PRINT_NOT_YET=Display of Food Db data (not implemented yet!)
#
# Pump Configuration (this will be added by each type of pump) [2]
@@ -391,15 +391,15 @@
PCFG_BOLUS_ALARM=After Bolus Alarm
PCFG_BOLUS_BLOCK=Bolus Block
PCFG_BASAL_UNIT=Basal Rate Unit
-UNIT_PER_HOUR=U/hr
-UNIT_PER_DAY=U/day
-PCFG_MAX_BOLUS=Max Bolus Insulin
-PCFG_MAX_BASAL=Max Basal Insulin
-PCFG_MAX_DAILY=Max Daily Insulin
-PCFG_GLUCOSE_UNIT=Blood Glucose Unit
+UNIT_PER_HOUR=U/Std
+UNIT_PER_DAY=U/Tag
+PCFG_MAX_BOLUS=Max. Bolusinsulin
+PCFG_MAX_BASAL=Max. Basalinsulin
+PCFG_MAX_DAILY=Max. Tagesinsulinmenge
+PCFG_GLUCOSE_UNIT=Blutzuckereinheit
PCFG_EASY_MODE=Easy Mode
PCFG_ACTIVE_INSULIN_DECREMENT_RATIO=Active Insulin Decrement Ratio
-PCFG_CH_INS_RATIO=CH/Insulin Ratio
-PCFG_BG_INS_RATIO=BG/Insulin Ratio (Correction factor)
-PCFG_TARGET_BG=Target BG
+PCFG_CH_INS_RATIO=KH/Insulin-Verh\u00E4ltnis
+PCFG_BG_INS_RATIO=BZ/Insulin-Verh\u00E4ltnis (Korrekturfaktor)
+PCFG_TARGET_BG=Ziel-BZ
PCFG_ACTIVE_INSULIN_RATE=Active Insulin Rate
Modified: trunk/ggc-pump/src/GGCPumpTool_de.properties
===================================================================
--- trunk/ggc-pump/src/GGCPumpTool_de.properties 2014-09-18 20:28:11 UTC (rev 1310)
+++ trunk/ggc-pump/src/GGCPumpTool_de.properties 2014-09-19 12:53:56 UTC (rev 1311)
@@ -5,16 +5,16 @@
# ### Language: German ###
# ### Created by: Reinhold Rumberger (ru...@us...)###
# ### Version: 1.2.2 ###
-# ### Last change: 10.08.2014 04:32:31 ###
+# ### Last change: 19.09.2014 14:50:54 ###
# ######################################################################
#
#
# Translation status:
# Words/expressions: 264
-# Not translated: 195 (74 %)
-# Need to be checked: 67 (25 %)
+# Not translated: 100 (38 %)
+# Need to be checked: 157 (59 %)
#
-# Translated: 2 (1 %)
+# Translated: 7 (3 %)
#
#
#
@@ -49,7 +49,7 @@
SELECT_X_DEVICE=Ger\u00E4t %s ausw\u00E4hlen
SELECTED_X_DEVICE=Ger\u00E4t %s ausgew\u00E4hlt
DEVICE_CUSTOM_NAME=%s benutzerdefinierter Name
-DEVICE_DOWNLOAD=DL
+DEVICE_DOWNLOAD=AUSL
DEVICE_SETTINGS=Einst.
#
@@ -116,14 +116,14 @@
# List [1]
#
DEVICE_LIST_WEB=Pumpenliste
-DEVICE_LIST_WEB_DESC=<html>Pumps list contains most of Pumps (even most of models). For each of this pumps, there is configuration entry, which contains only basic settings for device (profile names, TBR settings, etc). Devices which support download have that shown in selector (DL column). Pumps in list are color coded, and color determines status of devices of selected company. Color coding description is shown at bottom of this page.<br></html>
+DEVICE_LIST_WEB_DESC=<html>Die Pumpenliste enth\u00E4lt die meisten Pumpen (auch die meisten Modelle). F\u00FCr jede dieser Pumpen gibt es einen Konfigurations-Eintrag, der nur die Grundeinstellungen des Ger\u00E4ts (Profilnamen, TBR-Einstellungen) enth\u00E4lt. Ger\u00E4te, die ausgelesen werden k\u00F6nnen, werden in der Auswahl markiert ("AUSL"-Spalte). Die Pumpen in der Liste sind farbcodiert, wobei die Farbe den Status der Ger\u00E4te des ausgew\u00E4hlten Unternehmens festlegt. Eine Beschreibung der Farbcodierung befindet sich am Ende dieser Seite.<br></html>
#
# Pump companies desc. (this is not description of company, but about our connection with company) [2]
#
-ROCHE_DESC=We got full support from Roche and implementation is planned to start in March 2009.
-MINIMED_DESC=We got partitial support from company and implementation will start in December 2008.
-ANIMAS_DESC=No support from company so far. Implementation not planned at this time.
+ROCHE_DESC=Wir haben die volle Unterst\u00FCtzunge Roches und die Implementierung sollte im M\u00E4rz 2009 gestartet werden.
+MINIMED_DESC=Wir haben eine unvollst\u00E4ndige Unterst\u00FCtzung dieses Unternehmens, und die Implementierung sollte im Dezember 2008 gestartet werden.
+ANIMAS_DESC=Keine Unterst\u00FCtzung dieses Unternehmens. Bisher ist keine Implementierung geplant.
#
# Pump Instructions [2]
@@ -154,7 +154,7 @@
SUM=Summe
FOOD=Food
IMMEDIATE_AMOUNT=Immediate Amount
-PUMP_DAILY_OVERVIEW=Pump Daily Stats
+PUMP_DAILY_OVERVIEW=T\u00E4gliche Pumpenstatistiken
DATE=Datum
TIME=Zeit
ADD_ROW=Pumpendaten hinzuf\u00FCgen
@@ -162,19 +162,19 @@
DELETE_MANY_ADDITIONAL_DATA=<html>There are many additional data entries under<br>this item. Are you sure you want to delete<br>them all?<br></html>
# table
-BASE_TYPE=Base Type
+BASE_TYPE=Grundtyp
SUB_TYPE=Untertyp
-ADDITIONAL=Additional
+ADDITIONAL=Zus\u00E4tzlich
# parametes
-ADD_DATA_ACTIVITY=Activity
-ADD_DATA_COMMENT=Comment
-ADD_DATA_BG=Blood Glucose
+ADD_DATA_ACTIVITY=Aktivit\u00E4t
+ADD_DATA_COMMENT=Kommentar
+ADD_DATA_BG=Blutzucker
ADD_DATA_URINE=Urin
ADD_DATA_CH=Kohlenhydrate
ADD_DATA_FOOD_DB=Food from Db (and CH)
ADD_DATA_FOOD_DESC=Food by Description (and CH)
-SELECT_SUBTYPE=Select Sub-type
+SELECT_SUBTYPE=Untertyp w\u00E4hlen
ENTRY_TYPE=Type Of Entry
# parameters add wizard 1
@@ -191,35 +191,35 @@
# entry types
SELECT_ITEM=Select Item
-BASAL_DOSE=Basal Dose
-BOLUS_DOSE=Bolus Dose
-EVENT=Event
-ALARM=Alarm
-ERROR=Error
+BASAL_DOSE=Basal-Dosis
+BOLUS_DOSE=Bolus-Dosis
+EVENT=Ereignis
+ALARM=Warnung
+ERROR=Fehler
REPORT=Report
PEN_INJECTION_BASAL=Pen/Injection Basal
PEN_INJECTION_BOLUS=Pen/Injection Bolus
ADDITIONAL_DATA=Additional Data
# pen/injection
-BOLUS_INSULIN=Bolus Insulin
-BASAL_INSULIN=Basal Insulin
+BOLUS_INSULIN=Bolusinsulin
+BASAL_INSULIN=Basalinsulin
# tbr
-TEMPORARY_BASAL_RATE=Temporary Basal Rate
-BASAL_TEMPORARY_BASAL_RATE=Temporary Basal Rate
+TEMPORARY_BASAL_RATE=Tempor\u00E4re Basalrate
+BASAL_TEMPORARY_BASAL_RATE=Tempor\u00E4re Basalrate
BASAL_TEMPORARY_BASAL_RATE_PROFILE=Temp. Basal Rate + Profile
TEMPORARY_BASAL_RATE_SHORT=TBR
-TBR_TYPE_UNIT=Unit (U)
-TBR_TYPE_PROC=Procent (%)
+TBR_TYPE_UNIT=Einheit (U)
+TBR_TYPE_PROC=Prozent (%)
# profile
-PROFILE=Profile
+PROFILE=Profil
NOT_SELECTED=Not Selected.
-BASAL_PROFILE=Profile
+BASAL_PROFILE=Profil
# parameters
-ACTIVITY=Activity
+ACTIVITY=Aktivit\u00E4t
COMMENT=Kommentar
URINE=Urin
CH_LONG=Kohlenhydrate
@@ -229,14 +229,14 @@
#
BASAL_TYPE=Basal Type
SELECT_BASAL_TYPE=Select Basal Type
-BASAL_VALUE=Value
-BASAL_PUMP_STATUS=Pump Status
-ON=On (Running)
-OFF=Off (Stopped)
+BASAL_VALUE=Wert
+BASAL_PUMP_STATUS=Pumpenstatus
+ON=An (L\u00E4uft)
+OFF=Aus (Gestoppt)
SUSPENDED=Suspended
-PUMP_STATUS=Pump Status
-BASAL_TEMPORARY_BASAL_RATE_ENDED=Temporary Basal Rate Ended
-BASAL_TEMPORARY_BASAL_RATE_CANCELED=Temporary Basal Rate Canceled
+PUMP_STATUS=Pumpenstatus
+BASAL_TEMPORARY_BASAL_RATE_ENDED=Tempor\u00E4re Basalrate beendet
+BASAL_TEMPORARY_BASAL_RATE_CANCELED=Tempor\u00E4re Basalrate abgebrochen
#
# Pump Bolus [1]
@@ -245,74 +245,74 @@
SELECT_BOLUS_TYPE=Select Bolus Type
BOLUS_STANDARD=Standard
BOLUS_AUDIO=Audio / Scroll
-BOLUS_SQUARE=Square
+BOLUS_SQUARE=Verz\u00F6gerung
BOLUS_MULTIWAVE=MultiWave
-AMOUNT=Amount
-AMOUNT_MW_1=Amount #1
-AMOUNT_MW_2=Amount #2
-DURATION_SHORT=Duration
+AMOUNT=Menge
+AMOUNT_MW_1=Menge #1
+AMOUNT_MW_2=Menge #2
+DURATION_SHORT=Dauer
SQUARE_AMOUNT=Square Amount
-DURATION=Duration
+DURATION=Dauer
#
# Pump Alarms [2]
#
ALARM_TYPE=Alarm Type
-ALARM_CARTRIDGE_LOW=Cartridge Low
-ALARM_BATTERY_LOW=Baterry Low
+ALARM_CARTRIDGE_LOW=Ampulle fast leer
+ALARM_BATTERY_LOW=Batterie niedrig
ALARM_REVIEW_DATETIME=Review Date/Time
ALARM_ALARM_CLOCK=Alarm Clock
ALARM_PUMP_TIMER=Pump Timer
-ALARM_TEMPORARY_BASAL_RATE_CANCELED=Temporary Basal Rate Canceled
-ALARM_TEMPORARY_BASAL_RATE_OVER=Temporary Basal Rate Over
-ALARM_BOLUS_CANCELED=Bolus Canceled
+ALARM_TEMPORARY_BASAL_RATE_CANCELED=Tempor\u00E4re Basalrate abgebrochen
+ALARM_TEMPORARY_BASAL_RATE_OVER=Tempor\u00E4re Basalrate abgelaufen
+ALARM_BOLUS_CANCELED=Bolus abgebrochen
#
# Pump Errors [2]
#
-ERROR_TYPE=Error Type
-ERROR_UNKNOWN_ERROR=Unknown Error
-ERROR_CARTRIDGE_EMPTY=Cartridge Empty
-ERROR_BATTERY_DEPLETED=Battery Depleted
+ERROR_TYPE=Fehlertyp
+ERROR_UNKNOWN_ERROR=Unbekannter Fehler
+ERROR_CARTRIDGE_EMPTY=Ampulle leer
+ERROR_BATTERY_DEPLETED=Batterie leer
ERROR_AUTOMATIC_OFF=Automatic Off
-ERROR_NO_DELIVERY=No Delivery (Occlussion)
+ERROR_NO_DELIVERY=No Delivery (Verstopfung)
ERROR_END_OF_OPERATION=End Of Operation
-ERROR_MECHANICAL_ERROR=Mechanical Error
-ERROR_ELECTRONIC_ERROR=Electronic Error
-ERROR_POWER_INTERRUPT=Power Interrupt
-ERROR_CARTRIDGE_ERROR=Cartridge Error
-ERROR_SET_NOT_PRIMED=Set Not Primed
+ERROR_MECHANICAL_ERROR=Mechanischer Fehler
+ERROR_ELECTRONIC_ERROR=Elektronischer Fehler
+ERROR_POWER_INTERRUPT=Stromzufuhr unterbrochen
+ERROR_CARTRIDGE_ERROR=Ampullenfehler
+ERROR_SET_NOT_PRIMED=Infusionsset nicht gef\u00FCllt
ERROR_DATA_INTERRUPTED=Data Interrupted
-ERROR_LANGUAGE_ERROR=Language Error
-ERROR_INSULIN_CHANGED=Insulin Changed
+ERROR_LANGUAGE_ERROR=Sprachfehler
+ERROR_INSULIN_CHANGED=Insulin ge\u00E4ndert
#
# Pump Events [2]
#
EVENT_TYPE=Event Type
-EVENT_PRIME_INFUSION_SET=Prime Infusion Set
-EVENT_CARTRIDGE_CHANGED=Cartridge changed
+EVENT_PRIME_INFUSION_SET=Infusionsset f\u00FCllen
+EVENT_CARTRIDGE_CHANGED=Ampulle gewechselt
EVENT_BASAL_RUN=Basal Run
EVENT_BASAL_STOP=Basal Stop
EVENT_POWER_DOWN=Power Down
EVENT_POWER_UP=Power Up
-EVENT_DATETIME_SET=Date/Time Set
-EVENT_DATETIME_CORRECT=Date/Time Corrected
+EVENT_DATETIME_SET=Datum/Zeit gestellt
+EVENT_DATETIME_CORRECT=Datum/Zeit korrigiert
EVENT_DATETIME_CORRECT_TIME_SHIFT_BACK=Date/Time Shift Back
EVENT_DATETIME_CORRECT_TIME_SHIFT_FORWARD=Date/Time Shift Forward
-EVENT_SET_MAX_BASAL=Set Max Basal
-EVENT_SET_MAX_BOLUS=Set Max Bolus
-EVENT_BATERRY_REMOVED=Baterry removed
-EVENT_BATERRY_REPLACED=Baterry replaced
-EVENT_BATERRY_LOW=Baterry low
-EVENT_BATERRY_LOW_DESC=Baterry low (%s)
-EVENT_BG_FROM_METER=BG From Meter
-EVENT_RESERVOIR_LOW=Reservoir low
-EVENT_RESERVOIR_LOW_DESC=Reservoir low (%s)
+EVENT_SET_MAX_BASAL=Max. Basal festlegen
+EVENT_SET_MAX_BOLUS=Max. Bolus festlegen
+EVENT_BATERRY_REMOVED=Batterie entfernt
+EVENT_BATERRY_REPLACED=Batterie gewechselt
+EVENT_BATERRY_LOW=Batterie fast leer
+EVENT_BATERRY_LOW_DESC=Batterie fast leer (%s)
+EVENT_BG_FROM_METER=BZ From Meter
+EVENT_RESERVOIR_LOW=Reservoir fast leer
+EVENT_RESERVOIR_LOW_DESC=Reservoir fast leer (%s)
EVENT_SET_TEMPORARY_BASAL_RATE_TYPE=Set temporary basal rate type
EVENT_SET_BASAL_PATTERN=Set basal pattern
-EVENT_SELF_TEST=Pump Self-test
-EVENT_DOWNLOAD=Pump data download
+EVENT_SELF_TEST=Pumpen-Selbsttest
+EVENT_DOWNLOAD=Pump Daten\u00FCbertragung
#
# Pump Reports [2]
@@ -320,18 +320,18 @@
REPORT_TYPE=Report Type
REPORT_TEXT=Report Text (Value)
REPORT_MISC=Misc (undefined)
-REPORT_BOLUS_TOTAL_DAY=Daily Bolus Total
-REPORT_BASAL_TOTAL_DAY=Daily Basal Total
-REPORT_INSULIN_TOTAL_DAY=Daily Insulin Total
+REPORT_BOLUS_TOTAL_DAY=Bolussumme (Tag)
+REPORT_BASAL_TOTAL_DAY=Basalsumme (Tag)
+REPORT_INSULIN_TOTAL_DAY=Insulin gesamt (Tag)
#
# Profiles [1]
#
PROFILE_SELECTOR=Profile Selector
-NEW=New
+NEW=Neu
PROFILE_BASAL_ENTRY=Profile Basal Entry
TIME_FROM=Time From
-TIME_TILL=TIme Till
+TIME_TILL=Time Until
BASAL_AMOUNT=Basal Amount
PROFILE_EDITOR=Profile Editor
DATE_FROM=Date From
@@ -340,8 +340,8 @@
NAME=Name
FROM=From
TILL=Till
-NEW__PROFILE=New
-NAME_OF_PROFILE=Name of Profile
+NEW__PROFILE=Neu
+NAME_OF_PROFILE=Profilname
PUMP_PROFILE_SELECTOR=Profile Selector (Pump)
ADD_BASAL_SUB_ENTRY=Add Basal Time Entry
EDIT_BASAL_SUB_ENTRY=Edit Basal Time Entry
@@ -367,18 +367,18 @@
#
MN_PUMP=Pump
MN_PUMP_PRINT_DESC=Report for Pumps Data
-MN_PUMP_PRINT_SIMPLE=Simple
+MN_PUMP_PRINT_SIMPLE=Einfach
MN_PUMP_PRINT_SIMPLE_DESC=Simple Report for Pump data
-MN_PUMP_PRINT_EXT=Extended
+MN_PUMP_PRINT_EXT=Erweitert
MN_PUMP_PRINT_EXT_DESC=Extended Report for Pump data (Simple + Foods)
-VALUE_SHORT=Value
-OTHER_DATA=Other Data
+VALUE_SHORT=Wert
+OTHER_DATA=Andere Daten
OTHER_DATA_FOOD=Other Data (with Food)
PUMP_DATA_BASE=Simple Pump Report
PUMP_DATA_EXT=Extended Pump Report
FOOD_DB_PRINT=Food (Db)
FOOD_DESC_PRINT=Food (Desc.)
-FOOD_DESC_PRINT_NOT_YET=Display of Food Db data not implemented yet!
+FOOD_DESC_PRINT_NOT_YET=Display of Food Db data (not implemented yet!)
#
# Pump Configuration (this will be added by each type of pump) [2]
@@ -391,15 +391,15 @@
PCFG_BOLUS_ALARM=After Bolus Alarm
PCFG_BOLUS_BLOCK=Bolus Block
PCFG_BASAL_UNIT=Basal Rate Unit
-UNIT_PER_HOUR=U/hr
-UNIT_PER_DAY=U/day
-PCFG_MAX_BOLUS=Max Bolus Insulin
-PCFG_MAX_BASAL=Max Basal Insulin
-PCFG_MAX_DAILY=Max Daily Insulin
-PCFG_GLUCOSE_UNIT=Blood Glucose Unit
+UNIT_PER_HOUR=U/Std
+UNIT_PER_DAY=U/Tag
+PCFG_MAX_BOLUS=Max. Bolusinsulin
+PCFG_MAX_BASAL=Max. Basalinsulin
+PCFG_MAX_DAILY=Max. Tagesinsulinmenge
+PCFG_GLUCOSE_UNIT=Blutzuckereinheit
PCFG_EASY_MODE=Easy Mode
PCFG_ACTIVE_INSULIN_DECREMENT_RATIO=Active Insulin Decrement Ratio
-PCFG_CH_INS_RATIO=CH/Insulin Ratio
-PCFG_BG_INS_RATIO=BG/Insulin Ratio (Correction factor)
-PCFG_TARGET_BG=Target BG
+PCFG_CH_INS_RATIO=KH/Insulin-Verh\u00E4ltnis
+PCFG_BG_INS_RATIO=BZ/Insulin-Verh\u00E4ltnis (Korrekturfaktor)
+PCFG_TARGET_BG=Ziel-BZ
PCFG_ACTIVE_INSULIN_RATE=Active Insulin Rate
Modified: trunk/ggc-pump/src/GGCPumpTool_en.properties
===================================================================
--- trunk/ggc-pump/src/GGCPumpTool_en.properties 2014-09-18 20:28:11 UTC (rev 1310)
+++ trunk/ggc-pump/src/GGCPumpTool_en.properties 2014-09-19 12:53:56 UTC (rev 1311)
@@ -127,7 +127,7 @@
# !G! Device Configuration [1]
#
READ_DEVICE_CONFIG_TITLE=Read Pump Configuration [%s on %s]
-SETTING_GROUP=Setting / Group
+SETTING_GROUP=Setting/Group
#
@@ -140,22 +140,22 @@
# !G! List [1]
#
DEVICE_LIST_WEB=Pumps List
-DEVICE_LIST_WEB_DESC=<html>Pumps list contains most of Pumps (even most of models). For each of this pumps, there is configuration entry, which contains only basic settings for device (profile names, TBR settings, etc). Devices which support download have that shown in selector (DL column). Pumps in list are color coded, and color determines status of devices of selected company. Color coding description is shown at bottom of this page.<br></html>
+DEVICE_LIST_WEB_DESC=<html>The pumps list contains most pumps (even most models). For each of these pumps, there is a configuration entry which contains only basic settings for the device (profile names, TBR settings, etc.). Devices which support downloading have that shown in the selector (DL column). The pumps in the list are color coded, and color determines the status of the devices from the selected company. The color coding description is shown at bottom of this page.<br></html>
#
# !G! Pump companies desc. (this is not description of company, but about our connection with company) [2]
#
-ROCHE_DESC=We got full support from Roche and implementation is planned to start in March 2009.
-MINIMED_DESC=We got partitial support from company and implementation will start in December 2008.
-ANIMAS_DESC=No support from company so far. Implementation not planned at this time.
+ROCHE_DESC=We got full support from Roche and the implementation is planned to start in March 2009.
+MINIMED_DESC=We got partial support from this company and implementation will start in December 2008.
+ANIMAS_DESC=No support from this company so far. Implementation not planned at this time.
#
# !G! Pump Instructions [2]
#
INSTRUCTIONS_DANA_III_R=<html>Instructions for pump download:<ul><li>Attach BlueTooth adapter (not all of them<br>work for this pump)</li><li>Prepare pump for data transfer (you only<br>need to do this once)</li><li>Since BT transfer is wireless, you might<br>need to have transfer data several times</li></ul>Click "Start Download" to begin reading data from<br>your pump...</html>
-INSTRUCTIONS_ACCUCHEK_SPIRIT=<html><body>Instructions for pump download:<ul><li>Pix Device should be attached before<br>program is started<li>Stop pump and activate data transfer mode<li>Click on "Start Download" to start download.<li>When new window opens place pump 10 cm<br>from Pix device</ul>Accu-Check Pix has sometimes problems with java,<br> so you might be forced repeat download.</body></html>
+INSTRUCTIONS_ACCUCHEK_SPIRIT=<html><body>Instructions for pump download:<ul><li>The SmartPix Device should be attached before<br>the program is started.<li>Stop the pump and activate the data transfer mode.<li>Click on "Start Download" to start the download.<li>When the new window opens, place the pump 10 cm<br>from the SmartPix device.</ul>Accu-Check SmartPix sometimes has problems with Java,<br> so you might be forced repeat the download.</body></html>
#
# !G! Manual Entry [1]
@@ -202,10 +202,10 @@
ADD_DATA_BG=Blood Glucose
ADD_DATA_URINE=Urine
ADD_DATA_CH=Carbohydrates
-ADD_DATA_FOOD_DB=Food from Db (and CH)
+ADD_DATA_FOOD_DB=Food from DB (and CH)
ADD_DATA_FOOD_DESC=Food by Description (and CH)
SELECT_SUBTYPE=Select Sub-type
-ENTRY_TYPE=Type Of Entry
+ENTRY_TYPE=Type of Entry
# !SG! parameters add wizard 1
ADD_PARAMETER=Add additional data (1/2)
@@ -242,7 +242,7 @@
BASAL_TEMPORARY_BASAL_RATE_PROFILE=Temp. Basal Rate + Profile
TEMPORARY_BASAL_RATE_SHORT=TBR
TBR_TYPE_UNIT=Unit (U)
-TBR_TYPE_PROC=Procent (%)
+TBR_TYPE_PROC=Percent (%)
# !SG! profile
PROFILE=Profile
@@ -277,7 +277,7 @@
BOLUS_TYPE=Bolus Type
SELECT_BOLUS_TYPE=Select Bolus Type
BOLUS_STANDARD=Standard
-BOLUS_AUDIO=Audio / Scroll
+BOLUS_AUDIO=Audio/Scroll
BOLUS_SQUARE=Square
BOLUS_MULTIWAVE=MultiWave
BOLUS_DUAL_NORMAL=Dual - Normal
@@ -295,7 +295,7 @@
#
ALARM_TYPE=Alarm Type
ALARM_CARTRIDGE_LOW=Cartridge Low
-ALARM_BATTERY_LOW=Baterry Low
+ALARM_BATTERY_LOW=Battery Low
ALARM_REVIEW_DATETIME=Review Date/Time
ALARM_ALARM_CLOCK=Alarm Clock
ALARM_PUMP_TIMER=Pump Timer
@@ -340,10 +340,10 @@
EVENT_DATETIME_CORRECT_TIME_SHIFT_FORWARD=Date/Time Shift Forward
EVENT_SET_MAX_BASAL=Set Max Basal
EVENT_SET_MAX_BOLUS=Set Max Bolus
-EVENT_BATERRY_REMOVED=Baterry removed
-EVENT_BATERRY_REPLACED=Baterry replaced
-EVENT_BATERRY_LOW=Baterry low
-EVENT_BATERRY_LOW_DESC=Baterry low (%s)
+EVENT_BATERRY_REMOVED=Battery removed
+EVENT_BATERRY_REPLACED=Battery replaced
+EVENT_BATERRY_LOW=Battery low
+EVENT_BATERRY_LOW_DESC=Battery low (%s)
EVENT_BG_FROM_METER=BG From Meter
EVENT_RESERVOIR_LOW=Reservoir low
EVENT_RESERVOIR_LOW_DESC=Reservoir low (%s)
@@ -371,15 +371,15 @@
NEW=New
PROFILE_BASAL_ENTRY=Profile Basal Entry
TIME_FROM=Time From
-TIME_TILL=TIme Till
+TIME_TILL=Time Until
BASAL_AMOUNT=Basal Amount
PROFILE_EDITOR=Profile Editor
DATE_FROM=Date From
-DATE_TILL=Date Till
+DATE_TILL=Date Until
BASE_BASAL=Base Basal
NAME=Name
FROM=From
-TILL=Till
+TILL=Until
NEW__PROFILE=New
NAME_OF_PROFILE=Name of Profile
PUMP_PROFILE_SELECTOR=Profile Selector (Pump)
@@ -389,7 +389,7 @@
DELETE_BASAL_SUB_ENTRY=Delete Basal Time Entry
IMPORT_BASAL_SUB_ENTRIES=Import Basal Time Entries
VALUE_AXIS_BASAL=Basal doses of insulin (in Units)
-TIME_AXIS_BASAL=Time (each bar represent 30 min. interval)
+TIME_AXIS_BASAL=Time (each bar represents a 30 min. interval)
#
# !G! Devices [2]
@@ -424,7 +424,7 @@
FOOD_DB_PRINT=Food (Db)
FOOD_DESC_PRINT=Food (Desc.)
-FOOD_DESC_PRINT_NOT_YET=Display of Food Db data not implemented yet!
+FOOD_DESC_PRINT_NOT_YET=Display of Food Db data (not implemented yet!)
#
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2014-09-19 13:26:43
|
Revision: 1312
http://sourceforge.net/p/ggc/code/1312
Author: andyrozman
Date: 2014-09-19 13:26:40 +0000 (Fri, 19 Sep 2014)
Log Message:
-----------
Printing issues mostly:
- creation of Itext document (there was an error: Bad descriptor)
- added settings for itext document (margins size)
- added page counter on abstract class
- fixed IcePdfViewer (old implementation closed whole application)
- PrintPumpDataAbstract added getCustomeSettings
WARNING: All other print methods need to be updated too, this will be fixed during weekend
Modified Paths:
--------------
trunk/ggc-plugin_base/pom.xml
trunk/ggc-plugin_base/src/GGCPlugin_en.properties
trunk/ggc-pump/src/ggc/pump/print/PrintPumpDataAbstract.java
Removed Paths:
-------------
trunk/ggc-plugin_base/src/GGCPlugin_de.properties
Modified: trunk/ggc-plugin_base/pom.xml
===================================================================
--- trunk/ggc-plugin_base/pom.xml 2014-09-19 12:53:56 UTC (rev 1311)
+++ trunk/ggc-plugin_base/pom.xml 2014-09-19 13:26:40 UTC (rev 1312)
@@ -46,7 +46,7 @@
<groupId>net.sf.ggc</groupId>
<artifactId>ggc-core</artifactId>
</dependency>
-<!--
+<!--
<dependency>
<groupId>org.bidib.jbidib.org.qbang.rxtx</groupId>
<artifactId>rxtxcomm</artifactId>
@@ -76,7 +76,7 @@
<groupId>com.neuronrobotics</groupId>
<artifactId>nrjavaserial</artifactId>
<!-- <version>3.9.3</version> -->
- <version>3.9.3</version>
+
</dependency>
<dependency>
Deleted: trunk/ggc-plugin_base/src/GGCPlugin_de.properties
===================================================================
--- trunk/ggc-plugin_base/src/GGCPlugin_de.properties 2014-09-19 12:53:56 UTC (rev 1311)
+++ trunk/ggc-plugin_base/src/GGCPlugin_de.properties 2014-09-19 13:26:40 UTC (rev 1312)
@@ -1,362 +0,0 @@
-#
-# ######################################################################
-# ### GNU Glucose Control ###
-# ######################################################################
-# ### Language: German ###
-# ### Created by: Reinhold Rumberger (ru...@us...)###
-# ### Version: 0.6.1 ###
-# ### Last change: 03.07.2011 14:41:33 ###
-# ######################################################################
-#
-#
-# Translation status:
-# Words/expressions: 245
-# Not translated: 236 (96 %)
-# Need to be checked: 0 (0 %)
-#
-# Translated: 9 (3 %)
-#
-#
-#
-##
-# Collation Rules - In unicode we can create special rules for sorting where we specify
-# sorting order of special characters. This will be used by tree's and special tables.
-# For english this is left empty. For all other (that have non-standard, non english
-# charcters) we need to set this if we want sorting to be done correctly.
-#
-COLLATION_RULES=< 0 < 1 < 2 < 3 < 4 < 5 < 6 < 7 < 8 < 9 < a,A,\u00E4,\u00C4,\u00E1,\u00E0,\u00C1,\u00C0,\u00E2,\u00C2 < b,B < c,C < d,D < e,E,\u00E9,\u00E8,\u00EA,\u00C9,\u00C8,\u00CA < f,F < g,G < h,H < i,I < j,J < k,K < l,L < m,M < n,N < o,O,\u00F6,\u00D6 < p,P < q,Q < r,R < s,S,\u00DF < t,T < u,U,\u00FC,\u00DC < v,V < w,W < x,X < y,Y < z,Z
-
-#
-# General [1]
-#
-
-# buttons and general stuff
-CANCEL=Abbrechen
-OK=OK
-HELP=Hilfe
-CLOSE=Schlie\u00DFen
-APPLY=Anwenden
-LOG__=log:
-SELECT=Select
-ERROR=Error
-ADD=Add
-EDIT=Edit
-DELETE=Delete
-NEXT=Next
-YES=Yes
-NO=No
-WARNING=Warning
-UNIT_MMOLL=mmol/L
-UNIT_MGDL=mg/dL
-FALSE=False
-TRUE=True
-DATE=Date
-TIME=Time
-GRAPH=Graph
-SELECT_ITEM_FIRST=Please select item first.
-ARE_YOU_SURE_DELETE=Are you sure you want to delete this item/entry?
-QUESTION=Question
-INFORMATION=Information
-INVALID_DATA=Invalid data
-VERSION=Version
-
-# weeks days and months
-SU=Su
-MO=Mo
-TU=Tu
-WE=We
-TH=Th
-FR=Fr
-SA=Sa
-JANUARY=January
-FEBRUARY=February
-MARCH=March
-APRIL=April
-MAY=May
-JUNE=June
-JULY=July
-AUGUST=August
-SEPTEMBER=September
-OCTOBER=October
-NOVEMBER=November
-DECEMBER=December
-
-#
-# Configuration [1]
-#
-MY__=My
-DEVICE_COMPANY=Company
-DEVICE_DEVICE=Ger\u00E4t
-NO_COMPANY_SELECTED=No company selected.
-NO_DEVICE_SELECTED=No device selected.
-TIMEZONE_CONFIGURATION=TimeZone Configuration
-SELECT_ITEM_OR_CANCEL=Select one of items or use Cancel option.
-SELECT_MASS_STORAGE_DRIVE=Select Mass Storage Drive
-SELECT_SERIAL_PORT=Select Serial Port
-SERIAL_PORT=Serial Port
-MASS_STORAGE_DRIVE=Mass Storage Drive
-NEW__=New
-NOT_SET=Not Set !
-TIMEZONE_PREFERENCES=TimeZone Preferences
-SELECT_TIMEZONE_LIST=Select correct timezone
-NEED_DAYLIGHTSAVING_FIX=Do we need daylight savings fix?
-WINTERTIME_FIX=Winter Time Fix
-SUMMERTIME_FIX=Summer Time Fix
-DEVICE_CONNECTION=Device connection
-CUSTOM_NAME=Custom name
-COMMUNICATION_SETTINGS=Communication Settings
-CONFIG_ERROR_NO_DEVICE_OR_PARAMETERS=<html>Configuration Error:<br>You either didn't select device, or you didn't correctly<br>enter all required parameters.<br></html>
-DEVICE_VERSION=Device version
-
-#
-# Ports [1]
-#
-COMMUNICATION_PORT=Communication Port
-
-#
-# Instructions Dialog [1]
-#
-OOPS_DEVICE_NOT_CONFIGURED=Oops ! You forgot to configure your %s\nand currently there is no %s configured\nand/or selected. Please visit configuration\nand configure your %s.
-CONFIGURED_DEVICE_INSTRUCTIONS=Configured %s and Instructions
-CONFIGURED_DEVICE=Configured Device
-INSTRUCTIONS=Instructions for Download
-MY_DEVICE_NAME=My name
-DEVICE_ICON=%s picture
-DEVICE_NAME_=Device name
-CONNECTION_TYPE=Connection
-CONNECTION_PARAMETER=C. Parameter
-STATUS=Status
-DAYLIGHTSAVINGS_FIX=Time (DS) fix
-DS_NO=No
-DS_FIX_SHORT=Yes (W.=%s / S.=%s)
-DS_FIX_LONG=Yes (Winter time fix=%s / Summer time fix=%s). Timezone: %s
-DEVICE_DOESNT_SUPPORT_DS_FIX=Not supported by device !
-DEVICE_DOESNT_SUPPORT_DS_FIX_2=Device doesn't support Daylight savings fix
-INSTRUCTIONS_DESC=<html>On upper right side you can see your configuration. If Status in it, is not 'Ready' then there is problem with configuration. Please exit and run configuration again and try to resolve problem. If problem still persist contact support (see Documentation). On lower right side you see instructions on how to connect device to your PC. Please follow them and after you completed, click on 'Start Download' button. You will be taken to next screen where all your device entries will be displayed as they download. All data is just displayed until you click on 'Export Data' button.</html>
-START_DOWNLOAD=Start Download >>>
-WAIT_UNTIL_DEVICE_PREINIT=Please wait until device is pre-inited!
-
-# status
-ERROR_IN_CONFIG=Error in config
-READY=Ready
-
-# Download support
-DEVICE_HAS_NO_DOWNLOAD_SUPPORT=<html>Your selected device (%s [%s])<br>doesn't support downloading of data.<br></html>
-DEVICE_DOWNLOAD_NOT_SUPPORTED_BY_GGC=<html>GGC at this time doesn't support downloading<br>from selected device (%s [%s]).<br>Check device listing to see if support is planned<br>or contact us for additional info.</html>
-DEVICE_DOWNLOAD_NOT_SUPPORTED_GENERIC=<html>Generic devices have no download support !<br>You need to select "real" device (and correct<br>one at that).<br></html>
-DEVICE_HAS_NO_DEVICE_DOWNLOAD_SUPPORT=<html>Your selected device (%s [%s])<br>doesn't support downloading of data.<br></html>
-DEVICE_HAS_NO_FILE_DOWNLOAD_SUPPORT=<html>Your selected device (%s [%s])<br>doesn't support import of data through files.<br></html>
-DEVICE_HAS_NO_CONFIG_DOWNLOAD_SUPPORT=<html>Your selected device (%s [%s])<br>doesn't support download of configuration.<br></html>
-INTERNAL_CONFIGURATION_ERROR=<html>There seems to be internal problem<br>in configuration of application.<br></html>
-
-#
-# File Selector [1]
-#
-IMPORT_FILE_SELECTOR=Import File Selector
-IMPORT_FILE_SELECTOR_DESC=<html><body>Please select import file of selected type. </body></html>
-SELECT_FILE=Select file:
-BROWSE=Browse
-MULTIPLE_IMPORT_SELECTOR=Multiple Import Selector
-MULTIPLE_IMPORT_SELECTOR_DESC=<html><body>This device has several possible import types. Please select correct import type, for import type you have available. </body></html>
-
-#
-# Transfer display [1]
-#
-ERROR_CONTACTING_DEVICE=We had problem contacting device.\nPlease recheck communication port settings\n(some of cables, can change their address,\nwhen reconnected). Run configuration again\nand problem should be solved!\n
-BREAK_COMMUNICATION=Break Communication
-EXPORT_DATA=Export Data
-DATA=Data
-LOG=Log
-DEVICE_INFO=%s Info
-ACTION=Action
-READING_OLD_DATA=Reading old data (from Db)
-STATUS_NONE=Unknown Status
-STATUS_READY=Ready
-STATUS_DOWNLOADING=Downloading
-STATUS_STOPPED_DEVICE=Download stopped (by device)
-STATUS_STOPPED_USER=Download stopped by user
-STATUS_DOWNLOAD_FINISHED=Download finished
-STATUS_READER_ERROR=Internal %s (or port) error
-UNKNOWN=Unknown
-NEW=New
-CHANGED=Changed
-OLD=Old
-LOG_IS_CURRENTLY_NOT_IMPLEMENTED=Log is currently not available.
-READ_DEVICE_DATA_TITLE=Read Meter Data [%s on %s]
-SW_VERSION=SW Version
-HW_VERSION=HW Version
-SELECT_ALL=Select All
-DESELECT_ALL=Deselect All
-FILTER=Filter
-FILTER_ALL=All
-FILTER_NEW=New
-FILTER_CHANGED=Changed
-FILTER_EXISTING=Old
-FILTER_UNKNOWN=Unknown
-FILTER_NEW_CHANGED=New + Changed
-FILTER_ALL_BUT_EXISTING=All except old
-
-#
-# Export [1]
-#
-EXPORT_OUTPUT=Output for export
-EXPORT_DEVICE_DATA=Export %s Data
-GGC_APPLICATION=GGC Application
-EXPORT_PROGRESS=Progress of export
-START=Start
-EXPORT_STATUS_READY=Ready
-EXPORT_STATUS_EXPORTING=Exporting
-EXPORT_STATUS_FINISHED=Finished
-
-#
-# List [1]
-#
-LEGEND_DESC=<html><b>Legend:</b><br><font color="green">Green</font> = All known devices supported<br><font color="#33FFFF">Cyan</font> = Testing<br><font color="#660066">Magenta</font> = some devices implemented<br><font color="blue">Blue</font> = work in progress<br><font color="#FFCC33">Orange</font> = Planned<br><font color="red">Red</font> = Not Planned</html>
-
-#
-# About [1]
-#
-SYSTEM_PROPERTIES=System Properties
-ABOUT=About
-PROPERTY=Property
-VALUE=Value
-LICENCE=Licence
-CREDITS=Credits
-LIBRARIES=Libraries
-GGC_DEVELOPMENT_TEAM=GGC Development Team
-SEE_CREDITS=(See Credits)
-DEVELOPERS_DESC=Developers & features they implemented
-HELPERS_DESC=People that helped (testing, lending or donating hardware,...)
-FEATURES=Features
-IMPLEMENTED_FEATURES=Implemented Features
-SUPPORTED_DEVICES=Supported Devices
-NOT_IMPLEMENTED_FEATURES=Not Implemented Features
-PLANNED_DEVICES=Planned Devices
-DEVICE_PLUGIN=%s Plug-in
-DEVICE_PLUGIN_ABOUT=About %s Plug-in
-
-#
-# Printing - Base [2]
-#
-PRINTING=Printing
-TYPE_OF_REPORT=Type Of Report
-SELECT_YEAR_AND_MONTH=Select Year And Month
-REPORT_FOOTER=This report is from \"GGC - GNU Gluco Control\", freely available at http://ggc.sourceforge.net
-FOR=For
-PRINTING_SETTINGS_NOT_SET=<html>Printing settings (Pdf Viewer) not set or set<br>incorrectly.</html>
-PRINTING_SETTINGS_NOT_SET_SOL=<html>Go to Tools->Preferences, tab Printing and set<br>correct path to Pdf Viewer</html>
-PDF_VIEVER_RUN_ERROR=<html>Error running PDF Viewer, unknown exception.</html>
-SELECT_STARTING_RANGE=Select starting range
-SELECT_ENDING_RANGE=Select ending range
-
-#
-# Device Interfaces [1]
-#
-SERIAL_PORTS=Serielle Schnittstellen: COM2,...
-MASS_STORAGE=Mass Storage: G:,...
-
-#
-# Used protocols [1]
-#
-DEVICE_PROTOCOL=Protocol
-PROT_NONE=None (dummy or N/A)
-PROT_SERIAL_BRIDGE=Serial (or USB bridge)
-PROT_MASS_STORAGE_XML=Mass Storage (Xml)
-PROT_BLUE_TOOTH=BlueTooth
-PROT_BLUETOOTH_SERIAL=Bluetooth (Serial)
-PROT_SERIAL_USB=Serial (USB)
-PROT_FILE_IMPORT=File import
-PROT_DATABASE=Database
-
-#
-# Libraries [1]
-#
-NO_BINARY_PART_FOUND=Device uses special library\ncalled: '%s' which requires "native"\n(binary) file, which is not present on\nyour system. Please take a look into\n<GGC_Install>\\lib\\native\\%s\nand look for file: '%s'.\nIf it's not there you must obtain it,\nif it is there, then there is something\nwrong with it (re-obtain it).\n
-
-#
-# Special Comments [1]
-#
-DEVICE_PIX_SPECIAL_COMMENT=Pix device displays data at end of reading and progress is just estimated.
-DEVICE_DUMMY_SPECIAL_COMMENT=This is Dummy device.
-
-#
-# Error Dialog [1]
-#
-ERROR_DIALOG=Error Dialog
-DETAILS=Details
-ERROR_SOLUTION=Solution
-EXCEPTION_LOG=Exception (Stack) Trace
-SEND_TO_SERVER=Send to Server
-SENDING_TO_SERVER=Sending to Server
-SEND_TO_SERVER_TEXT=<html>This part is not implemented yet. But at later time when<br>this works, you will able to send us report of error<br>and receive solution (if it exists).<br></html>
-NO_SOLUTION_AVAILABLE=No solution available.
-ERROR_COUNT=Errors (%s)
-
-#
-# Download Device [2]
-#
-DOWNLOAD_DEVICE=Data from device
-DOWNLOAD_FILE=Import from file
-DOWNLOAD_CONFIG=Config from device
-DOWNLOAD_NOT_SUPPORTED_GGC=Not supported by GGC
-DOWNLOAD_NOT_SUPPORTED_BY_DEVICE=Not supported by device
-
-#
-# File Import [2]
-#
-IMPORT_FILE=Import file
-
-#
-# Devices [1]
-#
-
-# Smart pix
-PIX_ABORT_AUTOSCAN=Autoscan aborted
-PIX_DETECT_DEVICES=Detecting devices
-PIX_UNRECOVERABLE_ERROR=Unrecoverable error
-PIX_READING_ELEMENT=Reading elements from device
-PIX_FINISHED_REPORT_READY=Finished reading. Report ready.
-PIX_FINISHED_READING=Finished reading. Report ready.
-PIX_READING=Reading data
-PIX_SCANNING=Scanning for device
-PIX_CREATING_REPORT=Creating report
-PIX_DEVICE_NOT_FOUND=Device not found
-PIX_ERROR_INIT_DEVICE=Error on init/read device
-SMARTPIX_VERSION_2=SmartPix v2.x
-SMARTPIX_VERSION_3=SmartPix v3.x or higher
-SMARTPIX_VERSION_INFO=<html><b>Smart Pix Version Info<br><br></b><b><i>SmartPix v1.x</i></b> - Devices with this firmware are not supported, because<br> they had too many bugs (for external use). If your device still has v1<br>firmware you can update it for free (see Roche site).<br><b><i>SmartPix v2.x</i></b> - Version 2 works ok on Windows, but there is problem<br>on other OSes (we tested on linux and Mac and it didn't work on any<br>of them)<br><b><i>SmartPix v3.x</i></b> - This version uses different type of commands for<br>controling devices, which works great on all OSes, so this is preffered<br>version to use.<br></html>
-
-# Minimed Pump/CGMS
-MM_DEVICE_INIT_PROBLEM=%s problem on initialization with %s:\n%s\n
-MM_INVALID_RETURN_VALUE=Invalid return value (%s), return value should be between %s and %s.
-MM_WRONG_STATE=Device is in wrong state for successful reading (current state=%s, required state=%s).
-MM_DEVICE_PUMP=Pump
-MM_DEVICE_CGMS=CGMS
-MM_PUMP_ERROR_REPLY=Error Reply
-MM_PUMP_STATE_REPLY=State Reply
-MM_ERROR_READING_DEVICE=Error on reading device.
-MM_SET_RF_POWER_ON=Set RF Power On
-MM_READ_PUMP_ERROR_STATUS=Read Pump Error Status (current alarm code)
-MM_READ_PUMP_STATE=Read Pump State
-MM_READ_TEMPORARY_BASAL=Read Temporary Basal
-MM_DETECT_BOLUS=Detect bolus (set temp basal rate)
-MM_ACKNOWLEDGE=Acknowledge
-MM_CANCEL_SUSPEND=Cancel Suspend
-MM_KEYPAD_PUSH_ACK=Keypad Push (ACK)
-MM_KEYPAD_PUSH_ESC=Keypad Push (ESC)
-MM_READ_FIRMWARE_VERSION=Read Firmware Version
-MM_PUMP_DELIVERY_TBR=Check TBR delivery
-MM_PUMP_DELIVERING_TBR=Pump is currently delivering TBR and cannot communicate with computer.
-
-#
-# Graphs [1]
-#
-
-# Date/range selector
-DATE_RANGE_SELECTOR=Range Selector
-ONE_WEEK=1 Week
-TWO_WEEKS=2 Weeks
-1_MONTH=1 Month
-3_MONTHS=3 Months
-CUSTOM=Custom
-RANGE=Range
Modified: trunk/ggc-plugin_base/src/GGCPlugin_en.properties
===================================================================
--- trunk/ggc-plugin_base/src/GGCPlugin_en.properties 2014-09-19 12:53:56 UTC (rev 1311)
+++ trunk/ggc-plugin_base/src/GGCPlugin_en.properties 2014-09-19 13:26:40 UTC (rev 1312)
@@ -264,8 +264,8 @@
PDF_VIEVER_RUN_ERROR=<html>Error running PDF Viewer, unknown exception.</html>
SELECT_STARTING_RANGE=Select starting range
SELECT_ENDING_RANGE=Select ending range
+PAGE=Page
-
#
# !G! Device Interfaces [1]
#
@@ -388,7 +388,17 @@
CUSTOM=Custom
RANGE=Range
+
+
#
+# MISSSING
+#
+DEVICE_NOT_FOUND_ON_CONFIGURED_PORT=Device Not Found On Configured Port or Port not found (%s)
+DEVICE_PORT_IN_USE=Selected port (%s) is in use and can't be claimed.
+
+
+
+#
# !G! Settings for devices
#
API_VERSION=Api Version
@@ -423,3 +433,4 @@
NONE=None
DEVICE_NOT_FOUND_ON_CONFIGURED_PORT=Device Not Found On Configured Port or Port not found (%s)
DEVICE_PORT_IN_USE=Selected port (%s) is in use and can't be claimed.
+
Modified: trunk/ggc-pump/src/ggc/pump/print/PrintPumpDataAbstract.java
===================================================================
--- trunk/ggc-pump/src/ggc/pump/print/PrintPumpDataAbstract.java 2014-09-19 12:53:56 UTC (rev 1311)
+++ trunk/ggc-pump/src/ggc/pump/print/PrintPumpDataAbstract.java 2014-09-19 13:26:40 UTC (rev 1312)
@@ -8,12 +8,13 @@
import java.util.Calendar;
import java.util.GregorianCalendar;
+import com.atech.print.engine.ITextDocumentPrintSettings;
import com.atech.print.engine.PrintAbstractIText;
import com.atech.utils.data.ATechDate;
import com.itextpdf.text.Document;
import com.itextpdf.text.Element;
import com.itextpdf.text.Font;
-
+import com.itextpdf.text.PageSize;
import com.itextpdf.text.Font.FontFamily;
import com.itextpdf.text.Paragraph;
import com.itextpdf.text.pdf.PdfPTable;
@@ -22,25 +23,25 @@
* Application: GGC - GNU Gluco Control
*
* See AUTHORS for copyright information.
- *
+ *
* 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
- *
+ *
* Filename: PrintFoodMenuAbstract
* Description: Abstract class for printing Food Menu's
- *
- * Author: andyrozman {an...@at...}
+ *
+ * Author: andyrozman {an...@at...}
*/
@@ -49,18 +50,18 @@
protected DeviceValuesRange deviceValuesRange;
protected DataAccessPump da_local = null;
-
+
/**
* Constructor
- *
- * @param dvr
+ *
+ * @param dvr
*/
public PrintPumpDataAbstract(DeviceValuesRange dvr)
{
super(DataAccessPump.getInstance().getI18nControlInstance(), false);
deviceValuesRange = dvr;
- da_local = DataAccessPump.getInstance();
+ da_local = DataAccessPump.getInstance();
init();
}
@@ -90,47 +91,53 @@
protected String getDateString(GregorianCalendar gc)
{
- return gc.get(Calendar.DAY_OF_MONTH) + "." + (gc.get(Calendar.MONTH) +1 ) + "." + gc.get(Calendar.YEAR);
+ return gc.get(Calendar.DAY_OF_MONTH) + "." + (gc.get(Calendar.MONTH) +1 ) + "." + gc.get(Calendar.YEAR);
}
-
-
- /**
+
+
+ /**
* Get Text Size
*/
public int getTextSize()
{
return 8;
}
-
-
+
+ @Override
+ public ITextDocumentPrintSettings getCustomDocumentSettings()
+ {
+ return new ITextDocumentPrintSettings(30, 30, 10, 30);
+ }
+
+
/**
* Create document body.
- *
+ *
* @param document
* @throws Exception
*/
@Override
public abstract void fillDocumentBody(Document document) throws Exception;
-
-
+
+
/**
* Returns data part of filename for printing job, showing which data is being printed
- *
- * @return
+ *
+ * @return
*/
@Override
public String getFileNameRange()
{
ATechDate atd1 = new ATechDate(da_local.getDataEntryObject().getDateTimeFormat(), deviceValuesRange.getStartGC());
ATechDate atd2 = new ATechDate(da_local.getDataEntryObject().getDateTimeFormat(), deviceValuesRange.getEndGC());
-
+
return atd1.getDateFilenameString() + "-" + atd2.getDateFilenameString();
}
-
-
+
+
/**
* Get text for title
- *
+ *
* @return title
*/
public abstract String getTitleText();
@@ -141,7 +148,7 @@
*/
public abstract int getTableColumnsCount();
- /**
+ /**
* Return columns widths for table
* @return
*/
@@ -149,7 +156,7 @@
/**
* Write additional header to documents
- *
+ *
* @param table
* @throws Exception
*/
@@ -157,7 +164,7 @@
/**
* Write together data (all data of certain type summed)
- *
+ *
* @param table
* @param rw
* @throws Exception
@@ -166,7 +173,7 @@
/**
* Write data in column
- *
+ *
* @param table
* @param mp
* @throws Exception
@@ -175,7 +182,7 @@
/**
* Write empty column data. If there is no data, this is used, to fill empty places.
- *
+ *
* @param table
* @throws Exception
*/
@@ -187,5 +194,5 @@
}
}
-
+
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X