[med-svn] [gnumed-client] 02/04: Imported Upstream version 1.6.6+dfsg

Andreas Tille tille at debian.org
Fri May 27 13:36:38 UTC 2016


This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository gnumed-client.

commit 2e4db2a8e06666b66835b43890c3e9b109e16d3b
Author: Andreas Tille <tille at debian.org>
Date:   Fri May 27 15:18:50 2016 +0200

    Imported Upstream version 1.6.6+dfsg
---
 client/CHANGELOG                             |  16 +
 client/appdata.xml                           |  74 ++--
 client/business/gmClinNarrative.py           |   2 +-
 client/business/gmClinicalRecord.py          |   7 +-
 client/business/gmForms.py                   |   6 +-
 client/business/gmPraxis.py                  |  24 +
 client/business/gmSoapDefs.py                |   2 +
 client/doc/schema/gnumed-entire_schema.html  |   2 +-
 client/gnumed.py                             |   2 +-
 client/importers/gmImportIncoming.py         |   4 +-
 client/po/ar-gnumed.mo                       | Bin 2373 -> 2373 bytes
 client/po/ar.po                              | 118 +++--
 client/po/bg-gnumed.mo                       | Bin 1340 -> 1340 bytes
 client/po/bg.po                              | 118 +++--
 client/po/ca-gnumed.mo                       | Bin 25469 -> 25469 bytes
 client/po/ca.po                              | 142 ++++--
 client/po/cs-gnumed.mo                       | Bin 27310 -> 27310 bytes
 client/po/cs.po                              | 132 ++++--
 client/po/da-gnumed.mo                       | Bin 3284 -> 3284 bytes
 client/po/da.po                              | 120 +++--
 client/po/de-gnumed.mo                       | Bin 475453 -> 493006 bytes
 client/po/de.po                              | 444 +++++++++++++------
 client/po/el-gnumed.mo                       | Bin 76625 -> 108365 bytes
 client/po/el.po                              | 641 ++++++++++++++++++---------
 client/po/en_AU-gnumed.mo                    | Bin 4988 -> 4988 bytes
 client/po/en_AU.po                           | 119 +++--
 client/po/en_CA-gnumed.mo                    | Bin 15065 -> 15065 bytes
 client/po/en_CA.po                           | 135 ++++--
 client/po/es-gnumed.mo                       | Bin 510739 -> 510739 bytes
 client/po/es.po                              | 101 ++++-
 client/po/fr-gnumed.mo                       | Bin 152111 -> 152053 bytes
 client/po/fr.po                              | 151 +++++--
 client/po/id-gnumed.mo                       | Bin 4526 -> 4526 bytes
 client/po/id.po                              | 118 +++--
 client/po/it-gnumed.mo                       | Bin 101346 -> 101242 bytes
 client/po/it.po                              | 149 +++++--
 client/po/ka-gnumed.mo                       | Bin 1928 -> 1928 bytes
 client/po/ka.po                              | 122 +++--
 client/po/nb-gnumed.mo                       | Bin 2194 -> 2194 bytes
 client/po/nb.po                              | 134 ++++--
 client/po/nl-gnumed.mo                       | Bin 141901 -> 141767 bytes
 client/po/nl.po                              | 151 +++++--
 client/po/pl-gnumed.mo                       | Bin 35554 -> 38003 bytes
 client/po/pl.po                              | 205 ++++++---
 client/po/pt-gnumed.mo                       | Bin 125025 -> 124922 bytes
 client/po/pt.po                              | 149 +++++--
 client/po/pt_BR-gnumed.mo                    | Bin 148846 -> 149991 bytes
 client/po/pt_BR.po                           | 176 ++++++--
 client/po/ro-gnumed.mo                       | Bin 1311 -> 1311 bytes
 client/po/ro.po                              | 118 +++--
 client/po/ru-gnumed.mo                       | Bin 431809 -> 431563 bytes
 client/po/ru.po                              | 151 +++++--
 client/po/ru_RU-gnumed.mo                    | Bin 451394 -> 451187 bytes
 client/po/ru_RU.po                           | 149 +++++--
 client/po/sq-gnumed.mo                       | Bin 33489 -> 33489 bytes
 client/po/sq.po                              | 133 ++++--
 client/po/sr-gnumed.mo                       | Bin 14583 -> 14583 bytes
 client/po/sr.po                              | 138 ++++--
 client/po/sv-gnumed.mo                       | Bin 61655 -> 65951 bytes
 client/po/sv.po                              | 273 ++++++++----
 client/po/tr-gnumed.mo                       | Bin 1940 -> 1940 bytes
 client/po/tr.po                              | 119 +++--
 client/po/uk-gnumed.mo                       | Bin 862 -> 862 bytes
 client/po/uk.po                              | 117 +++--
 client/po/zh_TW-gnumed.mo                    | Bin 2740 -> 2740 bytes
 client/po/zh_TW.po                           | 119 +++--
 client/pycommon/gmI18N.py                    | 103 +++--
 client/pycommon/gmTools.py                   |   7 +-
 client/wxGladeWidgets/wxgReviewDocPartDlg.py | 248 ++++++-----
 client/wxpython/gmDocumentWidgets.py         |  18 +-
 client/wxpython/gmHabitWidgets.py            |   2 +-
 client/wxpython/gmListWidgets.py             |   1 +
 client/wxpython/gmPersonContactWidgets.py    |  17 +
 73 files changed, 3906 insertions(+), 1371 deletions(-)

diff --git a/client/CHANGELOG b/client/CHANGELOG
index 715f572..e065dcf 100644
--- a/client/CHANGELOG
+++ b/client/CHANGELOG
@@ -6,6 +6,22 @@
 # rel-1-6-patches
 ------------------------------------------------
 
+	1.6.6
+
+FIX: error when running gm-import_incoming as root
+FIX: failure to show entries with soap_cat=NULL in EMR list journal
+FIX: copy-pasto 'nicotine' -> 'ethanol'
+
+IMPROVED: clear metadata panel after importing new document
+IMRPOVED: enable editing of document source org
+IMPROVED: list context menu layout
+IMPROVED: handling of Windows locale names like Hungarian_Hungary [thanks Attila]
+IMPROVED: AppData file
+IMRPOVED: OOo/LO/SO detection [thanks John]
+IMRPOVED: tree display of documents
+
+NEW: calculate distance of patient address to your praxis
+
 	1.6.5
 
 IMPROVED: list context menu: operate on _selected_ rows
diff --git a/client/appdata.xml b/client/appdata.xml
index c81d8ff..01d53e0 100644
--- a/client/appdata.xml
+++ b/client/appdata.xml
@@ -1,36 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright karsten.hilbert at gmx.net, GPL v2> -->
+<!-- Copyright 2016 Karsten Hilbert <karsten.hilbert at gmx.net> -->
 <!-- Thanks to Carsten Grohmann <mail at carstengrohmann.de> -->
-<application>
-    <id type="desktop">gnumed-client.desktop</id>
-    <metadata_license>CC0-1.0</metadata_license>
-    <project_license>GPL v2 or later</project_license>
-    <name>GNUmed</name>
-    <summary>
-        An Electronic Medical Record for community care.
-    </summary>
-    <description>
-        <p>
-            GNUmeds purpose is to enable doctors to keep a medically
-            sound record on their patients' health. It does not currently
-            provide functionality for stock keeping. Clinical features
-            are well-tested by real doctors in the field.
-        </p>
-        <p>
-            While the GNUmed team has taken the utmost care to make sure
-            the medical records are safe at all times you still need to
-            make sure you are taking appropriate steps to backup the
-            medical data to a safe place at appropriate intervals. Do
-            not forget to test your recovery procedures, too !
-        </p>
-        <p>
-            Protect your data! GNUmed itself comes without
-            any warranty whatsoever. You have been warned.
-        </p>
-    </description>
-    <screenshots>
-        <screenshot type="default">http://wiki.gnumed.de</screenshot>
-    </screenshots>
-    <url type="homepage">http://www.gnumed.de</url>
-    <updatecontact>gnumed-devel_at_gnu.org</updatecontact>
-</application>
+<!-- Thanks to Richard Hughes (https://people.freedesktop.org/~hughsient/appdata/) -->
+<component type="desktop">
+ <id>gnumed-client.desktop</id>
+ <metadata_license>CC0-1.0</metadata_license>
+ <project_license>GPL-2.0+ and GFDL-1.3</project_license>
+ <name>GNUmed EMR</name>
+ <summary>An Electronic Medical Record for community care.</summary>
+ <description>
+	<p>
+	GNUmed enables doctors to keep a medically sound record
+	on their patients' health. It does not currently provide
+	functionality for stock keeping. Clinical features are
+	well-tested by real doctors in the field.
+	</p>
+	<p>
+	While the GNUmed team has taken the utmost care to make
+	sure the medical records are safe at all times you still
+	need to make sure you are taking appropriate steps to
+	backup medical data to a safe place at appropriate intervals.
+	Do not forget to test your recovery procedures, too !
+	</p>
+	<p>
+	Protect your data! GNUmed itself comes without
+	any warranty whatsoever. You have been warned.
+	</p>
+ </description>
+ <screenshots>
+	<screenshot type="default">
+		<caption>http://wiki.gnumed.de</caption>
+	</screenshot>
+	<!--<screenshot type="default">
+			<image>http://www.hughsie.com/en_US/main.png</image>
+			<caption>The main window showing the application in action</caption>
+		</screenshot>-->
+ </screenshots>
+ <url type="homepage">http://www.gnumed.de</url>
+ <updatecontact>gnumed-devel_at_gnu.org</updatecontact>
+ <!--<project_group>GNOME</project_group>-->
+</component>
diff --git a/client/business/gmClinNarrative.py b/client/business/gmClinNarrative.py
index 88e97d5..ab0c064 100644
--- a/client/business/gmClinNarrative.py
+++ b/client/business/gmClinNarrative.py
@@ -441,7 +441,7 @@ def get_as_journal(since=None, until=None, encounters=None, episodes=None, issue
 			c_vej.encounter_l10n_type
 		FROM
 			clin.v_emr_journal c_vej
-				join clin.soap_cat_ranks c_scr on (c_scr.soap_cat = c_vej.soap_cat)
+				join clin.soap_cat_ranks c_scr on (c_scr.soap_cat IS NOT DISTINCT FROM c_vej.soap_cat)
 		WHERE
 			%s
 		%s""" % (
diff --git a/client/business/gmClinicalRecord.py b/client/business/gmClinicalRecord.py
index db10560..945166e 100644
--- a/client/business/gmClinicalRecord.py
+++ b/client/business/gmClinicalRecord.py
@@ -79,7 +79,8 @@ _map_clin_root_item2type_str = {
 	'clin.allergy': _('Allergy'),
 	'clin.allergy_state': _('Allergy state'),
 	'clin.family_history': _('Family history'),
-	'blobs.doc_med': _('Document')
+	'blobs.doc_med': _('Document'),
+	'dem.message_inbox': _('Inbox message')
 }
 
 def format_clin_root_item_type(table):
@@ -90,6 +91,7 @@ def format_clin_root_item_type(table):
 
 #------------------------------------------------------------
 from Gnumed.business.gmDocuments import cDocument
+from Gnumed.business.gmProviderInbox import cInboxMessage
 
 _map_table2class = {
 	'clin.encounter': gmEMRStructItems.cEncounter,
@@ -106,7 +108,8 @@ _map_table2class = {
 	'clin.allergy_state': gmAllergy.cAllergyState,
 	'clin.family_history': gmFamilyHistory.cFamilyHistory,
 	'clin.suppressed_hint': gmAutoHints.cSuppressedHint,
-	'blobs.doc_med': cDocument
+	'blobs.doc_med': cDocument,
+	'dem.message_inbox': cInboxMessage
 }
 
 def instantiate_clin_root_item(table, pk):
diff --git a/client/business/gmForms.py b/client/business/gmForms.py
index 150a516..974f5f6 100644
--- a/client/business/gmForms.py
+++ b/client/business/gmForms.py
@@ -357,6 +357,7 @@ def __configure_path_to_UNO():
 	_log.info('UNO should be at [%s], appending to sys.path', uno_path)
 
 	sys.path.append(uno_path)
+
 #-----------------------------------------------------------
 def init_ooo():
 	"""FIXME: consider this:
@@ -415,14 +416,15 @@ def init_ooo():
 	global writer_binary
 	found, binary = gmShellAPI.find_first_binary(binaries = [
 		'lowriter',
-		'oowriter'
+		'oowriter',
+		'swriter'
 	])
 	if found:
 		_log.debug('OOo/LO writer binary found: %s', binary)
 		writer_binary = binary
 	else:
 		_log.debug('OOo/LO writer binary NOT found')
-		raise ImportError('LibreOffice/OpenOffice (lowriter/oowriter) not found')
+		raise ImportError('LibreOffice/OpenOffice (lowriter/oowriter/swriter) not found')
 
 	_log.debug('python UNO bridge successfully initialized')
 
diff --git a/client/business/gmPraxis.py b/client/business/gmPraxis.py
index 4dbc0ad..920b15b 100644
--- a/client/business/gmPraxis.py
+++ b/client/business/gmPraxis.py
@@ -1,3 +1,4 @@
+# -*- coding: utf8 -*-
 """GNUmed Praxis related middleware."""
 #============================================================
 __license__ = "GPL"
@@ -7,6 +8,7 @@ __author__ = "K.Hilbert <Karsten.Hilbert at gmx.net>"
 import sys
 import logging
 import io
+import urllib
 
 
 if __name__ == '__main__':
@@ -85,18 +87,40 @@ class cPraxisBranch(gmBusinessDBObject.cBusinessDBObject):
 		txt += u' '
 		txt += u'\n '.join(self.org_unit.format(with_address = True, with_org = True, with_comms = True))
 		return txt
+
 	#--------------------------------------------------------
 	def lock(self, exclusive=False):
 		return lock_praxis_branch(pk_praxis_branch = self._payload[self._idx['pk_praxis_branch']], exclusive = exclusive)
+
 	#--------------------------------------------------------
 	def unlock(self, exclusive=False):
 		return unlock_praxis_branch(pk_praxis_branch = self._payload[self._idx['pk_praxis_branch']], exclusive = exclusive)
+
 	#--------------------------------------------------------
 	def get_comm_channels(self, comm_medium=None):
 		return self.org_unit.get_comm_channels(comm_medium = comm_medium)
+
 	#--------------------------------------------------------
 	def get_external_ids(self, id_type=None, issuer=None):
 		return self.org_unit.get_external_ids(id_type = id_type, issuer = issuer)
+
+	#--------------------------------------------------------
+	def get_distance2address_url(self, address):
+		self_adr = self.address
+		url = u'https://www.luftlinie.org/%s-%s-%s-%s-%s/%s-%s-%s-%s-%s' % (
+			urllib.quote(self_adr['street'].encode('utf8')),
+			urllib.quote(self_adr['number'].encode('utf8')),
+			urllib.quote(self_adr['urb'].encode('utf8')),
+			urllib.quote(self_adr['postcode'].encode('utf8')),
+			urllib.quote(self_adr['country'].encode('utf8')),
+			urllib.quote(address['street'].encode('utf8')),
+			urllib.quote(address['number'].encode('utf8')),
+			urllib.quote(address['urb'].encode('utf8')),
+			urllib.quote(address['postcode'].encode('utf8')),
+			urllib.quote(address['country'].encode('utf8'))
+		)
+		return url
+
 	#--------------------------------------------------------
 	# properties
 	#--------------------------------------------------------
diff --git a/client/business/gmSoapDefs.py b/client/business/gmSoapDefs.py
index b18e46f..97774ef 100644
--- a/client/business/gmSoapDefs.py
+++ b/client/business/gmSoapDefs.py
@@ -25,6 +25,7 @@ soap_cat2l10n = {
 	u'a': _('SOAP_char_A=A').replace(u'SOAP_char_A=', u''),
 	u'p': _('SOAP_char_P=P').replace(u'SOAP_char_P=', u''),
 	u'u': _('SOAP_char_U=U').replace(u'SOAP_char_U=', u''),
+	u'': _U_ELLIPSIS,
 	None: _U_ELLIPSIS
 }
 
@@ -35,6 +36,7 @@ soap_cat2l10n_str = {
 	u'a': _('SOAP_string_Assessment=Assessment').replace(u'SOAP_string_Assessment=', u''),
 	u'p': _('SOAP_string_Plan=Plan').replace(u'SOAP_string_Plan=', u''),
 	u'u': _('SOAP_string_Unspecified=Unspecified').replace(u'SOAP_string_Unspecified=', u''),
+	u'':  _('SOAP_string_Administrative=Administrative').replace(u'SOAP_string_Administrative=', u''),
 	None: _('SOAP_string_Administrative=Administrative').replace(u'SOAP_string_Administrative=', u'')
 }
 
diff --git a/client/doc/schema/gnumed-entire_schema.html b/client/doc/schema/gnumed-entire_schema.html
index c421c7c..1bd1ec2 100644
--- a/client/doc/schema/gnumed-entire_schema.html
+++ b/client/doc/schema/gnumed-entire_schema.html
@@ -112,7 +112,7 @@
   <body>
 
     <!-- Primary Index -->
-	<p><br><br>Dumped on 2016-04-25</p>
+	<p><br><br>Dumped on 2016-05-26</p>
 <h1><a name="index">Index of database - gnumed_v21</a></h1>
 <ul>
     
diff --git a/client/gnumed.py b/client/gnumed.py
index a6dc05d..7155470 100644
--- a/client/gnumed.py
+++ b/client/gnumed.py
@@ -88,7 +88,7 @@ against. Please run GNUmed as a non-root user.
 	sys.exit(1)
 
 #----------------------------------------------------------
-current_client_version = u'1.6.5'
+current_client_version = u'1.6.6'
 current_client_branch = u'1.6'
 
 _log = None
diff --git a/client/importers/gmImportIncoming.py b/client/importers/gmImportIncoming.py
index 16e2fc6..23de574 100644
--- a/client/importers/gmImportIncoming.py
+++ b/client/importers/gmImportIncoming.py
@@ -15,13 +15,13 @@ import os
 
 # do not run as root
 if os.name in ['posix'] and os.geteuid() == 0:
-	print("""
+	print(u"""
 %s should not be run as root.
 
 Running as <root> can potentially put all your
 medical data at risk. It is strongly advised
 against. Please run as a non-root user.
-""") % sys.argv[0]
+""" % sys.argv[0])
 	sys.exit(1)
 
 
diff --git a/client/po/ar-gnumed.mo b/client/po/ar-gnumed.mo
index 7cd468c..069846c 100644
Binary files a/client/po/ar-gnumed.mo and b/client/po/ar-gnumed.mo differ
diff --git a/client/po/ar.po b/client/po/ar.po
index 48c36cf..25e360f 100644
--- a/client/po/ar.po
+++ b/client/po/ar.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNUmed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-06 11:39+0200\n"
+"POT-Creation-Date: 2016-05-26 12:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -2128,12 +2128,6 @@ msgstr ""
 msgid "New patient ID:"
 msgstr ""
 
-msgid "Your review"
-msgstr ""
-
-msgid "Reviews by others"
-msgstr ""
-
 msgid "(you are/are not the primary reviewer)"
 msgstr ""
 
@@ -2166,6 +2160,9 @@ msgid ""
 "in a new episode name to associate a different one."
 msgstr ""
 
+msgid "The organizational unit this document originates from."
+msgstr ""
+
 msgid "Enter the date of creation of the document."
 msgstr ""
 
@@ -2220,9 +2217,18 @@ msgstr ""
 msgid "Cancel this review."
 msgstr ""
 
+msgid "Your review"
+msgstr ""
+
+msgid "Reviews by others"
+msgstr ""
+
 msgid "Episode"
 msgstr ""
 
+msgid "Source"
+msgstr ""
+
 msgid "Date"
 msgstr ""
 
@@ -4806,19 +4812,16 @@ msgstr ""
 msgid "Close this dialog."
 msgstr ""
 
-msgid "age"
-msgstr ""
-
-msgid "review status"
+msgid "Age"
 msgstr ""
 
-msgid "episode"
+msgid "Review status"
 msgstr ""
 
-msgid "health issue"
+msgid "Health issue"
 msgstr ""
 
-msgid "type"
+msgid "Organization"
 msgstr ""
 
 msgid "Sort newest documents to top of tree."
@@ -4836,6 +4839,9 @@ msgstr ""
 msgid "Sort documents by their type."
 msgstr ""
 
+msgid "Sort documents by the organization they are from."
+msgstr ""
+
 msgid "Sort documents by"
 msgstr ""
 
@@ -5103,9 +5109,6 @@ msgstr ""
 msgid "The category of the organizational unit."
 msgstr ""
 
-msgid "Organization"
-msgstr ""
-
 msgid "Unit"
 msgstr ""
 
@@ -5265,9 +5268,6 @@ msgid ""
 "(SQL query)"
 msgstr ""
 
-msgid "Source"
-msgstr ""
-
 msgid "URL"
 msgstr ""
 
@@ -6966,9 +6966,6 @@ msgstr ""
 msgid "missing, reported later"
 msgstr ""
 
-msgid "Health issue"
-msgstr ""
-
 msgid "External care"
 msgstr ""
 
@@ -6996,6 +6993,10 @@ msgstr ""
 msgid "Document"
 msgstr ""
 
+#, fuzzy
+msgid "Inbox message"
+msgstr "رسالة معلومات عامة"
+
 #, python-format
 msgid "unmapped entry type from table [%s]"
 msgstr ""
@@ -8605,6 +8606,9 @@ msgstr ""
 msgid "who"
 msgstr ""
 
+msgid "type"
+msgstr ""
+
 msgid "entry"
 msgstr ""
 
@@ -9460,6 +9464,9 @@ msgstr ""
 msgid "nicotine"
 msgstr ""
 
+msgid "ethanol"
+msgstr ""
+
 msgid "unit"
 msgstr ""
 
@@ -10663,9 +10670,6 @@ msgstr ""
 msgid "Progress Note"
 msgstr ""
 
-msgid "Age"
-msgstr ""
-
 msgid "N/A"
 msgstr ""
 
@@ -11955,6 +11959,12 @@ msgstr ""
 msgid "Show selected address on map"
 msgstr ""
 
+msgid "Distance"
+msgstr ""
+
+msgid "Show distance from your praxis"
+msgstr ""
+
 msgid "Adding new address"
 msgstr ""
 
@@ -12179,6 +12189,30 @@ msgstr ""
 msgid "Find next [%s] (<CTRL-N>)"
 msgstr ""
 
+msgid "&All rows"
+msgstr ""
+
+msgid "All rows as &CSV"
+msgstr ""
+
+msgid "&Tooltips of all rows"
+msgstr ""
+
+msgid "&Data of all rows"
+msgstr ""
+
+msgid "&Selected rows"
+msgstr ""
+
+msgid "&Selected rows as CSV"
+msgstr ""
+
+msgid "&Tooltips of selected rows"
+msgstr ""
+
+msgid "&Data of selected rows"
+msgstr ""
+
 msgid "Tooltips of selected rows"
 msgstr ""
 
@@ -12208,7 +12242,7 @@ msgstr ""
 msgid "Column &%s (current row): %s"
 msgstr ""
 
-msgid "Copy to e&xport area..."
+msgid "&Save to file..."
 msgstr ""
 
 msgid "&Copy to clipboard..."
@@ -12237,6 +12271,30 @@ msgid ""
 "%s"
 msgstr ""
 
+#, python-format
+msgid "All rows saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All tooltips saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All data saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected rows saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected tooltips saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected data saved to [%s]."
+msgstr ""
+
 msgid "Monty the Serpent && the FSF Present"
 msgstr ""
 
@@ -13655,6 +13713,9 @@ msgstr ""
 msgid "sorted by type"
 msgstr ""
 
+msgid "sorted by organization"
+msgstr ""
+
 msgid "Cannot load documents. No active patient."
 msgstr ""
 
@@ -13740,6 +13801,9 @@ msgstr ""
 msgid "%s (unattributed episode)"
 msgstr ""
 
+msgid "unknown organization"
+msgstr ""
+
 #, python-format
 msgid "part %2s"
 msgstr ""
diff --git a/client/po/bg-gnumed.mo b/client/po/bg-gnumed.mo
index 72322ff..978a71c 100644
Binary files a/client/po/bg-gnumed.mo and b/client/po/bg-gnumed.mo differ
diff --git a/client/po/bg.po b/client/po/bg.po
index 192b2d7..d40f140 100644
--- a/client/po/bg.po
+++ b/client/po/bg.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNUmed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-06 11:39+0200\n"
+"POT-Creation-Date: 2016-05-26 12:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -2125,12 +2125,6 @@ msgstr ""
 msgid "New patient ID:"
 msgstr ""
 
-msgid "Your review"
-msgstr ""
-
-msgid "Reviews by others"
-msgstr ""
-
 msgid "(you are/are not the primary reviewer)"
 msgstr ""
 
@@ -2163,6 +2157,9 @@ msgid ""
 "in a new episode name to associate a different one."
 msgstr ""
 
+msgid "The organizational unit this document originates from."
+msgstr ""
+
 msgid "Enter the date of creation of the document."
 msgstr ""
 
@@ -2217,9 +2214,18 @@ msgstr ""
 msgid "Cancel this review."
 msgstr ""
 
+msgid "Your review"
+msgstr ""
+
+msgid "Reviews by others"
+msgstr ""
+
 msgid "Episode"
 msgstr ""
 
+msgid "Source"
+msgstr ""
+
 msgid "Date"
 msgstr ""
 
@@ -4806,19 +4812,16 @@ msgstr ""
 msgid "Close this dialog."
 msgstr ""
 
-msgid "age"
-msgstr ""
-
-msgid "review status"
+msgid "Age"
 msgstr ""
 
-msgid "episode"
+msgid "Review status"
 msgstr ""
 
-msgid "health issue"
+msgid "Health issue"
 msgstr ""
 
-msgid "type"
+msgid "Organization"
 msgstr ""
 
 msgid "Sort newest documents to top of tree."
@@ -4836,6 +4839,9 @@ msgstr ""
 msgid "Sort documents by their type."
 msgstr ""
 
+msgid "Sort documents by the organization they are from."
+msgstr ""
+
 msgid "Sort documents by"
 msgstr ""
 
@@ -5104,9 +5110,6 @@ msgstr ""
 msgid "The category of the organizational unit."
 msgstr ""
 
-msgid "Organization"
-msgstr ""
-
 msgid "Unit"
 msgstr ""
 
@@ -5265,9 +5268,6 @@ msgid ""
 "(SQL query)"
 msgstr ""
 
-msgid "Source"
-msgstr ""
-
 msgid "URL"
 msgstr ""
 
@@ -6961,9 +6961,6 @@ msgstr ""
 msgid "missing, reported later"
 msgstr ""
 
-msgid "Health issue"
-msgstr ""
-
 msgid "External care"
 msgstr ""
 
@@ -6992,6 +6989,9 @@ msgstr ""
 msgid "Document"
 msgstr " %s документи\n"
 
+msgid "Inbox message"
+msgstr ""
+
 #, python-format
 msgid "unmapped entry type from table [%s]"
 msgstr ""
@@ -8603,6 +8603,9 @@ msgstr ""
 msgid "who"
 msgstr ""
 
+msgid "type"
+msgstr ""
+
 msgid "entry"
 msgstr ""
 
@@ -9458,6 +9461,9 @@ msgstr ""
 msgid "nicotine"
 msgstr ""
 
+msgid "ethanol"
+msgstr ""
+
 msgid "unit"
 msgstr ""
 
@@ -10661,9 +10667,6 @@ msgstr ""
 msgid "Progress Note"
 msgstr ""
 
-msgid "Age"
-msgstr ""
-
 msgid "N/A"
 msgstr ""
 
@@ -11952,6 +11955,12 @@ msgstr ""
 msgid "Show selected address on map"
 msgstr ""
 
+msgid "Distance"
+msgstr ""
+
+msgid "Show distance from your praxis"
+msgstr ""
+
 msgid "Adding new address"
 msgstr ""
 
@@ -12173,6 +12182,30 @@ msgstr ""
 msgid "Find next [%s] (<CTRL-N>)"
 msgstr ""
 
+msgid "&All rows"
+msgstr ""
+
+msgid "All rows as &CSV"
+msgstr ""
+
+msgid "&Tooltips of all rows"
+msgstr ""
+
+msgid "&Data of all rows"
+msgstr ""
+
+msgid "&Selected rows"
+msgstr ""
+
+msgid "&Selected rows as CSV"
+msgstr ""
+
+msgid "&Tooltips of selected rows"
+msgstr ""
+
+msgid "&Data of selected rows"
+msgstr ""
+
 msgid "Tooltips of selected rows"
 msgstr ""
 
@@ -12202,7 +12235,7 @@ msgstr ""
 msgid "Column &%s (current row): %s"
 msgstr ""
 
-msgid "Copy to e&xport area..."
+msgid "&Save to file..."
 msgstr ""
 
 msgid "&Copy to clipboard..."
@@ -12231,6 +12264,30 @@ msgid ""
 "%s"
 msgstr ""
 
+#, python-format
+msgid "All rows saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All tooltips saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All data saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected rows saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected tooltips saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected data saved to [%s]."
+msgstr ""
+
 msgid "Monty the Serpent && the FSF Present"
 msgstr ""
 
@@ -13649,6 +13706,9 @@ msgstr ""
 msgid "sorted by type"
 msgstr ""
 
+msgid "sorted by organization"
+msgstr ""
+
 msgid "Cannot load documents. No active patient."
 msgstr ""
 
@@ -13734,6 +13794,10 @@ msgstr ""
 msgid "%s (unattributed episode)"
 msgstr ""
 
+#, fuzzy
+msgid "unknown organization"
+msgstr "неизвестна реакция"
+
 #, python-format
 msgid "part %2s"
 msgstr ""
diff --git a/client/po/ca-gnumed.mo b/client/po/ca-gnumed.mo
index 0d6bfaa..2948685 100644
Binary files a/client/po/ca-gnumed.mo and b/client/po/ca-gnumed.mo differ
diff --git a/client/po/ca.po b/client/po/ca.po
index 5f8e722..2704ce0 100644
--- a/client/po/ca.po
+++ b/client/po/ca.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnumed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-06 11:39+0200\n"
+"POT-Creation-Date: 2016-05-26 12:47+0200\n"
 "PO-Revision-Date: 2012-06-01 01:20+0000\n"
 "Last-Translator: ncq <Unknown>\n"
 "Language-Team: Catalan <ca at li.org>\n"
@@ -2242,12 +2242,6 @@ msgstr ""
 msgid "New patient ID:"
 msgstr "Identificació pacient intern"
 
-msgid "Your review"
-msgstr "La teva revisió"
-
-msgid "Reviews by others"
-msgstr "Revisions d'altri"
-
 msgid "(you are/are not the primary reviewer)"
 msgstr "(no ets el revisior primari)"
 
@@ -2280,6 +2274,10 @@ msgid ""
 "in a new episode name to associate a different one."
 msgstr ""
 
+#, fuzzy
+msgid "The organizational unit this document originates from."
+msgstr "Vacunació"
+
 msgid "Enter the date of creation of the document."
 msgstr ""
 
@@ -2334,9 +2332,18 @@ msgstr "Guarda la teva revisió."
 msgid "Cancel this review."
 msgstr ""
 
+msgid "Your review"
+msgstr "La teva revisió"
+
+msgid "Reviews by others"
+msgstr "Revisions d'altri"
+
 msgid "Episode"
 msgstr ""
 
+msgid "Source"
+msgstr ""
+
 msgid "Date"
 msgstr ""
 
@@ -5049,21 +5056,19 @@ msgstr ""
 msgid "Close this dialog."
 msgstr ""
 
-msgid "age"
+msgid "Age"
 msgstr ""
 
-msgid "review status"
-msgstr ""
+#, fuzzy
+msgid "Review status"
+msgstr "Revisions d'altri"
 
-msgid "episode"
+msgid "Health issue"
 msgstr ""
 
 #, fuzzy
-msgid "health issue"
-msgstr "Sisuplau, seleccioni un assumpte mèdic."
-
-msgid "type"
-msgstr ""
+msgid "Organization"
+msgstr "Vacunació"
 
 msgid "Sort newest documents to top of tree."
 msgstr ""
@@ -5080,6 +5085,9 @@ msgstr ""
 msgid "Sort documents by their type."
 msgstr ""
 
+msgid "Sort documents by the organization they are from."
+msgstr ""
+
 msgid "Sort documents by"
 msgstr ""
 
@@ -5353,10 +5361,6 @@ msgstr ""
 msgid "The category of the organizational unit."
 msgstr ""
 
-#, fuzzy
-msgid "Organization"
-msgstr "Vacunació"
-
 msgid "Unit"
 msgstr ""
 
@@ -5521,9 +5525,6 @@ msgid ""
 "(SQL query)"
 msgstr ""
 
-msgid "Source"
-msgstr ""
-
 msgid "URL"
 msgstr ""
 
@@ -7281,9 +7282,6 @@ msgstr "resultat corretgit"
 msgid "missing, reported later"
 msgstr ""
 
-msgid "Health issue"
-msgstr ""
-
 #, fuzzy
 msgid "External care"
 msgstr "Identificació pacient extern"
@@ -7318,6 +7316,10 @@ msgstr "Guarda el document finalitzat."
 msgid "Document"
 msgstr "Documents"
 
+#, fuzzy
+msgid "Inbox message"
+msgstr "missatge d'inforamció genèric"
+
 #, python-format
 msgid "unmapped entry type from table [%s]"
 msgstr ""
@@ -8988,6 +8990,9 @@ msgstr ""
 msgid "who"
 msgstr ""
 
+msgid "type"
+msgstr ""
+
 msgid "entry"
 msgstr ""
 
@@ -9862,6 +9867,9 @@ msgstr ""
 msgid "nicotine"
 msgstr ""
 
+msgid "ethanol"
+msgstr ""
+
 #, fuzzy
 msgid "unit"
 msgstr "unitats"
@@ -11090,9 +11098,6 @@ msgstr ""
 msgid "Progress Note"
 msgstr ""
 
-msgid "Age"
-msgstr ""
-
 msgid "N/A"
 msgstr ""
 
@@ -12421,6 +12426,14 @@ msgstr "Sr"
 msgid "Show selected address on map"
 msgstr "Edita l'entrada seleccionada."
 
+#, fuzzy
+msgid "Distance"
+msgstr "Substància"
+
+#, fuzzy
+msgid "Show distance from your praxis"
+msgstr "La teva revisió"
+
 msgid "Adding new address"
 msgstr ""
 
@@ -12658,6 +12671,33 @@ msgstr ""
 msgid "Find next [%s] (<CTRL-N>)"
 msgstr ""
 
+#, fuzzy
+msgid "&All rows"
+msgstr "Opcions"
+
+msgid "All rows as &CSV"
+msgstr ""
+
+msgid "&Tooltips of all rows"
+msgstr ""
+
+msgid "&Data of all rows"
+msgstr ""
+
+#, fuzzy
+msgid "&Selected rows"
+msgstr "Selecciona"
+
+msgid "&Selected rows as CSV"
+msgstr ""
+
+msgid "&Tooltips of selected rows"
+msgstr ""
+
+#, fuzzy
+msgid "&Data of selected rows"
+msgstr "Esborra les entrades seleccionades de la llista."
+
 msgid "Tooltips of selected rows"
 msgstr ""
 
@@ -12688,8 +12728,8 @@ msgid "Column &%s (current row): %s"
 msgstr "Documents: %s"
 
 #, fuzzy
-msgid "Copy to e&xport area..."
-msgstr "Llistat de vacunes buit"
+msgid "&Save to file..."
+msgstr "Guarda la teva revisió."
 
 #, fuzzy
 msgid "&Copy to clipboard..."
@@ -12720,6 +12760,30 @@ msgid ""
 "%s"
 msgstr ""
 
+#, python-format
+msgid "All rows saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All tooltips saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All data saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected rows saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected tooltips saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected data saved to [%s]."
+msgstr ""
+
 msgid "Monty the Serpent && the FSF Present"
 msgstr ""
 
@@ -14189,6 +14253,10 @@ msgstr "Sisuplau, seleccioni un assumpte mèdic."
 msgid "sorted by type"
 msgstr ""
 
+#, fuzzy
+msgid "sorted by organization"
+msgstr "Llistat de vacunes buit"
+
 msgid "Cannot load documents. No active patient."
 msgstr ""
 
@@ -14280,6 +14348,10 @@ msgstr "%s la setmana passada (%s of %s)"
 msgid "%s (unattributed episode)"
 msgstr "Episodis no atribuïts"
 
+#, fuzzy
+msgid "unknown organization"
+msgstr "reacció desconeguda"
+
 #, python-format
 msgid "part %2s"
 msgstr ""
@@ -18654,6 +18726,14 @@ msgid "Abort and do NOT connect to GNUmed."
 msgstr "Interromput  i no connectat a GNUmed"
 
 #, fuzzy
+#~ msgid "health issue"
+#~ msgstr "Sisuplau, seleccioni un assumpte mèdic."
+
+#, fuzzy
+#~ msgid "Copy to e&xport area..."
+#~ msgstr "Llistat de vacunes buit"
+
+#, fuzzy
 #~ msgid "&Entry time"
 #~ msgstr "Mostra l'hora"
 
diff --git a/client/po/cs-gnumed.mo b/client/po/cs-gnumed.mo
index e7f9ce7..9612234 100644
Binary files a/client/po/cs-gnumed.mo and b/client/po/cs-gnumed.mo differ
diff --git a/client/po/cs.po b/client/po/cs.po
index d1379ae..b0f8605 100644
--- a/client/po/cs.po
+++ b/client/po/cs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNUmed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-06 11:39+0200\n"
+"POT-Creation-Date: 2016-05-26 12:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -2265,12 +2265,6 @@ msgstr ""
 msgid "New patient ID:"
 msgstr ""
 
-msgid "Your review"
-msgstr ""
-
-msgid "Reviews by others"
-msgstr ""
-
 msgid "(you are/are not the primary reviewer)"
 msgstr ""
 
@@ -2303,6 +2297,9 @@ msgid ""
 "in a new episode name to associate a different one."
 msgstr ""
 
+msgid "The organizational unit this document originates from."
+msgstr ""
+
 msgid "Enter the date of creation of the document."
 msgstr ""
 
@@ -2357,9 +2354,18 @@ msgstr ""
 msgid "Cancel this review."
 msgstr ""
 
+msgid "Your review"
+msgstr ""
+
+msgid "Reviews by others"
+msgstr ""
+
 msgid "Episode"
 msgstr ""
 
+msgid "Source"
+msgstr ""
+
 msgid "Date"
 msgstr ""
 
@@ -4966,19 +4972,16 @@ msgstr ""
 msgid "Close this dialog."
 msgstr ""
 
-msgid "age"
-msgstr ""
-
-msgid "review status"
+msgid "Age"
 msgstr ""
 
-msgid "episode"
+msgid "Review status"
 msgstr ""
 
-msgid "health issue"
-msgstr ""
+msgid "Health issue"
+msgstr "Zdravotní problém"
 
-msgid "type"
+msgid "Organization"
 msgstr ""
 
 msgid "Sort newest documents to top of tree."
@@ -4996,6 +4999,9 @@ msgstr ""
 msgid "Sort documents by their type."
 msgstr ""
 
+msgid "Sort documents by the organization they are from."
+msgstr ""
+
 msgid "Sort documents by"
 msgstr ""
 
@@ -5266,9 +5272,6 @@ msgstr ""
 msgid "The category of the organizational unit."
 msgstr ""
 
-msgid "Organization"
-msgstr ""
-
 msgid "Unit"
 msgstr ""
 
@@ -5430,9 +5433,6 @@ msgid ""
 "(SQL query)"
 msgstr ""
 
-msgid "Source"
-msgstr ""
-
 msgid "URL"
 msgstr ""
 
@@ -7155,9 +7155,6 @@ msgstr ""
 msgid "missing, reported later"
 msgstr ""
 
-msgid "Health issue"
-msgstr "Zdravotní problém"
-
 msgid "External care"
 msgstr ""
 
@@ -7190,6 +7187,10 @@ msgstr "Rodinná anamnéza"
 msgid "Document"
 msgstr "Dokumenty:"
 
+#, fuzzy
+msgid "Inbox message"
+msgstr "obecná informační hláška"
+
 #, python-format
 msgid "unmapped entry type from table [%s]"
 msgstr ""
@@ -8824,6 +8825,9 @@ msgstr ""
 msgid "who"
 msgstr ""
 
+msgid "type"
+msgstr ""
+
 msgid "entry"
 msgstr ""
 
@@ -9683,6 +9687,9 @@ msgstr ""
 msgid "nicotine"
 msgstr ""
 
+msgid "ethanol"
+msgstr ""
+
 msgid "unit"
 msgstr ""
 
@@ -10893,9 +10900,6 @@ msgstr ""
 msgid "Progress Note"
 msgstr ""
 
-msgid "Age"
-msgstr ""
-
 msgid "N/A"
 msgstr ""
 
@@ -12193,6 +12197,13 @@ msgstr "Bře"
 msgid "Show selected address on map"
 msgstr ""
 
+#, fuzzy
+msgid "Distance"
+msgstr " Jméno souboru: %s\n"
+
+msgid "Show distance from your praxis"
+msgstr ""
+
 msgid "Adding new address"
 msgstr ""
 
@@ -12416,6 +12427,32 @@ msgstr ""
 msgid "Find next [%s] (<CTRL-N>)"
 msgstr ""
 
+msgid "&All rows"
+msgstr ""
+
+msgid "All rows as &CSV"
+msgstr ""
+
+msgid "&Tooltips of all rows"
+msgstr ""
+
+msgid "&Data of all rows"
+msgstr ""
+
+#, fuzzy
+msgid "&Selected rows"
+msgstr "Vybrat událost."
+
+msgid "&Selected rows as CSV"
+msgstr ""
+
+msgid "&Tooltips of selected rows"
+msgstr ""
+
+#, fuzzy
+msgid "&Data of selected rows"
+msgstr "Duplikovat vybranou událost"
+
 msgid "Tooltips of selected rows"
 msgstr ""
 
@@ -12445,9 +12482,8 @@ msgstr ""
 msgid "Column &%s (current row): %s"
 msgstr "Dokumenty: %s"
 
-#, fuzzy
-msgid "Copy to e&xport area..."
-msgstr "Nelze kopírovat do schránky."
+msgid "&Save to file..."
+msgstr ""
 
 #, fuzzy
 msgid "&Copy to clipboard..."
@@ -12477,6 +12513,30 @@ msgid ""
 "%s"
 msgstr ""
 
+#, python-format
+msgid "All rows saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All tooltips saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All data saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected rows saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected tooltips saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected data saved to [%s]."
+msgstr ""
+
 msgid "Monty the Serpent && the FSF Present"
 msgstr ""
 
@@ -13914,6 +13974,10 @@ msgstr ""
 msgid "sorted by type"
 msgstr ""
 
+#, fuzzy
+msgid "sorted by organization"
+msgstr "Očkování"
+
 msgid "Cannot load documents. No active patient."
 msgstr ""
 
@@ -14000,6 +14064,10 @@ msgstr ""
 msgid "%s (unattributed episode)"
 msgstr ""
 
+#, fuzzy
+msgid "unknown organization"
+msgstr "neznámá reakce"
+
 #, python-format
 msgid "part %2s"
 msgstr ""
@@ -18279,6 +18347,10 @@ msgid "Abort and do NOT connect to GNUmed."
 msgstr ""
 
 #, fuzzy
+#~ msgid "Copy to e&xport area..."
+#~ msgstr "Nelze kopírovat do schránky."
+
+#, fuzzy
 #~ msgid "&Entry time"
 #~ msgstr "Koncový čas "
 
diff --git a/client/po/da-gnumed.mo b/client/po/da-gnumed.mo
index d498e5e..177d6dd 100644
Binary files a/client/po/da-gnumed.mo and b/client/po/da-gnumed.mo differ
diff --git a/client/po/da.po b/client/po/da.po
index d2d1bef..2896683 100644
--- a/client/po/da.po
+++ b/client/po/da.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNUmed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-06 11:39+0200\n"
+"POT-Creation-Date: 2016-05-26 12:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -2126,12 +2126,6 @@ msgstr ""
 msgid "New patient ID:"
 msgstr "Internt patient ID"
 
-msgid "Your review"
-msgstr ""
-
-msgid "Reviews by others"
-msgstr ""
-
 msgid "(you are/are not the primary reviewer)"
 msgstr ""
 
@@ -2164,6 +2158,9 @@ msgid ""
 "in a new episode name to associate a different one."
 msgstr ""
 
+msgid "The organizational unit this document originates from."
+msgstr ""
+
 msgid "Enter the date of creation of the document."
 msgstr ""
 
@@ -2218,9 +2215,18 @@ msgstr ""
 msgid "Cancel this review."
 msgstr ""
 
+msgid "Your review"
+msgstr ""
+
+msgid "Reviews by others"
+msgstr ""
+
 msgid "Episode"
 msgstr ""
 
+msgid "Source"
+msgstr ""
+
 msgid "Date"
 msgstr ""
 
@@ -4812,19 +4818,16 @@ msgstr ""
 msgid "Close this dialog."
 msgstr ""
 
-msgid "age"
-msgstr ""
-
-msgid "review status"
+msgid "Age"
 msgstr ""
 
-msgid "episode"
+msgid "Review status"
 msgstr ""
 
-msgid "health issue"
+msgid "Health issue"
 msgstr ""
 
-msgid "type"
+msgid "Organization"
 msgstr ""
 
 msgid "Sort newest documents to top of tree."
@@ -4842,6 +4845,9 @@ msgstr ""
 msgid "Sort documents by their type."
 msgstr ""
 
+msgid "Sort documents by the organization they are from."
+msgstr ""
+
 msgid "Sort documents by"
 msgstr ""
 
@@ -5110,9 +5116,6 @@ msgstr ""
 msgid "The category of the organizational unit."
 msgstr ""
 
-msgid "Organization"
-msgstr ""
-
 msgid "Unit"
 msgstr ""
 
@@ -5272,9 +5275,6 @@ msgid ""
 "(SQL query)"
 msgstr ""
 
-msgid "Source"
-msgstr ""
-
 msgid "URL"
 msgstr ""
 
@@ -6973,9 +6973,6 @@ msgstr "Korrekt resultat"
 msgid "missing, reported later"
 msgstr ""
 
-msgid "Health issue"
-msgstr ""
-
 #, fuzzy
 msgid "External care"
 msgstr "Ekstern patient ID"
@@ -7007,6 +7004,9 @@ msgstr "Familiehistorik"
 msgid "Document"
 msgstr "Dokumenter:"
 
+msgid "Inbox message"
+msgstr ""
+
 #, python-format
 msgid "unmapped entry type from table [%s]"
 msgstr ""
@@ -8626,6 +8626,9 @@ msgstr ""
 msgid "who"
 msgstr ""
 
+msgid "type"
+msgstr ""
+
 msgid "entry"
 msgstr ""
 
@@ -9483,6 +9486,9 @@ msgstr ""
 msgid "nicotine"
 msgstr ""
 
+msgid "ethanol"
+msgstr ""
+
 msgid "unit"
 msgstr ""
 
@@ -10687,9 +10693,6 @@ msgstr ""
 msgid "Progress Note"
 msgstr ""
 
-msgid "Age"
-msgstr ""
-
 msgid "N/A"
 msgstr ""
 
@@ -11979,6 +11982,13 @@ msgstr ""
 msgid "Show selected address on map"
 msgstr ""
 
+#, fuzzy
+msgid "Distance"
+msgstr "%s: tilfælde (%s)"
+
+msgid "Show distance from your praxis"
+msgstr ""
+
 msgid "Adding new address"
 msgstr ""
 
@@ -12201,6 +12211,30 @@ msgstr ""
 msgid "Find next [%s] (<CTRL-N>)"
 msgstr ""
 
+msgid "&All rows"
+msgstr ""
+
+msgid "All rows as &CSV"
+msgstr ""
+
+msgid "&Tooltips of all rows"
+msgstr ""
+
+msgid "&Data of all rows"
+msgstr ""
+
+msgid "&Selected rows"
+msgstr ""
+
+msgid "&Selected rows as CSV"
+msgstr ""
+
+msgid "&Tooltips of selected rows"
+msgstr ""
+
+msgid "&Data of selected rows"
+msgstr ""
+
 msgid "Tooltips of selected rows"
 msgstr ""
 
@@ -12230,7 +12264,7 @@ msgstr ""
 msgid "Column &%s (current row): %s"
 msgstr "Dokumenter: %s"
 
-msgid "Copy to e&xport area..."
+msgid "&Save to file..."
 msgstr ""
 
 msgid "&Copy to clipboard..."
@@ -12259,6 +12293,30 @@ msgid ""
 "%s"
 msgstr ""
 
+#, python-format
+msgid "All rows saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All tooltips saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All data saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected rows saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected tooltips saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected data saved to [%s]."
+msgstr ""
+
 msgid "Monty the Serpent && the FSF Present"
 msgstr ""
 
@@ -13678,6 +13736,10 @@ msgstr ""
 msgid "sorted by type"
 msgstr ""
 
+#, fuzzy
+msgid "sorted by organization"
+msgstr "Vaccinationer"
+
 msgid "Cannot load documents. No active patient."
 msgstr ""
 
@@ -13763,6 +13825,10 @@ msgstr ""
 msgid "%s (unattributed episode)"
 msgstr ""
 
+#, fuzzy
+msgid "unknown organization"
+msgstr "Ukendt reaktion"
+
 #, python-format
 msgid "part %2s"
 msgstr ""
diff --git a/client/po/de-gnumed.mo b/client/po/de-gnumed.mo
index 125790c..bb77dfc 100644
Binary files a/client/po/de-gnumed.mo and b/client/po/de-gnumed.mo differ
diff --git a/client/po/de.po b/client/po/de.po
index b42c304..550446d 100644
--- a/client/po/de.po
+++ b/client/po/de.po
@@ -5,8 +5,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNUmed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-06 11:40+0200\n"
-"PO-Revision-Date: 2016-04-06 11:50+0200\n"
+"POT-Creation-Date: 2016-05-26 12:47+0200\n"
+"PO-Revision-Date: 2016-05-26 12:38+0200\n"
 "Last-Translator: Karsten Hilbert <Karsten.Hilbert at gmx.net>\n"
 "Language-Team: Deutsch\n"
 "Language: de_DE\n"
@@ -44,6 +44,9 @@ msgid ""
 "You are trying to open an old file with a new version of timeline. Please "
 "install version 0.21.1 of timeline to convert it to the new format."
 msgstr ""
+"Sie versuchen ein Dateiformat zu öffnen, das nicht von dieser Timeline-"
+"Version gelesen werden kann. Bitte installieren Sie Version 0.21.1 und "
+"wandeln Sie die Datei in das neue Format um."
 
 msgid "Other timelines can't be imported to a directory timeline"
 msgstr ""
@@ -91,6 +94,8 @@ msgstr "Berühr mich mit der Maus!"
 
 msgid "Hovering events with a triangle shows the event description."
 msgstr ""
+"Wenn man mit der Maus über ein Ereignis mit einem Dreieck fährt wird die "
+"Beschreibung des Ereignisses sichtbar."
 
 msgid "Features"
 msgstr "Fähigkeiten"
@@ -105,23 +110,33 @@ msgid ""
 "\n"
 "You can also middle click with the mouse to center around that point."
 msgstr ""
+"Klicken Sie mit der linken Maustaste irgendwo auf dem Zeitstrahl und ziehen "
+"sie ihn.\n"
+"\n"
+"Sie können auch das Mausrad benutzen.\n"
+"\n"
+"Sie können ebenfalls mit der mittleren Maustaste klicken, um den Zeitstrahl "
+"gegenüber diesem Punkt mittig einzustellen."
 
 msgid "Container"
-msgstr ""
+msgstr "Behälter"
 
 msgid "?"
-msgstr ""
+msgstr "?"
 
 msgid "Resize me"
-msgstr ""
+msgstr "Größe ändern"
 
 msgid ""
 "Container Subevent 1\n"
 "Click on the event to get the resize handles"
 msgstr ""
+"Behälter für das Unterereignis 1\n"
+"Klicken Sie bitte auf das Ereignis, um die Griffe zur Größenänderung zu "
+"sehen."
 
 msgid "Drag me"
-msgstr ""
+msgstr "Ziehen Sie mich"
 
 msgid ""
 "Container Subevent 2\n"
@@ -132,6 +147,14 @@ msgid ""
 "Keep the Alt key down and find the drag point at the center of the container "
 "and drag it."
 msgstr ""
+"Behälter für das Unterereignis 2\n"
+"\n"
+"Klicken Sie bitte auf das Ereignis, um die Griffe zum Verschieben zu sehen "
+"und verschieben Sie es.\n"
+"\n"
+"Um den ganzen Behälter zu verschieben, halten Sie bitte die Alt-Taste "
+"gedrückt, während Sie es anklicken. Sie finden den Punkt zum Verschieben in "
+"der Mitte des Behälters."
 
 msgid "Zoom"
 msgstr "Vergrößerung"
@@ -141,6 +164,9 @@ msgid ""
 "\n"
 "Hold down Shift while dragging with the mouse."
 msgstr ""
+"Halten Sie die Strg-Taste gedrückt, während Sie mit dem Mausrad rollen.\n"
+"\n"
+"Halten Sie die Umschalt-Taste gedrückt, während Sie es mit der Maus ziehen."
 
 msgid "Create event"
 msgstr "Ereignis hinzufügen"
@@ -150,33 +176,42 @@ msgid ""
 "\n"
 "Hold down Ctrl while dragging the mouse to select a period."
 msgstr ""
+"Irgendwo in den Zeitstrahl doppelklicken.\n"
+"\n"
+"Halten Sie dann Strg gedrückt, während Sie mit der Maus ziehen, um einen "
+"Zeitabschnitt zu wählen."
 
 msgid "Edit event"
 msgstr "Ereignis bearbeiten"
 
 msgid "Double click on an event."
-msgstr ""
+msgstr "Auf ein Ereignis doppelklicken"
 
 msgid "Select event"
-msgstr ""
+msgstr "Ereignis auswählen"
 
 msgid ""
 "Click on it.\n"
 "\n"
 "Hold down Ctrl while clicking events to select multiple."
 msgstr ""
+"Klicken Sie drauf.\n"
+"\n"
+"Halten Sie die Strg-Taste gedrückt, während sie auf Ereignisse klicken, um "
+"mehrere gleichzeitig auszuwählen."
 
 msgid "Delete event"
 msgstr "Ereignis löschen"
 
 msgid "Select events to be deleted and press the Del key."
 msgstr ""
+"Wählen Sie die zu löschenden Ereignisse und drücken die Entfernen-Taste."
 
 msgid "Resize and move me!"
-msgstr ""
+msgstr "Verändern Sie meine Größe und bewegen Sie mich!"
 
 msgid "First select me and then drag the handles."
-msgstr ""
+msgstr "Wählen Sie mich zunächst aus, ziehen Sie dann an den Griffen."
 
 msgid "Saving"
 msgstr "Speichern"
@@ -187,6 +222,11 @@ msgid ""
 "\n"
 "Choose File/New/File Timeline to create a timeline that is saved on disk."
 msgstr ""
+"Dieser Zeitstrahl wird im Direktzugriffsspeicher abgelegt, Veränderungen "
+"daran werden daher nicht in die nächste Sitzung übernommen.\n"
+"\n"
+"Wählen Sie im Menü Datei/Neu/Datei/Zeitstrahldatei, um einen Zeitstrahl zu "
+"erschaffen, der auf der Festplatte gespeichert wird."
 
 msgid "Start time "
 msgstr "Anfangszeit "
@@ -303,31 +343,31 @@ msgid "Delete"
 msgstr "Löschen"
 
 msgid "Check All"
-msgstr ""
+msgstr "Alle auswählen"
 
 msgid "Check children"
-msgstr ""
+msgstr "Tochterelemente prüfen"
 
 msgid "Check all children"
-msgstr ""
+msgstr "Alle Tochterelemente prüfen"
 
 msgid "Check all parents"
-msgstr ""
+msgstr "Alle Elternelemente auswählen"
 
 msgid "Check parents for checked children"
-msgstr ""
+msgstr "Elternelemente nach ausgewählten Tochterelementen prüfen"
 
 msgid "Uncheck All"
 msgstr ""
 
 msgid "Uncheck children"
-msgstr ""
+msgstr "Tochterelemente abwählen"
 
 msgid "Uncheck all children"
-msgstr ""
+msgstr "Alle Tochterelemente abwählen"
 
 msgid "Uncheck all parents"
-msgstr ""
+msgstr "Alle Elternelemente abwählen"
 
 msgid "Check all parents of all childs"
 msgstr ""
@@ -366,7 +406,7 @@ msgid "Invalid date"
 msgstr "Ungültiges Datum"
 
 msgid "Give feedback"
-msgstr ""
+msgstr "Rückmeldung geben"
 
 msgid "Add new"
 msgstr "Neues Ereignis hinzufügen"
@@ -375,10 +415,10 @@ msgid "Edit categories"
 msgstr "Kategorien bearbeiten"
 
 msgid "Select a Category:"
-msgstr ""
+msgstr "Eine Kategorie auswählen:"
 
 msgid "Set Category on events without category"
-msgstr ""
+msgstr "Kategorie bei Ereignissen ohne Kategorie einstellen"
 
 msgid "Set Category on selected events"
 msgstr ""
@@ -390,7 +430,7 @@ msgid "Found Events"
 msgstr ""
 
 msgid "&Enlarge"
-msgstr ""
+msgstr "&Erweitern"
 
 msgid "&Reduce"
 msgstr ""
@@ -405,16 +445,16 @@ msgid "to"
 msgstr "bis"
 
 msgid "Container:"
-msgstr ""
+msgstr "Behälter:"
 
 msgid "Add Container"
-msgstr ""
+msgstr "Behälter hinzufügen"
 
 msgid "Period"
 msgstr "Zeitraum"
 
 msgid "Fuzzy"
-msgstr ""
+msgstr "Unscharf"
 
 msgid "Locked"
 msgstr "Fixiert"
@@ -438,7 +478,7 @@ msgid "Icon"
 msgstr "Bildchen"
 
 msgid "Hyperlink"
-msgstr ""
+msgstr "Verweis"
 
 msgid "Progress"
 msgstr ""
@@ -447,7 +487,7 @@ msgid "Add more events after this one"
 msgstr "Weitere Ereignisse hinzufügen"
 
 msgid "Edit Container"
-msgstr ""
+msgstr "Behälter bearbeiten"
 
 msgid "Edit Event"
 msgstr "Ereignis bearbeiten"
@@ -456,7 +496,7 @@ msgid "Create Event"
 msgstr "Neues Ereignis eintragen"
 
 msgid "Email Feedback"
-msgstr ""
+msgstr "E-Mail-Rückmeldung"
 
 msgid "Default client"
 msgstr ""
@@ -539,10 +579,10 @@ msgid "Exit the program"
 msgstr "Programm beenden"
 
 msgid "Find Categories..."
-msgstr ""
+msgstr "Kategorien finden …"
 
 msgid "Shortcuts..."
-msgstr ""
+msgstr "Tastenkürzel …"
 
 msgid "&Edit"
 msgstr "Bea&rbeiten"
@@ -557,16 +597,16 @@ msgid "&Balloons on hover"
 msgstr ""
 
 msgid "Zoom &In\tCtrl++"
-msgstr ""
+msgstr "&Vergrößern\tStrg++"
 
 msgid "Zoom &Out\tCtrl+-"
-msgstr ""
+msgstr "V&erkleinern\tStrg+-"
 
 msgid "Vertical Zoom &In\tAlt++"
-msgstr ""
+msgstr "Senkrecht ver&größern\tAlt++"
 
 msgid "Vertical Zoom &Out\tAlt+-"
-msgstr ""
+msgstr "Senkrecht ver&kleinern\tAlt++"
 
 msgid "&View"
 msgstr "&Ansicht"
@@ -575,7 +615,7 @@ msgid "Create &Event..."
 msgstr "Neues &Ereignis eintragen..."
 
 msgid "&Edit Selected Event..."
-msgstr ""
+msgstr "&Ausgewähltes Ereignis bearbeiten …"
 
 msgid "&Duplicate Selected Event..."
 msgstr "Ausgewähltes Ereignis &duplizieren..."
@@ -584,7 +624,7 @@ msgid "Set Category on Selected Events..."
 msgstr ""
 
 msgid "&Measure Distance between two Events..."
-msgstr ""
+msgstr "&Zeit zwischen zwei Ereignissen messen"
 
 msgid "Set Category on events &without category..."
 msgstr ""
@@ -593,7 +633,7 @@ msgid "Edit &Categories"
 msgstr "&Kategorien bearbeiten"
 
 msgid "&Read Only"
-msgstr ""
+msgstr "&Nur lesbar"
 
 msgid "&Timeline"
 msgstr "&Zeitstrahl"
@@ -611,7 +651,7 @@ msgid "&Navigate"
 msgstr "&Position/Zoom"
 
 msgid "Feedback"
-msgstr ""
+msgstr "Rückmeldung"
 
 msgid "&Contents\tF1"
 msgstr "&Inhalt\tF1"
@@ -653,7 +693,7 @@ msgid "Open Timeline"
 msgstr "Zeitstrahl öffnen"
 
 msgid "Save Timeline As"
-msgstr ""
+msgstr "Zeitstrahl speichern unter"
 
 msgid ""
 "Could not find pysvg Python package. It is needed to export to SVG. See the "
@@ -668,10 +708,10 @@ msgid "Unable to write configuration file."
 msgstr "Die Konfigurationsdatei konnte nicht geschrieben werden."
 
 msgid "Distance between selected events"
-msgstr ""
+msgstr "Abstand zwischen ausgewählten Ereignissen"
 
 msgid "Events are overlapping or distance is 0"
-msgstr ""
+msgstr "Die Ereignisse überschneiden sich oder der Abstand ist 0"
 
 msgid "No timeline opened."
 msgstr "Sie haben noch keinen Zeitstrahl geöffnet."
@@ -736,19 +776,19 @@ msgid "Sunday"
 msgstr "Sonntag"
 
 msgid "Category Finder"
-msgstr ""
+msgstr "Kategoriefinder"
 
 msgid "Check"
-msgstr ""
+msgstr "Auswählen"
 
 msgid "Uncheck"
-msgstr ""
+msgstr "Abwählen"
 
 msgid "Feedback On Feature"
-msgstr ""
+msgstr "Rückmeldung zu Funktionen"
 
 msgid "Give Feedback"
-msgstr ""
+msgstr "Rückmeldung geben"
 
 msgid "Help"
 msgstr "Hilfe"
@@ -783,16 +823,16 @@ msgid "Container Properties"
 msgstr ""
 
 msgid "Edit Shortcuts"
-msgstr ""
+msgstr "Tastenkürzel bearbeiten"
 
 msgid "Functions:"
-msgstr ""
+msgstr "Funktionen:"
 
 msgid "Modifier:"
 msgstr ""
 
 msgid "Shortcut Key:"
-msgstr ""
+msgstr "Tastenkürzel:"
 
 msgid "Unable to copy to clipboard."
 msgstr "Kann nicht in die Zwischenablage kopieren."
@@ -836,17 +876,17 @@ msgid "Question"
 msgstr "Frage"
 
 msgid "Both Modifier and Shortcut key must be given!"
-msgstr ""
+msgstr "Sowohl das Attribut als auch das Tastenkürzel muss angegeben werden!"
 
 #, python-format
 msgid "The shortcut %s is already bound to function '%s'!"
-msgstr ""
+msgstr "Das Tastenkürzel %s ist bereits mit der Funktion »%s« verbunden!"
 
 msgid "You must select a category!"
-msgstr ""
+msgstr "Sie müssen eine Kategorie auswählen!"
 
 msgid "Progress %:"
-msgstr ""
+msgstr "Fortschritt %:"
 
 msgid "Test"
 msgstr "Test"
@@ -864,7 +904,7 @@ msgid "Select Icon"
 msgstr "Wählen Sie ein Icon"
 
 msgid "You can't change time when the Event is locked"
-msgstr ""
+msgstr "Sie können die Zeit nicht ändern, wenn das Ereignis gesperrt ist."
 
 msgid "End must be > Start"
 msgstr ""
@@ -874,7 +914,7 @@ msgid "Entered period is too long."
 msgstr "Entered period is too long."
 
 msgid "Start time > Now."
-msgstr ""
+msgstr "Die Anfangszeit liegt in der Zukunft."
 
 #, python-format
 msgid "Field '%s' can't be empty."
@@ -935,7 +975,7 @@ msgstr ""
 "Datenobjekt zu verwenden, das diese Funktion unterstützt.\n"
 
 msgid "Can multiple users work with the same timeline?"
-msgstr ""
+msgstr "Können mehrere Benutzer mit dem selben Zeitstrahl arbeiten?"
 
 msgid ""
 "\n"
@@ -970,9 +1010,22 @@ msgid ""
 "line. Period events are displayed below the line and point events are "
 "displayed above the line.\n"
 msgstr ""
+"\n"
+"Der Zeitstrahl zeigt Daten gemäß dem Gregorianischen Kalender auf der X-"
+"Achse. Derzeit ist das früheste Datum begrenzt auf den Tag 0 des "
+"Julianischen Kalenders (November 24, 4714 BC).\n"
+"\n"
+"Zukünftige Versionen könnten mehrere Arten von Zeitstrahlen unterstützen, "
+"sodass Sie beispielsweise eine Zeit über die Anzahl der Minuten vom "
+"jeweiligen Startzeitpunkt definieren können. Sollten Sie an einer solchen "
+"Funktion interessiert sein, melden Sie sich bitte bei uns.\n"
+"\n"
+"Der Zeitstrahl teilt durch eine horizontal anpassbare Trennlinie zwei "
+"Flächen. Ereignisse mit Dauer werden unterhalb der Linie angezeigt, "
+"punktuelle Ereignisse oberhalb.\n"
 
 msgid "Scrolling Timeline"
-msgstr ""
+msgstr "Den Zeitstrahl bewegen"
 
 msgid ""
 "\n"
@@ -989,9 +1042,23 @@ msgid ""
 "and period-events.\n"
 "\n"
 msgstr ""
+"\n"
+"Ein Zeitstrahl kann horizontal (entlang der Zeitachse) und vertikal (entlang "
+"der Ereignis-Achse) bewegt werden.\n"
+"\n"
+"Es gibt zwei Möglichkeiten, sie horizontal zu bewegen. Sie können entweder "
+"verschiedene Optionen in dem Navigationsmenü oder die Maus benutzen. Um "
+"hierfür die Maus zu verwenden, halten Sie die linke Maustaste gedrückt und "
+"ziehen Sie die Maus horizontal.\n"
+"\n"
+"Um das Sichtfenster vertikal zu bewegen, halten Sie die Umschalt- und Strg-"
+"Taste gedrückt und drehen Sie das Mausrad.\n"
+"Ereignisse werden so zur Trennlinie oder von ihr fort bewegt, die punktuelle "
+"Ereignisse und andauernde Ereignisse trennt.\n"
+"\n"
 
 msgid "Zooming Timeline"
-msgstr ""
+msgstr "Zeitstrahl vergrößern/verkleinern"
 
 msgid ""
 "\n"
@@ -1002,6 +1069,15 @@ msgid ""
 "\n"
 "To zoom vertically, hold down the Alt-key and scroll the mouse wheel.\n"
 msgstr ""
+"\n"
+"Ein Zeitstrahl kann sowohl horizontal (entlang der Zeitachse) als auch "
+"senkrecht (entlang der Ereignisachse) vergrößert und verkleinert werden.\n"
+"\n"
+"Um ihn horizontal zu verschieben, halten Sie die Strg-Taste gedrückt und "
+"bewegen das Mausrad.\n"
+"\n"
+"Um senkrecht zu vergrößern und zu verkleinern, halten Sie die Alt-Taste "
+"gedrückt und bewegen das Mausrad.\n"
 
 msgid "Events"
 msgstr "Ereignisse"
@@ -1013,6 +1089,11 @@ msgid ""
 "that event happened). This can be either a specific point in time or a "
 "period.\n"
 msgstr ""
+"\n"
+"Ein Ereignis ist das prinzipielle Dateiformat, um Informationen auf dem "
+"Zeitstrahl darzustellen. Es muss klar sein, wo auf dem Zeitstrahl es "
+"untergebracht werden soll (also wann dieses Ereignis passiert ist). Dies "
+"kann entweder ein genauer Zeitpunkt oder ein Zeitraum sein.\n"
 
 msgid ""
 "\n"
@@ -1032,6 +1113,23 @@ msgid ""
 " - Alert - An alert dialog is opened at the specified alert time.\n"
 " - Hyperlink - A hyperlink that can be reached in the event context menu.\n"
 msgstr ""
+"\n"
+"Für ein Ereignis können die folgenden Eigenschaften festgelegt werden.\n"
+"\n"
+" - Anfangsdatum und -zeit.\n"
+" - Enddatum und -zeit (wenn das Ereignis einen Zeitraum einnimmt).\n"
+" - Text - Die Beschriftung, die für ein Ereignis angezeigt wird.\n"
+" - Kategorie - Eine Möglichkeit, Ereignisse zu gruppieren.\n"
+" - Behälter - Eine andere Möglichkeit, Ereignisse zu gruppieren.\n"
+" - Unscharf - Diese Funktion stellt Anfang und Ende eines Ereignisses "
+"unscharf dar, um anzudeuten, dass die genauen Zeiten unbekannt sind.\n"
+" - Gesperrt - Anfangs- und Endpunkte können nicht geändert werden.\n"
+" - Endet heute - Der Endpunkt wird stets auf das aktuelle Datum gestellt.\n"
+" - Beschreibung - Ereignisbeschreibung, die in der Blase angezeigt wird.\n"
+" - Bild - Dieses Bild wird in der Blase angezeigt.\n"
+" - Alarm - Ein Alarmdialog wird zur angegebenen Alarmzeit geöffnet.\n"
+" - Verweis - Eine Verknüpfung, auf die im Ereigniskontextmenü zugegriffen "
+"werden kann.\n"
 
 msgid "Categories"
 msgstr "Kategorien"
@@ -1071,9 +1169,13 @@ msgid ""
 "selecting one event and select the 'Timeline -> Edit Selected Event...' "
 "menu.\n"
 msgstr ""
+"\n"
+"Der *Ereignis bearbeiten* Dialog kann durch Doppelklick auf ein Ereignis "
+"geöffnet werden oder indem man ein Ereignis auswählt und das Menü "
+"'Zeitleiste -> Ausgewähltes Ereignis bearbeiten…' anwählt.\n"
 
 msgid "Move event vertically"
-msgstr ""
+msgstr "Ereignis senkrecht bewegen"
 
 msgid ""
 "\n"
@@ -1082,7 +1184,7 @@ msgid ""
 msgstr ""
 
 msgid "Duplicate event"
-msgstr ""
+msgstr "Ereignis verdoppeln"
 
 msgid ""
 "\n"
@@ -1111,9 +1213,13 @@ msgid ""
 "To select an event, click on it. To select multiple events, hold down the "
 "*Ctrl* key while clicking events.\n"
 msgstr ""
+"\n"
+"Um ein Ereignis auszuwählen, klicken Sie auf dieses. Um mehrere Ereignisse "
+"auszuwählen, halten Sie die *Strg* Taste gedrückt, während Sie auf die "
+"Ereignisse klicken.\n"
 
 msgid "Import timeline"
-msgstr ""
+msgstr "Zeitstrahl importieren"
 
 msgid ""
 "\n"
@@ -1122,9 +1228,14 @@ msgid ""
 "First open a timeline and then select menu 'File -> Import timeline...' and "
 "select the timeline to be imported.\n"
 msgstr ""
+"\n"
+"Diese Funktion kann benutzt werden, um zwei Zeitstrahlen zu vereinen.\n"
+"\n"
+"Öffnen Sie zuerst einen Zeitstrahl und wählen dann im Menü 'Datei -> "
+"Zeitstrahl importieren …' und wählen Sie den einzulesenden Zeitstrahl aus.\n"
 
 msgid "Event Containers"
-msgstr ""
+msgstr "Ereignisbehälter"
 
 msgid ""
 "\n"
@@ -1204,10 +1315,10 @@ msgid "No timeline set"
 msgstr "Kein Zeitstrahl gesetzt"
 
 msgid "Can't scroll more to the left"
-msgstr ""
+msgstr "Kann nicht weiter nach links gerollt werden"
 
 msgid "Can't scroll more to the right"
-msgstr ""
+msgstr "Kann nicht weiter nach rechts gerollt werden"
 
 msgid "Edit"
 msgstr "Bearbeiten"
@@ -1216,7 +1327,7 @@ msgid "Duplicate..."
 msgstr "Duplizieren..."
 
 msgid "Sticky Balloon"
-msgstr ""
+msgstr "Haftende Blase"
 
 msgid "Goto URL"
 msgstr "Gehe zur Webseite"
@@ -1236,7 +1347,7 @@ msgid "Are you sure you want to delete this event?"
 msgstr "Wollen Sie dieses Ereignis wirklich löschen?"
 
 msgid "Select region to zoom into"
-msgstr ""
+msgstr "Bereich zum vergrößern wählen"
 
 msgid "Region too long"
 msgstr "Bereich zu groß"
@@ -1296,7 +1407,7 @@ msgid "Fit Month"
 msgstr "Zoom auf einen Monat einstellen"
 
 msgid "Fit Week"
-msgstr ""
+msgstr "Woche einpassen"
 
 msgid "Fit Day"
 msgstr "Zoom auf einen Tag einstellen"
@@ -1347,13 +1458,13 @@ msgid "Go to Date"
 msgstr "Zu bestimmtem Datum springen"
 
 msgid "Go to &Zero\tCtrl+Z"
-msgstr ""
+msgstr "Gehe zu &Null\tStrg+Z"
 
 msgid "Go to &Time\tCtrl+T"
-msgstr ""
+msgstr "Gehe zu &Zeit\tStrg+T"
 
 msgid "Can't zoom deeper than 5"
-msgstr ""
+msgstr "Tiefer als 5 kann nicht vergrößert werden"
 
 msgid "1-period"
 msgstr ""
@@ -1368,88 +1479,88 @@ msgid "1000-period"
 msgstr ""
 
 msgid "Go to Time"
-msgstr ""
+msgstr "Zu Zeit gehen"
 
 msgid "File"
 msgstr "Datei"
 
 msgid "View"
-msgstr ""
+msgstr "Ansicht"
 
 msgid "Navigate"
-msgstr ""
+msgstr "Navigieren"
 
 msgid "Import..."
-msgstr ""
+msgstr "Importieren …"
 
 msgid "Export Current view to Image..."
-msgstr ""
+msgstr "Aktuelle Ansicht als Bild exportieren …"
 
 msgid "Export Whole Timeline to Images..."
-msgstr ""
+msgstr "Gesamten Zeitstrahl als Bilder exportieren …"
 
 msgid "Export to SVG..."
-msgstr ""
+msgstr "Als SVG exportieren …"
 
 msgid "Exit"
 msgstr "Beenden"
 
 msgid "Find"
-msgstr ""
+msgstr "Finden"
 
 msgid "Shortcuts"
-msgstr ""
+msgstr "Tastenkürzel"
 
 msgid "Sidebar"
-msgstr ""
+msgstr "Seitenleiste"
 
 msgid "Legend"
-msgstr ""
+msgstr "Legende"
 
 msgid "Ballons on hover"
-msgstr ""
+msgstr "Blasen bei Mausberührung"
 
 msgid "Zoom In"
-msgstr ""
+msgstr "Vergrößern"
 
 msgid "Zoom Out"
-msgstr ""
+msgstr "Verkleinern"
 
 msgid "Vertical Zoom In"
-msgstr ""
+msgstr "Senkrecht vergrößern"
 
 msgid "Vertical Zoom Out"
-msgstr ""
+msgstr "Senkrecht verkleinern"
 
 msgid "Edit Selected Event"
-msgstr ""
+msgstr "Ausgewähltes Ereignis bearbeiten"
 
 msgid "Duplicate Selected Event"
-msgstr ""
+msgstr "Ausgewähltes Ereignis verdoppeln"
 
 msgid "Set Category on Selected Events"
-msgstr ""
+msgstr "Kategorie für ausgewählte Ereignisse einstellen"
 
 msgid "Measure Distance between two Events"
-msgstr ""
+msgstr "Zeit zwischen zwei Ereignissen messen"
 
 msgid "Read Only"
-msgstr ""
+msgstr "Schreibgeschützt"
 
 msgid "Contents"
-msgstr ""
+msgstr "Inhalt"
 
 msgid "About"
-msgstr ""
+msgstr "Über"
 
 msgid "Find First Event"
-msgstr ""
+msgstr "Erstes Ereignis finden"
 
 msgid "Find Last Event"
-msgstr ""
+msgstr "Letzte Ereignis finden"
 
 msgid "Find All Events"
-msgstr ""
+msgstr "Alle Ereignisse finden"
 
 #, python-format
 msgid "File '%s' does not exist."
@@ -1463,6 +1574,12 @@ msgid ""
 "\n"
 "Do you want to Synchronize?"
 msgstr ""
+"Jemand anderes hat den Zeitstrahl verändert.\n"
+"Sie haben zwei Möglichkeiten!\n"
+"  1. Stellen Sie den Zeitstrahl auf den schreibgeschützten Modus um.\n"
+"  2. Gleichen Sie den Zeitstrahl ab.\n"
+"\n"
+"Möchten Sie sie abgleichen?"
 
 msgid ""
 "Help requested\n"
@@ -2257,12 +2374,6 @@ msgstr "Suchbegriff:"
 msgid "New patient ID:"
 msgstr "Neue Patientennummer:"
 
-msgid "Your review"
-msgstr "Ihre Bewertung"
-
-msgid "Reviews by others"
-msgstr "Bewertungen durch Kollegen"
-
 msgid "(you are/are not the primary reviewer)"
 msgstr "(Sie sind/sind nicht der Verantwortliche)"
 
@@ -2298,6 +2409,9 @@ msgstr ""
 "auswählen oder einen Namen für eine neue Episode eintippen, um die Zuordnung "
 "zu .ändern."
 
+msgid "The organizational unit this document originates from."
+msgstr "Die Organisation aus der dieses Dokument stammt."
+
 msgid "Enter the date of creation of the document."
 msgstr "Geben Sie das Datum der Erstellung des Dokuments ein."
 
@@ -2374,9 +2488,18 @@ msgstr "Bewertung speichern."
 msgid "Cancel this review."
 msgstr "Bewertung abbrechen."
 
+msgid "Your review"
+msgstr "Ihre Bewertung"
+
+msgid "Reviews by others"
+msgstr "Bewertungen durch Kollegen"
+
 msgid "Episode"
 msgstr "Episode"
 
+msgid "Source"
+msgstr "Quelle"
+
 msgid "Date"
 msgstr "Datum"
 
@@ -5325,20 +5448,17 @@ msgstr "Details der Konsultation ändern"
 msgid "Close this dialog."
 msgstr "Diesen Dialog schließen."
 
-msgid "age"
+msgid "Age"
 msgstr "Alter"
 
-msgid "review status"
-msgstr "gesehen/ungesehen"
-
-msgid "episode"
-msgstr "Episode"
+msgid "Review status"
+msgstr "Status"
 
-msgid "health issue"
+msgid "Health issue"
 msgstr "Grunderkrankung"
 
-msgid "type"
-msgstr "Typ"
+msgid "Organization"
+msgstr "Organisation"
 
 msgid "Sort newest documents to top of tree."
 msgstr "Sortiere jüngste Dokumente nach oben."
@@ -5355,6 +5475,9 @@ msgstr "Sortiere Dokumente nach der Grunderkrankung, zu der sie gehören."
 msgid "Sort documents by their type."
 msgstr "Sortiere Dokumente nach ihrem Typ."
 
+msgid "Sort documents by the organization they are from."
+msgstr "Sortiere Dokumente nach der Organisation, aus der sie kommen."
+
 msgid "Sort documents by"
 msgstr "Sortiere Dokumente nach"
 
@@ -5677,9 +5800,6 @@ msgstr "Die Bezeichnung der Abteilung."
 msgid "The category of the organizational unit."
 msgstr "Die Kategorie der Abteilung."
 
-msgid "Organization"
-msgstr "Organisation"
-
 msgid "Unit"
 msgstr "Einheit"
 
@@ -5869,9 +5989,6 @@ msgstr ""
 "Bedingungen\n"
 "(SQL-Abfrage)"
 
-msgid "Source"
-msgstr "Quelle"
-
 msgid "URL"
 msgstr "Adresse/Nummer"
 
@@ -6846,7 +6963,7 @@ msgid "Manage"
 msgstr "Verwalten"
 
 msgid "&Panel:"
-msgstr ""
+msgstr "&Profil:"
 
 msgid "&Pick"
 msgstr "&Wählen"
@@ -7763,9 +7880,6 @@ msgstr "berichtigtes Ergebnis"
 msgid "missing, reported later"
 msgstr "fehlt/folgt"
 
-msgid "Health issue"
-msgstr "Grunderkrankung"
-
 msgid "External care"
 msgstr "Externe Mitbetreuung"
 
@@ -7793,6 +7907,9 @@ msgstr "Familienanamnese"
 msgid "Document"
 msgstr "Dokument"
 
+msgid "Inbox message"
+msgstr "Nachricht im Posteingang"
+
 #, python-format
 msgid "unmapped entry type from table [%s]"
 msgstr "nicht übertragener Eintragtyp, aus Tabelle [%s]"
@@ -9519,6 +9636,9 @@ msgstr "wann"
 msgid "who"
 msgstr "wer"
 
+msgid "type"
+msgstr "Typ"
+
 msgid "entry"
 msgstr "Eintrag"
 
@@ -10525,6 +10645,9 @@ msgstr "Einnahme"
 msgid "nicotine"
 msgstr "Nikotin"
 
+msgid "ethanol"
+msgstr "Ethanol"
+
 msgid "unit"
 msgstr "Einheit"
 
@@ -11860,9 +11983,6 @@ msgstr "Karteieintrag"
 msgid "Progress Note"
 msgstr "Verlaufsnotiz"
 
-msgid "Age"
-msgstr "Alter"
-
 msgid "N/A"
 msgstr "N/A"
 
@@ -13426,6 +13546,12 @@ msgstr "Karte"
 msgid "Show selected address on map"
 msgstr "Gewählte Adresse auf einer Karte zeigen"
 
+msgid "Distance"
+msgstr "Distanz"
+
+msgid "Show distance from your praxis"
+msgstr "Distanz zur Praxis anzeigen"
+
 msgid "Adding new address"
 msgstr "Neue Adresse hinzufügen"
 
@@ -13671,6 +13797,30 @@ msgstr "Finden (<STRG-F>)"
 msgid "Find next [%s] (<CTRL-N>)"
 msgstr "Finde nächste [%s] (<STRG-N>)"
 
+msgid "&All rows"
+msgstr "&Alle Einträge"
+
+msgid "All rows as &CSV"
+msgstr "Alle Einträge als &CSV"
+
+msgid "&Tooltips of all rows"
+msgstr "&Tooltips aller Einträge"
+
+msgid "&Data of all rows"
+msgstr "&Daten aller Einträge"
+
+msgid "&Selected rows"
+msgstr "&Markierte Einträge"
+
+msgid "&Selected rows as CSV"
+msgstr "&Markierte Einträge als CSV"
+
+msgid "&Tooltips of selected rows"
+msgstr "&Tooltips der markierten Einträge"
+
+msgid "&Data of selected rows"
+msgstr "&Daten der markierten Einträge"
+
 msgid "Tooltips of selected rows"
 msgstr "Tooltips der markierten Einträge"
 
@@ -13700,8 +13850,8 @@ msgstr "Spalte &%s (aktueller Eintrag): \"%s\" [#%s]"
 msgid "Column &%s (current row): %s"
 msgstr "Spalte &%s (aktueller Eintrag): %s"
 
-msgid "Copy to e&xport area..."
-msgstr "In E&xportbereich kopieren..."
+msgid "&Save to file..."
+msgstr "&Speichern in Datei …"
 
 msgid "&Copy to clipboard..."
 msgstr "In Zwischenablage &kopieren..."
@@ -13735,6 +13885,30 @@ msgstr ""
 "\n"
 "%s"
 
+#, python-format
+msgid "All rows saved to [%s]."
+msgstr "Alle Einträge in [%s] gespeichert."
+
+#, python-format
+msgid "All tooltips saved to [%s]."
+msgstr "Alle Tooltips in [%s] gespeichert."
+
+#, python-format
+msgid "All data saved to [%s]."
+msgstr "Alle Daten in [%s] gespeichert."
+
+#, python-format
+msgid "Selected rows saved to [%s]."
+msgstr "[%s]: Markierte Einträge gespeichert."
+
+#, python-format
+msgid "Selected tooltips saved to [%s]."
+msgstr "[%s]: Tooltips markierter Einträge gespeichert."
+
+#, python-format
+msgid "Selected data saved to [%s]."
+msgstr "[%s]: Daten markierter Einträge gespeichert."
+
 msgid "Monty the Serpent && the FSF Present"
 msgstr "Monty die Python && die FSF präsentieren"
 
@@ -15444,6 +15618,9 @@ msgstr "sortiert nach Grunderkrankung"
 msgid "sorted by type"
 msgstr "sortiert nach Typ"
 
+msgid "sorted by organization"
+msgstr "sortiert nach Organisationen"
+
 msgid "Cannot load documents. No active patient."
 msgstr "Kann Dokumente nicht laden. Kein Patient aktiv."
 
@@ -15529,6 +15706,9 @@ msgstr "%s%7s (%s):%s (%s)"
 msgid "%s (unattributed episode)"
 msgstr "%s (nicht zugeordnete Episoden)"
 
+msgid "unknown organization"
+msgstr "unbekannte Organisation"
+
 #, python-format
 msgid "part %2s"
 msgstr "Teil %2s"
@@ -20548,6 +20728,18 @@ msgstr "Abbrechen"
 msgid "Abort and do NOT connect to GNUmed."
 msgstr "Abbrechen und keine Verbindung zu GNUmed herstellen."
 
+#~ msgid "age"
+#~ msgstr "Alter"
+
+#~ msgid "episode"
+#~ msgstr "Episode"
+
+#~ msgid "health issue"
+#~ msgstr "Grunderkrankung"
+
+#~ msgid "Copy to e&xport area..."
+#~ msgstr "In E&xportbereich kopieren..."
+
 #~ msgid "Row tooltip"
 #~ msgstr "Tooltip des Eintrags"
 
diff --git a/client/po/el-gnumed.mo b/client/po/el-gnumed.mo
index a1504cc..265d2d7 100644
Binary files a/client/po/el-gnumed.mo and b/client/po/el-gnumed.mo differ
diff --git a/client/po/el.po b/client/po/el.po
index 087b93b..83641b6 100644
--- a/client/po/el.po
+++ b/client/po/el.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnumed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-06 11:40+0200\n"
+"POT-Creation-Date: 2016-05-26 12:47+0200\n"
 "PO-Revision-Date: 2012-06-01 01:24+0000\n"
 "Last-Translator: ncq <Unknown>\n"
 "Language-Team: Ελληνικά, Σύγχρονα <opensuse-translation-el at opensuse.org>\n"
@@ -48,6 +48,9 @@ msgid ""
 "You are trying to open an old file with a new version of timeline. Please "
 "install version 0.21.1 of timeline to convert it to the new format."
 msgstr ""
+"Επιχειρείτε να ανοίξετε ένα παλαιό αρχείο με μια νέα έκδοση του Timeline. "
+"Παρακαλώ εγκαταστήστε την έκδοση 0.21.1 του Timeline για να το μετατρέψετε "
+"σε νέα μορφή αρχείου."
 
 msgid "Other timelines can't be imported to a directory timeline"
 msgstr ""
@@ -86,19 +89,20 @@ msgid "Welcome to Timeline"
 msgstr "Μήνυμα υποδοχής"
 
 msgid "Intro"
-msgstr ""
+msgstr "Εισαγωγή"
 
 msgid "Hover me!"
-msgstr ""
+msgstr "Αιωρήσου επάνω μου!"
 
 msgid "Hovering events with a triangle shows the event description."
 msgstr ""
+"Με αιώρηση πάνω από γεγονότα με τριγωνάκι εμφανίζεται η περιγραφή τους."
 
 msgid "Features"
-msgstr ""
+msgstr "Χαρακτηριστικά"
 
 msgid "Scroll"
-msgstr ""
+msgstr "Κύλιση"
 
 msgid ""
 "Left click somewhere on the timeline and start dragging.\n"
@@ -107,24 +111,32 @@ msgid ""
 "\n"
 "You can also middle click with the mouse to center around that point."
 msgstr ""
+"Κάντε αριστερό κλικ στη χρονογραμμή και αρχίστε να σέρνετε το ποντίκι.\n"
+"\n"
+"Μπορείτε, επίσης, να χρησιμοποιήσετε τη ρόδα κύλισης του ποντικιού.\n"
+"\n"
+"Μπορείτε, επίσης, να κάνετε μεσαίο κλικ με το ποντίκι, για να κεντράρετε "
+"γύρω από εκείνο το σημείο."
 
 #, fuzzy
 msgid "Container"
 msgstr "Συνέχεια"
 
 msgid "?"
-msgstr ""
+msgstr ";"
 
 msgid "Resize me"
-msgstr ""
+msgstr "Άλλαξε το μέγεθός μου"
 
 msgid ""
 "Container Subevent 1\n"
 "Click on the event to get the resize handles"
 msgstr ""
+"Ομαδοποίηση υπογεγονότος 1\n"
+"Κάντε κλικ στο γεγονός για να εμφανιστούν τα χειριστήρια αλλαγής μεγέθους."
 
 msgid "Drag me"
-msgstr ""
+msgstr "Σύρε με"
 
 msgid ""
 "Container Subevent 2\n"
@@ -135,9 +147,15 @@ msgid ""
 "Keep the Alt key down and find the drag point at the center of the container "
 "and drag it."
 msgstr ""
+"Ομαδοποίηση υπογεγονότος 2\n"
+"\n"
+"Κάντε κλικ στο γεγονός για να εμφανιστούν τα χειριστήρια αλλαγής μεγέθους.\n"
+"\n"
+"Για να σύρετε ολόκληρη την ομαδοποίηση, ενώ κρατάτε πατημένο το πλήκτρο Alt "
+"κάντε κλικ στο σημείο συρσίματος στο κέντρο της ομαδοποίησης και σύρετέ την."
 
 msgid "Zoom"
-msgstr ""
+msgstr "Μεγέθυνση"
 
 msgid ""
 "Hold down Ctrl while scrolling the mouse wheel.\n"
@@ -157,13 +175,17 @@ msgid ""
 "\n"
 "Hold down Ctrl while dragging the mouse to select a period."
 msgstr ""
+"Κάντε διπλό κλικ κάπου στη χρονογραμμή.\n"
+"\n"
+"Κρατήστε πατημένο το Ctrl καθώς σύρετε το ποντίκι για να επιλέξετε μια "
+"χρονική περίοδο."
 
 #, fuzzy
 msgid "Edit event"
 msgstr "ανενεργό"
 
 msgid "Double click on an event."
-msgstr ""
+msgstr "Διπλό κλικ σε ένα γεγονός"
 
 #, fuzzy
 msgid "Select event"
@@ -174,19 +196,23 @@ msgid ""
 "\n"
 "Hold down Ctrl while clicking events to select multiple."
 msgstr ""
+"Κάντε κλικ επάνω του.\n"
+"\n"
+"Κρατήστε πατημένο το Ctrl ενώ κάνετε κλικ σε γεγονότα, για να επιλέξετε "
+"πολλά από αυτά."
 
 #, fuzzy
 msgid "Delete event"
 msgstr " Διαγραφή "
 
 msgid "Select events to be deleted and press the Del key."
-msgstr ""
+msgstr "Επιλέξτε γεγονότα προς διαγραφή και πατήστε το πλήκτρο Del."
 
 msgid "Resize and move me!"
-msgstr ""
+msgstr "Άλλαξε το μέγεθός μου και μετακίνησέ με!"
 
 msgid "First select me and then drag the handles."
-msgstr ""
+msgstr "Πρώτα επίλεξέ με και μετά σύρε τα χειριστήρια."
 
 #, fuzzy
 msgid "Saving"
@@ -198,16 +224,21 @@ msgid ""
 "\n"
 "Choose File/New/File Timeline to create a timeline that is saved on disk."
 msgstr ""
+"Η χρονογραμμή αποθηκεύτηκε στη μνήμη και οι αλλαγές που έγιναν σε αυτή δεν "
+"θα διατηρηθούν μεταξύ δύο συνεδριών.\n"
+"\n"
+"Επιλέξτε Αρχείο/Νέα/Χρονογραμμή για δημιουργία χρονογραμμής που αποθηκεύεται "
+"στον σκληρό δίσκο."
 
 #, fuzzy
 msgid "Start time "
 msgstr "Άρχισε νέο"
 
 msgid "End time "
-msgstr ""
+msgstr "Χρόνος λήξης "
 
 msgid "Start time can't be after end time"
-msgstr ""
+msgstr "Ο χρόνος έναρξης δεν μπορεί να είναι μετά τον χρόνο λήξης"
 
 msgid "Duration"
 msgstr "Διάρκεια"
@@ -215,9 +246,11 @@ msgstr "Διάρκεια"
 #, python-format
 msgid "Unable to save timeline data to '%s'. File left unmodified."
 msgstr ""
+"Αδυναμία αποθήκευσης των δεδομένων της χρονογραμμής στο '%s'. Το αρχείο "
+"παρέμεινε ως είχε."
 
 msgid "Unable to write timeline data."
-msgstr ""
+msgstr "Αδυναμία εγγραφής δεδομένων χρονογραμμής."
 
 #, python-format
 msgid "Unable to write to temporary file '%s'."
@@ -225,7 +258,7 @@ msgstr ""
 
 #, python-format
 msgid "Unable to take backup to '%s'."
-msgstr ""
+msgstr "Αδυναμία λήψης αντιγράφου ασφαλείας στο '%s'."
 
 #, python-format
 msgid "Unable to rename temporary file '%s' to original."
@@ -245,20 +278,20 @@ msgstr "Εξαγωγή σε &αρχείο"
 
 #, python-format
 msgid "File '%s' exists. Overwrite?"
-msgstr ""
+msgstr "Το αρχείο '%s' υπάρχει. Θέλετε να αντικατασταθεί;"
 
 msgid "Jan"
-msgstr ""
+msgstr "Ιαν"
 
 msgid "Feb"
-msgstr ""
+msgstr "Φεβ"
 
 #, fuzzy
 msgid "Mar"
 msgstr "Κύριος"
 
 msgid "Apr"
-msgstr ""
+msgstr "Απρ"
 
 #, fuzzy
 msgid "May"
@@ -269,7 +302,7 @@ msgid "Jun"
 msgstr "Εκτέλεση"
 
 msgid "Jul"
-msgstr ""
+msgstr "Ιούλ"
 
 #, fuzzy
 msgid "Aug"
@@ -280,7 +313,7 @@ msgid "Sep"
 msgstr "Ρύθμιση"
 
 msgid "Oct"
-msgstr ""
+msgstr "Οκτ"
 
 #, fuzzy
 msgid "Nov"
@@ -291,16 +324,16 @@ msgid "Dec"
 msgstr "Συσκευή"
 
 msgid "Mon"
-msgstr ""
+msgstr "Δευ"
 
 msgid "Tue"
-msgstr ""
+msgstr "Τρί"
 
 msgid "Wed"
-msgstr ""
+msgstr "Τετ"
 
 msgid "Thu"
-msgstr ""
+msgstr "Πέμ"
 
 #, fuzzy
 msgid "Fri"
@@ -319,38 +352,38 @@ msgid "Edit..."
 msgstr "Επεξεργασία"
 
 msgid "Add..."
-msgstr ""
+msgstr "Προσθήκη..."
 
 msgid "Delete"
 msgstr "Διαγραφή"
 
 msgid "Check All"
-msgstr ""
+msgstr "Επιλογή όλων"
 
 msgid "Check children"
-msgstr ""
+msgstr "Επιλογή απόγονου"
 
 msgid "Check all children"
-msgstr ""
+msgstr "Επιλογή όλων των απόγονων"
 
 #, fuzzy
 msgid "Check all parents"
 msgstr "Έλεγχος ενημερώσεων"
 
 msgid "Check parents for checked children"
-msgstr ""
+msgstr "Επιλογή προγόνων για τους επιλεγμένους απόγονους"
 
 msgid "Uncheck All"
-msgstr ""
+msgstr "Αποεπιλογή όλων"
 
 msgid "Uncheck children"
-msgstr ""
+msgstr "Αποεπιλογή απογόνων"
 
 msgid "Uncheck all children"
-msgstr ""
+msgstr "Αποεπιλογή όλων των απογόνων"
 
 msgid "Uncheck all parents"
-msgstr ""
+msgstr "Αποεπιλογή όλων των προγόνων"
 
 msgid "Check all parents of all childs"
 msgstr ""
@@ -368,22 +401,26 @@ msgstr "Κατηγορία"
 
 #, python-format
 msgid "Are you sure you want to delete category '%s'?"
-msgstr ""
+msgstr "Είστε βέβαιος ότι θέλετε να διαγράψετε την κατηγορία '%s';"
 
 #, python-format
 msgid "Events belonging to '%s' will no longer belong to a category."
 msgstr ""
+"Τα γεγονότα που ανήκουν στην κατηγορία '%s' δεν θα ανήκουν πλέον σε μια "
+"κατηγορία."
 
 #, python-format
 msgid "Events belonging to '%s' will now belong to '%s'."
 msgstr ""
+"Τα γεγονότα που ανήκουν στην κατηγορία '%s' τώρα θα ανήκουν πλέον στην "
+"κατηγορία '%s'."
 
 #, fuzzy
 msgid "No match"
 msgstr "Ταίριασμα"
 
 msgid "Only one match"
-msgstr ""
+msgstr "Μόνο μία αντιστοίχιση"
 
 #, fuzzy
 msgid "Invalid date"
@@ -406,7 +443,7 @@ msgid "Select a Category:"
 msgstr "Κατηγορία"
 
 msgid "Set Category on events without category"
-msgstr ""
+msgstr "Καθορισμός κατηγορίας για γεγονότα χωρίς κατηγορία"
 
 #, fuzzy
 msgid "Set Category on selected events"
@@ -421,10 +458,10 @@ msgid "Found Events"
 msgstr "Συμβάν"
 
 msgid "&Enlarge"
-msgstr ""
+msgstr "&Μεγέθυνση"
 
 msgid "&Reduce"
-msgstr ""
+msgstr "&Σμίκρυνση"
 
 #, fuzzy
 msgid "Event Properties"
@@ -435,7 +472,7 @@ msgid "When:"
 msgstr "Πότε"
 
 msgid "to"
-msgstr ""
+msgstr "μέχρι"
 
 #, fuzzy
 msgid "Container:"
@@ -446,13 +483,13 @@ msgid "Add Container"
 msgstr "Συνέχεια"
 
 msgid "Period"
-msgstr ""
+msgstr "Χρονικό διάστημα"
 
 msgid "Fuzzy"
-msgstr ""
+msgstr "Ασαφές"
 
 msgid "Locked"
-msgstr ""
+msgstr "Κλειδωμένο"
 
 #, fuzzy
 msgid "Ends today"
@@ -470,20 +507,20 @@ msgid "Description"
 msgstr "Περιγραφή"
 
 msgid "Alert"
-msgstr ""
+msgstr "Ειδοποίηση"
 
 msgid "Icon"
-msgstr ""
+msgstr "Εικόνα"
 
 msgid "Hyperlink"
-msgstr ""
+msgstr "Σύνδεσμος"
 
 #, fuzzy
 msgid "Progress"
 msgstr "Σημειώσεις προόδου"
 
 msgid "Add more events after this one"
-msgstr ""
+msgstr "Συνέχιση προσθήκης γεγονότων"
 
 #, fuzzy
 msgid "Edit Container"
@@ -498,7 +535,7 @@ msgid "Create Event"
 msgstr "Δημιουργία νέου"
 
 msgid "Email Feedback"
-msgstr ""
+msgstr "Αποστολή ανατροφοδότησης με email"
 
 #, fuzzy
 msgid "Default client"
@@ -509,12 +546,14 @@ msgid "Gmail"
 msgstr "αλληλογραφία"
 
 msgid "Other email client"
-msgstr ""
+msgstr "Άλλος email client"
 
 msgid ""
 "Copy and paste this email into your favorite email client and send it from "
 "there."
 msgstr ""
+"Αντιγράψτε και επικολήστε αυτό το email στον email client που χρησιμοποιείτε "
+"και στείλτε το από εκεί."
 
 msgid "Other"
 msgstr "Άλλα"
@@ -528,7 +567,7 @@ msgid "Subject:"
 msgstr "Θέμα"
 
 msgid "Body:"
-msgstr ""
+msgstr "Κείμενο:"
 
 #, fuzzy
 msgid "Send With:"
@@ -556,10 +595,10 @@ msgid "Directory Timeline..."
 msgstr ""
 
 msgid "Open an existing timeline"
-msgstr ""
+msgstr "Άνοιγμα υπάρχουσας χρονογραμμής"
 
 msgid "Open &Recent"
-msgstr ""
+msgstr "Άνοιγμα &πρόσφατου αρχείου"
 
 #, fuzzy
 msgid "Save As..."
@@ -591,38 +630,38 @@ msgid "Export the current view to a SVG image"
 msgstr ""
 
 msgid "Exit the program"
-msgstr ""
+msgstr "Τερματισμός του προγράμματος"
 
 #, fuzzy
 msgid "Find Categories..."
 msgstr "Κατηγορία"
 
 msgid "Shortcuts..."
-msgstr ""
+msgstr "Συντομεύσεις..."
 
 msgid "&Edit"
 msgstr "&Επεξεργασία"
 
 msgid "&Sidebar\tCtrl+I"
-msgstr ""
+msgstr "&Πλευρική μπάρα\tCtrl+I"
 
 msgid "&Legend"
-msgstr ""
+msgstr "&Υπόμνημα"
 
 msgid "&Balloons on hover"
-msgstr ""
+msgstr "&Μπαλόνια κατά την αιώρηση"
 
 msgid "Zoom &In\tCtrl++"
-msgstr ""
+msgstr "Μεγέθυνση \tCtrl++"
 
 msgid "Zoom &Out\tCtrl+-"
-msgstr ""
+msgstr "Σμίκρυνση \tCtrl+-"
 
 msgid "Vertical Zoom &In\tAlt++"
-msgstr ""
+msgstr "Κάθετη μεγέθυνση\tAlt++"
 
 msgid "Vertical Zoom &Out\tAlt+-"
-msgstr ""
+msgstr "Κάθετη σμίκρυνση\tAlt+-"
 
 #, fuzzy
 msgid "&View"
@@ -637,14 +676,14 @@ msgid "&Edit Selected Event..."
 msgstr "Επεξεργασία του επιλεγμένου αντικειμένου."
 
 msgid "&Duplicate Selected Event..."
-msgstr ""
+msgstr "&Δημιουργία αντιγράφου επιλεγμένου γεγονότος..."
 
 #, fuzzy
 msgid "Set Category on Selected Events..."
 msgstr "Επεξεργασία του επιλεγμένου αντικειμένου."
 
 msgid "&Measure Distance between two Events..."
-msgstr ""
+msgstr "&Μέτρηση απόστασης μεταξύ δύο γεγονότων..."
 
 #, fuzzy
 msgid "Set Category on events &without category..."
@@ -655,10 +694,10 @@ msgid "Edit &Categories"
 msgstr "Κατηγορία"
 
 msgid "&Read Only"
-msgstr ""
+msgstr "Μόνο για &ανάγνωση"
 
 msgid "&Timeline"
-msgstr ""
+msgstr "&Χρονογραμμή"
 
 #, fuzzy
 msgid "Find &First Event"
@@ -673,17 +712,17 @@ msgid "Fit &All Events"
 msgstr "ανενεργό"
 
 msgid "&Navigate"
-msgstr ""
+msgstr "&Περιήγηση"
 
 msgid "Feedback"
-msgstr ""
+msgstr "Ανατροφοδότηση"
 
 #, fuzzy
 msgid "&Contents\tF1"
 msgstr "&Επαφές"
 
 msgid "Getting started &tutorial"
-msgstr ""
+msgstr "&Βοήθημα για να ξεκινήσετε"
 
 #, fuzzy
 msgid "Give &Feedback..."
@@ -697,7 +736,7 @@ msgid "&Help"
 msgstr "&Βοήθεια"
 
 msgid "read-only"
-msgstr ""
+msgstr "μόνο για ανάγνωση"
 
 #, fuzzy
 msgid "Timeline files"
@@ -712,10 +751,10 @@ msgid "Create Timeline"
 msgstr "Δημιουργία νέου"
 
 msgid "The specified timeline already exists."
-msgstr ""
+msgstr "Η συγκεκριμένη χρονογραμμή υπάρχει ήδη."
 
 msgid "Opening timeline instead of creating new."
-msgstr ""
+msgstr "Άνοιγμα χρονογραμμής αντί για δημιουργία νέας."
 
 #, fuzzy
 msgid "Information"
@@ -740,22 +779,22 @@ msgid "Export to SVG"
 msgstr "Εξαγωγή σε &αρχείο"
 
 msgid "Unable to write configuration file."
-msgstr ""
+msgstr "Αδυναμία εγγραφής στο αρχείο ρυθμίσεων."
 
 msgid "Distance between selected events"
-msgstr ""
+msgstr "Απόσταση μεταξύ επιλεγμένων γεγονότων."
 
 msgid "Events are overlapping or distance is 0"
-msgstr ""
+msgstr "Τα γεγονότα επικαλύπτονται ή η απόσταση είναι 0"
 
 msgid "No timeline opened."
-msgstr ""
+msgstr "Δεν άνοιξε καμιά χρονογραμμή"
 
 msgid "First time using Timeline?"
-msgstr ""
+msgstr "Είναι η πρώτη σας φορά στο Timeline;"
 
 msgid "Getting started tutorial"
-msgstr ""
+msgstr "Βοήθημα για να ξεκινήσετε"
 
 msgid "Relevant help topics:"
 msgstr ""
@@ -764,25 +803,26 @@ msgid "Contact"
 msgstr "Επαφή"
 
 msgid "View Categories Individually"
-msgstr ""
+msgstr "Ξεχωριστή προβολή κατηγοριών"
 
 #, python-format
 msgid "Category name '%s' not valid. Must be non-empty."
 msgstr ""
+"Το όνομα της κατηγορίας '%s' δεν είναι έγκυρο. Πρέπει να μην είναι κενό."
 
 #, python-format
 msgid "Category name '%s' already in use."
-msgstr ""
+msgstr "Το όνομα της κατηγορίας '%s' χρησιμοποιείται ήδη."
 
 #, fuzzy
 msgid "Name:"
 msgstr "Όνομα"
 
 msgid "Color:"
-msgstr ""
+msgstr "Χρώμα:"
 
 msgid "Font Color:"
-msgstr ""
+msgstr "Χρώμα γραμματοσειράς:"
 
 #, fuzzy
 msgid "Parent:"
@@ -801,32 +841,32 @@ msgid "Date && Time"
 msgstr "Ημερομηνία / Ώρα"
 
 msgid "Week start on:"
-msgstr ""
+msgstr "Η εβδομάδα αρχίζει από:"
 
 msgid "Open most recent timeline on startup"
-msgstr ""
+msgstr "Άνοιγμα της πιο πρόσφατης χρονογραμμής στο ξεκίνημα"
 
 msgid "Use inertial scrolling"
-msgstr ""
+msgstr "Χρήση αδρανούς κύλισης"
 
 msgid "Monday"
-msgstr ""
+msgstr "Δευτέρα"
 
 msgid "Sunday"
-msgstr ""
+msgstr "Κυριακή"
 
 #, fuzzy
 msgid "Category Finder"
 msgstr "Κατηγορία"
 
 msgid "Check"
-msgstr ""
+msgstr "Επιλογή"
 
 msgid "Uncheck"
-msgstr ""
+msgstr "Αποεπιλογή"
 
 msgid "Feedback On Feature"
-msgstr ""
+msgstr "Ανατροφοδότηση για τη λειτουργία"
 
 #, fuzzy
 msgid "Give Feedback"
@@ -842,27 +882,27 @@ msgid ""
 msgstr ""
 
 msgid "Go to home page"
-msgstr ""
+msgstr "Μετάβαση στην αρχική σελίδα"
 
 #, fuzzy
 msgid "Go back one page"
 msgstr "Μετάβαση πίσω"
 
 msgid "Go forward one page"
-msgstr ""
+msgstr "Μπροστά μια σελίδα"
 
 msgid "Page not found"
-msgstr ""
+msgstr "Η σελίδα δεν βρέθηκε"
 
 #, python-format
 msgid "Could not find page '%s'."
-msgstr ""
+msgstr "Αδυναμία εύρεσης της σελίδας '%s'."
 
 msgid "Container Properties"
 msgstr ""
 
 msgid "Edit Shortcuts"
-msgstr ""
+msgstr "Επεξεργασία συντομεύσεων"
 
 #, fuzzy
 msgid "Functions:"
@@ -873,10 +913,10 @@ msgid "Modifier:"
 msgstr "τροποποιημένη καταχώρηση"
 
 msgid "Shortcut Key:"
-msgstr ""
+msgstr "Πλήκτρο συντόμευσης:"
 
 msgid "Unable to copy to clipboard."
-msgstr ""
+msgstr "Αδυναμία αντιγραφής στο πρόχειρο"
 
 #, fuzzy
 msgid "Duplicate Event"
@@ -884,23 +924,23 @@ msgstr "Ημέρα χορήγησης"
 
 #, python-format
 msgid "%d Events not duplicated due to missing dates."
-msgstr ""
+msgstr "%d γεγονότα δεν αντιγράφηκαν επειδή έλειπαν ημερομηνίες."
 
 msgid "Number of duplicates:"
-msgstr ""
+msgstr "Αριθμός αντιγράφων:"
 
 #, fuzzy
 msgid "Frequency:"
 msgstr "Ακολουθία"
 
 msgid "Forward"
-msgstr ""
+msgstr "Εμπρός"
 
 msgid "Backward"
-msgstr ""
+msgstr "Πίσω"
 
 msgid "Both"
-msgstr ""
+msgstr "Εμπρός και Πίσω"
 
 #, fuzzy
 msgid "Direction"
@@ -914,18 +954,18 @@ msgid "Error"
 msgstr "Σφάλμα"
 
 msgid "Warning"
-msgstr ""
+msgstr "Προειδοποίηση"
 
 #, fuzzy
 msgid "Question"
 msgstr "Περιγραφή"
 
 msgid "Both Modifier and Shortcut key must be given!"
-msgstr ""
+msgstr "Και ο μετατροπέας και το πλήκτρο συντόμευσης πρέπει να δίνονται."
 
 #, python-format
 msgid "The shortcut %s is already bound to function '%s'!"
-msgstr ""
+msgstr "Η συντόμευση %s είναι ήδη προορισμένη για τη λειτουργία '%s'."
 
 #, fuzzy
 msgid "You must select a category!"
@@ -939,21 +979,23 @@ msgid "Test"
 msgstr "Δοκιμή"
 
 msgid "URL:"
-msgstr ""
+msgstr "Διεύθυνση URL:"
 
 #, python-format
 msgid "Images will be scaled to fit inside a %ix%i box."
 msgstr ""
+"Το μέγεθος των εικόνων θα αλλάξει ώστε να ταιριάζουν μέσα σε ένα %ix%i "
+"πλαίσιο."
 
 #, fuzzy
 msgid "Select Icon"
 msgstr "Επιλογή"
 
 msgid "You can't change time when the Event is locked"
-msgstr ""
+msgstr "Δεν μπορείτε να αλλάξετε τον χρόνο όταν το γεγονός είναι κλειδωμένο"
 
 msgid "End must be > Start"
-msgstr ""
+msgstr "Το Τέλος πρέπει να είναι > Αρχή"
 
 msgid "Entered period is too long."
 msgstr ""
@@ -985,25 +1027,28 @@ msgid "Help contents"
 msgstr "Ραντεβού"
 
 msgid "Questions and answers"
-msgstr ""
+msgstr "Ερωτήσεις και απαντήσεις"
 
 msgid "Concepts"
-msgstr ""
+msgstr "Έννοιες"
 
 msgid "Tasks"
-msgstr ""
+msgstr "Εργασίες"
 
 msgid "Where is the save button?"
-msgstr ""
+msgstr "Πού είναι το κουμπί για την αποθήκευση;"
 
 msgid ""
 "\n"
 "There is no save button. Timeline will automatically save your data whenever "
 "needed.\n"
 msgstr ""
+"\n"
+"Δεν υπάρχει κουμπί για την αποθήκευση. Η χρονογραμμή θα αποθηκεύει αυτόματα "
+"τα δεδομένα σας όποτε χρειάζεται.\n"
 
 msgid "Where do the week numbers go if I start my weeks on Sunday?"
-msgstr ""
+msgstr "Τι γίνεται με τους αριθμούς των εβδομάδων εάν αυτές ξεκινούν Κυριακή;"
 
 msgid ""
 "\n"
@@ -1011,9 +1056,13 @@ msgid ""
 "on Sunday at present.  We plan on using a different date object that will "
 "support this in future versions.\n"
 msgstr ""
+"\n"
+"Μέχρι στιγμής δεν υποστηρίζεται η δυνατότητα εμφάνισης αριθμού εβδομάδων που "
+"αρχίζουν Κυριακή. Σχεδιάζουμε να χρησιμοποιήσουμε ένα διαφορετικό τρόπο για "
+"την εμφάνισή τους σε επόμενες εκδόσεις.\n"
 
 msgid "Can multiple users work with the same timeline?"
-msgstr ""
+msgstr "Είναι εφικτή η εργασία πολλών χρηστών στην ίδια χρονογραμμή;"
 
 msgid ""
 "\n"
@@ -1069,6 +1118,21 @@ msgid ""
 "and period-events.\n"
 "\n"
 msgstr ""
+"\n"
+"Σε μια χρονογραμμή μπορεί να γίνει οριζόντια (κατά μήκος του χρονικού άξονα) "
+"και κάθετη (κατά μήκος του άξονα του γεγονότος) κύλιση .\n"
+"\n"
+"Υπάρχουν δύο τρόποι οριζόντιας κύλισης. Μπορείτε είτε να χρησιμοποιήσετε τις "
+"διαφορετικές επιλογές από το μενού Περιήγηση είτε το ποντίκι σας. Στη "
+"δεύτερη περίπτωση, κρατήστε πατημένο το αριστερό πλήκτρο του ποντικιού και "
+"σύρετέ το οριζόντια.\n"
+"\n"
+"Για κάθετη κύλιση, κρατήστε πατημένο το πλήκτρο Shift ή το Ctrl και κυλίστε "
+"το ροδάκι του ποντικιού.\n"
+"Τα γεγονότα μετακινούνται είτε προς  είτε απομακρύνονται από τη διαχωριστική "
+"γραμμή, που ξεχωρίζει τα γεγονότα συγκεκριμένων ημερομηνιών και γεγονότων με "
+"χρονική διάρκεια.\n"
+"\n"
 
 #, fuzzy
 msgid "Zooming Timeline"
@@ -1083,6 +1147,15 @@ msgid ""
 "\n"
 "To zoom vertically, hold down the Alt-key and scroll the mouse wheel.\n"
 msgstr ""
+"\n"
+"Εστίαση μπορεί να γίνει σε μια χρονογραμμή είτε οριζόντια (κατά μήκος του "
+"χρονικού άξονα) είτε κάθετα (κατά μήκος του άξονα του γεγονότος).\n"
+"\n"
+"Για την οριζόντια κύλιση, κρατήστε πατημένο το πλήκτρο Ctrl και κυλίστε το "
+"ροδάκι του ποντικιού.\n"
+"\n"
+"Για την κάθετη κύλιση, κρατήστε πατημένο το πλήκτρο Alt και κυλίστε το "
+"ροδάκι του ποντικιού.\n"
 
 #, fuzzy
 msgid "Events"
@@ -1095,6 +1168,12 @@ msgid ""
 "that event happened). This can be either a specific point in time or a "
 "period.\n"
 msgstr ""
+"\n"
+"Το γεγονός είναι ο βασικός τύπος αναπαράστασης πληροφοριών σε μια "
+"χρονογραμμή. Θα πρέπει να καθορίζεται πάντα σε ποιο σημείο της χρονογραμμής "
+"θα πρέπει να τοποθετηθεί, ανάλογα με το πότε συνέβη. Αυτό μπορεί να είναι "
+"ένα συγκεκριμενο σημείο στη χρονογραμμή, ακριβής χρονολογία, ή μια χρονική "
+"περίοδος.\n"
 
 msgid ""
 "\n"
@@ -1114,6 +1193,22 @@ msgid ""
 " - Alert - An alert dialog is opened at the specified alert time.\n"
 " - Hyperlink - A hyperlink that can be reached in the event context menu.\n"
 msgstr ""
+"\n"
+"Για κάθε γεγονός υπάρχουν οι παρακάτω επιλογές:\n"
+"\n"
+" - Ημερομηνία και ώρα έναρξης.\n"
+" - Ημερομηνία και ώρα λήξης (για χρονικές περιόδους).\n"
+" - Τίτλος: το κείμενο που αποτελεί τον τίτλο κάθε γεγονότος.\n"
+" - Κατηγορία: τρόπος ομαδοποίησης γεγονότων.\n"
+" - Ομαδοποίηση: ένας διαφορετικός τρόπος ομαδοποίησης γεγονότων.\n"
+" - Ασαφές: δείχνει ότι δεν είναι γνωστοί οι ακριβείς χρόνοι.\n"
+" - Κλειδωμένο: οι χρόνοι έναρξης και λήξης δεν μπορούν να αλλάξουν.\n"
+" - Λήγει σήμερα: ο χρόνος λήξης του γεγονότος είναι η τρέχουσα ημέρα.\n"
+" - Περιγραφή: λεπτομέρειες που εμφανίζονται σε αναδυόμενο μπαλόνι.\n"
+" - Εικόνα: εισαγωγή εικόνας και εμφάνισή της σε μπαλόνι.\n"
+" - Ειδοποίηση: εμφανίζει ένα πλαίσιο διαλόγου σε μια συγκεκριμένη χρονική "
+"στιγμή.\n"
+" - Σύνδεσμος: εισαγωγή συνδέσμου και πρόσβαση σε αυτόν με δεξί κλικ.\n"
 
 #, fuzzy
 msgid "Categories"
@@ -1125,6 +1220,10 @@ msgid ""
 "category. All events that belong to the same category are displayed with the "
 "same background color.\n"
 msgstr ""
+"\n"
+"Με τις κατηγορίες ομαδοποιούνται τα γεγονότα. Ένα γεγονός μπορεί να ανήκει "
+"μόνο σε μία κατηγορία. Όλα τα γεγονότας της ίδιας κατηγορίας, εμφανίζονται "
+"με το ίδιο χρώμα παρασκηνίου.\n"
 
 msgid ""
 "\n"
@@ -1135,6 +1234,15 @@ msgid ""
 "- Press the *Ctrl* key, thereafter hold *left* mouse button down on the "
 "timeline, drag the mouse and release it.\n"
 msgstr ""
+"\n"
+"Η *Δημιουργία Γεγονότος* μπορεί να ανοίξει με τους εξής τρόπους:\n"
+"\n"
+"- Επιλέξτε από το μενού  *Χρονογραμμή* - *Δημιουργία Γεγονότος*.\n"
+"- Κάντε διπλό κλικ με το *αριστερό* πλήκτρο του ποντικιού, πάνω στη "
+"χρονογραμμή.\n"
+"- Πατήστε ταυτόχρονα το *Ctrl* και το *αριστερό* κουμπί του ποντικιού πάνω "
+"στη χρονογραμμή, σύρτε το ποντίκι και αφήστε το για δημιουργία χρονικής "
+"περιόδου.\n"
 
 msgid ""
 "\n"
@@ -1142,9 +1250,12 @@ msgid ""
 "selecting one event and select the 'Timeline -> Edit Selected Event...' "
 "menu.\n"
 msgstr ""
+"\n"
+"Η *Επεξεργασία γεγονότος* με διπλό κλικ σε ένα γεγονός ή με επιλογή ενός "
+"γεγονότος και επιλογή 'Χρονογραμμή -> Επεξεργασία επιλεγμένου γεγονότος...'\n"
 
 msgid "Move event vertically"
-msgstr ""
+msgstr "Κάθετη μετακίνηση γεγονότος"
 
 msgid ""
 "\n"
@@ -1184,6 +1295,9 @@ msgid ""
 "To select an event, click on it. To select multiple events, hold down the "
 "*Ctrl* key while clicking events.\n"
 msgstr ""
+"\n"
+"Για να επιλέξετε ένα γεγονός, κάντε κλικ επάνω του. Για να επιλέξετε πολλά "
+"γεγονότα μαζί, πατήστε το πλήκτρο *Ctrl* και κάνετε κλικ στα γεγονότα.\n"
 
 #, fuzzy
 msgid "Import timeline"
@@ -1196,6 +1310,11 @@ msgid ""
 "First open a timeline and then select menu 'File -> Import timeline...' and "
 "select the timeline to be imported.\n"
 msgstr ""
+"\n"
+"Αυτή η λειτουργία χρησιμοποιείται για τη συνένωση δύο χρονογραμμών σε μια.\n"
+"\n"
+"Ανοίξτε μια χρονογραμμή και μετά επιλέξτε από το μενού 'Αρχείο -> Εισαγωγή "
+"χρονογραμμής...' και επιλέξτε τη χρονογραμμή που θέλετε να εισάγετε.\n"
 
 #, fuzzy
 msgid "Event Containers"
@@ -1219,14 +1338,21 @@ msgid ""
 "To delete an event, select it and press the *Del* key. Multiple events can "
 "be deleted at the same time.\n"
 msgstr ""
+"\n"
+"Για να διαγράψετε ένα γεγονός επιλέξτε το και πατήστε το πλήκτρο *Del*. "
+"Μπορείτε να διαγράψετε πολλά γεγονότα ταυτόχρονα με τον ίδιο τρόπο.\n"
 
 msgid "Will associated events be deleted when I delete a category?"
 msgstr ""
+"Αν διαγράψω μια κατηγορία, θα διαγραφούν και τα σχετιζόμενα με αυτή γεγονότα;"
 
 msgid ""
 "\n"
 "No. The events will still be there but they will not belong to a category.\n"
 msgstr ""
+"\n"
+"Όχι. Τα γεγονότα θα είναι ακόμη εκεί, αλλά δεν θα ανήκουν πλέον σε κάποια "
+"κατηγορία.\n"
 
 msgid ""
 "\n"
@@ -1236,6 +1362,13 @@ msgid ""
 "The visibility of categories can also be edited in the sidebar (*View* > "
 "*Sidebar*).\n"
 msgstr ""
+"\n"
+"Μπορείτε να διαχειρισθείτε τις κατηγορίες από το μενού **Χρονογραμμή* > "
+"*Επεξεργασία κατηγοριών*. Για την επεξεργασία μιας υπάρχουσας κατηγορίας, "
+"κάντε διπλό κλικ  επάνω της.\n"
+"\n"
+"Μπορείτε, επίσης, να επεξεργασθείτε την ορατότητα των κατηγοριών μέσα από "
+"την πλευρική μπάρα (*Εμφάνιση* > *Πλευρική μπάρα*).\n"
 
 msgid ""
 "\n"
@@ -1243,111 +1376,119 @@ msgid ""
 "with users and developers of Timeline, send an email to the user mailing "
 "list: <thetimelineproj-user at lists.sourceforge.net>. (Please use English.)\n"
 msgstr ""
+"\n"
+"Αν έχετε περισσότερες απορίες για το Timeline, ή αν θέλετε να έρθετε σε "
+"επαφή με τους χρήστες και τους developers του Timeline, στείλτε ένα e-mail "
+"στη λίστα χρηστών: <thetimelineproj-user at lists.sourceforge.net>. (Παρακαλώ "
+"χρησιμοποιήστε αγγλικά)\n"
 
 msgid "Why is Timeline not available in my language?"
-msgstr ""
+msgstr "Γιατί το Timeline δεν είναι διαθέσιμο στη γλώσσα μου;"
 
 msgid ""
 "\n"
 "Timeline is developed and translated by volunteers. If you would like to "
 "contribute translations you are very much welcome to contact us.\n"
 msgstr ""
+"\n"
+"Το Timeline αναπτύσσεται και μεταφράζεται από εθελοντές. Αν θέλετε να "
+"συνεισφέρετε με τις μεταφράσεις σας, τότε επικοινωνήστε μαζί μας.\n"
 
 msgid "No timeline set"
-msgstr ""
+msgstr "Δεν έχει ορισθεί χρονογραμμή"
 
 msgid "Can't scroll more to the left"
-msgstr ""
+msgstr "Αδύνατη η κύλιση προς τα αριστερά"
 
 msgid "Can't scroll more to the right"
-msgstr ""
+msgstr "Αδύνατη η κύλιση προς τα δεξιά"
 
 msgid "Edit"
 msgstr "Επεξεργασία"
 
 msgid "Duplicate..."
-msgstr ""
+msgstr "Δημιουργία αντιγράφου..."
 
 msgid "Sticky Balloon"
-msgstr ""
+msgstr "Αναδυόμενο μπαλόνι"
 
 msgid "Goto URL"
-msgstr ""
+msgstr "Μετάβαση στο URL"
 
 msgid "Center"
-msgstr ""
+msgstr "Κέντρο"
 
 #, python-format
 msgid "%s events hidden"
-msgstr ""
+msgstr "%s των συμβάντων είναι κρυφά"
 
 #, python-format
 msgid "Are you sure you want to delete %d events?"
-msgstr ""
+msgstr "Είστε βέβαιος ότι θέλετε να διαγράψετε %d γεγονότα;"
 
 msgid "Are you sure you want to delete this event?"
-msgstr ""
+msgstr "Είστε σίγουρος ότι θέλετε να διαγράψετε αυτό το γεγονός;"
 
 msgid "Select region to zoom into"
-msgstr ""
+msgstr "Επιλέξτε την περιοχή που θέλετε να μεγεθύνετε"
 
 msgid "Region too long"
-msgstr ""
+msgstr "Η περιοχή είναι πολύ μεγάλη"
 
 msgid "Region too short"
-msgstr ""
+msgstr "Η περιοχή είναι πολύ μικρή"
 
 msgid "Can't move locked event"
-msgstr ""
+msgstr "Αδύνατη η μετακίνηση ενός κλειδωμένου γεγονότος"
 
 msgid "Period is too long"
 msgstr ""
 
 msgid "Go to &Today\tCtrl+T"
-msgstr ""
+msgstr "Μετάβαση στη σημερινή ημέρα\tCtrl+T"
 
 #, fuzzy
 msgid "Go to &Date...\tCtrl+G"
 msgstr "Τελευταία Ημέρα"
 
 msgid "Backward\tPgUp"
-msgstr ""
+msgstr "Μετακίνηση πίσω\tPgUp"
 
 msgid "Forward\tPgDn"
-msgstr ""
+msgstr "Μετακίνηση εμπρός\tPgDn"
 
 msgid "Forward One Wee&k\tCtrl+K"
-msgstr ""
+msgstr "Εμπρός κατά μία εβδομάδα\tCtrl+K"
 
 msgid "Back One &Week\tCtrl+W"
-msgstr ""
+msgstr "Πίσω κατά μία εβδομάδα\tCtrl+W"
 
 msgid "Forward One Mont&h\tCtrl+h"
 msgstr ""
 
 msgid "Back One &Month\tCtrl+M"
-msgstr ""
+msgstr "Πίσω κατά ένα μήνα\tCtrl+M"
 
 msgid "Forward One Yea&r\tCtrl+R"
-msgstr ""
+msgstr "Εμπρός κατά ένα έτος\tCtrl+R"
 
 msgid "Back One &Year\tCtrl+Y"
-msgstr ""
+msgstr "Πίσω κατά ένα έτος\tCtrl+Y"
 
 msgid "Fit Millennium"
-msgstr ""
+msgstr "Προσαρμογή σε χιλιετία"
 
 msgid "Fit Century"
-msgstr ""
+msgstr "Προσαρμογή σε αιώνα"
 
 msgid "Fit Decade"
-msgstr ""
+msgstr "Προσαρμογή σε δεκαετία"
 
 msgid "Fit Year"
-msgstr ""
+msgstr "Προσαρμογή σε έτος"
 
 msgid "Fit Month"
-msgstr ""
+msgstr "Προσαρμογή σε μήνα"
 
 #, fuzzy
 msgid "Fit Week"
@@ -1364,22 +1505,22 @@ msgid "days"
 msgstr "ημέρες"
 
 msgid "hour"
-msgstr ""
+msgstr "ώρα"
 
 msgid "hours"
-msgstr ""
+msgstr "ώρες"
 
 msgid "minute"
-msgstr ""
+msgstr "λεπτό"
 
 msgid "minutes"
-msgstr ""
+msgstr "λεπτά"
 
 msgid "can't be before year 10"
-msgstr ""
+msgstr "δεν μπορεί να είναι πριν το έτος 10"
 
 msgid "can't be after year 9989"
-msgstr ""
+msgstr "δεν μπορεί να είναι πριν το έτος 9989"
 
 msgid "Can't zoom wider than 1200 years"
 msgstr ""
@@ -1396,38 +1537,38 @@ msgid "Week"
 msgstr "Εβδομάδες"
 
 msgid "Month"
-msgstr ""
+msgstr "Μήνας"
 
 msgid "Year"
-msgstr ""
+msgstr "Έτος"
 
 #, fuzzy
 msgid "Go to Date"
 msgstr "Τελευταία Ημέρα"
 
 msgid "Go to &Zero\tCtrl+Z"
-msgstr ""
+msgstr "Μετάβαση στο έτος μηδέν\tCtrl+Z"
 
 msgid "Go to &Time\tCtrl+T"
-msgstr ""
+msgstr "Μετάβαση στην ώρα\tCtrl+T"
 
 msgid "Can't zoom deeper than 5"
-msgstr ""
+msgstr "Είναι αδύνταη η εστίαση περισσότερο από 5"
 
 msgid "1-period"
-msgstr ""
+msgstr "1-χρονική περίοδος"
 
 msgid "10-period"
-msgstr ""
+msgstr "10-χρονικές περίοδοι"
 
 msgid "100-period"
-msgstr ""
+msgstr "100-περίοδοι"
 
 msgid "1000-period"
-msgstr ""
+msgstr "1000-περίοδοι"
 
 msgid "Go to Time"
-msgstr ""
+msgstr "Μετάβαση στην ώρα"
 
 msgid "File"
 msgstr "Αρχείο"
@@ -1437,7 +1578,7 @@ msgid "View"
 msgstr "Προβολή  καταγραφής"
 
 msgid "Navigate"
-msgstr ""
+msgstr "Περιήγηση"
 
 #, fuzzy
 msgid "Import..."
@@ -1459,31 +1600,31 @@ msgid "Exit"
 msgstr "Έξοδος"
 
 msgid "Find"
-msgstr ""
+msgstr "Αναζήτηση"
 
 msgid "Shortcuts"
-msgstr ""
+msgstr "Συντομεύσεις"
 
 msgid "Sidebar"
-msgstr ""
+msgstr "Πλευρική μπάρα"
 
 msgid "Legend"
-msgstr ""
+msgstr "Υπόμνημα"
 
 msgid "Ballons on hover"
-msgstr ""
+msgstr "Μπαλόνια κατά την αιώρηση"
 
 msgid "Zoom In"
-msgstr ""
+msgstr "Μεγέθυνση"
 
 msgid "Zoom Out"
-msgstr ""
+msgstr "Σμίκρυνση"
 
 msgid "Vertical Zoom In"
-msgstr ""
+msgstr "Κάθετη μεγέθυνση"
 
 msgid "Vertical Zoom Out"
-msgstr ""
+msgstr "Κάθετη σμίκρυνση"
 
 #, fuzzy
 msgid "Edit Selected Event"
@@ -1498,17 +1639,17 @@ msgid "Set Category on Selected Events"
 msgstr "Επεξεργασία του επιλεγμένου αντικειμένου."
 
 msgid "Measure Distance between two Events"
-msgstr ""
+msgstr "Μέτρηση απόστασης μεταξύ δύο γεγονότων"
 
 msgid "Read Only"
-msgstr ""
+msgstr "Μόνο για ανάγνωση"
 
 #, fuzzy
 msgid "Contents"
 msgstr "&Επαφές"
 
 msgid "About"
-msgstr ""
+msgstr "Σχετικά"
 
 #, fuzzy
 msgid "Find First Event"
@@ -1524,7 +1665,7 @@ msgstr "ανενεργό"
 
 #, python-format
 msgid "File '%s' does not exist."
-msgstr ""
+msgstr "Το αρχείο '%s' δεν υπάρχει."
 
 msgid ""
 "Someoneelse has changed the Timeline.\n"
@@ -1534,6 +1675,12 @@ msgid ""
 "\n"
 "Do you want to Synchronize?"
 msgstr ""
+"Κάποιος έχει μετατρέψει την εφαρμογή Timeline.\n"
+"Έχετε δύο επιλογές:\n"
+"  1. Να βάλετε την εφαρμογή σε λειτουργία 'Μόνο ανάγνωση'.\n"
+"  2. Να κάνετε συγχρονισμό της εφαρμογής.\n"
+"\n"
+"Θέλετε να κάνετε συγχρονισμό;"
 
 msgid ""
 "Help requested\n"
@@ -2280,12 +2427,6 @@ msgstr "Αναζήτηση με"
 msgid "New patient ID:"
 msgstr "ID εσωτερικού ασθενούς"
 
-msgid "Your review"
-msgstr ""
-
-msgid "Reviews by others"
-msgstr ""
-
 msgid "(you are/are not the primary reviewer)"
 msgstr ""
 
@@ -2318,6 +2459,10 @@ msgid ""
 "in a new episode name to associate a different one."
 msgstr ""
 
+#, fuzzy
+msgid "The organizational unit this document originates from."
+msgstr "Η εμπορική ονομασία του φάρμακου που λαμβάνει ο ασθενής."
+
 msgid "Enter the date of creation of the document."
 msgstr ""
 
@@ -2372,9 +2517,18 @@ msgstr ""
 msgid "Cancel this review."
 msgstr ""
 
+msgid "Your review"
+msgstr ""
+
+msgid "Reviews by others"
+msgstr ""
+
 msgid "Episode"
 msgstr "Επεισόδιο"
 
+msgid "Source"
+msgstr "Πηγή"
+
 msgid "Date"
 msgstr "Ημέρα"
 
@@ -4218,7 +4372,7 @@ msgid "↢ C&lipboard"
 msgstr ""
 
 msgid "&Remove"
-msgstr ""
+msgstr "Αφαίρεση"
 
 msgid "&Print"
 msgstr "&Εκτύπωση"
@@ -5203,21 +5357,18 @@ msgstr "επεξεργασία λεπτομερειών της συνεδρία
 msgid "Close this dialog."
 msgstr "Κλείσιμο αυτού του διαλόγου."
 
-msgid "age"
-msgstr "ηλικία"
-
-msgid "review status"
-msgstr ""
-
-msgid "episode"
-msgstr ""
+msgid "Age"
+msgstr "Ηλικία"
 
 #, fuzzy
-msgid "health issue"
+msgid "Review status"
+msgstr "κατάσταση"
+
+msgid "Health issue"
 msgstr "Θέμα υγείας"
 
-msgid "type"
-msgstr "τύπος"
+msgid "Organization"
+msgstr ""
 
 msgid "Sort newest documents to top of tree."
 msgstr ""
@@ -5234,6 +5385,9 @@ msgstr ""
 msgid "Sort documents by their type."
 msgstr ""
 
+msgid "Sort documents by the organization they are from."
+msgstr ""
+
 msgid "Sort documents by"
 msgstr ""
 
@@ -5517,9 +5671,6 @@ msgstr "Η εμπορική ονομασία του φάρμακου που λα
 msgid "The category of the organizational unit."
 msgstr ""
 
-msgid "Organization"
-msgstr ""
-
 msgid "Unit"
 msgstr "Μονάδα"
 
@@ -5684,9 +5835,6 @@ msgid ""
 "(SQL query)"
 msgstr ""
 
-msgid "Source"
-msgstr "Πηγή"
-
 msgid "URL"
 msgstr "URL"
 
@@ -7535,9 +7683,6 @@ msgstr "διορθωμένο αποτέλεσμα"
 msgid "missing, reported later"
 msgstr "λείπει, ανέφερε αργότερα"
 
-msgid "Health issue"
-msgstr "Θέμα υγείας"
-
 #, fuzzy
 msgid "External care"
 msgstr "ID εξωτερικού ασθενούς"
@@ -7575,6 +7720,10 @@ msgstr "Οικογενειακό Ιστορικό"
 msgid "Document"
 msgstr "Έγγραφα"
 
+#, fuzzy
+msgid "Inbox message"
+msgstr "Μήνυμα γενικής πληροφορίας"
+
 #, python-format
 msgid "unmapped entry type from table [%s]"
 msgstr ""
@@ -9278,6 +9427,9 @@ msgstr "πότε"
 msgid "who"
 msgstr "ποιος"
 
+msgid "type"
+msgstr "τύπος"
+
 msgid "entry"
 msgstr "καταχώρηση"
 
@@ -10160,6 +10312,9 @@ msgstr ""
 msgid "nicotine"
 msgstr ""
 
+msgid "ethanol"
+msgstr ""
+
 #, fuzzy
 msgid "unit"
 msgstr "μονάδες"
@@ -11401,9 +11556,6 @@ msgstr "Σημειώσεις"
 msgid "Progress Note"
 msgstr ""
 
-msgid "Age"
-msgstr "Ηλικία"
-
 msgid "N/A"
 msgstr ""
 
@@ -12749,6 +12901,13 @@ msgstr "Κύριος"
 msgid "Show selected address on map"
 msgstr "Επεξεργασία του επιλεγμένου αντικειμένου."
 
+#, fuzzy
+msgid "Distance"
+msgstr "Ουσία"
+
+msgid "Show distance from your praxis"
+msgstr ""
+
 msgid "Adding new address"
 msgstr ""
 
@@ -12985,6 +13144,33 @@ msgstr ""
 msgid "Find next [%s] (<CTRL-N>)"
 msgstr ""
 
+#, fuzzy
+msgid "&All rows"
+msgstr "&Όλοι οι χρήστες"
+
+msgid "All rows as &CSV"
+msgstr ""
+
+msgid "&Tooltips of all rows"
+msgstr ""
+
+msgid "&Data of all rows"
+msgstr ""
+
+#, fuzzy
+msgid "&Selected rows"
+msgstr "&Επιλογή"
+
+msgid "&Selected rows as CSV"
+msgstr ""
+
+msgid "&Tooltips of selected rows"
+msgstr ""
+
+#, fuzzy
+msgid "&Data of selected rows"
+msgstr "Διαγραφή της επιλεγμένης αλλεργίας από την λίστα στην βάση δεδομένων."
+
 msgid "Tooltips of selected rows"
 msgstr ""
 
@@ -13015,8 +13201,8 @@ msgid "Column &%s (current row): %s"
 msgstr "Αρχεία:%s"
 
 #, fuzzy
-msgid "Copy to e&xport area..."
-msgstr "Προσθήκη νέου ονόματος"
+msgid "&Save to file..."
+msgstr " Αποθήκευση "
 
 #, fuzzy
 msgid "&Copy to clipboard..."
@@ -13048,6 +13234,30 @@ msgid ""
 "%s"
 msgstr ""
 
+#, python-format
+msgid "All rows saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All tooltips saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All data saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected rows saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected tooltips saved to [%s]."
+msgstr ""
+
+#, fuzzy, python-format
+msgid "Selected data saved to [%s]."
+msgstr "Διαγραφή μηνύματος"
+
 msgid "Monty the Serpent && the FSF Present"
 msgstr ""
 
@@ -14545,6 +14755,10 @@ msgstr "Θέμα υγείας"
 msgid "sorted by type"
 msgstr ""
 
+#, fuzzy
+msgid "sorted by organization"
+msgstr "Επεξεργασία φαρμακευτικής αγωγής"
+
 msgid "Cannot load documents. No active patient."
 msgstr ""
 
@@ -14642,6 +14856,10 @@ msgstr ""
 msgid "%s (unattributed episode)"
 msgstr "Μη καθορισμένα επεισόδια"
 
+#, fuzzy
+msgid "unknown organization"
+msgstr "Άγνωστη αντίδραση"
+
 #, python-format
 msgid "part %2s"
 msgstr ""
@@ -19095,6 +19313,17 @@ msgstr "Ματαίωση"
 msgid "Abort and do NOT connect to GNUmed."
 msgstr "Ματαίωση και ΔΕΝ θα συνδεθείτε με το GNUmed."
 
+#~ msgid "age"
+#~ msgstr "ηλικία"
+
+#, fuzzy
+#~ msgid "health issue"
+#~ msgstr "Θέμα υγείας"
+
+#, fuzzy
+#~ msgid "Copy to e&xport area..."
+#~ msgstr "Προσθήκη νέου ονόματος"
+
 #, fuzzy
 #~ msgid "&Entry time"
 #~ msgstr "Άρχισε νέο"
diff --git a/client/po/en_AU-gnumed.mo b/client/po/en_AU-gnumed.mo
index 23040d0..6c28497 100644
Binary files a/client/po/en_AU-gnumed.mo and b/client/po/en_AU-gnumed.mo differ
diff --git a/client/po/en_AU.po b/client/po/en_AU.po
index 793b938..63d0831 100644
--- a/client/po/en_AU.po
+++ b/client/po/en_AU.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNUmed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-06 11:40+0200\n"
+"POT-Creation-Date: 2016-05-26 12:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -2126,12 +2126,6 @@ msgstr ""
 msgid "New patient ID:"
 msgstr ""
 
-msgid "Your review"
-msgstr ""
-
-msgid "Reviews by others"
-msgstr ""
-
 msgid "(you are/are not the primary reviewer)"
 msgstr ""
 
@@ -2164,6 +2158,9 @@ msgid ""
 "in a new episode name to associate a different one."
 msgstr ""
 
+msgid "The organizational unit this document originates from."
+msgstr ""
+
 msgid "Enter the date of creation of the document."
 msgstr ""
 
@@ -2218,9 +2215,18 @@ msgstr ""
 msgid "Cancel this review."
 msgstr ""
 
+msgid "Your review"
+msgstr ""
+
+msgid "Reviews by others"
+msgstr ""
+
 msgid "Episode"
 msgstr ""
 
+msgid "Source"
+msgstr ""
+
 msgid "Date"
 msgstr ""
 
@@ -4812,19 +4818,16 @@ msgstr ""
 msgid "Close this dialog."
 msgstr ""
 
-msgid "age"
-msgstr ""
-
-msgid "review status"
+msgid "Age"
 msgstr ""
 
-msgid "episode"
+msgid "Review status"
 msgstr ""
 
-msgid "health issue"
+msgid "Health issue"
 msgstr ""
 
-msgid "type"
+msgid "Organization"
 msgstr ""
 
 msgid "Sort newest documents to top of tree."
@@ -4842,6 +4845,9 @@ msgstr ""
 msgid "Sort documents by their type."
 msgstr ""
 
+msgid "Sort documents by the organization they are from."
+msgstr ""
+
 msgid "Sort documents by"
 msgstr ""
 
@@ -5110,9 +5116,6 @@ msgstr ""
 msgid "The category of the organizational unit."
 msgstr ""
 
-msgid "Organization"
-msgstr ""
-
 msgid "Unit"
 msgstr ""
 
@@ -5272,9 +5275,6 @@ msgid ""
 "(SQL query)"
 msgstr ""
 
-msgid "Source"
-msgstr ""
-
 msgid "URL"
 msgstr ""
 
@@ -6971,9 +6971,6 @@ msgstr ""
 msgid "missing, reported later"
 msgstr ""
 
-msgid "Health issue"
-msgstr ""
-
 msgid "External care"
 msgstr ""
 
@@ -7003,6 +7000,9 @@ msgstr ""
 msgid "Document"
 msgstr "Documents:"
 
+msgid "Inbox message"
+msgstr ""
+
 #, python-format
 msgid "unmapped entry type from table [%s]"
 msgstr ""
@@ -8626,6 +8626,9 @@ msgstr ""
 msgid "who"
 msgstr ""
 
+msgid "type"
+msgstr ""
+
 msgid "entry"
 msgstr ""
 
@@ -9481,6 +9484,9 @@ msgstr ""
 msgid "nicotine"
 msgstr ""
 
+msgid "ethanol"
+msgstr ""
+
 msgid "unit"
 msgstr ""
 
@@ -10686,9 +10692,6 @@ msgstr ""
 msgid "Progress Note"
 msgstr ""
 
-msgid "Age"
-msgstr ""
-
 msgid "N/A"
 msgstr ""
 
@@ -11990,6 +11993,13 @@ msgstr ""
 msgid "Show selected address on map"
 msgstr ""
 
+#, fuzzy
+msgid "Distance"
+msgstr "%s: encounter (%s)"
+
+msgid "Show distance from your praxis"
+msgstr ""
+
 msgid "Adding new address"
 msgstr ""
 
@@ -12211,6 +12221,30 @@ msgstr ""
 msgid "Find next [%s] (<CTRL-N>)"
 msgstr ""
 
+msgid "&All rows"
+msgstr ""
+
+msgid "All rows as &CSV"
+msgstr ""
+
+msgid "&Tooltips of all rows"
+msgstr ""
+
+msgid "&Data of all rows"
+msgstr ""
+
+msgid "&Selected rows"
+msgstr ""
+
+msgid "&Selected rows as CSV"
+msgstr ""
+
+msgid "&Tooltips of selected rows"
+msgstr ""
+
+msgid "&Data of selected rows"
+msgstr ""
+
 msgid "Tooltips of selected rows"
 msgstr ""
 
@@ -12240,7 +12274,7 @@ msgstr ""
 msgid "Column &%s (current row): %s"
 msgstr "Documents: %s"
 
-msgid "Copy to e&xport area..."
+msgid "&Save to file..."
 msgstr ""
 
 msgid "&Copy to clipboard..."
@@ -12269,6 +12303,30 @@ msgid ""
 "%s"
 msgstr ""
 
+#, python-format
+msgid "All rows saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All tooltips saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All data saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected rows saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected tooltips saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected data saved to [%s]."
+msgstr ""
+
 msgid "Monty the Serpent && the FSF Present"
 msgstr ""
 
@@ -13690,6 +13748,9 @@ msgstr ""
 msgid "sorted by type"
 msgstr ""
 
+msgid "sorted by organization"
+msgstr ""
+
 msgid "Cannot load documents. No active patient."
 msgstr ""
 
@@ -13775,6 +13836,10 @@ msgstr ""
 msgid "%s (unattributed episode)"
 msgstr ""
 
+#, fuzzy
+msgid "unknown organization"
+msgstr "unknown reaction"
+
 #, python-format
 msgid "part %2s"
 msgstr ""
diff --git a/client/po/en_CA-gnumed.mo b/client/po/en_CA-gnumed.mo
index 90de363..cc57064 100644
Binary files a/client/po/en_CA-gnumed.mo and b/client/po/en_CA-gnumed.mo differ
diff --git a/client/po/en_CA.po b/client/po/en_CA.po
index ed24636..0d8c8b3 100644
--- a/client/po/en_CA.po
+++ b/client/po/en_CA.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnumed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-06 11:40+0200\n"
+"POT-Creation-Date: 2016-05-26 12:47+0200\n"
 "PO-Revision-Date: 2010-02-09 16:17+0000\n"
 "Last-Translator: Brett Alton <brett.jr.alton at gmail.com>\n"
 "Language-Team: English (Canada) <en_CA at li.org>\n"
@@ -2174,12 +2174,6 @@ msgstr ""
 msgid "New patient ID:"
 msgstr "internal patient ID"
 
-msgid "Your review"
-msgstr ""
-
-msgid "Reviews by others"
-msgstr ""
-
 msgid "(you are/are not the primary reviewer)"
 msgstr ""
 
@@ -2212,6 +2206,10 @@ msgid ""
 "in a new episode name to associate a different one."
 msgstr ""
 
+#, fuzzy
+msgid "The organizational unit this document originates from."
+msgstr "Vaccination"
+
 msgid "Enter the date of creation of the document."
 msgstr ""
 
@@ -2266,9 +2264,18 @@ msgstr ""
 msgid "Cancel this review."
 msgstr ""
 
+msgid "Your review"
+msgstr ""
+
+msgid "Reviews by others"
+msgstr ""
+
 msgid "Episode"
 msgstr ""
 
+msgid "Source"
+msgstr ""
+
 msgid "Date"
 msgstr ""
 
@@ -4897,20 +4904,16 @@ msgstr ""
 msgid "Close this dialog."
 msgstr ""
 
-msgid "age"
+msgid "Age"
 msgstr ""
 
-msgid "review status"
+msgid "Review status"
 msgstr ""
 
-msgid "episode"
+msgid "Health issue"
 msgstr ""
 
-#, fuzzy
-msgid "health issue"
-msgstr "health issue: %s"
-
-msgid "type"
+msgid "Organization"
 msgstr ""
 
 msgid "Sort newest documents to top of tree."
@@ -4928,6 +4931,9 @@ msgstr ""
 msgid "Sort documents by their type."
 msgstr ""
 
+msgid "Sort documents by the organization they are from."
+msgstr ""
+
 msgid "Sort documents by"
 msgstr ""
 
@@ -5199,9 +5205,6 @@ msgstr ""
 msgid "The category of the organizational unit."
 msgstr ""
 
-msgid "Organization"
-msgstr ""
-
 msgid "Unit"
 msgstr ""
 
@@ -5365,9 +5368,6 @@ msgid ""
 "(SQL query)"
 msgstr ""
 
-msgid "Source"
-msgstr ""
-
 msgid "URL"
 msgstr ""
 
@@ -7100,9 +7100,6 @@ msgstr "corrected result"
 msgid "missing, reported later"
 msgstr "missing, reported later"
 
-msgid "Health issue"
-msgstr ""
-
 #, fuzzy
 msgid "External care"
 msgstr "external patient ID"
@@ -7135,6 +7132,9 @@ msgstr " %s documents\n"
 msgid "Document"
 msgstr "Documents:"
 
+msgid "Inbox message"
+msgstr ""
+
 #, python-format
 msgid "unmapped entry type from table [%s]"
 msgstr ""
@@ -8800,6 +8800,9 @@ msgstr ""
 msgid "who"
 msgstr ""
 
+msgid "type"
+msgstr ""
+
 msgid "entry"
 msgstr ""
 
@@ -9664,6 +9667,9 @@ msgstr ""
 msgid "nicotine"
 msgstr ""
 
+msgid "ethanol"
+msgstr ""
+
 msgid "unit"
 msgstr ""
 
@@ -10883,9 +10889,6 @@ msgstr ""
 msgid "Progress Note"
 msgstr ""
 
-msgid "Age"
-msgstr ""
-
 msgid "N/A"
 msgstr ""
 
@@ -12194,6 +12197,13 @@ msgstr "Mr"
 msgid "Show selected address on map"
 msgstr ""
 
+#, fuzzy
+msgid "Distance"
+msgstr "Exported: %s\n"
+
+msgid "Show distance from your praxis"
+msgstr ""
+
 msgid "Adding new address"
 msgstr ""
 
@@ -12420,6 +12430,32 @@ msgstr ""
 msgid "Find next [%s] (<CTRL-N>)"
 msgstr ""
 
+msgid "&All rows"
+msgstr ""
+
+msgid "All rows as &CSV"
+msgstr ""
+
+msgid "&Tooltips of all rows"
+msgstr ""
+
+msgid "&Data of all rows"
+msgstr ""
+
+#, fuzzy
+msgid "&Selected rows"
+msgstr "external patient ID"
+
+msgid "&Selected rows as CSV"
+msgstr ""
+
+msgid "&Tooltips of selected rows"
+msgstr ""
+
+#, fuzzy
+msgid "&Data of selected rows"
+msgstr " %s documents\n"
+
 msgid "Tooltips of selected rows"
 msgstr ""
 
@@ -12449,9 +12485,8 @@ msgstr ""
 msgid "Column &%s (current row): %s"
 msgstr "Documents: %s"
 
-#, fuzzy
-msgid "Copy to e&xport area..."
-msgstr "There are no encounters for this episode."
+msgid "&Save to file..."
+msgstr ""
 
 msgid "&Copy to clipboard..."
 msgstr ""
@@ -12480,6 +12515,30 @@ msgid ""
 "%s"
 msgstr ""
 
+#, python-format
+msgid "All rows saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All tooltips saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All data saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected rows saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected tooltips saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected data saved to [%s]."
+msgstr ""
+
 msgid "Monty the Serpent && the FSF Present"
 msgstr ""
 
@@ -13920,6 +13979,10 @@ msgstr "health issue: %s"
 msgid "sorted by type"
 msgstr ""
 
+#, fuzzy
+msgid "sorted by organization"
+msgstr "Vaccination"
+
 msgid "Cannot load documents. No active patient."
 msgstr ""
 
@@ -14008,6 +14071,10 @@ msgstr "%s this week (%s of %s)"
 msgid "%s (unattributed episode)"
 msgstr "Unattributed episodes"
 
+#, fuzzy
+msgid "unknown organization"
+msgstr "unknown reaction"
+
 #, python-format
 msgid "part %2s"
 msgstr ""
@@ -18329,6 +18396,14 @@ msgid "Abort and do NOT connect to GNUmed."
 msgstr "Abort and do NOT connect to GNUmed."
 
 #, fuzzy
+#~ msgid "health issue"
+#~ msgstr "health issue: %s"
+
+#, fuzzy
+#~ msgid "Copy to e&xport area..."
+#~ msgstr "There are no encounters for this episode."
+
+#, fuzzy
 #~ msgid ""
 #~ "Health issue: %s%s%s (%s versions)\n"
 #~ "\n"
diff --git a/client/po/es-gnumed.mo b/client/po/es-gnumed.mo
index 842caba..defdc04 100644
Binary files a/client/po/es-gnumed.mo and b/client/po/es-gnumed.mo differ
diff --git a/client/po/es.po b/client/po/es.po
index 318e24a..480aa5d 100644
--- a/client/po/es.po
+++ b/client/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-18 21:14+0200\n"
+"POT-Creation-Date: 2016-05-26 12:47+0200\n"
 "PO-Revision-Date: 2016-02-24 18:28+0100\n"
 "Last-Translator: Karsten Hilbert <Karsten.Hilbert at gmx.net>\n"
 "Language-Team: colombiano <es at li.org>\n"
@@ -2413,12 +2413,6 @@ msgstr "Busca término:"
 msgid "New patient ID:"
 msgstr "Nueva ID del paciente"
 
-msgid "Your review"
-msgstr "Su evaluación"
-
-msgid "Reviews by others"
-msgstr "Evaluacion de otros"
-
 msgid "(you are/are not the primary reviewer)"
 msgstr "(eres/no eres el evaluador principal)"
 
@@ -2453,6 +2447,11 @@ msgstr ""
 "Mostrar el episodio asociado a este documento. Seleccione otro o escriba el "
 "nombre de un episodio nuevo para asociarlo con otro."
 
+#, fuzzy
+msgid "The organizational unit this document originates from."
+msgstr ""
+"Opcional: la organización (unidad) desde la cual se originó este documento."
+
 msgid "Enter the date of creation of the document."
 msgstr "Ingrese la fecha de creación del documento."
 
@@ -2527,9 +2526,18 @@ msgstr "Guardar su evaluación."
 msgid "Cancel this review."
 msgstr "Cancelar la evaluación."
 
+msgid "Your review"
+msgstr "Su evaluación"
+
+msgid "Reviews by others"
+msgstr "Evaluacion de otros"
+
 msgid "Episode"
 msgstr "Episodio"
 
+msgid "Source"
+msgstr "Fuente"
+
 msgid "Date"
 msgstr "Fecha"
 
@@ -6099,9 +6107,6 @@ msgstr ""
 "Condición\n"
 "(Búsqueda SQL)"
 
-msgid "Source"
-msgstr "Fuente"
-
 msgid "URL"
 msgstr "URL"
 
@@ -8054,6 +8059,10 @@ msgstr "Historial Familiar"
 msgid "Document"
 msgstr "Documento"
 
+#, fuzzy
+msgid "Inbox message"
+msgstr "Editando bandeja de entrada de mensajes"
+
 #, python-format
 msgid "unmapped entry type from table [%s]"
 msgstr "ingreso no mapeado desde la tabla [%s]"
@@ -10804,6 +10813,9 @@ msgstr "Ingesta"
 msgid "nicotine"
 msgstr "nicotina"
 
+msgid "ethanol"
+msgstr ""
+
 msgid "unit"
 msgstr "unidad"
 
@@ -13707,6 +13719,14 @@ msgstr "Mapa"
 msgid "Show selected address on map"
 msgstr "Muestro la dirección seleccionada en el mapa."
 
+#, fuzzy
+msgid "Distance"
+msgstr "Sustancia"
+
+#, fuzzy
+msgid "Show distance from your praxis"
+msgstr "Sucursales de su consulta"
+
 msgid "Adding new address"
 msgstr "Agregando una nueva dirección"
 
@@ -13954,6 +13974,35 @@ msgstr "Encuentra (<CTRL-F>)"
 msgid "Find next [%s] (<CTRL-N>)"
 msgstr "Encuentra siguiente [%s] (<CTRL-N>)"
 
+#, fuzzy
+msgid "&All rows"
+msgstr "&Todos los usuarios"
+
+msgid "All rows as &CSV"
+msgstr ""
+
+#, fuzzy
+msgid "&Tooltips of all rows"
+msgstr "Herramientas de ayuda sobre filas seleccionadas"
+
+msgid "&Data of all rows"
+msgstr ""
+
+#, fuzzy
+msgid "&Selected rows"
+msgstr "&Seleccionar"
+
+msgid "&Selected rows as CSV"
+msgstr ""
+
+#, fuzzy
+msgid "&Tooltips of selected rows"
+msgstr "Herramientas de ayuda sobre filas seleccionadas"
+
+#, fuzzy
+msgid "&Data of selected rows"
+msgstr "Herramientas de ayuda sobre filas seleccionadas"
+
 msgid "Tooltips of selected rows"
 msgstr "Herramientas de ayuda sobre filas seleccionadas"
 
@@ -13988,8 +14037,8 @@ msgid "Column &%s (current row): %s"
 msgstr "Columna &%s: %s"
 
 #, fuzzy
-msgid "Copy to e&xport area..."
-msgstr "Copio todos los estudios al área de exportación."
+msgid "&Save to file..."
+msgstr "Guardar Como ..."
 
 msgid "&Copy to clipboard..."
 msgstr "&Copiar al portapapeles ..."
@@ -14023,6 +14072,30 @@ msgstr ""
 "\n"
 "%s"
 
+#, python-format
+msgid "All rows saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All tooltips saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All data saved to [%s]."
+msgstr ""
+
+#, fuzzy, python-format
+msgid "Selected rows saved to [%s]."
+msgstr "Definición de reporte borrado [%s]."
+
+#, fuzzy, python-format
+msgid "Selected tooltips saved to [%s]."
+msgstr "Definición de reporte borrado [%s]."
+
+#, fuzzy, python-format
+msgid "Selected data saved to [%s]."
+msgstr "Fijar el idioma de la base de datos en [%s]."
+
 msgid "Monty the Serpent && the FSF Present"
 msgstr "La Serpiente Monty && la FSF presentan"
 
@@ -20899,6 +20972,10 @@ msgstr "Aborto"
 msgid "Abort and do NOT connect to GNUmed."
 msgstr "Aborto y NO conecto a GNUMed."
 
+#, fuzzy
+#~ msgid "Copy to e&xport area..."
+#~ msgstr "Copio todos los estudios al área de exportación."
+
 #~ msgid "age"
 #~ msgstr "edad"
 
diff --git a/client/po/fr-gnumed.mo b/client/po/fr-gnumed.mo
index 2dec24d..368c18e 100644
Binary files a/client/po/fr-gnumed.mo and b/client/po/fr-gnumed.mo differ
diff --git a/client/po/fr.po b/client/po/fr.po
index 8081fdf..4fd0eaa 100644
--- a/client/po/fr.po
+++ b/client/po/fr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnumed 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-06 11:40+0200\n"
+"POT-Creation-Date: 2016-05-26 12:47+0200\n"
 "PO-Revision-Date: 2012-06-01 01:16+0000\n"
 "Last-Translator: ncq <Unknown>\n"
 "Language-Team: FR <LL at li.org>\n"
@@ -2397,12 +2397,6 @@ msgstr "Chercher par"
 msgid "New patient ID:"
 msgstr "patient ID interne"
 
-msgid "Your review"
-msgstr "Votre examen"
-
-msgid "Reviews by others"
-msgstr "Examens faits par d'autres"
-
 msgid "(you are/are not the primary reviewer)"
 msgstr "(vous êtes/n'êtes pas le principal examinateur)"
 
@@ -2437,6 +2431,10 @@ msgstr ""
 "Affiche l'épisode associé au document. Choisissez-en un autre ou inscrivez "
 "le nom d'un nouvel épisode pour l'associer à un autre."
 
+#, fuzzy
+msgid "The organizational unit this document originates from."
+msgstr "Nom de l'organisation."
+
 msgid "Enter the date of creation of the document."
 msgstr "Indiquer la date de création du document."
 
@@ -2502,9 +2500,18 @@ msgstr "Enregister votre examen."
 msgid "Cancel this review."
 msgstr "Annuler cet examen."
 
+msgid "Your review"
+msgstr "Votre examen"
+
+msgid "Reviews by others"
+msgstr "Examens faits par d'autres"
+
 msgid "Episode"
 msgstr "Épisode"
 
+msgid "Source"
+msgstr "Source"
+
 msgid "Date"
 msgstr "Date"
 
@@ -5539,21 +5546,18 @@ msgstr "modifer les détails de la consultation"
 msgid "Close this dialog."
 msgstr "Fermer cette boîte de dialogue."
 
-msgid "age"
-msgstr "âge"
-
-msgid "review status"
-msgstr ""
-
-msgid "episode"
-msgstr "épisode"
+msgid "Age"
+msgstr "Age"
 
 #, fuzzy
-msgid "health issue"
+msgid "Review status"
+msgstr "Modification"
+
+msgid "Health issue"
 msgstr "épisode de santé"
 
-msgid "type"
-msgstr "type"
+msgid "Organization"
+msgstr "Organisation"
 
 msgid "Sort newest documents to top of tree."
 msgstr "Trier les documents par: plus récents"
@@ -5571,6 +5575,10 @@ msgstr "Trier les documents par la période à laquelle ils appartiennent."
 msgid "Sort documents by their type."
 msgstr "Trier les documents par: type"
 
+#, fuzzy
+msgid "Sort documents by the organization they are from."
+msgstr "Trier les documents par la période à laquelle ils appartiennent."
+
 msgid "Sort documents by"
 msgstr "Trier les documents par"
 
@@ -5876,9 +5884,6 @@ msgstr "Le nom de l'unité."
 msgid "The category of the organizational unit."
 msgstr "La catégorie de l'unité."
 
-msgid "Organization"
-msgstr "Organisation"
-
 msgid "Unit"
 msgstr "Unité"
 
@@ -6047,9 +6052,6 @@ msgid ""
 "(SQL query)"
 msgstr ""
 
-msgid "Source"
-msgstr "Source"
-
 msgid "URL"
 msgstr "URL"
 
@@ -8014,9 +8016,6 @@ msgstr "résultat corrigé"
 msgid "missing, reported later"
 msgstr "manquant, pour plus tard"
 
-msgid "Health issue"
-msgstr "épisode de santé"
-
 #, fuzzy
 msgid "External care"
 msgstr "Code externe"
@@ -8054,6 +8053,10 @@ msgstr "Antécédents Familiaux"
 msgid "Document"
 msgstr "Documents"
 
+#, fuzzy
+msgid "Inbox message"
+msgstr "Message d'information générique"
+
 #, python-format
 msgid "unmapped entry type from table [%s]"
 msgstr ""
@@ -9783,6 +9786,9 @@ msgstr "quand"
 msgid "who"
 msgstr "qui"
 
+msgid "type"
+msgstr "type"
+
 msgid "entry"
 msgstr ""
 
@@ -10718,6 +10724,9 @@ msgstr ""
 msgid "nicotine"
 msgstr ""
 
+msgid "ethanol"
+msgstr ""
+
 #, fuzzy
 msgid "unit"
 msgstr "unités"
@@ -11984,9 +11993,6 @@ msgstr "Notes"
 msgid "Progress Note"
 msgstr ""
 
-msgid "Age"
-msgstr "Age"
-
 msgid "N/A"
 msgstr ""
 
@@ -13371,6 +13377,14 @@ msgstr "M."
 msgid "Show selected address on map"
 msgstr "Modifier l'objet sélectionné."
 
+#, fuzzy
+msgid "Distance"
+msgstr "Substance"
+
+#, fuzzy
+msgid "Show distance from your praxis"
+msgstr "Votre examen"
+
 msgid "Adding new address"
 msgstr ""
 
@@ -13619,6 +13633,33 @@ msgstr ""
 msgid "Find next [%s] (<CTRL-N>)"
 msgstr ""
 
+#, fuzzy
+msgid "&All rows"
+msgstr "&Tout le monde"
+
+msgid "All rows as &CSV"
+msgstr ""
+
+msgid "&Tooltips of all rows"
+msgstr ""
+
+msgid "&Data of all rows"
+msgstr ""
+
+#, fuzzy
+msgid "&Selected rows"
+msgstr "&Selectionner"
+
+msgid "&Selected rows as CSV"
+msgstr ""
+
+msgid "&Tooltips of selected rows"
+msgstr ""
+
+#, fuzzy
+msgid "&Data of selected rows"
+msgstr "Ne pas reformater le texte"
+
 msgid "Tooltips of selected rows"
 msgstr ""
 
@@ -13652,8 +13693,8 @@ msgid "Column &%s (current row): %s"
 msgstr "Documents: %s"
 
 #, fuzzy
-msgid "Copy to e&xport area..."
-msgstr "Ajouter un nouveau vaccin"
+msgid "&Save to file..."
+msgstr "Enregister votre examen."
 
 #, fuzzy
 msgid "&Copy to clipboard..."
@@ -13685,6 +13726,30 @@ msgid ""
 "%s"
 msgstr ""
 
+#, python-format
+msgid "All rows saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All tooltips saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All data saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected rows saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected tooltips saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected data saved to [%s]."
+msgstr ""
+
 msgid "Monty the Serpent && the FSF Present"
 msgstr "Monty le Serpent && la FSF présentent"
 
@@ -15194,6 +15259,10 @@ msgstr "Trier par: période"
 msgid "sorted by type"
 msgstr "trier par type"
 
+#, fuzzy
+msgid "sorted by organization"
+msgstr "Ajouter de nouvelles vaccinations"
+
 msgid "Cannot load documents. No active patient."
 msgstr ""
 
@@ -15286,6 +15355,10 @@ msgstr "%s %s (%s aujourd'hui !)"
 msgid "%s (unattributed episode)"
 msgstr "Rencontres non-attribuées"
 
+#, fuzzy
+msgid "unknown organization"
+msgstr "réaction inconnue"
+
 #, python-format
 msgid "part %2s"
 msgstr ""
@@ -19838,6 +19911,20 @@ msgstr "Abandonner"
 msgid "Abort and do NOT connect to GNUmed."
 msgstr "Annuler et ne PAS se connecter a GNUmed."
 
+#~ msgid "age"
+#~ msgstr "âge"
+
+#~ msgid "episode"
+#~ msgstr "épisode"
+
+#, fuzzy
+#~ msgid "health issue"
+#~ msgstr "épisode de santé"
+
+#, fuzzy
+#~ msgid "Copy to e&xport area..."
+#~ msgstr "Ajouter un nouveau vaccin"
+
 #, fuzzy
 #~ msgid "&Entry time"
 #~ msgstr "Démarré"
diff --git a/client/po/id-gnumed.mo b/client/po/id-gnumed.mo
index 7d79015..0008d45 100644
Binary files a/client/po/id-gnumed.mo and b/client/po/id-gnumed.mo differ
diff --git a/client/po/id.po b/client/po/id.po
index 1d1e0d1..501e8f9 100644
--- a/client/po/id.po
+++ b/client/po/id.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNUmed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-06 11:40+0200\n"
+"POT-Creation-Date: 2016-05-26 12:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -2153,12 +2153,6 @@ msgstr ""
 msgid "New patient ID:"
 msgstr ""
 
-msgid "Your review"
-msgstr ""
-
-msgid "Reviews by others"
-msgstr ""
-
 msgid "(you are/are not the primary reviewer)"
 msgstr ""
 
@@ -2191,6 +2185,9 @@ msgid ""
 "in a new episode name to associate a different one."
 msgstr ""
 
+msgid "The organizational unit this document originates from."
+msgstr ""
+
 msgid "Enter the date of creation of the document."
 msgstr ""
 
@@ -2245,9 +2242,18 @@ msgstr ""
 msgid "Cancel this review."
 msgstr ""
 
+msgid "Your review"
+msgstr ""
+
+msgid "Reviews by others"
+msgstr ""
+
 msgid "Episode"
 msgstr ""
 
+msgid "Source"
+msgstr ""
+
 msgid "Date"
 msgstr ""
 
@@ -4838,19 +4844,16 @@ msgstr ""
 msgid "Close this dialog."
 msgstr ""
 
-msgid "age"
-msgstr ""
-
-msgid "review status"
+msgid "Age"
 msgstr ""
 
-msgid "episode"
+msgid "Review status"
 msgstr ""
 
-msgid "health issue"
+msgid "Health issue"
 msgstr ""
 
-msgid "type"
+msgid "Organization"
 msgstr ""
 
 msgid "Sort newest documents to top of tree."
@@ -4868,6 +4871,9 @@ msgstr ""
 msgid "Sort documents by their type."
 msgstr ""
 
+msgid "Sort documents by the organization they are from."
+msgstr ""
+
 msgid "Sort documents by"
 msgstr ""
 
@@ -5136,9 +5142,6 @@ msgstr ""
 msgid "The category of the organizational unit."
 msgstr ""
 
-msgid "Organization"
-msgstr ""
-
 msgid "Unit"
 msgstr ""
 
@@ -5300,9 +5303,6 @@ msgid ""
 "(SQL query)"
 msgstr ""
 
-msgid "Source"
-msgstr ""
-
 msgid "URL"
 msgstr ""
 
@@ -7005,9 +7005,6 @@ msgstr ""
 msgid "missing, reported later"
 msgstr ""
 
-msgid "Health issue"
-msgstr ""
-
 msgid "External care"
 msgstr ""
 
@@ -7036,6 +7033,9 @@ msgstr ""
 msgid "Document"
 msgstr ""
 
+msgid "Inbox message"
+msgstr ""
+
 #, python-format
 msgid "unmapped entry type from table [%s]"
 msgstr ""
@@ -8648,6 +8648,9 @@ msgstr ""
 msgid "who"
 msgstr ""
 
+msgid "type"
+msgstr ""
+
 msgid "entry"
 msgstr ""
 
@@ -9503,6 +9506,9 @@ msgstr ""
 msgid "nicotine"
 msgstr ""
 
+msgid "ethanol"
+msgstr ""
+
 msgid "unit"
 msgstr ""
 
@@ -10709,9 +10715,6 @@ msgstr ""
 msgid "Progress Note"
 msgstr ""
 
-msgid "Age"
-msgstr ""
-
 msgid "N/A"
 msgstr ""
 
@@ -12004,6 +12007,12 @@ msgstr "Mar"
 msgid "Show selected address on map"
 msgstr ""
 
+msgid "Distance"
+msgstr ""
+
+msgid "Show distance from your praxis"
+msgstr ""
+
 msgid "Adding new address"
 msgstr ""
 
@@ -12227,6 +12236,31 @@ msgstr ""
 msgid "Find next [%s] (<CTRL-N>)"
 msgstr ""
 
+msgid "&All rows"
+msgstr ""
+
+msgid "All rows as &CSV"
+msgstr ""
+
+msgid "&Tooltips of all rows"
+msgstr ""
+
+msgid "&Data of all rows"
+msgstr ""
+
+#, fuzzy
+msgid "&Selected rows"
+msgstr "Pilih acara"
+
+msgid "&Selected rows as CSV"
+msgstr ""
+
+msgid "&Tooltips of selected rows"
+msgstr ""
+
+msgid "&Data of selected rows"
+msgstr ""
+
 msgid "Tooltips of selected rows"
 msgstr ""
 
@@ -12256,7 +12290,7 @@ msgstr ""
 msgid "Column &%s (current row): %s"
 msgstr ""
 
-msgid "Copy to e&xport area..."
+msgid "&Save to file..."
 msgstr ""
 
 msgid "&Copy to clipboard..."
@@ -12285,6 +12319,30 @@ msgid ""
 "%s"
 msgstr ""
 
+#, python-format
+msgid "All rows saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All tooltips saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All data saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected rows saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected tooltips saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected data saved to [%s]."
+msgstr ""
+
 msgid "Monty the Serpent && the FSF Present"
 msgstr ""
 
@@ -13708,6 +13766,9 @@ msgstr ""
 msgid "sorted by type"
 msgstr ""
 
+msgid "sorted by organization"
+msgstr ""
+
 msgid "Cannot load documents. No active patient."
 msgstr ""
 
@@ -13793,6 +13854,9 @@ msgstr ""
 msgid "%s (unattributed episode)"
 msgstr ""
 
+msgid "unknown organization"
+msgstr ""
+
 #, python-format
 msgid "part %2s"
 msgstr ""
diff --git a/client/po/it-gnumed.mo b/client/po/it-gnumed.mo
index d18c17c..48e2267 100644
Binary files a/client/po/it-gnumed.mo and b/client/po/it-gnumed.mo differ
diff --git a/client/po/it.po b/client/po/it.po
index bde9567..8a15354 100644
--- a/client/po/it.po
+++ b/client/po/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNUmed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-06 11:40+0200\n"
+"POT-Creation-Date: 2016-05-26 12:47+0200\n"
 "PO-Revision-Date: 2012-06-01 01:22+0000\n"
 "Last-Translator: ncq <Unknown>\n"
 "Language-Team: GNUmed\n"
@@ -2299,12 +2299,6 @@ msgstr "Cerca per"
 msgid "New patient ID:"
 msgstr "ID interno paziente"
 
-msgid "Your review"
-msgstr "Il tuo esame"
-
-msgid "Reviews by others"
-msgstr "Esami esterni"
-
 msgid "(you are/are not the primary reviewer)"
 msgstr "(sei/non sei il primo esaminatore)"
 
@@ -2337,6 +2331,10 @@ msgid ""
 "in a new episode name to associate a different one."
 msgstr ""
 
+#, fuzzy
+msgid "The organizational unit this document originates from."
+msgstr "Selezionare l'episodio del quale si desidera spostare la narrazione."
+
 msgid "Enter the date of creation of the document."
 msgstr "Inserisci la data di creazione del documento."
 
@@ -2391,9 +2389,18 @@ msgstr "Salva il tuo esame."
 msgid "Cancel this review."
 msgstr "Annula questo esame."
 
+msgid "Your review"
+msgstr "Il tuo esame"
+
+msgid "Reviews by others"
+msgstr "Esami esterni"
+
 msgid "Episode"
 msgstr "Episodio"
 
+msgid "Source"
+msgstr "Fonte"
+
 msgid "Date"
 msgstr "Data"
 
@@ -5236,21 +5243,18 @@ msgstr "modifica dettagli dell'appuntamento"
 msgid "Close this dialog."
 msgstr "Chiudi questa finestra"
 
-msgid "age"
-msgstr "età"
+msgid "Age"
+msgstr "Età"
 
-msgid "review status"
+#, fuzzy
+msgid "Review status"
 msgstr "stato revisione"
 
-msgid "episode"
-msgstr "episodio"
-
-#, fuzzy
-msgid "health issue"
+msgid "Health issue"
 msgstr "Problema di salute"
 
-msgid "type"
-msgstr "tipo"
+msgid "Organization"
+msgstr ""
 
 msgid "Sort newest documents to top of tree."
 msgstr "Ordina i tre documenti più recenti."
@@ -5268,6 +5272,10 @@ msgstr "Ordina documenti per episodio di appartenenza."
 msgid "Sort documents by their type."
 msgstr "Ordina documenti per tipo"
 
+#, fuzzy
+msgid "Sort documents by the organization they are from."
+msgstr "Ordina documenti per episodio di appartenenza."
+
 msgid "Sort documents by"
 msgstr "Ordina documenti per"
 
@@ -5562,9 +5570,6 @@ msgstr "La marca del farmaco che il paziente sta assumendo."
 msgid "The category of the organizational unit."
 msgstr ""
 
-msgid "Organization"
-msgstr ""
-
 msgid "Unit"
 msgstr "Unità di misura"
 
@@ -5734,9 +5739,6 @@ msgid ""
 "(SQL query)"
 msgstr ""
 
-msgid "Source"
-msgstr "Fonte"
-
 msgid "URL"
 msgstr "URL"
 
@@ -7594,9 +7596,6 @@ msgstr "risultato corretto"
 msgid "missing, reported later"
 msgstr "mancante, riportato in seguito"
 
-msgid "Health issue"
-msgstr "Problema di salute"
-
 #, fuzzy
 msgid "External care"
 msgstr "Codice esterno"
@@ -7634,6 +7633,10 @@ msgstr "Storia familiare"
 msgid "Document"
 msgstr "Documenti"
 
+#, fuzzy
+msgid "Inbox message"
+msgstr "Modifica nome"
+
 #, python-format
 msgid "unmapped entry type from table [%s]"
 msgstr ""
@@ -9350,6 +9353,9 @@ msgstr "quando"
 msgid "who"
 msgstr "chi"
 
+msgid "type"
+msgstr "tipo"
+
 msgid "entry"
 msgstr "voce"
 
@@ -10241,6 +10247,9 @@ msgstr ""
 msgid "nicotine"
 msgstr ""
 
+msgid "ethanol"
+msgstr ""
+
 #, fuzzy
 msgid "unit"
 msgstr "unità"
@@ -11506,9 +11515,6 @@ msgstr "Note"
 msgid "Progress Note"
 msgstr ""
 
-msgid "Age"
-msgstr "Età"
-
 msgid "N/A"
 msgstr "N/D"
 
@@ -12894,6 +12900,14 @@ msgstr "Sig."
 msgid "Show selected address on map"
 msgstr "un indirizzo deve essere selezionato"
 
+#, fuzzy
+msgid "Distance"
+msgstr "Sostanza"
+
+#, fuzzy
+msgid "Show distance from your praxis"
+msgstr "Il tuo esame"
+
 msgid "Adding new address"
 msgstr "Aggiungi il nuovo indirizzo"
 
@@ -13138,6 +13152,33 @@ msgstr ""
 msgid "Find next [%s] (<CTRL-N>)"
 msgstr ""
 
+#, fuzzy
+msgid "&All rows"
+msgstr "&Tutti gli utenti"
+
+msgid "All rows as &CSV"
+msgstr ""
+
+msgid "&Tooltips of all rows"
+msgstr ""
+
+msgid "&Data of all rows"
+msgstr ""
+
+#, fuzzy
+msgid "&Selected rows"
+msgstr "&Seleziona"
+
+msgid "&Selected rows as CSV"
+msgstr ""
+
+msgid "&Tooltips of selected rows"
+msgstr ""
+
+#, fuzzy
+msgid "&Data of selected rows"
+msgstr "Rimuovi la/le voce/i selezionata/e dalla lista."
+
 msgid "Tooltips of selected rows"
 msgstr ""
 
@@ -13168,8 +13209,8 @@ msgid "Column &%s (current row): %s"
 msgstr "Documenti: %s"
 
 #, fuzzy
-msgid "Copy to e&xport area..."
-msgstr "Aggiungi una nuova persona"
+msgid "&Save to file..."
+msgstr "Salva il tuo esame."
 
 #, fuzzy
 msgid "&Copy to clipboard..."
@@ -13201,6 +13242,30 @@ msgid ""
 "%s"
 msgstr ""
 
+#, python-format
+msgid "All rows saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All tooltips saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All data saved to [%s]."
+msgstr ""
+
+#, fuzzy, python-format
+msgid "Selected rows saved to [%s]."
+msgstr "cancellare la definizione del report [%s]."
+
+#, fuzzy, python-format
+msgid "Selected tooltips saved to [%s]."
+msgstr "cancellare la definizione del report [%s]."
+
+#, fuzzy, python-format
+msgid "Selected data saved to [%s]."
+msgstr "Imposta la lingua del tuo database a [%s]"
+
 msgid "Monty the Serpent && the FSF Present"
 msgstr ""
 
@@ -14721,6 +14786,10 @@ msgstr "ordinati per episodio"
 msgid "sorted by type"
 msgstr "ordinati per tipo"
 
+#, fuzzy
+msgid "sorted by organization"
+msgstr "Aggiungo nuovo paziente"
+
 msgid "Cannot load documents. No active patient."
 msgstr "Non posso caricare i documenti. Nessun paziente attivo."
 
@@ -14813,6 +14882,10 @@ msgstr "%s%7s %s:%s (%s part(s)%s)"
 msgid "%s (unattributed episode)"
 msgstr "Casi non attribuiti"
 
+#, fuzzy
+msgid "unknown organization"
+msgstr "reazione sconosciuta"
+
 #, python-format
 msgid "part %2s"
 msgstr "parte %2s"
@@ -19361,6 +19434,20 @@ msgstr "Annulla"
 msgid "Abort and do NOT connect to GNUmed."
 msgstr "Annulla e NON connetti a GNUmed"
 
+#~ msgid "age"
+#~ msgstr "età"
+
+#~ msgid "episode"
+#~ msgstr "episodio"
+
+#, fuzzy
+#~ msgid "health issue"
+#~ msgstr "Problema di salute"
+
+#, fuzzy
+#~ msgid "Copy to e&xport area..."
+#~ msgstr "Aggiungi una nuova persona"
+
 #, fuzzy
 #~ msgid "&Entry time"
 #~ msgstr "Incomincia nuovo"
diff --git a/client/po/ka-gnumed.mo b/client/po/ka-gnumed.mo
index 05bf22e..b0f5b6c 100644
Binary files a/client/po/ka-gnumed.mo and b/client/po/ka-gnumed.mo differ
diff --git a/client/po/ka.po b/client/po/ka.po
index 292d839..b525999 100644
--- a/client/po/ka.po
+++ b/client/po/ka.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNUmed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-06 11:40+0200\n"
+"POT-Creation-Date: 2016-05-26 12:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -2125,12 +2125,6 @@ msgstr ""
 msgid "New patient ID:"
 msgstr ""
 
-msgid "Your review"
-msgstr ""
-
-msgid "Reviews by others"
-msgstr ""
-
 msgid "(you are/are not the primary reviewer)"
 msgstr ""
 
@@ -2163,6 +2157,9 @@ msgid ""
 "in a new episode name to associate a different one."
 msgstr ""
 
+msgid "The organizational unit this document originates from."
+msgstr ""
+
 msgid "Enter the date of creation of the document."
 msgstr ""
 
@@ -2217,9 +2214,18 @@ msgstr ""
 msgid "Cancel this review."
 msgstr ""
 
+msgid "Your review"
+msgstr ""
+
+msgid "Reviews by others"
+msgstr ""
+
 msgid "Episode"
 msgstr ""
 
+msgid "Source"
+msgstr ""
+
 msgid "Date"
 msgstr ""
 
@@ -4809,19 +4815,16 @@ msgstr ""
 msgid "Close this dialog."
 msgstr ""
 
-msgid "age"
-msgstr ""
-
-msgid "review status"
+msgid "Age"
 msgstr ""
 
-msgid "episode"
+msgid "Review status"
 msgstr ""
 
-msgid "health issue"
+msgid "Health issue"
 msgstr ""
 
-msgid "type"
+msgid "Organization"
 msgstr ""
 
 msgid "Sort newest documents to top of tree."
@@ -4839,6 +4842,9 @@ msgstr ""
 msgid "Sort documents by their type."
 msgstr ""
 
+msgid "Sort documents by the organization they are from."
+msgstr ""
+
 msgid "Sort documents by"
 msgstr ""
 
@@ -5107,9 +5113,6 @@ msgstr ""
 msgid "The category of the organizational unit."
 msgstr ""
 
-msgid "Organization"
-msgstr ""
-
 msgid "Unit"
 msgstr ""
 
@@ -5268,9 +5271,6 @@ msgid ""
 "(SQL query)"
 msgstr ""
 
-msgid "Source"
-msgstr ""
-
 msgid "URL"
 msgstr ""
 
@@ -6983,9 +6983,6 @@ msgstr ""
 msgid "missing, reported later"
 msgstr ""
 
-msgid "Health issue"
-msgstr ""
-
 msgid "External care"
 msgstr ""
 
@@ -7016,6 +7013,9 @@ msgstr "ოჯახის ისტორია"
 msgid "Document"
 msgstr " %ს საბუთები\n"
 
+msgid "Inbox message"
+msgstr ""
+
 #, python-format
 msgid "unmapped entry type from table [%s]"
 msgstr ""
@@ -8631,6 +8631,9 @@ msgstr ""
 msgid "who"
 msgstr ""
 
+msgid "type"
+msgstr ""
+
 msgid "entry"
 msgstr ""
 
@@ -9488,6 +9491,9 @@ msgstr ""
 msgid "nicotine"
 msgstr ""
 
+msgid "ethanol"
+msgstr ""
+
 msgid "unit"
 msgstr ""
 
@@ -10699,9 +10705,6 @@ msgstr ""
 msgid "Progress Note"
 msgstr ""
 
-msgid "Age"
-msgstr ""
-
 msgid "N/A"
 msgstr ""
 
@@ -11992,6 +11995,15 @@ msgstr ""
 msgid "Show selected address on map"
 msgstr ""
 
+#, fuzzy
+msgid "Distance"
+msgstr ""
+"%ს:%ს %.8ს (ვ%ს)\n"
+"%ს"
+
+msgid "Show distance from your praxis"
+msgstr ""
+
 msgid "Adding new address"
 msgstr ""
 
@@ -12213,6 +12225,30 @@ msgstr ""
 msgid "Find next [%s] (<CTRL-N>)"
 msgstr ""
 
+msgid "&All rows"
+msgstr ""
+
+msgid "All rows as &CSV"
+msgstr ""
+
+msgid "&Tooltips of all rows"
+msgstr ""
+
+msgid "&Data of all rows"
+msgstr ""
+
+msgid "&Selected rows"
+msgstr ""
+
+msgid "&Selected rows as CSV"
+msgstr ""
+
+msgid "&Tooltips of selected rows"
+msgstr ""
+
+msgid "&Data of selected rows"
+msgstr ""
+
 msgid "Tooltips of selected rows"
 msgstr ""
 
@@ -12242,7 +12278,7 @@ msgstr ""
 msgid "Column &%s (current row): %s"
 msgstr ""
 
-msgid "Copy to e&xport area..."
+msgid "&Save to file..."
 msgstr ""
 
 msgid "&Copy to clipboard..."
@@ -12271,6 +12307,30 @@ msgid ""
 "%s"
 msgstr ""
 
+#, python-format
+msgid "All rows saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All tooltips saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All data saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected rows saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected tooltips saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected data saved to [%s]."
+msgstr ""
+
 msgid "Monty the Serpent && the FSF Present"
 msgstr ""
 
@@ -13689,6 +13749,10 @@ msgstr ""
 msgid "sorted by type"
 msgstr ""
 
+#, fuzzy
+msgid "sorted by organization"
+msgstr "ვაქცინაცია"
+
 msgid "Cannot load documents. No active patient."
 msgstr ""
 
@@ -13774,6 +13838,10 @@ msgstr ""
 msgid "%s (unattributed episode)"
 msgstr ""
 
+#, fuzzy
+msgid "unknown organization"
+msgstr "უცნობი რეაქცია"
+
 #, python-format
 msgid "part %2s"
 msgstr ""
diff --git a/client/po/nb-gnumed.mo b/client/po/nb-gnumed.mo
index 8fe0b52..d6d4c84 100644
Binary files a/client/po/nb-gnumed.mo and b/client/po/nb-gnumed.mo differ
diff --git a/client/po/nb.po b/client/po/nb.po
index d161e07..5758deb 100644
--- a/client/po/nb.po
+++ b/client/po/nb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnumed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-06 11:40+0200\n"
+"POT-Creation-Date: 2016-05-26 12:47+0200\n"
 "PO-Revision-Date: 2009-02-12 20:47+0000\n"
 "Last-Translator: Leif Gunnar Erlandsen <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb at li.org>\n"
@@ -2181,12 +2181,6 @@ msgstr "Lab resultat"
 msgid "New patient ID:"
 msgstr "aktiv"
 
-msgid "Your review"
-msgstr ""
-
-msgid "Reviews by others"
-msgstr ""
-
 msgid "(you are/are not the primary reviewer)"
 msgstr ""
 
@@ -2219,6 +2213,10 @@ msgid ""
 "in a new episode name to associate a different one."
 msgstr ""
 
+#, fuzzy
+msgid "The organizational unit this document originates from."
+msgstr "Vaksinasjon"
+
 msgid "Enter the date of creation of the document."
 msgstr ""
 
@@ -2273,9 +2271,18 @@ msgstr ""
 msgid "Cancel this review."
 msgstr ""
 
+msgid "Your review"
+msgstr ""
+
+msgid "Reviews by others"
+msgstr ""
+
 msgid "Episode"
 msgstr ""
 
+msgid "Source"
+msgstr ""
+
 msgid "Date"
 msgstr ""
 
@@ -4937,20 +4944,18 @@ msgstr ""
 msgid "Close this dialog."
 msgstr ""
 
-msgid "age"
-msgstr ""
-
-msgid "review status"
+msgid "Age"
 msgstr ""
 
-msgid "episode"
+msgid "Review status"
 msgstr ""
 
-msgid "health issue"
+msgid "Health issue"
 msgstr ""
 
-msgid "type"
-msgstr ""
+#, fuzzy
+msgid "Organization"
+msgstr "Vaksinasjon"
 
 msgid "Sort newest documents to top of tree."
 msgstr ""
@@ -4967,6 +4972,9 @@ msgstr ""
 msgid "Sort documents by their type."
 msgstr ""
 
+msgid "Sort documents by the organization they are from."
+msgstr ""
+
 msgid "Sort documents by"
 msgstr ""
 
@@ -5237,10 +5245,6 @@ msgstr ""
 msgid "The category of the organizational unit."
 msgstr ""
 
-#, fuzzy
-msgid "Organization"
-msgstr "Vaksinasjon"
-
 msgid "Unit"
 msgstr ""
 
@@ -5407,9 +5411,6 @@ msgid ""
 "(SQL query)"
 msgstr ""
 
-msgid "Source"
-msgstr ""
-
 msgid "URL"
 msgstr ""
 
@@ -7154,9 +7155,6 @@ msgstr ""
 msgid "missing, reported later"
 msgstr ""
 
-msgid "Health issue"
-msgstr ""
-
 msgid "External care"
 msgstr ""
 
@@ -7190,6 +7188,9 @@ msgstr "Dokumenter:"
 msgid "Document"
 msgstr "Dokumenter:"
 
+msgid "Inbox message"
+msgstr ""
+
 #, python-format
 msgid "unmapped entry type from table [%s]"
 msgstr ""
@@ -8852,6 +8853,9 @@ msgstr ""
 msgid "who"
 msgstr ""
 
+msgid "type"
+msgstr ""
+
 msgid "entry"
 msgstr ""
 
@@ -9720,6 +9724,9 @@ msgstr ""
 msgid "nicotine"
 msgstr ""
 
+msgid "ethanol"
+msgstr ""
+
 #, fuzzy
 msgid "unit"
 msgstr "har allergier"
@@ -10939,9 +10946,6 @@ msgstr ""
 msgid "Progress Note"
 msgstr ""
 
-msgid "Age"
-msgstr ""
-
 msgid "N/A"
 msgstr ""
 
@@ -12258,6 +12262,13 @@ msgstr "Herr"
 msgid "Show selected address on map"
 msgstr ""
 
+#, fuzzy
+msgid "Distance"
+msgstr " Status: %s, %s"
+
+msgid "Show distance from your praxis"
+msgstr ""
+
 msgid "Adding new address"
 msgstr ""
 
@@ -12491,6 +12502,32 @@ msgstr ""
 msgid "Find next [%s] (<CTRL-N>)"
 msgstr ""
 
+msgid "&All rows"
+msgstr ""
+
+msgid "All rows as &CSV"
+msgstr ""
+
+msgid "&Tooltips of all rows"
+msgstr ""
+
+msgid "&Data of all rows"
+msgstr ""
+
+#, fuzzy
+msgid "&Selected rows"
+msgstr "Dokumenter:"
+
+msgid "&Selected rows as CSV"
+msgstr ""
+
+msgid "&Tooltips of selected rows"
+msgstr ""
+
+#, fuzzy
+msgid "&Data of selected rows"
+msgstr "Dokumenter:"
+
 msgid "Tooltips of selected rows"
 msgstr ""
 
@@ -12520,9 +12557,8 @@ msgstr ""
 msgid "Column &%s (current row): %s"
 msgstr "Dokumenter: %s"
 
-#, fuzzy
-msgid "Copy to e&xport area..."
-msgstr "Vaksinasjon"
+msgid "&Save to file..."
+msgstr ""
 
 #, fuzzy
 msgid "&Copy to clipboard..."
@@ -12553,6 +12589,30 @@ msgid ""
 "%s"
 msgstr ""
 
+#, python-format
+msgid "All rows saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All tooltips saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All data saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected rows saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected tooltips saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected data saved to [%s]."
+msgstr ""
+
 msgid "Monty the Serpent && the FSF Present"
 msgstr ""
 
@@ -13999,6 +14059,10 @@ msgstr ""
 msgid "sorted by type"
 msgstr ""
 
+#, fuzzy
+msgid "sorted by organization"
+msgstr "Vaksinasjon"
+
 msgid "Cannot load documents. No active patient."
 msgstr ""
 
@@ -14091,6 +14155,10 @@ msgstr "Pasient: %s (%s), Nr: %s\n"
 msgid "%s (unattributed episode)"
 msgstr ""
 
+#, fuzzy
+msgid "unknown organization"
+msgstr "ukjent reaksjon"
+
 #, python-format
 msgid "part %2s"
 msgstr ""
@@ -18414,6 +18482,10 @@ msgid "Abort and do NOT connect to GNUmed."
 msgstr ""
 
 #, fuzzy
+#~ msgid "Copy to e&xport area..."
+#~ msgstr "Vaksinasjon"
+
+#, fuzzy
 #~ msgid ""
 #~ "Health issue: %s%s%s (%s versions)\n"
 #~ "\n"
diff --git a/client/po/nl-gnumed.mo b/client/po/nl-gnumed.mo
index 409fb09..a45a8e5 100644
Binary files a/client/po/nl-gnumed.mo and b/client/po/nl-gnumed.mo differ
diff --git a/client/po/nl.po b/client/po/nl.po
index 945aed4..42b2c3d 100644
--- a/client/po/nl.po
+++ b/client/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnumed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-06 11:40+0200\n"
+"POT-Creation-Date: 2016-05-26 12:47+0200\n"
 "PO-Revision-Date: 2012-06-01 01:19+0000\n"
 "Last-Translator: Anik ten Have <anik at itchi-go.nl>\n"
 "Language-Team: Dutch <nl at li.org>\n"
@@ -2364,12 +2364,6 @@ msgstr "Geef zoekterm in:"
 msgid "New patient ID:"
 msgstr "interne patiëntennummer"
 
-msgid "Your review"
-msgstr "Uw beoordeling"
-
-msgid "Reviews by others"
-msgstr "Beoordelingen door anderen"
-
 msgid "(you are/are not the primary reviewer)"
 msgstr "U bent / bent niet de primaire beoordeler"
 
@@ -2406,6 +2400,10 @@ msgstr ""
 "type of geef een nieuwe episodenaam in om met een andere te associeren."
 
 #, fuzzy
+msgid "The organizational unit this document originates from."
+msgstr "instellingen bewaren"
+
+#, fuzzy
 msgid "Enter the date of creation of the document."
 msgstr "Benodigd: Het soort document"
 
@@ -2475,9 +2473,18 @@ msgstr "Bewaar uw beoordeling."
 msgid "Cancel this review."
 msgstr "Annuleer deze beoordeling."
 
+msgid "Your review"
+msgstr "Uw beoordeling"
+
+msgid "Reviews by others"
+msgstr "Beoordelingen door anderen"
+
 msgid "Episode"
 msgstr "Episode"
 
+msgid "Source"
+msgstr "Bron"
+
 msgid "Date"
 msgstr "Datum"
 
@@ -5472,21 +5479,20 @@ msgstr "bewerk details van de ontmoeting"
 msgid "Close this dialog."
 msgstr "Sluit deze dialoog."
 
-msgid "age"
-msgstr "leeftijd"
+msgid "Age"
+msgstr "Leeftijd"
 
-msgid "review status"
+#, fuzzy
+msgid "Review status"
 msgstr "beoordelingsstatus"
 
-msgid "episode"
-msgstr "episode"
-
 #, fuzzy
-msgid "health issue"
+msgid "Health issue"
 msgstr "Gezondheidsprobleem"
 
-msgid "type"
-msgstr "soort"
+#, fuzzy
+msgid "Organization"
+msgstr "Organisatie"
 
 msgid "Sort newest documents to top of tree."
 msgstr "Sorteer met nieuwste documenten bovenaan"
@@ -5504,6 +5510,10 @@ msgstr "Sorteer documenten bij de episode waar ze bijhoren."
 msgid "Sort documents by their type."
 msgstr "Sorteer documenten op soort."
 
+#, fuzzy
+msgid "Sort documents by the organization they are from."
+msgstr "Sorteer documenten bij de episode waar ze bijhoren."
+
 msgid "Sort documents by"
 msgstr "Sorteer documenten op"
 
@@ -5818,10 +5828,6 @@ msgid "The category of the organizational unit."
 msgstr "instellingen bewaren"
 
 #, fuzzy
-msgid "Organization"
-msgstr "Organisatie"
-
-#, fuzzy
 msgid "Unit"
 msgstr "Eenheid:"
 
@@ -5993,9 +5999,6 @@ msgid ""
 "(SQL query)"
 msgstr ""
 
-msgid "Source"
-msgstr "Bron"
-
 msgid "URL"
 msgstr "Webadres"
 
@@ -7889,10 +7892,6 @@ msgid "missing, reported later"
 msgstr "vermist, rapport volgt"
 
 #, fuzzy
-msgid "Health issue"
-msgstr "Gezondheidsprobleem"
-
-#, fuzzy
 msgid "External care"
 msgstr "BSN bewerken."
 
@@ -7929,6 +7928,10 @@ msgstr "medische geschiedenis"
 msgid "Document"
 msgstr "Documenten"
 
+#, fuzzy
+msgid "Inbox message"
+msgstr "Naam bewerken"
+
 #, python-format
 msgid "unmapped entry type from table [%s]"
 msgstr ""
@@ -9723,6 +9726,9 @@ msgstr "wanneer"
 msgid "who"
 msgstr "wie"
 
+msgid "type"
+msgstr "soort"
+
 msgid "entry"
 msgstr "ingave"
 
@@ -10747,6 +10753,9 @@ msgstr ""
 msgid "nicotine"
 msgstr ""
 
+msgid "ethanol"
+msgstr ""
+
 #, fuzzy
 msgid "unit"
 msgstr "eenheden"
@@ -12088,9 +12097,6 @@ msgstr "Notitie"
 msgid "Progress Note"
 msgstr "Vooruitgangsrapport"
 
-msgid "Age"
-msgstr "Leeftijd"
-
 msgid "N/A"
 msgstr "N.v.t."
 
@@ -13536,6 +13542,14 @@ msgstr "Dhr"
 msgid "Show selected address on map"
 msgstr "moet adres selecteren"
 
+#, fuzzy
+msgid "Distance"
+msgstr "Stof"
+
+#, fuzzy
+msgid "Show distance from your praxis"
+msgstr "Uw beoordeling"
+
 msgid "Adding new address"
 msgstr "Nieuw adres toevoegen"
 
@@ -13793,6 +13807,33 @@ msgstr ""
 msgid "Find next [%s] (<CTRL-N>)"
 msgstr ""
 
+#, fuzzy
+msgid "&All rows"
+msgstr "&Alle gebruikers"
+
+msgid "All rows as &CSV"
+msgstr ""
+
+msgid "&Tooltips of all rows"
+msgstr ""
+
+msgid "&Data of all rows"
+msgstr ""
+
+#, fuzzy
+msgid "&Selected rows"
+msgstr "&Selecteer"
+
+msgid "&Selected rows as CSV"
+msgstr ""
+
+msgid "&Tooltips of selected rows"
+msgstr ""
+
+#, fuzzy
+msgid "&Data of selected rows"
+msgstr "Verwijder de geselecteerde items van de lijst."
+
 msgid "Tooltips of selected rows"
 msgstr ""
 
@@ -13823,8 +13864,8 @@ msgid "Column &%s (current row): %s"
 msgstr "Documenten: %s"
 
 #, fuzzy
-msgid "Copy to e&xport area..."
-msgstr "patiënt activeren van rapportresultaat"
+msgid "&Save to file..."
+msgstr " Bewaren "
 
 #, fuzzy
 msgid "&Copy to clipboard..."
@@ -13856,6 +13897,30 @@ msgid ""
 "%s"
 msgstr "Geef zoekterm in:"
 
+#, python-format
+msgid "All rows saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All tooltips saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All data saved to [%s]."
+msgstr ""
+
+#, fuzzy, python-format
+msgid "Selected rows saved to [%s]."
+msgstr "Verwijderede rapportdefinitie [%s]."
+
+#, fuzzy, python-format
+msgid "Selected tooltips saved to [%s]."
+msgstr "Verwijderede rapportdefinitie [%s]."
+
+#, fuzzy, python-format
+msgid "Selected data saved to [%s]."
+msgstr "Stel de taal van de database in op [%s]."
+
 msgid "Monty the Serpent && the FSF Present"
 msgstr "Monty the Serpent && the FSF presenteren"
 
@@ -15545,6 +15610,10 @@ msgstr "Creëer gezondheidsprobleem"
 msgid "sorted by type"
 msgstr "gesorteerd op soort"
 
+#, fuzzy
+msgid "sorted by organization"
+msgstr "Nieuwe patiënt toevoegen"
+
 msgid "Cannot load documents. No active patient."
 msgstr "Kan documenten niet laden. Geen actieve patiënt."
 
@@ -15648,6 +15717,10 @@ msgstr "%s%7s %s: %s (%s part(s), %s)"
 msgid "%s (unattributed episode)"
 msgstr "Niet toegewezen episodes"
 
+#, fuzzy
+msgid "unknown organization"
+msgstr "onbekende reactie"
+
 #, python-format
 msgid "part %2s"
 msgstr "part %2s"
@@ -20776,6 +20849,20 @@ msgstr "Afbreken"
 msgid "Abort and do NOT connect to GNUmed."
 msgstr "Afbreken en GEEN verbinding maken met GNUmed."
 
+#~ msgid "age"
+#~ msgstr "leeftijd"
+
+#~ msgid "episode"
+#~ msgstr "episode"
+
+#, fuzzy
+#~ msgid "health issue"
+#~ msgstr "Gezondheidsprobleem"
+
+#, fuzzy
+#~ msgid "Copy to e&xport area..."
+#~ msgstr "patiënt activeren van rapportresultaat"
+
 #, fuzzy
 #~ msgid "&Entry time"
 #~ msgstr "Begin nieuw"
diff --git a/client/po/pl-gnumed.mo b/client/po/pl-gnumed.mo
index 07024c2..251595b 100644
Binary files a/client/po/pl-gnumed.mo and b/client/po/pl-gnumed.mo differ
diff --git a/client/po/pl.po b/client/po/pl.po
index 5f7402e..a9f0a10 100644
--- a/client/po/pl.po
+++ b/client/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnumed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-06 11:40+0200\n"
+"POT-Creation-Date: 2016-05-26 12:47+0200\n"
 "PO-Revision-Date: 2012-06-01 01:17+0000\n"
 "Last-Translator: J.Luszawski <jl at leksoft.com.pl>\n"
 "Language-Team: Polish <pl at li.org>\n"
@@ -87,10 +87,10 @@ msgid "Intro"
 msgstr "Wprowadzenie"
 
 msgid "Hover me!"
-msgstr ""
+msgstr "Najedź na mnie!"
 
 msgid "Hovering events with a triangle shows the event description."
-msgstr ""
+msgstr "Najechanie na wydarzenia z trójkątem pokazuje opis wydarzenia."
 
 msgid "Features"
 msgstr "Cechy"
@@ -116,7 +116,7 @@ msgid "Container"
 msgstr "Kontakt"
 
 msgid "?"
-msgstr ""
+msgstr "?"
 
 #, fuzzy
 msgid "Resize me"
@@ -128,7 +128,7 @@ msgid ""
 msgstr ""
 
 msgid "Drag me"
-msgstr ""
+msgstr "Przeciągnij mnie"
 
 msgid ""
 "Container Subevent 2\n"
@@ -206,6 +206,10 @@ msgid ""
 "\n"
 "Choose File/New/File Timeline to create a timeline that is saved on disk."
 msgstr ""
+"Ta Linia czasu jest przechowywana w pamięci i żadne modyfikacje nie zostaną "
+"zachowane.\n"
+"\n"
+"Wybierz Plik/Nowy/Linia czasu by stworzyć Linię czasu zapisaną na dysku."
 
 msgid "Start time "
 msgstr "Czas rozpoczęcia "
@@ -403,7 +407,7 @@ msgid "Select a Category:"
 msgstr ""
 
 msgid "Set Category on events without category"
-msgstr ""
+msgstr "Ustaw Kategorię dla wydarzeń bez kategorii"
 
 msgid "Set Category on selected events"
 msgstr ""
@@ -547,7 +551,7 @@ msgid "Open &Recent"
 msgstr "Otwórz pop&rzednie linie  czasu"
 
 msgid "Save As..."
-msgstr ""
+msgstr "Zapisz jako..."
 
 msgid "Import timeline..."
 msgstr ""
@@ -804,7 +808,7 @@ msgid "Feedback On Feature"
 msgstr ""
 
 msgid "Give Feedback"
-msgstr ""
+msgstr "Podziel się opinią"
 
 msgid "Help"
 msgstr "Pomoc"
@@ -851,10 +855,10 @@ msgid "Modifier:"
 msgstr "zmieniony wpis"
 
 msgid "Shortcut Key:"
-msgstr ""
+msgstr "Klawisz skrótu:"
 
 msgid "Unable to copy to clipboard."
-msgstr ""
+msgstr "Nie można skopiować do schowka."
 
 msgid "Duplicate Event"
 msgstr ""
@@ -897,14 +901,14 @@ msgid "Question"
 msgstr "Opis"
 
 msgid "Both Modifier and Shortcut key must be given!"
-msgstr ""
+msgstr "Musisz podać modyfikator oraz klawisz skrótu!"
 
 #, python-format
 msgid "The shortcut %s is already bound to function '%s'!"
-msgstr ""
+msgstr "Skrót %s został już przypisany do funkcji '%s'!"
 
 msgid "You must select a category!"
-msgstr ""
+msgstr "Musisz wybrać kategorię!"
 
 #, fuzzy
 msgid "Progress %:"
@@ -914,7 +918,7 @@ msgid "Test"
 msgstr ""
 
 msgid "URL:"
-msgstr ""
+msgstr "URL:"
 
 #, python-format
 msgid "Images will be scaled to fit inside a %ix%i box."
@@ -925,7 +929,7 @@ msgid "Select Icon"
 msgstr "Wybierz obrazek"
 
 msgid "You can't change time when the Event is locked"
-msgstr ""
+msgstr "Nie możesz zmienićczasu kiedy Wydarzenie jest zablokowane."
 
 msgid "End must be > Start"
 msgstr "Data końcowa nie może być wcześniejsza niż początkowa"
@@ -945,7 +949,7 @@ msgid "Text"
 msgstr "Tekst"
 
 msgid "Name"
-msgstr ""
+msgstr "Nazwa"
 
 #, fuzzy, python-format
 msgid "Search results for '%s'"
@@ -962,7 +966,7 @@ msgid "Questions and answers"
 msgstr "Często zadawane pytania"
 
 msgid "Concepts"
-msgstr ""
+msgstr "Założenia"
 
 msgid "Tasks"
 msgstr "Zadania"
@@ -995,7 +999,7 @@ msgstr ""
 "pierwszy dzień tygodnia. Planujemy dokonać tego w przyszłości.\n"
 
 msgid "Can multiple users work with the same timeline?"
-msgstr ""
+msgstr "Czy wielu użytkowników może pracować z tą samą linią czasu?"
 
 msgid ""
 "\n"
@@ -1435,7 +1439,7 @@ msgid "Go to Time"
 msgstr ""
 
 msgid "File"
-msgstr ""
+msgstr "Plik"
 
 #, fuzzy
 msgid "View"
@@ -1446,7 +1450,7 @@ msgid "Navigate"
 msgstr "&Nawigacja"
 
 msgid "Import..."
-msgstr ""
+msgstr "Import..."
 
 #, fuzzy
 msgid "Export Current view to Image..."
@@ -1461,13 +1465,13 @@ msgid "Export to SVG..."
 msgstr "Eksport do pliku obrazka"
 
 msgid "Exit"
-msgstr ""
+msgstr "Wyjdź"
 
 msgid "Find"
-msgstr ""
+msgstr "Szukaj"
 
 msgid "Shortcuts"
-msgstr ""
+msgstr "Skróty klawiszowe"
 
 #, fuzzy
 msgid "Sidebar"
@@ -1490,10 +1494,10 @@ msgid "Zoom Out"
 msgstr "Przybliżenie"
 
 msgid "Vertical Zoom In"
-msgstr ""
+msgstr "Przybliż w pionie"
 
 msgid "Vertical Zoom Out"
-msgstr ""
+msgstr "Oddal w pionie"
 
 #, fuzzy
 msgid "Edit Selected Event"
@@ -1508,17 +1512,17 @@ msgid "Set Category on Selected Events"
 msgstr "poprawiony wynik"
 
 msgid "Measure Distance between two Events"
-msgstr ""
+msgstr "Zmierz odległość między dwoma Wydarzeniami"
 
 msgid "Read Only"
-msgstr ""
+msgstr "Tylko do odczytu"
 
 #, fuzzy
 msgid "Contents"
 msgstr "Zawartość pomocy\tF1"
 
 msgid "About"
-msgstr ""
+msgstr "O programie"
 
 #, fuzzy
 msgid "Find First Event"
@@ -1544,6 +1548,12 @@ msgid ""
 "\n"
 "Do you want to Synchronize?"
 msgstr ""
+"Ktoś zmienił Linię czasu.\n"
+"Masz dwie opcje!\n"
+"  1. Ustaw Linię czasu w trybie Tylko do odczytu.\n"
+"  2. Zsynchronizuj Linię czasu.\n"
+"\n"
+"Czy chcesz zsynchronizować?"
 
 msgid ""
 "Help requested\n"
@@ -2293,12 +2303,6 @@ msgstr "Wynik bad. lab."
 msgid "New patient ID:"
 msgstr "wewn. identyfikator pacjenta"
 
-msgid "Your review"
-msgstr ""
-
-msgid "Reviews by others"
-msgstr ""
-
 msgid "(you are/are not the primary reviewer)"
 msgstr ""
 
@@ -2333,6 +2337,10 @@ msgstr ""
 "Pokazuje epizod powiązany z tym dokumentem. Żeby powiązać z innym wybierz "
 "lub wpisz nową nazwę epizodu."
 
+#, fuzzy
+msgid "The organizational unit this document originates from."
+msgstr "Wybierz epizod, do którego chcesz przenieść opis."
+
 msgid "Enter the date of creation of the document."
 msgstr ""
 
@@ -2388,9 +2396,18 @@ msgstr ""
 msgid "Cancel this review."
 msgstr ""
 
+msgid "Your review"
+msgstr ""
+
+msgid "Reviews by others"
+msgstr ""
+
 msgid "Episode"
 msgstr "Epizod"
 
+msgid "Source"
+msgstr ""
+
 msgid "Date"
 msgstr ""
 
@@ -5155,20 +5172,17 @@ msgstr ""
 msgid "Close this dialog."
 msgstr "Zamknij to okno."
 
-msgid "age"
+msgid "Age"
 msgstr ""
 
-msgid "review status"
+msgid "Review status"
 msgstr ""
 
-msgid "episode"
-msgstr "epizod"
-
 #, fuzzy
-msgid "health issue"
+msgid "Health issue"
 msgstr "Problem zdrowotny"
 
-msgid "type"
+msgid "Organization"
 msgstr ""
 
 msgid "Sort newest documents to top of tree."
@@ -5187,6 +5201,10 @@ msgstr "Sortuj dokumenty według epizodów, do których należą."
 msgid "Sort documents by their type."
 msgstr ""
 
+#, fuzzy
+msgid "Sort documents by the organization they are from."
+msgstr "Sortuj dokumenty według epizodów, do których należą."
+
 msgid "Sort documents by"
 msgstr ""
 
@@ -5466,9 +5484,6 @@ msgstr "Wprowadź opis tego zewnętrznego identyfikatora."
 msgid "The category of the organizational unit."
 msgstr ""
 
-msgid "Organization"
-msgstr ""
-
 msgid "Unit"
 msgstr ""
 
@@ -5637,9 +5652,6 @@ msgid ""
 "(SQL query)"
 msgstr ""
 
-msgid "Source"
-msgstr ""
-
 msgid "URL"
 msgstr ""
 
@@ -7425,10 +7437,6 @@ msgid "missing, reported later"
 msgstr "brakujący, zgłoszony później"
 
 #, fuzzy
-msgid "Health issue"
-msgstr "Problem zdrowotny"
-
-#, fuzzy
 msgid "External care"
 msgstr "zewn. identyfikator pacjenta"
 
@@ -7465,6 +7473,10 @@ msgstr "Dodawanie nowego epizodu"
 msgid "Document"
 msgstr "Dokumenty:"
 
+#, fuzzy
+msgid "Inbox message"
+msgstr "Dodawanie nowego epizodu"
+
 #, python-format
 msgid "unmapped entry type from table [%s]"
 msgstr ""
@@ -9188,6 +9200,9 @@ msgstr ""
 msgid "who"
 msgstr ""
 
+msgid "type"
+msgstr ""
+
 msgid "entry"
 msgstr ""
 
@@ -10085,6 +10100,9 @@ msgstr ""
 msgid "nicotine"
 msgstr ""
 
+msgid "ethanol"
+msgstr ""
+
 #, fuzzy
 msgid "unit"
 msgstr "Opis"
@@ -11343,9 +11361,6 @@ msgstr ""
 msgid "Progress Note"
 msgstr ""
 
-msgid "Age"
-msgstr ""
-
 msgid "N/A"
 msgstr ""
 
@@ -12705,6 +12720,13 @@ msgstr "Pan"
 msgid "Show selected address on map"
 msgstr "To wyświetla listę dostępnych typów dokumentów."
 
+#, fuzzy
+msgid "Distance"
+msgstr "Substancje"
+
+msgid "Show distance from your praxis"
+msgstr ""
+
 msgid "Adding new address"
 msgstr ""
 
@@ -12942,6 +12964,33 @@ msgstr ""
 msgid "Find next [%s] (<CTRL-N>)"
 msgstr ""
 
+#, fuzzy
+msgid "&All rows"
+msgstr "Usuwanie epizodu"
+
+msgid "All rows as &CSV"
+msgstr ""
+
+msgid "&Tooltips of all rows"
+msgstr ""
+
+msgid "&Data of all rows"
+msgstr ""
+
+#, fuzzy
+msgid "&Selected rows"
+msgstr "Wybierz zdarzenie"
+
+msgid "&Selected rows as CSV"
+msgstr ""
+
+msgid "&Tooltips of selected rows"
+msgstr ""
+
+#, fuzzy
+msgid "&Data of selected rows"
+msgstr "Działaj na elementach wybranych z powyższej listy."
+
 msgid "Tooltips of selected rows"
 msgstr ""
 
@@ -12971,9 +13020,8 @@ msgstr ""
 msgid "Column &%s (current row): %s"
 msgstr "Dokumenty: %s"
 
-#, fuzzy
-msgid "Copy to e&xport area..."
-msgstr "Dodawanie nowego epizodu"
+msgid "&Save to file..."
+msgstr ""
 
 #, fuzzy
 msgid "&Copy to clipboard..."
@@ -13004,6 +13052,30 @@ msgid ""
 "%s"
 msgstr ""
 
+#, python-format
+msgid "All rows saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All tooltips saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All data saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected rows saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected tooltips saved to [%s]."
+msgstr ""
+
+#, fuzzy, python-format
+msgid "Selected data saved to [%s]."
+msgstr "Wybieranie problemu zdrowotnego"
+
 msgid "Monty the Serpent && the FSF Present"
 msgstr ""
 
@@ -14501,6 +14573,10 @@ msgstr "utwórz problem zdrowotny"
 msgid "sorted by type"
 msgstr ""
 
+#, fuzzy
+msgid "sorted by organization"
+msgstr "Dodawanie nowego epizodu"
+
 msgid "Cannot load documents. No active patient."
 msgstr ""
 
@@ -14600,6 +14676,10 @@ msgstr ""
 msgid "%s (unattributed episode)"
 msgstr "Niesklasyfikowane epizody"
 
+#, fuzzy
+msgid "unknown organization"
+msgstr "nieznana reakcja"
+
 #, python-format
 msgid "part %2s"
 msgstr ""
@@ -19045,6 +19125,17 @@ msgstr "Przerwij"
 msgid "Abort and do NOT connect to GNUmed."
 msgstr "Przerwij i NIE łącz z GNUmed-em"
 
+#~ msgid "episode"
+#~ msgstr "epizod"
+
+#, fuzzy
+#~ msgid "health issue"
+#~ msgstr "Problem zdrowotny"
+
+#, fuzzy
+#~ msgid "Copy to e&xport area..."
+#~ msgstr "Dodawanie nowego epizodu"
+
 #, fuzzy
 #~ msgid "&Entry time"
 #~ msgstr "Czas zakończenia "
diff --git a/client/po/pt-gnumed.mo b/client/po/pt-gnumed.mo
index 8e1bd28..be19981 100644
Binary files a/client/po/pt-gnumed.mo and b/client/po/pt-gnumed.mo differ
diff --git a/client/po/pt.po b/client/po/pt.po
index 1a1bd61..82e95bc 100644
--- a/client/po/pt.po
+++ b/client/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnumed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-06 11:40+0200\n"
+"POT-Creation-Date: 2016-05-26 12:47+0200\n"
 "PO-Revision-Date: 2010-07-17 11:08+0000\n"
 "Last-Translator: Luis Mendonça <Unknown>\n"
 "Language-Team: Portuguese <pt at li.org>\n"
@@ -2295,12 +2295,6 @@ msgstr "Pesquisa"
 msgid "New patient ID:"
 msgstr "ID interna do paciente"
 
-msgid "Your review"
-msgstr "Sua revisão"
-
-msgid "Reviews by others"
-msgstr "Revisões por outros"
-
 msgid "(you are/are not the primary reviewer)"
 msgstr "(você é/não é o revisor primário)"
 
@@ -2335,6 +2329,10 @@ msgstr ""
 "Mostra o episódio associado com esse documento. Selecione ou digite o nome "
 "de outro episódio a qual deseja associar esse documento."
 
+#, fuzzy
+msgid "The organizational unit this document originates from."
+msgstr "Nome da organização"
+
 msgid "Enter the date of creation of the document."
 msgstr ""
 
@@ -2403,9 +2401,18 @@ msgstr "Salvar sua revisão"
 msgid "Cancel this review."
 msgstr "Cancelar essa revisão."
 
+msgid "Your review"
+msgstr "Sua revisão"
+
+msgid "Reviews by others"
+msgstr "Revisões por outros"
+
 msgid "Episode"
 msgstr "Episódio"
 
+msgid "Source"
+msgstr ""
+
 msgid "Date"
 msgstr "Data"
 
@@ -5283,21 +5290,18 @@ msgstr "editar detalhes da consulta"
 msgid "Close this dialog."
 msgstr "Fechar essa janela"
 
-msgid "age"
-msgstr "idade"
+msgid "Age"
+msgstr "Idade"
 
-msgid "review status"
+#, fuzzy
+msgid "Review status"
 msgstr "rever estado"
 
-msgid "episode"
-msgstr "episódio"
-
-#, fuzzy
-msgid "health issue"
+msgid "Health issue"
 msgstr "Problema de Saúde"
 
-msgid "type"
-msgstr "tipo"
+msgid "Organization"
+msgstr ""
 
 msgid "Sort newest documents to top of tree."
 msgstr "Organizar documentos mais recentes no topo da árvore."
@@ -5315,6 +5319,10 @@ msgstr "Organizar documentos pelo episódio a qual pertencem."
 msgid "Sort documents by their type."
 msgstr "Organizar documentos por tipo."
 
+#, fuzzy
+msgid "Sort documents by the organization they are from."
+msgstr "Organizar documentos pelo episódio a qual pertencem."
+
 msgid "Sort documents by"
 msgstr "Organizar documentos por"
 
@@ -5618,9 +5626,6 @@ msgstr "Nome da organização"
 msgid "The category of the organizational unit."
 msgstr ""
 
-msgid "Organization"
-msgstr ""
-
 msgid "Unit"
 msgstr ""
 
@@ -5790,9 +5795,6 @@ msgid ""
 "(SQL query)"
 msgstr ""
 
-msgid "Source"
-msgstr ""
-
 msgid "URL"
 msgstr "URL"
 
@@ -7652,9 +7654,6 @@ msgstr "resultado corrigido"
 msgid "missing, reported later"
 msgstr "em falta, relatado mais tarde"
 
-msgid "Health issue"
-msgstr "Problema de Saúde"
-
 #, fuzzy
 msgid "External care"
 msgstr "ID externa do paciente"
@@ -7692,6 +7691,10 @@ msgstr "Apagando documento"
 msgid "Document"
 msgstr "Documentos:"
 
+#, fuzzy
+msgid "Inbox message"
+msgstr "mensagem informativa genérica"
+
 #, python-format
 msgid "unmapped entry type from table [%s]"
 msgstr ""
@@ -9445,6 +9448,9 @@ msgstr ""
 msgid "who"
 msgstr ""
 
+msgid "type"
+msgstr "tipo"
+
 msgid "entry"
 msgstr ""
 
@@ -10369,6 +10375,9 @@ msgstr ""
 msgid "nicotine"
 msgstr ""
 
+msgid "ethanol"
+msgstr ""
+
 #, fuzzy
 msgid "unit"
 msgstr "unidades"
@@ -11647,9 +11656,6 @@ msgstr "Notas"
 msgid "Progress Note"
 msgstr "Notas de Evolução"
 
-msgid "Age"
-msgstr "Idade"
-
 msgid "N/A"
 msgstr "N/D"
 
@@ -13024,6 +13030,14 @@ msgstr "Sr"
 msgid "Show selected address on map"
 msgstr "obrigatório selecionar endereço"
 
+#, fuzzy
+msgid "Distance"
+msgstr "Substância"
+
+#, fuzzy
+msgid "Show distance from your praxis"
+msgstr "Sua revisão"
+
 msgid "Adding new address"
 msgstr "Adicionando novo endereço"
 
@@ -13282,6 +13296,33 @@ msgstr ""
 msgid "Find next [%s] (<CTRL-N>)"
 msgstr ""
 
+#, fuzzy
+msgid "&All rows"
+msgstr "&Todos os usuários"
+
+msgid "All rows as &CSV"
+msgstr ""
+
+msgid "&Tooltips of all rows"
+msgstr ""
+
+msgid "&Data of all rows"
+msgstr ""
+
+#, fuzzy
+msgid "&Selected rows"
+msgstr "&Selecionar"
+
+msgid "&Selected rows as CSV"
+msgstr ""
+
+msgid "&Tooltips of selected rows"
+msgstr ""
+
+#, fuzzy
+msgid "&Data of selected rows"
+msgstr "Remover o(s) item(s) selecionado(s) da lista."
+
 msgid "Tooltips of selected rows"
 msgstr ""
 
@@ -13312,8 +13353,8 @@ msgid "Column &%s (current row): %s"
 msgstr "Documentos: %s"
 
 #, fuzzy
-msgid "Copy to e&xport area..."
-msgstr "Adicionando novo nome"
+msgid "&Save to file..."
+msgstr "Salvar sua revisão"
 
 #, fuzzy
 msgid "&Copy to clipboard..."
@@ -13345,6 +13386,30 @@ msgid ""
 "%s"
 msgstr ""
 
+#, python-format
+msgid "All rows saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All tooltips saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All data saved to [%s]."
+msgstr ""
+
+#, fuzzy, python-format
+msgid "Selected rows saved to [%s]."
+msgstr "Definição de relatório [%s] apagada."
+
+#, fuzzy, python-format
+msgid "Selected tooltips saved to [%s]."
+msgstr "Definição de relatório [%s] apagada."
+
+#, fuzzy, python-format
+msgid "Selected data saved to [%s]."
+msgstr "Definição de relatório [%s] apagada."
+
 msgid "Monty the Serpent && the FSF Present"
 msgstr "Monty a Serpente && o FSF Apresentam"
 
@@ -14864,6 +14929,10 @@ msgstr "Criar Problema de Saúde"
 msgid "sorted by type"
 msgstr ""
 
+#, fuzzy
+msgid "sorted by organization"
+msgstr "Acrescenta uma empresa"
+
 msgid "Cannot load documents. No active patient."
 msgstr ""
 
@@ -14960,6 +15029,10 @@ msgstr ""
 msgid "%s (unattributed episode)"
 msgstr "Unattributed episodes"
 
+#, fuzzy
+msgid "unknown organization"
+msgstr "reação desconhecida"
+
 #, python-format
 msgid "part %2s"
 msgstr ""
@@ -19650,6 +19723,20 @@ msgstr "Interromper"
 msgid "Abort and do NOT connect to GNUmed."
 msgstr "Imterromper e NÃO ligar ao GNUmed"
 
+#~ msgid "age"
+#~ msgstr "idade"
+
+#~ msgid "episode"
+#~ msgstr "episódio"
+
+#, fuzzy
+#~ msgid "health issue"
+#~ msgstr "Problema de Saúde"
+
+#, fuzzy
+#~ msgid "Copy to e&xport area..."
+#~ msgstr "Adicionando novo nome"
+
 #, fuzzy
 #~ msgid "&Entry time"
 #~ msgstr "Iniciar Nova"
diff --git a/client/po/pt_BR-gnumed.mo b/client/po/pt_BR-gnumed.mo
index be994ea..a5f0be4 100644
Binary files a/client/po/pt_BR-gnumed.mo and b/client/po/pt_BR-gnumed.mo differ
diff --git a/client/po/pt_BR.po b/client/po/pt_BR.po
index 73c7346..e82bf06 100644
--- a/client/po/pt_BR.po
+++ b/client/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnumed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-06 11:40+0200\n"
+"POT-Creation-Date: 2016-05-26 12:47+0200\n"
 "PO-Revision-Date: 2012-06-01 01:18+0000\n"
 "Last-Translator: Rogerio Luz Coelho <dr.rogerioluzcoelho at gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR at li.org>\n"
@@ -44,6 +44,8 @@ msgid ""
 "You are trying to open an old file with a new version of timeline. Please "
 "install version 0.21.1 of timeline to convert it to the new format."
 msgstr ""
+"Você está tentando abrir um arquivo antigo com uma nova versão do timeline. "
+"Por favor instale a versão 0.21.1 do timeline para converter ao novo formato."
 
 msgid "Other timelines can't be imported to a directory timeline"
 msgstr ""
@@ -120,7 +122,7 @@ msgid "Container"
 msgstr "Continue"
 
 msgid "?"
-msgstr ""
+msgstr "?"
 
 #, fuzzy
 msgid "Resize me"
@@ -130,9 +132,11 @@ msgid ""
 "Container Subevent 1\n"
 "Click on the event to get the resize handles"
 msgstr ""
+"Container Subevento 1\n"
+"Click no evento para disponibilizar as alças de redimensionamento."
 
 msgid "Drag me"
-msgstr ""
+msgstr "Arraste-me"
 
 msgid ""
 "Container Subevent 2\n"
@@ -422,7 +426,7 @@ msgid "Select a Category:"
 msgstr ""
 
 msgid "Set Category on events without category"
-msgstr ""
+msgstr "Definir categoria para eventos sem categoria"
 
 msgid "Set Category on selected events"
 msgstr ""
@@ -573,7 +577,7 @@ msgid "Open &Recent"
 msgstr "Abrir &Recente"
 
 msgid "Save As..."
-msgstr ""
+msgstr "Salvar como..."
 
 msgid "Import timeline..."
 msgstr ""
@@ -842,7 +846,7 @@ msgid "Feedback On Feature"
 msgstr ""
 
 msgid "Give Feedback"
-msgstr ""
+msgstr "Dê a sua opinião"
 
 msgid "Help"
 msgstr "Ajuda"
@@ -1036,6 +1040,7 @@ msgstr ""
 
 msgid "Can multiple users work with the same timeline?"
 msgstr ""
+"Podem múltiplos usuários trabalharem na mesma timeline simultaneamente?"
 
 msgid ""
 "\n"
@@ -1497,7 +1502,7 @@ msgid "Go to Time"
 msgstr " opção [%s]: %s"
 
 msgid "File"
-msgstr ""
+msgstr "Arquivo"
 
 #, fuzzy
 msgid "View"
@@ -1552,10 +1557,10 @@ msgid "Zoom Out"
 msgstr "Zoom"
 
 msgid "Vertical Zoom In"
-msgstr ""
+msgstr "Aumentar zoom vertical"
 
 msgid "Vertical Zoom Out"
-msgstr ""
+msgstr "Diminuir zoom vertical"
 
 #, fuzzy
 msgid "Edit Selected Event"
@@ -1570,17 +1575,17 @@ msgid "Set Category on Selected Events"
 msgstr "Editar o item selecionado."
 
 msgid "Measure Distance between two Events"
-msgstr ""
+msgstr "Medir distância entre dois eventos"
 
 msgid "Read Only"
-msgstr ""
+msgstr "Somente leitura"
 
 #, fuzzy
 msgid "Contents"
 msgstr "Componentes"
 
 msgid "About"
-msgstr ""
+msgstr "Sobre..."
 
 #, fuzzy
 msgid "Find First Event"
@@ -2400,12 +2405,6 @@ msgstr "Pesquisa"
 msgid "New patient ID:"
 msgstr "ID do paciente interno"
 
-msgid "Your review"
-msgstr "Sua revisão"
-
-msgid "Reviews by others"
-msgstr "Revisões por outros"
-
 msgid "(you are/are not the primary reviewer)"
 msgstr "(você é/não é o revisor primário)"
 
@@ -2440,6 +2439,10 @@ msgstr ""
 "Mostra o episódio associado com esse documento. Selecione ou digite o nome "
 "de outro episódio a qual deseja associar esse documento."
 
+#, fuzzy
+msgid "The organizational unit this document originates from."
+msgstr "Selecione o episódio para o qual você quer mover a descrição"
+
 msgid "Enter the date of creation of the document."
 msgstr ""
 
@@ -2508,9 +2511,18 @@ msgstr "Salvar sua revisão"
 msgid "Cancel this review."
 msgstr "Cancelar essa revisão."
 
+msgid "Your review"
+msgstr "Sua revisão"
+
+msgid "Reviews by others"
+msgstr "Revisões por outros"
+
 msgid "Episode"
 msgstr "Episódio"
 
+msgid "Source"
+msgstr ""
+
 msgid "Date"
 msgstr "Data"
 
@@ -5428,21 +5440,18 @@ msgstr "editar detalhes da consulta"
 msgid "Close this dialog."
 msgstr "Fechar essa janela"
 
-msgid "age"
-msgstr "idade"
+msgid "Age"
+msgstr "Idade"
 
-msgid "review status"
+#, fuzzy
+msgid "Review status"
 msgstr "rever estado"
 
-msgid "episode"
-msgstr "episódio"
-
-#, fuzzy
-msgid "health issue"
+msgid "Health issue"
 msgstr "Problema de Saúde"
 
-msgid "type"
-msgstr "tipo"
+msgid "Organization"
+msgstr ""
 
 msgid "Sort newest documents to top of tree."
 msgstr "Organizar documentos mais recentes no topo da árvore."
@@ -5460,6 +5469,10 @@ msgstr "Organizar documentos pelo episódio a qual pertencem."
 msgid "Sort documents by their type."
 msgstr "Organizar documentos por tipo."
 
+#, fuzzy
+msgid "Sort documents by the organization they are from."
+msgstr "Organizar documentos pelo episódio a qual pertencem."
+
 msgid "Sort documents by"
 msgstr "Organizar documentos por"
 
@@ -5772,9 +5785,6 @@ msgstr "A marca do medicamento que o paciente está tomando."
 msgid "The category of the organizational unit."
 msgstr ""
 
-msgid "Organization"
-msgstr ""
-
 msgid "Unit"
 msgstr "Unidade"
 
@@ -5945,9 +5955,6 @@ msgid ""
 "(SQL query)"
 msgstr ""
 
-msgid "Source"
-msgstr ""
-
 msgid "URL"
 msgstr "URL"
 
@@ -7833,9 +7840,6 @@ msgstr "resultado corrigido"
 msgid "missing, reported later"
 msgstr "faltando, será registrado posteriormente"
 
-msgid "Health issue"
-msgstr "Problema de Saúde"
-
 #, fuzzy
 msgid "External care"
 msgstr "Código externo"
@@ -7871,6 +7875,10 @@ msgstr "Histórico Familiar"
 msgid "Document"
 msgstr "Documentos"
 
+#, fuzzy
+msgid "Inbox message"
+msgstr "Editando nome"
+
 #, python-format
 msgid "unmapped entry type from table [%s]"
 msgstr ""
@@ -9617,6 +9625,9 @@ msgstr ""
 msgid "who"
 msgstr ""
 
+msgid "type"
+msgstr "tipo"
+
 msgid "entry"
 msgstr ""
 
@@ -10544,6 +10555,9 @@ msgstr ""
 msgid "nicotine"
 msgstr ""
 
+msgid "ethanol"
+msgstr ""
+
 #, fuzzy
 msgid "unit"
 msgstr "unidades"
@@ -11826,9 +11840,6 @@ msgstr "Notas"
 msgid "Progress Note"
 msgstr "Notas de Evolução"
 
-msgid "Age"
-msgstr "Idade"
-
 msgid "N/A"
 msgstr "N/D"
 
@@ -13204,6 +13215,14 @@ msgstr "Sr"
 msgid "Show selected address on map"
 msgstr "obrigatório selecionar endereço"
 
+#, fuzzy
+msgid "Distance"
+msgstr "Substância"
+
+#, fuzzy
+msgid "Show distance from your praxis"
+msgstr "Sua revisão"
+
 msgid "Adding new address"
 msgstr "Adicionando novo endereço"
 
@@ -13460,6 +13479,33 @@ msgstr ""
 msgid "Find next [%s] (<CTRL-N>)"
 msgstr ""
 
+#, fuzzy
+msgid "&All rows"
+msgstr "&Todos os usuários"
+
+msgid "All rows as &CSV"
+msgstr ""
+
+msgid "&Tooltips of all rows"
+msgstr ""
+
+msgid "&Data of all rows"
+msgstr ""
+
+#, fuzzy
+msgid "&Selected rows"
+msgstr "&Selecionar"
+
+msgid "&Selected rows as CSV"
+msgstr ""
+
+msgid "&Tooltips of selected rows"
+msgstr ""
+
+#, fuzzy
+msgid "&Data of selected rows"
+msgstr "Remover o(s) item(s) selecionado(s) da lista."
+
 msgid "Tooltips of selected rows"
 msgstr ""
 
@@ -13490,8 +13536,8 @@ msgid "Column &%s (current row): %s"
 msgstr "Documentos: %s"
 
 #, fuzzy
-msgid "Copy to e&xport area..."
-msgstr "Adicionando novo nome"
+msgid "&Save to file..."
+msgstr "Salvar sua revisão"
 
 #, fuzzy
 msgid "&Copy to clipboard..."
@@ -13523,6 +13569,30 @@ msgid ""
 "%s"
 msgstr ""
 
+#, python-format
+msgid "All rows saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All tooltips saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All data saved to [%s]."
+msgstr ""
+
+#, fuzzy, python-format
+msgid "Selected rows saved to [%s]."
+msgstr "Definição de relatório [%s] apagada."
+
+#, fuzzy, python-format
+msgid "Selected tooltips saved to [%s]."
+msgstr "Definição de relatório [%s] apagada."
+
+#, fuzzy, python-format
+msgid "Selected data saved to [%s]."
+msgstr "Definição de relatório [%s] apagada."
+
 msgid "Monty the Serpent && the FSF Present"
 msgstr "Monty a Serpente && o FSF Apresentam"
 
@@ -15045,6 +15115,10 @@ msgstr "Criar Problema de Saúde"
 msgid "sorted by type"
 msgstr ""
 
+#, fuzzy
+msgid "sorted by organization"
+msgstr "Adicionando novo paciente"
+
 msgid "Cannot load documents. No active patient."
 msgstr ""
 
@@ -15141,6 +15215,10 @@ msgstr ""
 msgid "%s (unattributed episode)"
 msgstr "Episódios Sem Definição."
 
+#, fuzzy
+msgid "unknown organization"
+msgstr "reação desconhecida"
+
 #, python-format
 msgid "part %2s"
 msgstr ""
@@ -19833,6 +19911,20 @@ msgstr "Cancelar"
 msgid "Abort and do NOT connect to GNUmed."
 msgstr "Cancelar e NÃO conectar ao GNUmed."
 
+#~ msgid "age"
+#~ msgstr "idade"
+
+#~ msgid "episode"
+#~ msgstr "episódio"
+
+#, fuzzy
+#~ msgid "health issue"
+#~ msgstr "Problema de Saúde"
+
+#, fuzzy
+#~ msgid "Copy to e&xport area..."
+#~ msgstr "Adicionando novo nome"
+
 #, fuzzy
 #~ msgid "&Entry time"
 #~ msgstr "Tempo de fim "
diff --git a/client/po/ro-gnumed.mo b/client/po/ro-gnumed.mo
index 3e41440..8766231 100644
Binary files a/client/po/ro-gnumed.mo and b/client/po/ro-gnumed.mo differ
diff --git a/client/po/ro.po b/client/po/ro.po
index 67aadf8..acd9933 100644
--- a/client/po/ro.po
+++ b/client/po/ro.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNUmed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-06 11:40+0200\n"
+"POT-Creation-Date: 2016-05-26 12:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -2124,12 +2124,6 @@ msgstr ""
 msgid "New patient ID:"
 msgstr ""
 
-msgid "Your review"
-msgstr ""
-
-msgid "Reviews by others"
-msgstr ""
-
 msgid "(you are/are not the primary reviewer)"
 msgstr ""
 
@@ -2162,6 +2156,9 @@ msgid ""
 "in a new episode name to associate a different one."
 msgstr ""
 
+msgid "The organizational unit this document originates from."
+msgstr ""
+
 msgid "Enter the date of creation of the document."
 msgstr ""
 
@@ -2216,9 +2213,18 @@ msgstr ""
 msgid "Cancel this review."
 msgstr ""
 
+msgid "Your review"
+msgstr ""
+
+msgid "Reviews by others"
+msgstr ""
+
 msgid "Episode"
 msgstr ""
 
+msgid "Source"
+msgstr ""
+
 msgid "Date"
 msgstr ""
 
@@ -4801,19 +4807,16 @@ msgstr ""
 msgid "Close this dialog."
 msgstr ""
 
-msgid "age"
-msgstr ""
-
-msgid "review status"
+msgid "Age"
 msgstr ""
 
-msgid "episode"
+msgid "Review status"
 msgstr ""
 
-msgid "health issue"
+msgid "Health issue"
 msgstr ""
 
-msgid "type"
+msgid "Organization"
 msgstr ""
 
 msgid "Sort newest documents to top of tree."
@@ -4831,6 +4834,9 @@ msgstr ""
 msgid "Sort documents by their type."
 msgstr ""
 
+msgid "Sort documents by the organization they are from."
+msgstr ""
+
 msgid "Sort documents by"
 msgstr ""
 
@@ -5099,9 +5105,6 @@ msgstr ""
 msgid "The category of the organizational unit."
 msgstr ""
 
-msgid "Organization"
-msgstr ""
-
 msgid "Unit"
 msgstr ""
 
@@ -5259,9 +5262,6 @@ msgid ""
 "(SQL query)"
 msgstr ""
 
-msgid "Source"
-msgstr ""
-
 msgid "URL"
 msgstr ""
 
@@ -6955,9 +6955,6 @@ msgstr ""
 msgid "missing, reported later"
 msgstr ""
 
-msgid "Health issue"
-msgstr ""
-
 msgid "External care"
 msgstr ""
 
@@ -6985,6 +6982,10 @@ msgstr ""
 msgid "Document"
 msgstr ""
 
+#, fuzzy
+msgid "Inbox message"
+msgstr "mesaj generic de informare"
+
 #, python-format
 msgid "unmapped entry type from table [%s]"
 msgstr ""
@@ -8596,6 +8597,9 @@ msgstr ""
 msgid "who"
 msgstr ""
 
+msgid "type"
+msgstr ""
+
 msgid "entry"
 msgstr ""
 
@@ -9451,6 +9455,9 @@ msgstr ""
 msgid "nicotine"
 msgstr ""
 
+msgid "ethanol"
+msgstr ""
+
 msgid "unit"
 msgstr ""
 
@@ -10654,9 +10661,6 @@ msgstr ""
 msgid "Progress Note"
 msgstr ""
 
-msgid "Age"
-msgstr ""
-
 msgid "N/A"
 msgstr ""
 
@@ -11945,6 +11949,12 @@ msgstr ""
 msgid "Show selected address on map"
 msgstr ""
 
+msgid "Distance"
+msgstr ""
+
+msgid "Show distance from your praxis"
+msgstr ""
+
 msgid "Adding new address"
 msgstr ""
 
@@ -12166,6 +12176,30 @@ msgstr ""
 msgid "Find next [%s] (<CTRL-N>)"
 msgstr ""
 
+msgid "&All rows"
+msgstr ""
+
+msgid "All rows as &CSV"
+msgstr ""
+
+msgid "&Tooltips of all rows"
+msgstr ""
+
+msgid "&Data of all rows"
+msgstr ""
+
+msgid "&Selected rows"
+msgstr ""
+
+msgid "&Selected rows as CSV"
+msgstr ""
+
+msgid "&Tooltips of selected rows"
+msgstr ""
+
+msgid "&Data of selected rows"
+msgstr ""
+
 msgid "Tooltips of selected rows"
 msgstr ""
 
@@ -12195,7 +12229,7 @@ msgstr ""
 msgid "Column &%s (current row): %s"
 msgstr ""
 
-msgid "Copy to e&xport area..."
+msgid "&Save to file..."
 msgstr ""
 
 msgid "&Copy to clipboard..."
@@ -12224,6 +12258,30 @@ msgid ""
 "%s"
 msgstr ""
 
+#, python-format
+msgid "All rows saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All tooltips saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All data saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected rows saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected tooltips saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected data saved to [%s]."
+msgstr ""
+
 msgid "Monty the Serpent && the FSF Present"
 msgstr ""
 
@@ -13638,6 +13696,9 @@ msgstr ""
 msgid "sorted by type"
 msgstr ""
 
+msgid "sorted by organization"
+msgstr ""
+
 msgid "Cannot load documents. No active patient."
 msgstr ""
 
@@ -13723,6 +13784,9 @@ msgstr ""
 msgid "%s (unattributed episode)"
 msgstr ""
 
+msgid "unknown organization"
+msgstr ""
+
 #, python-format
 msgid "part %2s"
 msgstr ""
diff --git a/client/po/ru-gnumed.mo b/client/po/ru-gnumed.mo
index f7caeea..214529f 100644
Binary files a/client/po/ru-gnumed.mo and b/client/po/ru-gnumed.mo differ
diff --git a/client/po/ru.po b/client/po/ru.po
index f2cd519..b437507 100644
--- a/client/po/ru.po
+++ b/client/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnumed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-06 11:40+0200\n"
+"POT-Creation-Date: 2016-05-26 12:47+0200\n"
 "PO-Revision-Date: 2012-01-21 13:50+0000\n"
 "Last-Translator: YvLy <Unknown>\n"
 "Language-Team: Russian <ru at li.org>\n"
@@ -2445,12 +2445,6 @@ msgstr "Ввод условия для писка:"
 msgid "New patient ID:"
 msgstr "внутренний ID пациента"
 
-msgid "Your review"
-msgstr "Ваше заключение"
-
-msgid "Reviews by others"
-msgstr "Заключения других"
-
 msgid "(you are/are not the primary reviewer)"
 msgstr "(вы не основной рецензент)"
 
@@ -2485,6 +2479,12 @@ msgstr ""
 "Показывает эпизод, относящийся к этому документу. Выбирите другой или "
 "введите название нового для связи с другим документом."
 
+#, fuzzy
+msgid "The organizational unit this document originates from."
+msgstr ""
+"\n"
+"Выберите нужное пребывание в стационаре для редактирования!\n"
+
 msgid "Enter the date of creation of the document."
 msgstr "Введите дату создания документа."
 
@@ -2557,9 +2557,18 @@ msgstr "Сохранить рецензию."
 msgid "Cancel this review."
 msgstr "Отменить рецензию."
 
+msgid "Your review"
+msgstr "Ваше заключение"
+
+msgid "Reviews by others"
+msgstr "Заключения других"
+
 msgid "Episode"
 msgstr "Обострение"
 
+msgid "Source"
+msgstr "Исходник"
+
 msgid "Date"
 msgstr "дата"
 
@@ -5637,20 +5646,18 @@ msgstr "редактировать описание обращения"
 msgid "Close this dialog."
 msgstr "Закрывает этот диалог."
 
-msgid "age"
-msgstr "возраст"
+msgid "Age"
+msgstr "Возраст"
 
-msgid "review status"
+#, fuzzy
+msgid "Review status"
 msgstr "состояние рецензии"
 
-msgid "episode"
-msgstr "эпизод"
-
-msgid "health issue"
-msgstr "заболевание"
+msgid "Health issue"
+msgstr "Заболевание"
 
-msgid "type"
-msgstr "тип"
+msgid "Organization"
+msgstr "Организация"
 
 msgid "Sort newest documents to top of tree."
 msgstr "Сортировать свежие документы в главном дереве."
@@ -5667,6 +5674,10 @@ msgstr "Сортировать документы по принадлежнос
 msgid "Sort documents by their type."
 msgstr "Сортировать документы по их типам."
 
+#, fuzzy
+msgid "Sort documents by the organization they are from."
+msgstr "Сортировать документы по принадлежности к  эпизодам."
+
 msgid "Sort documents by"
 msgstr "Сортировать документы по"
 
@@ -5991,9 +6002,6 @@ msgstr "Название организационного подразделен
 msgid "The category of the organizational unit."
 msgstr "Категория организационного подразделения."
 
-msgid "Organization"
-msgstr "Организация"
-
 msgid "Unit"
 msgstr "Единица измерения"
 
@@ -6173,9 +6181,6 @@ msgid ""
 "(SQL query)"
 msgstr ""
 
-msgid "Source"
-msgstr "Исходник"
-
 msgid "URL"
 msgstr "URL"
 
@@ -8129,9 +8134,6 @@ msgstr "скорректированный результат"
 msgid "missing, reported later"
 msgstr "отсутсвует, будет сообщено позже"
 
-msgid "Health issue"
-msgstr "Заболевание"
-
 #, fuzzy
 msgid "External care"
 msgstr "Внешний код"
@@ -8167,6 +8169,10 @@ msgstr "Семейный анамнез"
 msgid "Document"
 msgstr "Документы"
 
+#, fuzzy
+msgid "Inbox message"
+msgstr "Редактирование почтового сообщения"
+
 #, python-format
 msgid "unmapped entry type from table [%s]"
 msgstr ""
@@ -9962,6 +9968,9 @@ msgstr "когда"
 msgid "who"
 msgstr "кто"
 
+msgid "type"
+msgstr "тип"
+
 msgid "entry"
 msgstr "запись"
 
@@ -10978,6 +10987,9 @@ msgstr ""
 msgid "nicotine"
 msgstr ""
 
+msgid "ethanol"
+msgstr ""
+
 #, fuzzy
 msgid "unit"
 msgstr "единицы измерения"
@@ -12361,9 +12373,6 @@ msgstr "Примечания"
 msgid "Progress Note"
 msgstr "Рабочая заметка"
 
-msgid "Age"
-msgstr "Возраст"
-
 msgid "N/A"
 msgstr "Нет данных"
 
@@ -13953,6 +13962,14 @@ msgstr "Мистер"
 msgid "Show selected address on map"
 msgstr "должен выбрать адрес"
 
+#, fuzzy
+msgid "Distance"
+msgstr "Вещество"
+
+#, fuzzy
+msgid "Show distance from your praxis"
+msgstr "Ваше заключение"
+
 msgid "Adding new address"
 msgstr "Добавление нового адреса."
 
@@ -14201,6 +14218,33 @@ msgstr ""
 msgid "Find next [%s] (<CTRL-N>)"
 msgstr ""
 
+#, fuzzy
+msgid "&All rows"
+msgstr "Пользователи &All"
+
+msgid "All rows as &CSV"
+msgstr ""
+
+msgid "&Tooltips of all rows"
+msgstr ""
+
+msgid "&Data of all rows"
+msgstr ""
+
+#, fuzzy
+msgid "&Selected rows"
+msgstr "&Select"
+
+msgid "&Selected rows as CSV"
+msgstr ""
+
+msgid "&Tooltips of selected rows"
+msgstr ""
+
+#, fuzzy
+msgid "&Data of selected rows"
+msgstr "Не переформатировать текст"
+
 msgid "Tooltips of selected rows"
 msgstr ""
 
@@ -14234,8 +14278,8 @@ msgid "Column &%s (current row): %s"
 msgstr "Документы: %s"
 
 #, fuzzy
-msgid "Copy to e&xport area..."
-msgstr "Активирование пациента из  полученного списка"
+msgid "&Save to file..."
+msgstr "Сохранить рецензию."
 
 #, fuzzy
 msgid "&Copy to clipboard..."
@@ -14267,6 +14311,30 @@ msgid ""
 "%s"
 msgstr "Ввод условия для писка:"
 
+#, python-format
+msgid "All rows saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All tooltips saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All data saved to [%s]."
+msgstr ""
+
+#, fuzzy, python-format
+msgid "Selected rows saved to [%s]."
+msgstr "Удаленное определение отчета [%s]."
+
+#, fuzzy, python-format
+msgid "Selected tooltips saved to [%s]."
+msgstr "Удаленное определение отчета [%s]."
+
+#, fuzzy, python-format
+msgid "Selected data saved to [%s]."
+msgstr "Установить язык базы данных на [%s]."
+
 msgid "Monty the Serpent && the FSF Present"
 msgstr "Змея Monty && существующий FSF"
 
@@ -15965,6 +16033,10 @@ msgstr "сортированное по заболеванию"
 msgid "sorted by type"
 msgstr "сортированное по типу"
 
+#, fuzzy
+msgid "sorted by organization"
+msgstr "Добавление новой организации"
+
 msgid "Cannot load documents. No active patient."
 msgstr "Невозможно загрузить документы. Нет активного пациента."
 
@@ -16055,6 +16127,10 @@ msgstr "%s%7s %s:%s (%s часть(и)%s)"
 msgid "%s (unattributed episode)"
 msgstr "Эпизоды без аттрибутов"
 
+#, fuzzy
+msgid "unknown organization"
+msgstr "неизвестная реакция"
+
 #, python-format
 msgid "part %2s"
 msgstr "часть %2s"
@@ -21206,6 +21282,19 @@ msgstr "Отменить"
 msgid "Abort and do NOT connect to GNUmed."
 msgstr "Отменить и НЕ подключаться к GNUmed."
 
+#~ msgid "age"
+#~ msgstr "возраст"
+
+#~ msgid "episode"
+#~ msgstr "эпизод"
+
+#~ msgid "health issue"
+#~ msgstr "заболевание"
+
+#, fuzzy
+#~ msgid "Copy to e&xport area..."
+#~ msgstr "Активирование пациента из  полученного списка"
+
 #, fuzzy
 #~ msgid "&Entry time"
 #~ msgstr "Время окончания "
diff --git a/client/po/ru_RU-gnumed.mo b/client/po/ru_RU-gnumed.mo
index 62b245e..a06888e 100644
Binary files a/client/po/ru_RU-gnumed.mo and b/client/po/ru_RU-gnumed.mo differ
diff --git a/client/po/ru_RU.po b/client/po/ru_RU.po
index 38e1599..a0c596a 100644
--- a/client/po/ru_RU.po
+++ b/client/po/ru_RU.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnumed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-06 11:40+0200\n"
+"POT-Creation-Date: 2016-05-26 12:47+0200\n"
 "PO-Revision-Date: 2012-05-30 18:43+0000\n"
 "Last-Translator: YvLy <Unknown>\n"
 "Language-Team: Russian <ru at li.org>\n"
@@ -2450,12 +2450,6 @@ msgstr "Ввод условия для писка:"
 msgid "New patient ID:"
 msgstr "внутренний ID пациента"
 
-msgid "Your review"
-msgstr "Ваше заключение"
-
-msgid "Reviews by others"
-msgstr "Заключения других"
-
 msgid "(you are/are not the primary reviewer)"
 msgstr "(вы не основной рецензент)"
 
@@ -2490,6 +2484,10 @@ msgstr ""
 "Показывает эпизод, относящийся к этому документу. Выбирите другой или "
 "введите название нового для связи с другим документом."
 
+#, fuzzy
+msgid "The organizational unit this document originates from."
+msgstr "Выберите единицу организации."
+
 msgid "Enter the date of creation of the document."
 msgstr "Введите дату создания документа."
 
@@ -2562,9 +2560,18 @@ msgstr "Сохранить рецензию."
 msgid "Cancel this review."
 msgstr "Отменить рецензию."
 
+msgid "Your review"
+msgstr "Ваше заключение"
+
+msgid "Reviews by others"
+msgstr "Заключения других"
+
 msgid "Episode"
 msgstr "Эпизод"
 
+msgid "Source"
+msgstr "Исходник"
+
 msgid "Date"
 msgstr "дата"
 
@@ -5642,20 +5649,18 @@ msgstr "изменить сведения по обращению"
 msgid "Close this dialog."
 msgstr "Закрывает этот диалог."
 
-msgid "age"
-msgstr "возраст"
+msgid "Age"
+msgstr "Возраст"
 
-msgid "review status"
+#, fuzzy
+msgid "Review status"
 msgstr "состояние рецензии"
 
-msgid "episode"
-msgstr "эпизод"
-
-msgid "health issue"
-msgstr "медицинская проблема"
+msgid "Health issue"
+msgstr "Медицинская проблема"
 
-msgid "type"
-msgstr "тип"
+msgid "Organization"
+msgstr "Организация"
 
 msgid "Sort newest documents to top of tree."
 msgstr "Сортировать свежие документы в главном дереве."
@@ -5672,6 +5677,10 @@ msgstr "Сортировать документы по принадлежнос
 msgid "Sort documents by their type."
 msgstr "Сортировать документы по их типам."
 
+#, fuzzy
+msgid "Sort documents by the organization they are from."
+msgstr "Сортировать документы по принадлежности к  эпизодам."
+
 msgid "Sort documents by"
 msgstr "Сортировать документы по"
 
@@ -5994,9 +6003,6 @@ msgstr "Название организационного подразделен
 msgid "The category of the organizational unit."
 msgstr "Категория организационного подразделения."
 
-msgid "Organization"
-msgstr "Организация"
-
 msgid "Unit"
 msgstr "Единица измерения"
 
@@ -6171,9 +6177,6 @@ msgid ""
 "(SQL query)"
 msgstr ""
 
-msgid "Source"
-msgstr "Исходник"
-
 msgid "URL"
 msgstr "URL"
 
@@ -8118,9 +8121,6 @@ msgstr "скорректированный результат"
 msgid "missing, reported later"
 msgstr "отсутсвует, будет сообщено позже"
 
-msgid "Health issue"
-msgstr "Медицинская проблема"
-
 #, fuzzy
 msgid "External care"
 msgstr "Внешний код"
@@ -8156,6 +8156,10 @@ msgstr "Семейный анамнез"
 msgid "Document"
 msgstr "Документы"
 
+#, fuzzy
+msgid "Inbox message"
+msgstr "Изменение почтового сообщения"
+
 #, python-format
 msgid "unmapped entry type from table [%s]"
 msgstr ""
@@ -9933,6 +9937,9 @@ msgstr "когда"
 msgid "who"
 msgstr "кто"
 
+msgid "type"
+msgstr "тип"
+
 msgid "entry"
 msgstr "запись"
 
@@ -10944,6 +10951,9 @@ msgstr ""
 msgid "nicotine"
 msgstr ""
 
+msgid "ethanol"
+msgstr ""
+
 #, fuzzy
 msgid "unit"
 msgstr "единицы измерения"
@@ -12313,9 +12323,6 @@ msgstr "Примечания"
 msgid "Progress Note"
 msgstr "Рабочая запись"
 
-msgid "Age"
-msgstr "Возраст"
-
 msgid "N/A"
 msgstr "Нет данных"
 
@@ -13872,6 +13879,14 @@ msgstr "Гражданин"
 msgid "Show selected address on map"
 msgstr "должен выбрать адрес"
 
+#, fuzzy
+msgid "Distance"
+msgstr "Вещество"
+
+#, fuzzy
+msgid "Show distance from your praxis"
+msgstr "Ваше заключение"
+
 msgid "Adding new address"
 msgstr "Добавление нового адреса."
 
@@ -14123,6 +14138,33 @@ msgstr ""
 msgid "Find next [%s] (<CTRL-N>)"
 msgstr ""
 
+#, fuzzy
+msgid "&All rows"
+msgstr "Пользователи &All"
+
+msgid "All rows as &CSV"
+msgstr ""
+
+msgid "&Tooltips of all rows"
+msgstr ""
+
+msgid "&Data of all rows"
+msgstr ""
+
+#, fuzzy
+msgid "&Selected rows"
+msgstr "&Select"
+
+msgid "&Selected rows as CSV"
+msgstr ""
+
+msgid "&Tooltips of selected rows"
+msgstr ""
+
+#, fuzzy
+msgid "&Data of selected rows"
+msgstr "Не переформатировать текст"
+
 msgid "Tooltips of selected rows"
 msgstr ""
 
@@ -14156,8 +14198,8 @@ msgid "Column &%s (current row): %s"
 msgstr "Документы: %s"
 
 #, fuzzy
-msgid "Copy to e&xport area..."
-msgstr "Активирование пациента из  полученного списка"
+msgid "&Save to file..."
+msgstr " Сохранить "
 
 #, fuzzy
 msgid "&Copy to clipboard..."
@@ -14189,6 +14231,30 @@ msgid ""
 "%s"
 msgstr "Ввод условия для писка:"
 
+#, python-format
+msgid "All rows saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All tooltips saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All data saved to [%s]."
+msgstr ""
+
+#, fuzzy, python-format
+msgid "Selected rows saved to [%s]."
+msgstr "Удаленное определение отчета [%s]."
+
+#, fuzzy, python-format
+msgid "Selected tooltips saved to [%s]."
+msgstr "Удаленное определение отчета [%s]."
+
+#, fuzzy, python-format
+msgid "Selected data saved to [%s]."
+msgstr "Установить язык базы данных на [%s]."
+
 msgid "Monty the Serpent && the FSF Present"
 msgstr "Змея Monty && существующий FSF"
 
@@ -15882,6 +15948,10 @@ msgstr "сортировка по медицинской проблеме"
 msgid "sorted by type"
 msgstr "сортированное по типу"
 
+#, fuzzy
+msgid "sorted by organization"
+msgstr "Добавление новой организации"
+
 msgid "Cannot load documents. No active patient."
 msgstr "Не удалось загрузить документы. Нет активного пациента."
 
@@ -15969,6 +16039,10 @@ msgstr "%s%7s %s:%s (%s часть(и)%s)"
 msgid "%s (unattributed episode)"
 msgstr "Эпизоды без принадлежности"
 
+#, fuzzy
+msgid "unknown organization"
+msgstr "неизвестная реакция"
+
 #, python-format
 msgid "part %2s"
 msgstr "часть %2s"
@@ -21096,6 +21170,19 @@ msgstr "Отменить"
 msgid "Abort and do NOT connect to GNUmed."
 msgstr "Отменить и НЕ подключаться к GNUmed."
 
+#~ msgid "age"
+#~ msgstr "возраст"
+
+#~ msgid "episode"
+#~ msgstr "эпизод"
+
+#~ msgid "health issue"
+#~ msgstr "медицинская проблема"
+
+#, fuzzy
+#~ msgid "Copy to e&xport area..."
+#~ msgstr "Активирование пациента из  полученного списка"
+
 #, fuzzy
 #~ msgid "&Entry time"
 #~ msgstr "Время окончания "
diff --git a/client/po/sq-gnumed.mo b/client/po/sq-gnumed.mo
index 170e91a..73ba2d1 100644
Binary files a/client/po/sq-gnumed.mo and b/client/po/sq-gnumed.mo differ
diff --git a/client/po/sq.po b/client/po/sq.po
index 189690d..d461b6c 100644
--- a/client/po/sq.po
+++ b/client/po/sq.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnumed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-06 11:40+0200\n"
+"POT-Creation-Date: 2016-05-26 12:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -2266,12 +2266,6 @@ msgstr "Liste mjekimi"
 msgid "New patient ID:"
 msgstr "Mjekime aktive: %s"
 
-msgid "Your review"
-msgstr ""
-
-msgid "Reviews by others"
-msgstr ""
-
 msgid "(you are/are not the primary reviewer)"
 msgstr ""
 
@@ -2304,6 +2298,9 @@ msgid ""
 "in a new episode name to associate a different one."
 msgstr ""
 
+msgid "The organizational unit this document originates from."
+msgstr ""
+
 msgid "Enter the date of creation of the document."
 msgstr ""
 
@@ -2358,9 +2355,18 @@ msgstr ""
 msgid "Cancel this review."
 msgstr ""
 
+msgid "Your review"
+msgstr ""
+
+msgid "Reviews by others"
+msgstr ""
+
 msgid "Episode"
 msgstr ""
 
+msgid "Source"
+msgstr ""
+
 msgid "Date"
 msgstr ""
 
@@ -4974,19 +4980,16 @@ msgstr ""
 msgid "Close this dialog."
 msgstr ""
 
-msgid "age"
-msgstr ""
-
-msgid "review status"
+msgid "Age"
 msgstr ""
 
-msgid "episode"
+msgid "Review status"
 msgstr ""
 
-msgid "health issue"
-msgstr ""
+msgid "Health issue"
+msgstr "Ceshtje shendeti"
 
-msgid "type"
+msgid "Organization"
 msgstr ""
 
 msgid "Sort newest documents to top of tree."
@@ -5004,6 +5007,9 @@ msgstr ""
 msgid "Sort documents by their type."
 msgstr ""
 
+msgid "Sort documents by the organization they are from."
+msgstr ""
+
 msgid "Sort documents by"
 msgstr ""
 
@@ -5274,9 +5280,6 @@ msgstr ""
 msgid "The category of the organizational unit."
 msgstr ""
 
-msgid "Organization"
-msgstr ""
-
 msgid "Unit"
 msgstr ""
 
@@ -5439,9 +5442,6 @@ msgid ""
 "(SQL query)"
 msgstr ""
 
-msgid "Source"
-msgstr ""
-
 msgid "URL"
 msgstr ""
 
@@ -7183,9 +7183,6 @@ msgstr ""
 msgid "missing, reported later"
 msgstr ""
 
-msgid "Health issue"
-msgstr "Ceshtje shendeti"
-
 msgid "External care"
 msgstr ""
 
@@ -7219,6 +7216,10 @@ msgstr "Historiku Familjar"
 msgid "Document"
 msgstr "Dokumenta:"
 
+#, fuzzy
+msgid "Inbox message"
+msgstr "mesazh informues i pergjithshem"
+
 #, python-format
 msgid "unmapped entry type from table [%s]"
 msgstr ""
@@ -8874,6 +8875,9 @@ msgstr ""
 msgid "who"
 msgstr ""
 
+msgid "type"
+msgstr ""
+
 msgid "entry"
 msgstr ""
 
@@ -9733,6 +9737,9 @@ msgstr ""
 msgid "nicotine"
 msgstr ""
 
+msgid "ethanol"
+msgstr ""
+
 #, fuzzy
 msgid "unit"
 msgstr "njesi"
@@ -10947,9 +10954,6 @@ msgstr ""
 msgid "Progress Note"
 msgstr ""
 
-msgid "Age"
-msgstr ""
-
 msgid "N/A"
 msgstr ""
 
@@ -12261,6 +12265,14 @@ msgstr "Mars"
 msgid "Show selected address on map"
 msgstr ""
 
+#, fuzzy
+msgid "Distance"
+msgstr "Substance"
+
+#, fuzzy
+msgid "Show distance from your praxis"
+msgstr "orë"
+
 msgid "Adding new address"
 msgstr ""
 
@@ -12484,6 +12496,32 @@ msgstr ""
 msgid "Find next [%s] (<CTRL-N>)"
 msgstr ""
 
+msgid "&All rows"
+msgstr ""
+
+msgid "All rows as &CSV"
+msgstr ""
+
+msgid "&Tooltips of all rows"
+msgstr ""
+
+msgid "&Data of all rows"
+msgstr ""
+
+#, fuzzy
+msgid "&Selected rows"
+msgstr "Zgjidhni ngjarje"
+
+msgid "&Selected rows as CSV"
+msgstr ""
+
+msgid "&Tooltips of selected rows"
+msgstr ""
+
+#, fuzzy
+msgid "&Data of selected rows"
+msgstr "Dyfishoni ngjarjen e zgjedhur"
+
 msgid "Tooltips of selected rows"
 msgstr ""
 
@@ -12513,9 +12551,8 @@ msgstr ""
 msgid "Column &%s (current row): %s"
 msgstr "Dokumente: %s"
 
-#, fuzzy
-msgid "Copy to e&xport area..."
-msgstr "E pamundur te kopjoj"
+msgid "&Save to file..."
+msgstr ""
 
 #, fuzzy
 msgid "&Copy to clipboard..."
@@ -12546,6 +12583,30 @@ msgid ""
 "%s"
 msgstr ""
 
+#, python-format
+msgid "All rows saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All tooltips saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All data saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected rows saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected tooltips saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected data saved to [%s]."
+msgstr ""
+
 msgid "Monty the Serpent && the FSF Present"
 msgstr ""
 
@@ -13984,6 +14045,10 @@ msgstr ""
 msgid "sorted by type"
 msgstr ""
 
+#, fuzzy
+msgid "sorted by organization"
+msgstr "Organizate: %s (%s)"
+
 msgid "Cannot load documents. No active patient."
 msgstr ""
 
@@ -14070,6 +14135,10 @@ msgstr ""
 msgid "%s (unattributed episode)"
 msgstr ""
 
+#, fuzzy
+msgid "unknown organization"
+msgstr "rekasion i panjohur"
+
 #, python-format
 msgid "part %2s"
 msgstr ""
@@ -18356,6 +18425,10 @@ msgid "Abort and do NOT connect to GNUmed."
 msgstr ""
 
 #, fuzzy
+#~ msgid "Copy to e&xport area..."
+#~ msgstr "E pamundur te kopjoj"
+
+#, fuzzy
 #~ msgid "&Entry time"
 #~ msgstr "Koha e mbarimit "
 
diff --git a/client/po/sr-gnumed.mo b/client/po/sr-gnumed.mo
index f3de810..ed46942 100644
Binary files a/client/po/sr-gnumed.mo and b/client/po/sr-gnumed.mo differ
diff --git a/client/po/sr.po b/client/po/sr.po
index dd2fec8..34320f4 100644
--- a/client/po/sr.po
+++ b/client/po/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnumed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-06 11:40+0200\n"
+"POT-Creation-Date: 2016-05-26 12:47+0200\n"
 "PO-Revision-Date: 2011-08-25 16:54+0000\n"
 "Last-Translator: Karolina Kalic <Unknown>\n"
 "Language-Team: Serbian <sr at li.org>\n"
@@ -2181,12 +2181,6 @@ msgstr "Листа лекова"
 msgid "New patient ID:"
 msgstr "Активни проблеми"
 
-msgid "Your review"
-msgstr ""
-
-msgid "Reviews by others"
-msgstr ""
-
 msgid "(you are/are not the primary reviewer)"
 msgstr ""
 
@@ -2219,6 +2213,10 @@ msgid ""
 "in a new episode name to associate a different one."
 msgstr ""
 
+#, fuzzy
+msgid "The organizational unit this document originates from."
+msgstr "Уреди вакцинације"
+
 msgid "Enter the date of creation of the document."
 msgstr ""
 
@@ -2273,9 +2271,18 @@ msgstr ""
 msgid "Cancel this review."
 msgstr ""
 
+msgid "Your review"
+msgstr ""
+
+msgid "Reviews by others"
+msgstr ""
+
 msgid "Episode"
 msgstr ""
 
+msgid "Source"
+msgstr ""
+
 msgid "Date"
 msgstr ""
 
@@ -4922,20 +4929,16 @@ msgstr ""
 msgid "Close this dialog."
 msgstr ""
 
-msgid "age"
-msgstr ""
-
-msgid "review status"
+msgid "Age"
 msgstr ""
 
-msgid "episode"
+msgid "Review status"
 msgstr ""
 
-#, fuzzy
-msgid "health issue"
+msgid "Health issue"
 msgstr "Здравствени проблем"
 
-msgid "type"
+msgid "Organization"
 msgstr ""
 
 msgid "Sort newest documents to top of tree."
@@ -4953,6 +4956,9 @@ msgstr ""
 msgid "Sort documents by their type."
 msgstr ""
 
+msgid "Sort documents by the organization they are from."
+msgstr ""
+
 msgid "Sort documents by"
 msgstr ""
 
@@ -5224,9 +5230,6 @@ msgstr ""
 msgid "The category of the organizational unit."
 msgstr ""
 
-msgid "Organization"
-msgstr ""
-
 msgid "Unit"
 msgstr ""
 
@@ -5390,9 +5393,6 @@ msgid ""
 "(SQL query)"
 msgstr ""
 
-msgid "Source"
-msgstr ""
-
 msgid "URL"
 msgstr ""
 
@@ -7120,9 +7120,6 @@ msgstr "исправљен резултат"
 msgid "missing, reported later"
 msgstr "недостаје, пријављено касније"
 
-msgid "Health issue"
-msgstr "Здравствени проблем"
-
 msgid "External care"
 msgstr ""
 
@@ -7159,6 +7156,10 @@ msgstr "Породична историја"
 msgid "Document"
 msgstr "Документа:"
 
+#, fuzzy
+msgid "Inbox message"
+msgstr "генеричка порука за обавештење"
+
 #, python-format
 msgid "unmapped entry type from table [%s]"
 msgstr ""
@@ -8810,6 +8811,9 @@ msgstr ""
 msgid "who"
 msgstr ""
 
+msgid "type"
+msgstr ""
+
 msgid "entry"
 msgstr ""
 
@@ -9685,6 +9689,9 @@ msgstr ""
 msgid "nicotine"
 msgstr ""
 
+msgid "ethanol"
+msgstr ""
+
 #, fuzzy
 msgid "unit"
 msgstr "једиице"
@@ -10914,9 +10921,6 @@ msgstr ""
 msgid "Progress Note"
 msgstr ""
 
-msgid "Age"
-msgstr ""
-
 msgid "N/A"
 msgstr ""
 
@@ -12232,6 +12236,13 @@ msgstr ""
 msgid "Show selected address on map"
 msgstr "Брисање вакцине"
 
+#, fuzzy
+msgid "Distance"
+msgstr "Супстанца"
+
+msgid "Show distance from your praxis"
+msgstr ""
+
 msgid "Adding new address"
 msgstr ""
 
@@ -12457,6 +12468,34 @@ msgstr ""
 msgid "Find next [%s] (<CTRL-N>)"
 msgstr ""
 
+msgid "&All rows"
+msgstr ""
+
+msgid "All rows as &CSV"
+msgstr ""
+
+msgid "&Tooltips of all rows"
+msgstr ""
+
+msgid "&Data of all rows"
+msgstr ""
+
+#, fuzzy
+msgid "&Selected rows"
+msgstr "Брисање вакцине"
+
+msgid "&Selected rows as CSV"
+msgstr ""
+
+msgid "&Tooltips of selected rows"
+msgstr ""
+
+#, fuzzy
+msgid "&Data of selected rows"
+msgstr ""
+"\n"
+"Комплетна историја вакцинације овог пацијента.\n"
+
 msgid "Tooltips of selected rows"
 msgstr ""
 
@@ -12486,9 +12525,8 @@ msgstr ""
 msgid "Column &%s (current row): %s"
 msgstr "Документа: %s"
 
-#, fuzzy
-msgid "Copy to e&xport area..."
-msgstr "Додавање нове вакцине"
+msgid "&Save to file..."
+msgstr ""
 
 #, fuzzy
 msgid "&Copy to clipboard..."
@@ -12518,6 +12556,30 @@ msgid ""
 "%s"
 msgstr ""
 
+#, python-format
+msgid "All rows saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All tooltips saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All data saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected rows saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected tooltips saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected data saved to [%s]."
+msgstr ""
+
 msgid "Monty the Serpent && the FSF Present"
 msgstr ""
 
@@ -13983,6 +14045,10 @@ msgstr "Здравствени проблем"
 msgid "sorted by type"
 msgstr ""
 
+#, fuzzy
+msgid "sorted by organization"
+msgstr "Уреди вакцинације"
+
 msgid "Cannot load documents. No active patient."
 msgstr ""
 
@@ -14071,6 +14137,10 @@ msgstr ""
 msgid "%s (unattributed episode)"
 msgstr ""
 
+#, fuzzy
+msgid "unknown organization"
+msgstr "непозната реакција"
+
 #, python-format
 msgid "part %2s"
 msgstr ""
@@ -18427,6 +18497,14 @@ msgid "Abort and do NOT connect to GNUmed."
 msgstr ""
 
 #, fuzzy
+#~ msgid "health issue"
+#~ msgstr "Здравствени проблем"
+
+#, fuzzy
+#~ msgid "Copy to e&xport area..."
+#~ msgstr "Додавање нове вакцине"
+
+#, fuzzy
 #~ msgid ""
 #~ "Health issue: %s%s%s (%s versions)\n"
 #~ "\n"
diff --git a/client/po/sv-gnumed.mo b/client/po/sv-gnumed.mo
index 7607222..321bf13 100644
Binary files a/client/po/sv-gnumed.mo and b/client/po/sv-gnumed.mo differ
diff --git a/client/po/sv.po b/client/po/sv.po
index e2e1aa7..2e07c99 100644
--- a/client/po/sv.po
+++ b/client/po/sv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnumed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-06 11:40+0200\n"
+"POT-Creation-Date: 2016-05-26 12:47+0200\n"
 "PO-Revision-Date: 2012-04-07 10:15+0000\n"
 "Last-Translator: Rikard Edgren <Unknown>\n"
 "Language-Team: Swedish <kde-i18n-doc at kde.org>\n"
@@ -45,6 +45,9 @@ msgid ""
 "You are trying to open an old file with a new version of timeline. Please "
 "install version 0.21.1 of timeline to convert it to the new format."
 msgstr ""
+"Du försöker öppna en fil med ett gammalt format med en ny version av "
+"Timeline. Du måste installera version 0.21.1 av Timeline för att konvertera "
+"filen till det nya formatet."
 
 msgid "Other timelines can't be imported to a directory timeline"
 msgstr "Man kan inte importera andra Timelines till en katalog-timeline"
@@ -123,7 +126,7 @@ msgid "Container"
 msgstr "Behållare:"
 
 msgid "?"
-msgstr ""
+msgstr "?"
 
 #, fuzzy
 msgid "Resize me"
@@ -133,9 +136,11 @@ msgid ""
 "Container Subevent 1\n"
 "Click on the event to get the resize handles"
 msgstr ""
+"Händels i container\n"
+"Klicka på händelsen för att få handtag för storleksändring"
 
 msgid "Drag me"
-msgstr ""
+msgstr "Dra mig"
 
 msgid ""
 "Container Subevent 2\n"
@@ -225,7 +230,7 @@ msgid "Start time can't be after end time"
 msgstr "Starttiden kan inte vara efter sluttiden"
 
 msgid "Duration"
-msgstr ""
+msgstr "Varaktighet"
 
 #, python-format
 msgid "Unable to save timeline data to '%s'. File left unmodified."
@@ -329,31 +334,31 @@ msgid "Delete"
 msgstr "Ta bort"
 
 msgid "Check All"
-msgstr ""
+msgstr "Markera alla"
 
 msgid "Check children"
-msgstr ""
+msgstr "Markera undernivåer"
 
 msgid "Check all children"
-msgstr ""
+msgstr "Markera alla undernivåer"
 
 msgid "Check all parents"
-msgstr ""
+msgstr "Markera alla överliggande nivåer"
 
 msgid "Check parents for checked children"
 msgstr ""
 
 msgid "Uncheck All"
-msgstr ""
+msgstr "Avmarkera alla"
 
 msgid "Uncheck children"
-msgstr ""
+msgstr "Avmarkera undernivåer"
 
 msgid "Uncheck all children"
-msgstr ""
+msgstr "Avmarkera alla undernivåer"
 
 msgid "Uncheck all parents"
-msgstr ""
+msgstr "Avmarkera alla överliggande nivåer"
 
 msgid "Check all parents of all childs"
 msgstr ""
@@ -391,7 +396,7 @@ msgid "Invalid date"
 msgstr "Ogiltigt datum"
 
 msgid "Give feedback"
-msgstr ""
+msgstr "Ge återkoppling"
 
 msgid "Add new"
 msgstr "Lägg till ny"
@@ -400,13 +405,13 @@ msgid "Edit categories"
 msgstr "Redigera kategorier"
 
 msgid "Select a Category:"
-msgstr ""
+msgstr "Välj en kategori:"
 
 msgid "Set Category on events without category"
-msgstr ""
+msgstr "Sätt Kategori på Händelser utan Kategori"
 
 msgid "Set Category on selected events"
-msgstr ""
+msgstr "Välj kategori för markerade händelser"
 
 msgid "Show time"
 msgstr "Visa tid"
@@ -416,10 +421,10 @@ msgid "Found Events"
 msgstr "Händelser"
 
 msgid "&Enlarge"
-msgstr ""
+msgstr "&Förstora"
 
 msgid "&Reduce"
-msgstr ""
+msgstr "&Reducera"
 
 msgid "Event Properties"
 msgstr "Egenskaper för Händelse"
@@ -464,10 +469,10 @@ msgid "Icon"
 msgstr "Ikon"
 
 msgid "Hyperlink"
-msgstr ""
+msgstr "Hyperlänk"
 
 msgid "Progress"
-msgstr ""
+msgstr "Framsteg"
 
 msgid "Add more events after this one"
 msgstr "Lägg till fler händelser efter denna"
@@ -482,37 +487,39 @@ msgid "Create Event"
 msgstr "Skapa Händelse"
 
 msgid "Email Feedback"
-msgstr ""
+msgstr "Återkoppling Email"
 
 msgid "Default client"
-msgstr ""
+msgstr "Förvald klient"
 
 msgid "Gmail"
-msgstr ""
+msgstr "Gmail"
 
 msgid "Other email client"
-msgstr ""
+msgstr "Annan epostklient"
 
 msgid ""
 "Copy and paste this email into your favorite email client and send it from "
 "there."
 msgstr ""
+"Kopiera och klistra in detta email i den epostklient du föredrar och skicka "
+"det därifrån."
 
 msgid "Other"
-msgstr ""
+msgstr "Övriga"
 
 msgid "To:"
-msgstr ""
+msgstr "Till:"
 
 #, fuzzy
 msgid "Subject:"
 msgstr "Välj Ikon"
 
 msgid "Body:"
-msgstr ""
+msgstr "Innehåll:"
 
 msgid "Send With:"
-msgstr ""
+msgstr "Skicka med:"
 
 msgid "&File"
 msgstr "&Arkiv"
@@ -540,7 +547,7 @@ msgid "Open &Recent"
 msgstr "Öppna s&enaste"
 
 msgid "Save As..."
-msgstr ""
+msgstr "Spara som…"
 
 msgid "Import timeline..."
 msgstr ""
@@ -574,7 +581,7 @@ msgid "Find Categories..."
 msgstr "Redigera Kategorier"
 
 msgid "Shortcuts..."
-msgstr ""
+msgstr "Genvägar..."
 
 msgid "&Edit"
 msgstr "&Redigera"
@@ -593,13 +600,13 @@ msgid "Zoom &In\tCtrl++"
 msgstr "Gå till &Noll \t Ctrl+0"
 
 msgid "Zoom &Out\tCtrl+-"
-msgstr ""
+msgstr "Z&ooma Ut\tCtrl+-"
 
 msgid "Vertical Zoom &In\tAlt++"
-msgstr ""
+msgstr "Zooma in vertikalt\tAlt++"
 
 msgid "Vertical Zoom &Out\tAlt+-"
-msgstr ""
+msgstr "Zooma ut vertikalt\tAlt+-"
 
 msgid "&View"
 msgstr "&Visa"
@@ -608,25 +615,25 @@ msgid "Create &Event..."
 msgstr "Skapa &Händelse..."
 
 msgid "&Edit Selected Event..."
-msgstr ""
+msgstr "&Editera valda Händelser..."
 
 msgid "&Duplicate Selected Event..."
 msgstr "&Duplicera Markerad Händelse..."
 
 msgid "Set Category on Selected Events..."
-msgstr ""
+msgstr "Sätt Kategori på valda Händelser..."
 
 msgid "&Measure Distance between two Events..."
 msgstr "&Mät avståndet mellan två händelser..."
 
 msgid "Set Category on events &without category..."
-msgstr ""
+msgstr "Välj kategori för alla händelser som saknar kategori..."
 
 msgid "Edit &Categories"
 msgstr "Redigera &Kategorier"
 
 msgid "&Read Only"
-msgstr ""
+msgstr "Sk&rivskyddad"
 
 msgid "&Timeline"
 msgstr "&Tidslinje"
@@ -647,7 +654,7 @@ msgid "&Navigate"
 msgstr "&Navigera"
 
 msgid "Feedback"
-msgstr ""
+msgstr "Återkoppling"
 
 msgid "&Contents\tF1"
 msgstr "&Innehåll\tF1"
@@ -657,7 +664,7 @@ msgid "Getting started &tutorial"
 msgstr "Kom igång övning"
 
 msgid "Give &Feedback..."
-msgstr ""
+msgstr "Ge &Feedback..."
 
 #, fuzzy
 msgid "Co&ntact"
@@ -691,7 +698,7 @@ msgid "Open Timeline"
 msgstr "Öppna Tidslinje"
 
 msgid "Save Timeline As"
-msgstr ""
+msgstr "Spara Timeline som"
 
 #, fuzzy
 msgid ""
@@ -731,7 +738,7 @@ msgid "Contact"
 msgstr "Kontakta"
 
 msgid "View Categories Individually"
-msgstr ""
+msgstr "Visa enbart markerade Kategorier"
 
 #, python-format
 msgid "Category name '%s' not valid. Must be non-empty."
@@ -783,16 +790,16 @@ msgid "Category Finder"
 msgstr "Kategorier"
 
 msgid "Check"
-msgstr ""
+msgstr "Markera"
 
 msgid "Uncheck"
-msgstr ""
+msgstr "Avmarkera"
 
 msgid "Feedback On Feature"
-msgstr ""
+msgstr "Återkoppling av funktion"
 
 msgid "Give Feedback"
-msgstr ""
+msgstr "Tyck till/Lämna respons"
 
 msgid "Help"
 msgstr "Hjälp"
@@ -827,7 +834,7 @@ msgid "Container Properties"
 msgstr "Egenskaper för Behållare"
 
 msgid "Edit Shortcuts"
-msgstr ""
+msgstr "Redigera snabbtangenter"
 
 #, fuzzy
 msgid "Functions:"
@@ -838,7 +845,7 @@ msgid "Modifier:"
 msgstr "Ändrat fält."
 
 msgid "Shortcut Key:"
-msgstr ""
+msgstr "Snabbtangent:"
 
 msgid "Unable to copy to clipboard."
 msgstr "Misslyckades med att kopiera till klippbordet"
@@ -876,30 +883,30 @@ msgid "Error"
 msgstr "Fel"
 
 msgid "Warning"
-msgstr ""
+msgstr "Varning"
 
 #, fuzzy
 msgid "Question"
 msgstr "Reaktion"
 
 msgid "Both Modifier and Shortcut key must be given!"
-msgstr ""
+msgstr "Både modifierare och snabbtangent måste anges!"
 
 #, python-format
 msgid "The shortcut %s is already bound to function '%s'!"
-msgstr ""
+msgstr "Snabbtangenten %s är redan kopplad till funktionen '%s'!"
 
 msgid "You must select a category!"
 msgstr "Du måste välja en kategori!"
 
 msgid "Progress %:"
-msgstr ""
+msgstr "Framsteg %:"
 
 msgid "Test"
 msgstr ""
 
 msgid "URL:"
-msgstr ""
+msgstr "URL:"
 
 #, python-format
 msgid "Images will be scaled to fit inside a %ix%i box."
@@ -1127,7 +1134,7 @@ msgstr ""
 "händelse.\n"
 
 msgid "Move event vertically"
-msgstr ""
+msgstr "Flytta händelser vertikalt"
 
 msgid ""
 "\n"
@@ -1279,7 +1286,7 @@ msgid "Sticky Balloon"
 msgstr "Fäst ballong"
 
 msgid "Goto URL"
-msgstr ""
+msgstr "Gå till URL"
 
 msgid "Center"
 msgstr "Centrera"
@@ -1357,7 +1364,7 @@ msgid "Fit Month"
 msgstr "Anpassa Månad"
 
 msgid "Fit Week"
-msgstr ""
+msgstr "Anpassa Vecka"
 
 msgid "Fit Day"
 msgstr "Anpassa Dag"
@@ -1432,7 +1439,7 @@ msgid "Go to Time"
 msgstr "Gå till tid"
 
 msgid "File"
-msgstr ""
+msgstr "Arkiv"
 
 #, fuzzy
 msgid "View"
@@ -1443,7 +1450,7 @@ msgid "Navigate"
 msgstr "&Navigera"
 
 msgid "Import..."
-msgstr ""
+msgstr "Importera..."
 
 #, fuzzy
 msgid "Export Current view to Image..."
@@ -1458,13 +1465,13 @@ msgid "Export to SVG..."
 msgstr "Exportera som &SVG..."
 
 msgid "Exit"
-msgstr ""
+msgstr "Avsluta"
 
 msgid "Find"
-msgstr ""
+msgstr "Sök"
 
 msgid "Shortcuts"
-msgstr ""
+msgstr "Snabbkommandon"
 
 #, fuzzy
 msgid "Sidebar"
@@ -1487,10 +1494,10 @@ msgid "Zoom Out"
 msgstr "Zooma"
 
 msgid "Vertical Zoom In"
-msgstr ""
+msgstr "Zooma in vertikalt"
 
 msgid "Vertical Zoom Out"
-msgstr ""
+msgstr "Zomma ut vertikalt"
 
 #, fuzzy
 msgid "Edit Selected Event"
@@ -1509,14 +1516,14 @@ msgid "Measure Distance between two Events"
 msgstr "&Mät avståndet mellan två händelser..."
 
 msgid "Read Only"
-msgstr ""
+msgstr "Skrivskyddad"
 
 #, fuzzy
 msgid "Contents"
 msgstr "&Innehåll\tF1"
 
 msgid "About"
-msgstr ""
+msgstr "Om"
 
 #, fuzzy
 msgid "Find First Event"
@@ -2313,12 +2320,6 @@ msgstr "Medicinlista"
 msgid "New patient ID:"
 msgstr "internt patient-ID"
 
-msgid "Your review"
-msgstr ""
-
-msgid "Reviews by others"
-msgstr ""
-
 msgid "(you are/are not the primary reviewer)"
 msgstr ""
 
@@ -2351,6 +2352,12 @@ msgid ""
 "in a new episode name to associate a different one."
 msgstr ""
 
+#, fuzzy
+msgid "The organizational unit this document originates from."
+msgstr ""
+"\n"
+"Välj den undersökningstyp du vill redigera!\n"
+
 msgid "Enter the date of creation of the document."
 msgstr ""
 
@@ -2405,9 +2412,18 @@ msgstr ""
 msgid "Cancel this review."
 msgstr ""
 
+msgid "Your review"
+msgstr ""
+
+msgid "Reviews by others"
+msgstr ""
+
 msgid "Episode"
 msgstr "Episod"
 
+msgid "Source"
+msgstr ""
+
 msgid "Date"
 msgstr ""
 
@@ -2648,7 +2664,7 @@ msgid "Browse"
 msgstr ""
 
 msgid "Export"
-msgstr ""
+msgstr "Exportera"
 
 msgid "Upload"
 msgstr ""
@@ -4170,7 +4186,7 @@ msgid "↢ C&lipboard"
 msgstr ""
 
 msgid "&Remove"
-msgstr ""
+msgstr "Ta bo&rt"
 
 msgid "&Print"
 msgstr ""
@@ -5121,19 +5137,16 @@ msgstr "Redigera undersökningens innehåll."
 msgid "Close this dialog."
 msgstr ""
 
-msgid "age"
-msgstr ""
-
-msgid "review status"
+msgid "Age"
 msgstr ""
 
-msgid "episode"
+msgid "Review status"
 msgstr ""
 
-msgid "health issue"
-msgstr ""
+msgid "Health issue"
+msgstr "Vårdbeteckning"
 
-msgid "type"
+msgid "Organization"
 msgstr ""
 
 msgid "Sort newest documents to top of tree."
@@ -5151,6 +5164,9 @@ msgstr ""
 msgid "Sort documents by their type."
 msgstr ""
 
+msgid "Sort documents by the organization they are from."
+msgstr ""
+
 msgid "Sort documents by"
 msgstr ""
 
@@ -5422,9 +5438,6 @@ msgstr ""
 msgid "The category of the organizational unit."
 msgstr ""
 
-msgid "Organization"
-msgstr ""
-
 msgid "Unit"
 msgstr ""
 
@@ -5587,9 +5600,6 @@ msgid ""
 "(SQL query)"
 msgstr ""
 
-msgid "Source"
-msgstr ""
-
 msgid "URL"
 msgstr ""
 
@@ -7390,9 +7400,6 @@ msgstr "korrigerade resultat"
 msgid "missing, reported later"
 msgstr "fattas, rapporteras senare"
 
-msgid "Health issue"
-msgstr "Vårdbeteckning"
-
 #, fuzzy
 msgid "External care"
 msgstr "externt patient-ID"
@@ -7425,6 +7432,10 @@ msgstr "Familjehistoria"
 msgid "Document"
 msgstr "Dokument:"
 
+#, fuzzy
+msgid "Inbox message"
+msgstr "Allmänt informationsmeddelande"
+
 #, python-format
 msgid "unmapped entry type from table [%s]"
 msgstr ""
@@ -9111,6 +9122,9 @@ msgstr ""
 msgid "who"
 msgstr ""
 
+msgid "type"
+msgstr ""
+
 msgid "entry"
 msgstr ""
 
@@ -9983,6 +9997,9 @@ msgstr ""
 msgid "nicotine"
 msgstr ""
 
+msgid "ethanol"
+msgstr ""
+
 #, fuzzy
 msgid "unit"
 msgstr "enheter"
@@ -11202,9 +11219,6 @@ msgstr ""
 msgid "Progress Note"
 msgstr ""
 
-msgid "Age"
-msgstr ""
-
 msgid "N/A"
 msgstr ""
 
@@ -12517,6 +12531,14 @@ msgstr ""
 "\n"
 "Välj den undersökningstyp du vill redigera!\n"
 
+#, fuzzy
+msgid "Distance"
+msgstr "Substans"
+
+#, fuzzy
+msgid "Show distance from your praxis"
+msgstr "timmar"
+
 msgid "Adding new address"
 msgstr ""
 
@@ -12743,6 +12765,32 @@ msgstr ""
 msgid "Find next [%s] (<CTRL-N>)"
 msgstr ""
 
+msgid "&All rows"
+msgstr ""
+
+msgid "All rows as &CSV"
+msgstr ""
+
+msgid "&Tooltips of all rows"
+msgstr ""
+
+msgid "&Data of all rows"
+msgstr ""
+
+#, fuzzy
+msgid "&Selected rows"
+msgstr "Välj händelse"
+
+msgid "&Selected rows as CSV"
+msgstr ""
+
+msgid "&Tooltips of selected rows"
+msgstr ""
+
+#, fuzzy
+msgid "&Data of selected rows"
+msgstr "Duplicera den Markerade Händelsen"
+
 msgid "Tooltips of selected rows"
 msgstr ""
 
@@ -12772,9 +12820,8 @@ msgstr ""
 msgid "Column &%s (current row): %s"
 msgstr "Dokument: %s"
 
-#, fuzzy
-msgid "Copy to e&xport area..."
-msgstr "Lägger till ny undersökningstyp"
+msgid "&Save to file..."
+msgstr ""
 
 #, fuzzy
 msgid "&Copy to clipboard..."
@@ -12805,6 +12852,30 @@ msgid ""
 "%s"
 msgstr ""
 
+#, python-format
+msgid "All rows saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All tooltips saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All data saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected rows saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected tooltips saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected data saved to [%s]."
+msgstr ""
+
 msgid "Monty the Serpent && the FSF Present"
 msgstr ""
 
@@ -14263,6 +14334,10 @@ msgstr ""
 msgid "sorted by type"
 msgstr ""
 
+#, fuzzy
+msgid "sorted by organization"
+msgstr "Senaste vaccineringar"
+
 msgid "Cannot load documents. No active patient."
 msgstr ""
 
@@ -14349,6 +14424,10 @@ msgstr ""
 msgid "%s (unattributed episode)"
 msgstr "Ej beaktade episoder:"
 
+#, fuzzy
+msgid "unknown organization"
+msgstr "okänd reaktion"
+
 #, python-format
 msgid "part %2s"
 msgstr ""
@@ -18784,6 +18863,10 @@ msgid "Abort and do NOT connect to GNUmed."
 msgstr "Avbryt och anslut EJ till GNUmed."
 
 #, fuzzy
+#~ msgid "Copy to e&xport area..."
+#~ msgstr "Lägger till ny undersökningstyp"
+
+#, fuzzy
 #~ msgid "&Entry time"
 #~ msgstr "Sluttid "
 
diff --git a/client/po/tr-gnumed.mo b/client/po/tr-gnumed.mo
index 41c3b68..72ec479 100644
Binary files a/client/po/tr-gnumed.mo and b/client/po/tr-gnumed.mo differ
diff --git a/client/po/tr.po b/client/po/tr.po
index 492647c..6661f8c 100644
--- a/client/po/tr.po
+++ b/client/po/tr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNUmed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-06 11:40+0200\n"
+"POT-Creation-Date: 2016-05-26 12:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -2139,12 +2139,6 @@ msgstr ""
 msgid "New patient ID:"
 msgstr ""
 
-msgid "Your review"
-msgstr ""
-
-msgid "Reviews by others"
-msgstr ""
-
 msgid "(you are/are not the primary reviewer)"
 msgstr ""
 
@@ -2177,6 +2171,9 @@ msgid ""
 "in a new episode name to associate a different one."
 msgstr ""
 
+msgid "The organizational unit this document originates from."
+msgstr ""
+
 msgid "Enter the date of creation of the document."
 msgstr ""
 
@@ -2231,9 +2228,18 @@ msgstr ""
 msgid "Cancel this review."
 msgstr ""
 
+msgid "Your review"
+msgstr ""
+
+msgid "Reviews by others"
+msgstr ""
+
 msgid "Episode"
 msgstr ""
 
+msgid "Source"
+msgstr ""
+
 msgid "Date"
 msgstr ""
 
@@ -4819,19 +4825,16 @@ msgstr ""
 msgid "Close this dialog."
 msgstr ""
 
-msgid "age"
-msgstr ""
-
-msgid "review status"
+msgid "Age"
 msgstr ""
 
-msgid "episode"
+msgid "Review status"
 msgstr ""
 
-msgid "health issue"
+msgid "Health issue"
 msgstr ""
 
-msgid "type"
+msgid "Organization"
 msgstr ""
 
 msgid "Sort newest documents to top of tree."
@@ -4849,6 +4852,9 @@ msgstr ""
 msgid "Sort documents by their type."
 msgstr ""
 
+msgid "Sort documents by the organization they are from."
+msgstr ""
+
 msgid "Sort documents by"
 msgstr ""
 
@@ -5117,9 +5123,6 @@ msgstr ""
 msgid "The category of the organizational unit."
 msgstr ""
 
-msgid "Organization"
-msgstr ""
-
 msgid "Unit"
 msgstr ""
 
@@ -5281,9 +5284,6 @@ msgid ""
 "(SQL query)"
 msgstr ""
 
-msgid "Source"
-msgstr ""
-
 msgid "URL"
 msgstr ""
 
@@ -6978,9 +6978,6 @@ msgstr ""
 msgid "missing, reported later"
 msgstr ""
 
-msgid "Health issue"
-msgstr ""
-
 msgid "External care"
 msgstr ""
 
@@ -7008,6 +7005,10 @@ msgstr ""
 msgid "Document"
 msgstr ""
 
+#, fuzzy
+msgid "Inbox message"
+msgstr "Genel bilgi mesajı"
+
 #, python-format
 msgid "unmapped entry type from table [%s]"
 msgstr ""
@@ -8617,6 +8618,9 @@ msgstr ""
 msgid "who"
 msgstr ""
 
+msgid "type"
+msgstr ""
+
 msgid "entry"
 msgstr ""
 
@@ -9472,6 +9476,9 @@ msgstr ""
 msgid "nicotine"
 msgstr ""
 
+msgid "ethanol"
+msgstr ""
+
 msgid "unit"
 msgstr ""
 
@@ -10675,9 +10682,6 @@ msgstr ""
 msgid "Progress Note"
 msgstr ""
 
-msgid "Age"
-msgstr ""
-
 msgid "N/A"
 msgstr ""
 
@@ -11967,6 +11971,12 @@ msgstr "Mar"
 msgid "Show selected address on map"
 msgstr ""
 
+msgid "Distance"
+msgstr ""
+
+msgid "Show distance from your praxis"
+msgstr ""
+
 msgid "Adding new address"
 msgstr ""
 
@@ -12189,6 +12199,30 @@ msgstr ""
 msgid "Find next [%s] (<CTRL-N>)"
 msgstr ""
 
+msgid "&All rows"
+msgstr ""
+
+msgid "All rows as &CSV"
+msgstr ""
+
+msgid "&Tooltips of all rows"
+msgstr ""
+
+msgid "&Data of all rows"
+msgstr ""
+
+msgid "&Selected rows"
+msgstr ""
+
+msgid "&Selected rows as CSV"
+msgstr ""
+
+msgid "&Tooltips of selected rows"
+msgstr ""
+
+msgid "&Data of selected rows"
+msgstr ""
+
 msgid "Tooltips of selected rows"
 msgstr ""
 
@@ -12218,7 +12252,7 @@ msgstr ""
 msgid "Column &%s (current row): %s"
 msgstr ""
 
-msgid "Copy to e&xport area..."
+msgid "&Save to file..."
 msgstr ""
 
 msgid "&Copy to clipboard..."
@@ -12247,6 +12281,30 @@ msgid ""
 "%s"
 msgstr ""
 
+#, python-format
+msgid "All rows saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All tooltips saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All data saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected rows saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected tooltips saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected data saved to [%s]."
+msgstr ""
+
 msgid "Monty the Serpent && the FSF Present"
 msgstr ""
 
@@ -13663,6 +13721,9 @@ msgstr ""
 msgid "sorted by type"
 msgstr ""
 
+msgid "sorted by organization"
+msgstr ""
+
 msgid "Cannot load documents. No active patient."
 msgstr ""
 
@@ -13748,6 +13809,10 @@ msgstr ""
 msgid "%s (unattributed episode)"
 msgstr ""
 
+#, fuzzy
+msgid "unknown organization"
+msgstr "Bilinmeyen format"
+
 #, python-format
 msgid "part %2s"
 msgstr ""
diff --git a/client/po/uk-gnumed.mo b/client/po/uk-gnumed.mo
index 934f893..7d67ab8 100644
Binary files a/client/po/uk-gnumed.mo and b/client/po/uk-gnumed.mo differ
diff --git a/client/po/uk.po b/client/po/uk.po
index 13798fd..cac8ca8 100644
--- a/client/po/uk.po
+++ b/client/po/uk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNUmed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-06 11:40+0200\n"
+"POT-Creation-Date: 2016-05-26 12:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -2124,12 +2124,6 @@ msgstr ""
 msgid "New patient ID:"
 msgstr ""
 
-msgid "Your review"
-msgstr ""
-
-msgid "Reviews by others"
-msgstr ""
-
 msgid "(you are/are not the primary reviewer)"
 msgstr ""
 
@@ -2162,6 +2156,9 @@ msgid ""
 "in a new episode name to associate a different one."
 msgstr ""
 
+msgid "The organizational unit this document originates from."
+msgstr ""
+
 msgid "Enter the date of creation of the document."
 msgstr ""
 
@@ -2216,9 +2213,18 @@ msgstr ""
 msgid "Cancel this review."
 msgstr ""
 
+msgid "Your review"
+msgstr ""
+
+msgid "Reviews by others"
+msgstr ""
+
 msgid "Episode"
 msgstr ""
 
+msgid "Source"
+msgstr ""
+
 msgid "Date"
 msgstr ""
 
@@ -4801,19 +4807,16 @@ msgstr ""
 msgid "Close this dialog."
 msgstr ""
 
-msgid "age"
-msgstr ""
-
-msgid "review status"
+msgid "Age"
 msgstr ""
 
-msgid "episode"
+msgid "Review status"
 msgstr ""
 
-msgid "health issue"
+msgid "Health issue"
 msgstr ""
 
-msgid "type"
+msgid "Organization"
 msgstr ""
 
 msgid "Sort newest documents to top of tree."
@@ -4831,6 +4834,9 @@ msgstr ""
 msgid "Sort documents by their type."
 msgstr ""
 
+msgid "Sort documents by the organization they are from."
+msgstr ""
+
 msgid "Sort documents by"
 msgstr ""
 
@@ -5099,9 +5105,6 @@ msgstr ""
 msgid "The category of the organizational unit."
 msgstr ""
 
-msgid "Organization"
-msgstr ""
-
 msgid "Unit"
 msgstr ""
 
@@ -5259,9 +5262,6 @@ msgid ""
 "(SQL query)"
 msgstr ""
 
-msgid "Source"
-msgstr ""
-
 msgid "URL"
 msgstr ""
 
@@ -6954,9 +6954,6 @@ msgstr ""
 msgid "missing, reported later"
 msgstr ""
 
-msgid "Health issue"
-msgstr ""
-
 msgid "External care"
 msgstr ""
 
@@ -6984,6 +6981,9 @@ msgstr ""
 msgid "Document"
 msgstr ""
 
+msgid "Inbox message"
+msgstr ""
+
 #, python-format
 msgid "unmapped entry type from table [%s]"
 msgstr ""
@@ -8595,6 +8595,9 @@ msgstr ""
 msgid "who"
 msgstr ""
 
+msgid "type"
+msgstr ""
+
 msgid "entry"
 msgstr ""
 
@@ -9450,6 +9453,9 @@ msgstr ""
 msgid "nicotine"
 msgstr ""
 
+msgid "ethanol"
+msgstr ""
+
 msgid "unit"
 msgstr ""
 
@@ -10653,9 +10659,6 @@ msgstr ""
 msgid "Progress Note"
 msgstr ""
 
-msgid "Age"
-msgstr ""
-
 msgid "N/A"
 msgstr ""
 
@@ -11944,6 +11947,12 @@ msgstr ""
 msgid "Show selected address on map"
 msgstr ""
 
+msgid "Distance"
+msgstr ""
+
+msgid "Show distance from your praxis"
+msgstr ""
+
 msgid "Adding new address"
 msgstr ""
 
@@ -12165,6 +12174,30 @@ msgstr ""
 msgid "Find next [%s] (<CTRL-N>)"
 msgstr ""
 
+msgid "&All rows"
+msgstr ""
+
+msgid "All rows as &CSV"
+msgstr ""
+
+msgid "&Tooltips of all rows"
+msgstr ""
+
+msgid "&Data of all rows"
+msgstr ""
+
+msgid "&Selected rows"
+msgstr ""
+
+msgid "&Selected rows as CSV"
+msgstr ""
+
+msgid "&Tooltips of selected rows"
+msgstr ""
+
+msgid "&Data of selected rows"
+msgstr ""
+
 msgid "Tooltips of selected rows"
 msgstr ""
 
@@ -12194,7 +12227,7 @@ msgstr ""
 msgid "Column &%s (current row): %s"
 msgstr ""
 
-msgid "Copy to e&xport area..."
+msgid "&Save to file..."
 msgstr ""
 
 msgid "&Copy to clipboard..."
@@ -12223,6 +12256,30 @@ msgid ""
 "%s"
 msgstr ""
 
+#, python-format
+msgid "All rows saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All tooltips saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All data saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected rows saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected tooltips saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected data saved to [%s]."
+msgstr ""
+
 msgid "Monty the Serpent && the FSF Present"
 msgstr ""
 
@@ -13637,6 +13694,9 @@ msgstr ""
 msgid "sorted by type"
 msgstr ""
 
+msgid "sorted by organization"
+msgstr ""
+
 msgid "Cannot load documents. No active patient."
 msgstr ""
 
@@ -13722,6 +13782,9 @@ msgstr ""
 msgid "%s (unattributed episode)"
 msgstr ""
 
+msgid "unknown organization"
+msgstr ""
+
 #, python-format
 msgid "part %2s"
 msgstr ""
diff --git a/client/po/zh_TW-gnumed.mo b/client/po/zh_TW-gnumed.mo
index 932756f..c123814 100644
Binary files a/client/po/zh_TW-gnumed.mo and b/client/po/zh_TW-gnumed.mo differ
diff --git a/client/po/zh_TW.po b/client/po/zh_TW.po
index cee1238..c151b7e 100644
--- a/client/po/zh_TW.po
+++ b/client/po/zh_TW.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNUmed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-06 11:40+0200\n"
+"POT-Creation-Date: 2016-05-26 12:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -2125,12 +2125,6 @@ msgstr ""
 msgid "New patient ID:"
 msgstr ""
 
-msgid "Your review"
-msgstr ""
-
-msgid "Reviews by others"
-msgstr ""
-
 msgid "(you are/are not the primary reviewer)"
 msgstr ""
 
@@ -2163,6 +2157,9 @@ msgid ""
 "in a new episode name to associate a different one."
 msgstr ""
 
+msgid "The organizational unit this document originates from."
+msgstr ""
+
 msgid "Enter the date of creation of the document."
 msgstr ""
 
@@ -2217,9 +2214,18 @@ msgstr ""
 msgid "Cancel this review."
 msgstr ""
 
+msgid "Your review"
+msgstr ""
+
+msgid "Reviews by others"
+msgstr ""
+
 msgid "Episode"
 msgstr ""
 
+msgid "Source"
+msgstr ""
+
 msgid "Date"
 msgstr ""
 
@@ -4805,19 +4811,16 @@ msgstr ""
 msgid "Close this dialog."
 msgstr ""
 
-msgid "age"
-msgstr ""
-
-msgid "review status"
+msgid "Age"
 msgstr ""
 
-msgid "episode"
+msgid "Review status"
 msgstr ""
 
-msgid "health issue"
+msgid "Health issue"
 msgstr ""
 
-msgid "type"
+msgid "Organization"
 msgstr ""
 
 msgid "Sort newest documents to top of tree."
@@ -4835,6 +4838,9 @@ msgstr ""
 msgid "Sort documents by their type."
 msgstr ""
 
+msgid "Sort documents by the organization they are from."
+msgstr ""
+
 msgid "Sort documents by"
 msgstr ""
 
@@ -5103,9 +5109,6 @@ msgstr ""
 msgid "The category of the organizational unit."
 msgstr ""
 
-msgid "Organization"
-msgstr ""
-
 msgid "Unit"
 msgstr ""
 
@@ -5263,9 +5266,6 @@ msgid ""
 "(SQL query)"
 msgstr ""
 
-msgid "Source"
-msgstr ""
-
 msgid "URL"
 msgstr ""
 
@@ -6961,9 +6961,6 @@ msgstr ""
 msgid "missing, reported later"
 msgstr ""
 
-msgid "Health issue"
-msgstr ""
-
 msgid "External care"
 msgstr ""
 
@@ -6993,6 +6990,10 @@ msgstr ""
 msgid "Document"
 msgstr "註記"
 
+#, fuzzy
+msgid "Inbox message"
+msgstr "通用資訊"
+
 #, python-format
 msgid "unmapped entry type from table [%s]"
 msgstr ""
@@ -8607,6 +8608,9 @@ msgstr ""
 msgid "who"
 msgstr ""
 
+msgid "type"
+msgstr ""
+
 msgid "entry"
 msgstr ""
 
@@ -9462,6 +9466,9 @@ msgstr ""
 msgid "nicotine"
 msgstr ""
 
+msgid "ethanol"
+msgstr ""
+
 #, fuzzy
 msgid "unit"
 msgstr "單位"
@@ -10666,9 +10673,6 @@ msgstr ""
 msgid "Progress Note"
 msgstr ""
 
-msgid "Age"
-msgstr ""
-
 msgid "N/A"
 msgstr ""
 
@@ -11959,6 +11963,12 @@ msgstr ""
 msgid "Show selected address on map"
 msgstr ""
 
+msgid "Distance"
+msgstr ""
+
+msgid "Show distance from your praxis"
+msgstr ""
+
 msgid "Adding new address"
 msgstr ""
 
@@ -12180,6 +12190,30 @@ msgstr ""
 msgid "Find next [%s] (<CTRL-N>)"
 msgstr ""
 
+msgid "&All rows"
+msgstr ""
+
+msgid "All rows as &CSV"
+msgstr ""
+
+msgid "&Tooltips of all rows"
+msgstr ""
+
+msgid "&Data of all rows"
+msgstr ""
+
+msgid "&Selected rows"
+msgstr ""
+
+msgid "&Selected rows as CSV"
+msgstr ""
+
+msgid "&Tooltips of selected rows"
+msgstr ""
+
+msgid "&Data of selected rows"
+msgstr ""
+
 msgid "Tooltips of selected rows"
 msgstr ""
 
@@ -12209,7 +12243,7 @@ msgstr ""
 msgid "Column &%s (current row): %s"
 msgstr ""
 
-msgid "Copy to e&xport area..."
+msgid "&Save to file..."
 msgstr ""
 
 msgid "&Copy to clipboard..."
@@ -12238,6 +12272,30 @@ msgid ""
 "%s"
 msgstr ""
 
+#, python-format
+msgid "All rows saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All tooltips saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "All data saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected rows saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected tooltips saved to [%s]."
+msgstr ""
+
+#, python-format
+msgid "Selected data saved to [%s]."
+msgstr ""
+
 msgid "Monty the Serpent && the FSF Present"
 msgstr ""
 
@@ -13653,6 +13711,9 @@ msgstr ""
 msgid "sorted by type"
 msgstr ""
 
+msgid "sorted by organization"
+msgstr ""
+
 msgid "Cannot load documents. No active patient."
 msgstr ""
 
@@ -13738,6 +13799,10 @@ msgstr ""
 msgid "%s (unattributed episode)"
 msgstr ""
 
+#, fuzzy
+msgid "unknown organization"
+msgstr "未知反應"
+
 #, python-format
 msgid "part %2s"
 msgstr ""
diff --git a/client/pycommon/gmI18N.py b/client/pycommon/gmI18N.py
index 0bc32eb..c1508f2 100644
--- a/client/pycommon/gmI18N.py
+++ b/client/pycommon/gmI18N.py
@@ -132,12 +132,12 @@ def __log_locale_settings(message=None):
 		_log.debug(message)
 
 	_log.debug('current locale settings:')
-	_log.debug('locale.get_locale(): %s' % str(locale.getlocale()))
+	_log.debug('locale.getlocale(): %s' % str(locale.getlocale()))
 	for category in _getlocale_categories.keys():
-		_log.debug('locale.get_locale(%s): %s' % (category, locale.getlocale(_getlocale_categories[category])))
+		_log.debug('locale.getlocale(%s): %s' % (category, locale.getlocale(_getlocale_categories[category])))
 
 	for category in _setlocale_categories.keys():
-		_log.debug('(locale.set_locale(%s): %s)' % (category, locale.setlocale(_setlocale_categories[category])))
+		_log.debug('(locale.setlocale(%s): %s)' % (category, locale.setlocale(_setlocale_categories[category])))
 
 	try:
 		_log.debug('locale.getdefaultlocale() - default (user) locale: %s' % str(locale.getdefaultlocale()))
@@ -286,42 +286,91 @@ def install_domain(domain=None, language=None, prefer_local_catalog=False):
 	# http://www.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap08.html
 	_log.debug('searching message catalog file for system locale [%s]' % system_locale)
 
+	_log.debug('checking process environment:')
 	for env_var in ['LANGUAGE', 'LC_ALL', 'LC_MESSAGES', 'LANG']:
 		tmp = os.getenv(env_var)
 		if env_var is None:
-			_log.debug('${%s} not set' % env_var)
+			_log.debug(' ${%s} not set' % env_var)
 		else:
-			_log.debug('${%s} = [%s]' % (env_var, tmp))
-
+			_log.debug(' ${%s} = [%s]' % (env_var, tmp))
+
+	# language codes to try
+	lang_candidates = []
+	# first: explicit language or default system language
+	# language=None: unadulterated default language for user (locale.getlocale()[0] value)
+	# language != None: explicit language setting as passed in by the caller
+	lang_candidates.append(language)
 	if language is not None:
-		_log.info('explicit setting of ${LANG} requested: [%s]' % language)
-		_log.info('this will override the system locale language setting')
-		os.environ['LANG'] = language
+		_log.info('explicit request for target language [%s]' % language)
+		# next: try default language for user if explicit language fails
+		lang_candidates.append(None)
+
+	# next try locale.getlocale()[0], if different (this can be strange on, say, Windows: Hungarian_Hungary)
+	if locale.getlocale()[0] not in lang_candidates:
+		lang_candidates.append(locale.getlocale()[0])
+
+	# next try locale.get*default*locale()[0], if different
+	if locale.getdefaultlocale()[0] not in lang_candidates:
+		lang_candidates.append(locale.getdefaultlocale()[0])
+
+	_log.debug('languages to try for translation: %s (None: implicit system default)', lang_candidates)
+	initial_lang = os.getenv('LANG')
+	_log.info('initial ${LANG} setting: %s', initial_lang)
+
+	# loop over language candidates
+	for lang_candidate in lang_candidates:
+		# setup baseline
+		_log.debug('resetting ${LANG} to initial user default [%s]', initial_lang)
+		if initial_lang is None:
+			del os.environ['LANG']
+			lang2log = u'$LANG=<>'
+		else:
+			os.environ['LANG'] = initial_lang
+			lang2log = u'$LANG(default)=%s' % initial_lang
+		# setup candidate language
+		if lang_candidate is not None:
+			_log.info('explicitely overriding system locale language [%s] by setting ${LANG} to [%s]', initial_lang, lang_candidate)
+			os.environ['LANG'] = lang_candidate
+			lang2log = u'$LANG(explicit)=%s' % lang_candidate
+
+		if __install_domain(domain = domain, prefer_local_catalog = prefer_local_catalog, language = lang2log):
+			return True
+
+	# install a dummy translation class
+	_log.warning("falling back to NullTranslations() class")
+	# this shouldn't fail
+	dummy = gettext.NullTranslations()
+	dummy.install()
+	return True
+
+#---------------------------------------------------------------------------
+def __install_domain(domain, prefer_local_catalog, language=u'?'):
+	# <language> only used for logging
 
 	# search for message catalog
-	candidates = []
+	candidate_PO_dirs = []
 
 	# - locally
 	if prefer_local_catalog:
-		_log.debug('preferring local message catalog')
+		_log.debug('prioritizing local message catalog')
 		# - one level above path to binary
 		#    last resort for inferior operating systems such as DOS/Windows
 		#    strip one directory level
 		#    this is a rather neat trick :-)
 		loc_dir = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), '..', 'po'))
 		_log.debug('looking above binary install directory [%s]' % loc_dir)
-		candidates.append(loc_dir)
+		candidate_PO_dirs.append(loc_dir)
 		# - in path to binary
 		loc_dir = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), 'po'))
 		_log.debug('looking in binary install directory [%s]' % loc_dir)
-		candidates.append(loc_dir)
+		candidate_PO_dirs.append(loc_dir)
 
 	# - standard places
 	if os.name == 'posix':
 		_log.debug('system is POSIX, looking in standard locations (see Python Manual)')
 		# if this is reported to segfault/fail/except on some
 		# systems we may have to assume "sys.prefix/share/locale/"
-		candidates.append(gettext.bindtextdomain(domain))
+		candidate_PO_dirs.append(gettext.bindtextdomain(domain))
 	else:
 		_log.debug('No use looking in standard POSIX locations - not a POSIX system.')
 
@@ -331,7 +380,7 @@ def install_domain(domain=None, language=None, prefer_local_catalog=False):
 	if env_key in os.environ:
 		loc_dir = os.path.abspath(os.path.join(os.environ[env_key], 'po'))
 		_log.debug('${%s} = "%s" -> [%s]' % (env_key, os.environ[env_key], loc_dir))
-		candidates.append(loc_dir)
+		candidate_PO_dirs.append(loc_dir)
 	else:
 		_log.info("${%s} not set" % env_key)
 
@@ -343,21 +392,22 @@ def install_domain(domain=None, language=None, prefer_local_catalog=False):
 		#    this is a rather neat trick :-)
 		loc_dir = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), '..', 'po'))
 		_log.debug('looking above binary install directory [%s]' % loc_dir)
-		candidates.append(loc_dir)
+		candidate_PO_dirs.append(loc_dir)
 		# - in path to binary
 		loc_dir = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), 'po' ))
 		_log.debug('looking in binary install directory [%s]' % loc_dir)
-		candidates.append(loc_dir)
+		candidate_PO_dirs.append(loc_dir)
 
 	# now try to actually install it
-	for candidate in candidates:
-		_log.debug('trying [%s](/%s/LC_MESSAGES/%s.mo)', candidate, system_locale, domain)
-		if not os.path.exists(candidate):
+	for candidate_PO_dir in candidate_PO_dirs:
+		_log.debug('trying with (%s, %s, %s)', candidate_PO_dir, language, domain)
+		_log.debug(' -> %s/%s/LC_MESSAGES/%s.mo', candidate_PO_dir, language, domain)
+		if not os.path.exists(candidate_PO_dir):
 			continue
 		try:
-			gettext.install(domain, candidate, unicode=1)
+			gettext.install(domain, candidate_PO_dir, unicode = 1)
 		except:
-			_log.exception('installing text domain [%s] failed from [%s]', domain, candidate)
+			_log.exception('installing text domain [%s] failed from [%s]', domain, candidate_PO_dir)
 			continue
 		global _
 		# does it translate ?
@@ -372,12 +422,7 @@ def install_domain(domain=None, language=None, prefer_local_catalog=False):
 			__builtin__._ = _translate_protected
 			return True
 
-	# 5) install a dummy translation class
-	_log.warning("falling back to NullTranslations() class")
-	# this shouldn't fail
-	dummy = gettext.NullTranslations()
-	dummy.install()
-	return True
+	return False
 
 #===========================================================================
 _encoding_mismatch_already_logged = False
@@ -471,7 +516,7 @@ if __name__ == "__main__":
 	print("system locale: ", system_locale, "; levels:", system_locale_level)
 	print("likely encoding:", get_encoding())
 
-	if len(sys.argv) > 1:
+	if len(sys.argv) > 2:
 		install_domain(domain = sys.argv[2])
 	else:
 		install_domain()
diff --git a/client/pycommon/gmTools.py b/client/pycommon/gmTools.py
index 9e5fb8b..8c574d1 100644
--- a/client/pycommon/gmTools.py
+++ b/client/pycommon/gmTools.py
@@ -278,14 +278,15 @@ class gmPaths(gmBorg.cBorg):
 			self.__tmp_dir_already_set
 			_log.debug(u'temp dir already set')
 		except AttributeError:
-			_log.info(u'initial temp dir: %s', tempfile.gettempdir())
+			_log.info(u'initial (user level) temp dir: %s', tempfile.gettempdir())
 			# $TMP/gnumed-$USER/
 			tmp_base = os.path.join(tempfile.gettempdir(), app_name + r'-' + getpass.getuser())
 			mkdir(tmp_base, 0o700)
 			tempfile.tempdir = tmp_base
-			_log.info(u'intermediate temp dir: %s', tempfile.gettempdir())
+			_log.info(u'intermediate (app level) temp dir: %s', tempfile.gettempdir())
 			# $TMP/gnumed-$USER/g$UNIQUE/
 			self.tmp_dir = tempfile.mkdtemp(prefix = r'g')
+			_log.info(u'final (app instance level) temp dir: %s', tempfile.gettempdir())
 
 		self.__log_paths()
 		if wx is None:
@@ -416,7 +417,7 @@ class gmPaths(gmBorg.cBorg):
 		_log.debug('previous temp dir: %s', tempfile.gettempdir())
 		self.__tmp_dir = path
 		tempfile.tempdir = self.__tmp_dir
-		_log.debug('current temp dir: %s', tempfile.gettempdir())
+		_log.debug('new temp dir: %s', tempfile.gettempdir())
 		self.__tmp_dir_already_set = True
 
 	def _get_tmp_dir(self):
diff --git a/client/wxGladeWidgets/wxgReviewDocPartDlg.py b/client/wxGladeWidgets/wxgReviewDocPartDlg.py
index bd9a457..18866af 100644
--- a/client/wxGladeWidgets/wxgReviewDocPartDlg.py
+++ b/client/wxGladeWidgets/wxgReviewDocPartDlg.py
@@ -1,131 +1,147 @@
 #!/usr/bin/env python
-# -*- coding: ISO-8859-15 -*-
-# generated by wxGlade 0.4cvs on Wed Jul  5 00:30:46 2006
+# -*- coding: UTF-8 -*-
+#
+# generated by wxGlade 0.7.2
+#
 
 import wx
 
-class wxgReviewDocPartDlg(wx.Dialog):
-    def __init__(self, *args, **kwds):
+# begin wxGlade: dependencies
+import gettext
+# end wxGlade
 
-        from Gnumed.wxpython import gmEMRStructWidgets, gmDateTimeInput, gmDocumentWidgets
+# begin wxGlade: extracode
+# end wxGlade
 
-        # begin wxGlade: wxgReviewDocPartDlg.__init__
-        kwds["style"] = wx.DEFAULT_DIALOG_STYLE|wx.RESIZE_BORDER|wx.MAXIMIZE_BOX|wx.MINIMIZE_BOX|wx.THICK_FRAME
-        wx.Dialog.__init__(self, *args, **kwds)
-        self.__szr_box_review_staticbox = wx.StaticBox(self, -1, _("Your review"))
-        self.__szr_reviews_staticbox = wx.StaticBox(self, -1, _("Reviews by others"))
-        self._PhWheel_episode = gmEMRStructWidgets.cEpisodeSelectionPhraseWheel(self, -1, style=wx.NO_BORDER)
-        self._PhWheel_doc_type = gmDocumentWidgets.cDocumentTypeSelectionPhraseWheel(self, -1, style=wx.NO_BORDER)
-        self._PRW_doc_comment = gmDocumentWidgets.cDocumentCommentPhraseWheel(self, -1, "", style=wx.NO_BORDER)
-        self._PhWheel_doc_date = gmDateTimeInput.cFuzzyTimestampInput(self, -1, style=wx.NO_BORDER)
-        self._TCTRL_reference = wx.TextCtrl(self, -1, "", style=wx.NO_BORDER)
-        self._TCTRL_filename = wx.TextCtrl(self, -1, "", style=wx.NO_BORDER)
-        self._SPINCTRL_seq_idx = wx.SpinCtrl(self, -1, "", min=0, max=10000, style=wx.SP_ARROW_KEYS|wx.SP_WRAP|wx.TE_AUTO_URL|wx.TE_NOHIDESEL|wx.NO_BORDER)
-        self._LCTRL_existing_reviews = wx.ListCtrl(self, -1, style=wx.LC_REPORT|wx.LC_ALIGN_LEFT|wx.LC_SINGLE_SEL|wx.LC_HRULES|wx.LC_VRULES|wx.NO_BORDER)
-        self._TCTRL_responsible = wx.TextCtrl(self, -1, _("(you are/are not the primary reviewer)"), style=wx.TE_READONLY|wx.NO_BORDER)
-        self._ChBOX_review = wx.CheckBox(self, -1, _("review document"))
-        self._ChBOX_abnormal = wx.CheckBox(self, -1, _("technically abnormal"))
-        self._ChBOX_responsible = wx.CheckBox(self, -1, _("take over responsibility"))
-        self._ChBOX_relevant = wx.CheckBox(self, -1, _("clinically relevant"))
-        self._ChBOX_sign_all_pages = wx.CheckBox(self, -1, _("sign all pages"))
-        self._BTN_save = wx.Button(self, wx.ID_OK, _("Save"))
-        self._BTN_cancel = wx.Button(self, wx.ID_CANCEL, _("Cancel"))
 
-        self.__set_properties()
-        self.__do_layout()
+class wxgReviewDocPartDlg(wx.Dialog):
+	def __init__(self, *args, **kwds):
 
-        self.Bind(wx.EVT_CHECKBOX, self._on_reviewed_box_checked, self._ChBOX_review)
-        self.Bind(wx.EVT_BUTTON, self._on_save_button_pressed, id=wx.ID_OK)
-        # end wxGlade
+		from Gnumed.wxpython import gmEMRStructWidgets, gmDateTimeInput, gmDocumentWidgets
+		from Gnumed.wxpython import gmOrganizationWidgets
 
-    def __set_properties(self):
-        # begin wxGlade: wxgReviewDocPartDlg.__set_properties
-        self.SetTitle(_("Edit document properties"))
-        self._PhWheel_episode.SetToolTipString(_("Shows the episode associated with this document. Select another one or type in a new episode name to associate a different one."))
-        self._PhWheel_doc_date.SetToolTipString(_("Enter the date of creation of the document."))
-        self._TCTRL_reference.SetToolTipString(_("Enter the ID by which this document is referenced externally."))
-        self._TCTRL_filename.SetToolTipString(_("An example file name for this document type.\n\nMainly used to derive a file name extension during export for operating systems which need that to guesstimate the viewer."))
-        self._SPINCTRL_seq_idx.SetToolTipString(_("The sequence index or page number. If invoked from a document instead of a page always applies to the first page."))
-        self._LCTRL_existing_reviews.SetToolTipString(_("Lists previous reviews for this document part.\n\nThe first line (marked with an icon) will show your previous review if there is one.\nThe second line (marked with a blue bar) will display the review of the responsible provider if there is such a review.\n\n You can edit your review below."))
-        self._LCTRL_existing_reviews.Enable(False)
-        self._TCTRL_responsible.SetBackgroundColour(wx.SystemSettings_GetColour(wx.SYS_COLOUR_BACKGROUND))
-        self._ChBOX_review.SetToolTipString(_("Check this if you want to edit your review."))
-        self._ChBOX_abnormal.SetToolTipString(_("Does this document inform on a state of the patient's health that is technically abnormal ?"))
-        self._ChBOX_abnormal.Enable(False)
-        self._ChBOX_responsible.SetToolTipString(_("Check this if you intend to take over responsibility for this document and not just review it."))
-        self._ChBOX_responsible.Enable(False)
-        self._ChBOX_relevant.SetToolTipString(_("Is this document clinically relevant."))
-        self._ChBOX_relevant.Enable(False)
-        self._ChBOX_sign_all_pages.SetToolTipString(_("Apply review to entire document rather than just this part or page."))
-        self._ChBOX_sign_all_pages.Enable(False)
-        self._ChBOX_sign_all_pages.SetValue(1)
-        self._BTN_save.SetToolTipString(_("Save your review."))
-        self._BTN_cancel.SetToolTipString(_("Cancel this review."))
-        self._BTN_cancel.SetFocus()
-        self._BTN_cancel.SetDefault()
-        # end wxGlade
+		# begin wxGlade: wxgReviewDocPartDlg.__init__
+		kwds["style"] = wx.DEFAULT_DIALOG_STYLE | wx.MAXIMIZE_BOX | wx.MINIMIZE_BOX | wx.RESIZE_BORDER
+		wx.Dialog.__init__(self, *args, **kwds)
+		self._PhWheel_episode = gmEMRStructWidgets.cEpisodeSelectionPhraseWheel(self, wx.ID_ANY, style=wx.NO_BORDER)
+		self._PhWheel_doc_type = gmDocumentWidgets.cDocumentTypeSelectionPhraseWheel(self, wx.ID_ANY, style=wx.NO_BORDER)
+		self._PRW_org = gmOrganizationWidgets.cOrgUnitPhraseWheel(self, wx.ID_ANY, "", style=wx.BORDER_NONE)
+		self._PRW_doc_comment = gmDocumentWidgets.cDocumentCommentPhraseWheel(self, wx.ID_ANY, "", style=wx.BORDER_NONE)
+		self._PhWheel_doc_date = gmDateTimeInput.cFuzzyTimestampInput(self, wx.ID_ANY, style=wx.NO_BORDER)
+		self._TCTRL_reference = wx.TextCtrl(self, wx.ID_ANY, "", style=wx.BORDER_NONE)
+		self._TCTRL_filename = wx.TextCtrl(self, wx.ID_ANY, "", style=wx.BORDER_NONE)
+		self._SPINCTRL_seq_idx = wx.SpinCtrl(self, wx.ID_ANY, "", min=0, max=10000, style=wx.BORDER_NONE | wx.SP_ARROW_KEYS | wx.SP_WRAP | wx.TE_AUTO_URL | wx.TE_NOHIDESEL)
+		self._LCTRL_existing_reviews = wx.ListCtrl(self, wx.ID_ANY, style=wx.BORDER_NONE | wx.LC_ALIGN_LEFT | wx.LC_HRULES | wx.LC_REPORT | wx.LC_SINGLE_SEL | wx.LC_VRULES)
+		self._TCTRL_responsible = wx.TextCtrl(self, wx.ID_ANY, _("(you are/are not the primary reviewer)"), style=wx.BORDER_NONE | wx.TE_READONLY)
+		self._ChBOX_review = wx.CheckBox(self, wx.ID_ANY, _("review document"))
+		self._ChBOX_abnormal = wx.CheckBox(self, wx.ID_ANY, _("technically abnormal"))
+		self._ChBOX_responsible = wx.CheckBox(self, wx.ID_ANY, _("take over responsibility"))
+		self._ChBOX_relevant = wx.CheckBox(self, wx.ID_ANY, _("clinically relevant"))
+		self._ChBOX_sign_all_pages = wx.CheckBox(self, wx.ID_ANY, _("sign all pages"))
+		self._BTN_save = wx.Button(self, wx.ID_OK, _("Save"))
+		self._BTN_cancel = wx.Button(self, wx.ID_CANCEL, _("Cancel"))
 
-    def __do_layout(self):
-        # begin wxGlade: wxgReviewDocPartDlg.__do_layout
-        __szr_main = wx.BoxSizer(wx.VERTICAL)
-        __szr_bottom = wx.BoxSizer(wx.HORIZONTAL)
-        __szr_box_review = wx.StaticBoxSizer(self.__szr_box_review_staticbox, wx.VERTICAL)
-        __szr_grid_review = wx.FlexGridSizer(4, 2, 0, 0)
-        __szr_reviews = wx.StaticBoxSizer(self.__szr_reviews_staticbox, wx.HORIZONTAL)
-        __szr_grid_properties = wx.FlexGridSizer(7, 2, 2, 3)
-        __lbl_episode_picker = wx.StaticText(self, -1, _("Episode"))
-        __szr_grid_properties.Add(__lbl_episode_picker, 0, wx.ALIGN_CENTER_VERTICAL, 0)
-        __szr_grid_properties.Add(self._PhWheel_episode, 1, wx.EXPAND|wx.ALIGN_CENTER_VERTICAL, 0)
-        __lbl_type = wx.StaticText(self, -1, _("Type"))
-        __szr_grid_properties.Add(__lbl_type, 0, wx.ALIGN_CENTER_VERTICAL, 0)
-        __szr_grid_properties.Add(self._PhWheel_doc_type, 1, wx.EXPAND|wx.ALIGN_CENTER_VERTICAL, 0)
-        __lbl_comment = wx.StaticText(self, -1, _("Comment"))
-        __szr_grid_properties.Add(__lbl_comment, 0, wx.ALIGN_CENTER_VERTICAL, 0)
-        __szr_grid_properties.Add(self._PRW_doc_comment, 1, wx.EXPAND|wx.ALIGN_CENTER_VERTICAL, 0)
-        __lbl_doc_date = wx.StaticText(self, -1, _("Date"))
-        __szr_grid_properties.Add(__lbl_doc_date, 0, wx.ALIGN_CENTER_VERTICAL, 0)
-        __szr_grid_properties.Add(self._PhWheel_doc_date, 1, wx.EXPAND|wx.ALIGN_CENTER_VERTICAL, 0)
-        __lbl_reference = wx.StaticText(self, -1, _("Reference"))
-        __szr_grid_properties.Add(__lbl_reference, 0, wx.ALIGN_CENTER_VERTICAL, 0)
-        __szr_grid_properties.Add(self._TCTRL_reference, 0, wx.EXPAND, 0)
-        __lbl_filename = wx.StaticText(self, -1, _("Filename"))
-        __lbl_filename.SetToolTipString(_("The original filename (if any). Only editable if invoked from a single part of the document."))
-        __szr_grid_properties.Add(__lbl_filename, 0, wx.ALIGN_CENTER_VERTICAL, 0)
-        __szr_grid_properties.Add(self._TCTRL_filename, 0, wx.EXPAND|wx.ALIGN_CENTER_VERTICAL, 0)
-        __lbl_seq_idx = wx.StaticText(self, -1, _("Seq #"))
-        __lbl_seq_idx.SetToolTipString(_("The sequence index or page number. If invoked from a document instead of a page always applies to the first page."))
-        __szr_grid_properties.Add(__lbl_seq_idx, 0, wx.ALIGN_CENTER_VERTICAL, 0)
-        __szr_grid_properties.Add(self._SPINCTRL_seq_idx, 0, wx.ALIGN_CENTER_VERTICAL, 0)
-        __szr_grid_properties.AddGrowableCol(1)
-        __szr_main.Add(__szr_grid_properties, 0, wx.ALL|wx.EXPAND, 5)
-        __szr_reviews.Add(self._LCTRL_existing_reviews, 1, wx.EXPAND, 0)
-        __szr_main.Add(__szr_reviews, 1, wx.EXPAND, 0)
-        __szr_box_review.Add(self._TCTRL_responsible, 0, wx.EXPAND|wx.ALIGN_CENTER_HORIZONTAL, 0)
-        __szr_grid_review.Add(self._ChBOX_review, 0, 0, 0)
-        __szr_grid_review.Add((5, 5), 1, wx.EXPAND, 0)
-        __szr_grid_review.Add(self._ChBOX_abnormal, 0, wx.LEFT, 10)
-        __szr_grid_review.Add(self._ChBOX_responsible, 0, wx.LEFT, 10)
-        __szr_grid_review.Add(self._ChBOX_relevant, 0, wx.LEFT, 10)
-        __szr_grid_review.Add(self._ChBOX_sign_all_pages, 0, wx.LEFT, 10)
-        __szr_box_review.Add(__szr_grid_review, 1, wx.EXPAND, 0)
-        __szr_main.Add(__szr_box_review, 1, wx.EXPAND, 0)
-        __szr_bottom.Add(self._BTN_save, 0, 0, 0)
-        __szr_bottom.Add(self._BTN_cancel, 0, 0, 0)
-        __szr_main.Add(__szr_bottom, 0, wx.EXPAND, 0)
-        self.SetSizer(__szr_main)
-        __szr_main.Fit(self)
-        self.Layout()
-        self.Centre()
-        # end wxGlade
+		self.__set_properties()
+		self.__do_layout()
 
-    def _on_reviewed_box_checked(self, event): # wxGlade: wxgReviewDocPartDlg.<event_handler>
-        print "Event handler `_on_reviewed_box_checked' not implemented!"
-        event.Skip()
+		self.Bind(wx.EVT_CHECKBOX, self._on_reviewed_box_checked, self._ChBOX_review)
+		self.Bind(wx.EVT_BUTTON, self._on_save_button_pressed, id=wx.ID_OK)
+		# end wxGlade
 
-    def _on_save_button_pressed(self, event): # wxGlade: wxgReviewDocPartDlg.<event_handler>
-        print "Event handler `_on_save_button_pressed' not implemented!"
-        event.Skip()
+	def __set_properties(self):
+		# begin wxGlade: wxgReviewDocPartDlg.__set_properties
+		self.SetTitle(_("Edit document properties"))
+		self._PhWheel_episode.SetToolTipString(_("Shows the episode associated with this document. Select another one or type in a new episode name to associate a different one."))
+		self._PRW_org.SetToolTipString(_("The organizational unit this document originates from."))
+		self._PRW_org.Enable(False)
+		self._PhWheel_doc_date.SetToolTipString(_("Enter the date of creation of the document."))
+		self._TCTRL_reference.SetToolTipString(_("Enter the ID by which this document is referenced externally."))
+		self._TCTRL_filename.SetToolTipString(_("An example file name for this document type.\n\nMainly used to derive a file name extension during export for operating systems which need that to guesstimate the viewer."))
+		self._SPINCTRL_seq_idx.SetToolTipString(_("The sequence index or page number. If invoked from a document instead of a page always applies to the first page."))
+		self._LCTRL_existing_reviews.SetToolTipString(_("Lists previous reviews for this document part.\n\nThe first line (marked with an icon) will show your previous review if there is one.\nThe second line (marked with a blue bar) will display the review of the responsible provider if there is such a review.\n\n You can edit your review below."))
+		self._LCTRL_existing_reviews.Enable(False)
+		self._TCTRL_responsible.SetBackgroundColour(wx.SystemSettings_GetColour(wx.SYS_COLOUR_BACKGROUND))
+		self._ChBOX_review.SetToolTipString(_("Check this if you want to edit your review."))
+		self._ChBOX_abnormal.SetToolTipString(_("Does this document inform on a state of the patient's health that is technically abnormal ?"))
+		self._ChBOX_abnormal.Enable(False)
+		self._ChBOX_responsible.SetToolTipString(_("Check this if you intend to take over responsibility for this document and not just review it."))
+		self._ChBOX_responsible.Enable(False)
+		self._ChBOX_relevant.SetToolTipString(_("Is this document clinically relevant."))
+		self._ChBOX_relevant.Enable(False)
+		self._ChBOX_sign_all_pages.SetToolTipString(_("Apply review to entire document rather than just this part or page."))
+		self._ChBOX_sign_all_pages.Enable(False)
+		self._ChBOX_sign_all_pages.SetValue(1)
+		self._BTN_save.SetToolTipString(_("Save your review."))
+		self._BTN_cancel.SetToolTipString(_("Cancel this review."))
+		self._BTN_cancel.SetFocus()
+		self._BTN_cancel.SetDefault()
+		# end wxGlade
 
-# end of class wxgReviewDocPartDlg
+	def __do_layout(self):
+		# begin wxGlade: wxgReviewDocPartDlg.__do_layout
+		__szr_main = wx.BoxSizer(wx.VERTICAL)
+		__szr_bottom = wx.BoxSizer(wx.HORIZONTAL)
+		__szr_box_review = wx.StaticBoxSizer(wx.StaticBox(self, wx.ID_ANY, _("Your review")), wx.VERTICAL)
+		__szr_grid_review = wx.FlexGridSizer(4, 2, 0, 0)
+		__szr_reviews = wx.StaticBoxSizer(wx.StaticBox(self, wx.ID_ANY, _("Reviews by others")), wx.HORIZONTAL)
+		__szr_grid_properties = wx.FlexGridSizer(8, 2, 2, 3)
+		__lbl_episode_picker = wx.StaticText(self, wx.ID_ANY, _("Episode"))
+		__lbl_episode_picker.SetForegroundColour(wx.Colour(255, 0, 0))
+		__szr_grid_properties.Add(__lbl_episode_picker, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+		__szr_grid_properties.Add(self._PhWheel_episode, 1, wx.ALIGN_CENTER_VERTICAL | wx.EXPAND, 0)
+		__lbl_type = wx.StaticText(self, wx.ID_ANY, _("Type"))
+		__lbl_type.SetForegroundColour(wx.Colour(255, 0, 0))
+		__szr_grid_properties.Add(__lbl_type, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+		__szr_grid_properties.Add(self._PhWheel_doc_type, 1, wx.ALIGN_CENTER_VERTICAL | wx.EXPAND, 0)
+		__lbl_org = wx.StaticText(self, wx.ID_ANY, _("Source"))
+		__szr_grid_properties.Add(__lbl_org, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+		__szr_grid_properties.Add(self._PRW_org, 1, wx.ALIGN_CENTER_VERTICAL | wx.EXPAND, 0)
+		__lbl_comment = wx.StaticText(self, wx.ID_ANY, _("Comment"))
+		__szr_grid_properties.Add(__lbl_comment, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+		__szr_grid_properties.Add(self._PRW_doc_comment, 1, wx.ALIGN_CENTER_VERTICAL | wx.EXPAND, 0)
+		__lbl_doc_date = wx.StaticText(self, wx.ID_ANY, _("Date"))
+		__lbl_doc_date.SetForegroundColour(wx.Colour(255, 0, 0))
+		__szr_grid_properties.Add(__lbl_doc_date, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+		__szr_grid_properties.Add(self._PhWheel_doc_date, 1, wx.ALIGN_CENTER_VERTICAL | wx.EXPAND, 0)
+		__lbl_reference = wx.StaticText(self, wx.ID_ANY, _("Reference"))
+		__szr_grid_properties.Add(__lbl_reference, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+		__szr_grid_properties.Add(self._TCTRL_reference, 1, wx.EXPAND, 0)
+		__lbl_filename = wx.StaticText(self, wx.ID_ANY, _("Filename"))
+		__lbl_filename.SetToolTipString(_("The original filename (if any). Only editable if invoked from a single part of the document."))
+		__szr_grid_properties.Add(__lbl_filename, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+		__szr_grid_properties.Add(self._TCTRL_filename, 1, wx.ALIGN_CENTER_VERTICAL | wx.EXPAND, 0)
+		__lbl_seq_idx = wx.StaticText(self, wx.ID_ANY, _("Seq #"))
+		__lbl_seq_idx.SetToolTipString(_("The sequence index or page number. If invoked from a document instead of a page always applies to the first page."))
+		__szr_grid_properties.Add(__lbl_seq_idx, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+		__szr_grid_properties.Add(self._SPINCTRL_seq_idx, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+		__szr_grid_properties.AddGrowableCol(1)
+		__szr_main.Add(__szr_grid_properties, 1, wx.EXPAND, 5)
+		__szr_reviews.Add(self._LCTRL_existing_reviews, 1, wx.EXPAND, 0)
+		__szr_main.Add(__szr_reviews, 1, wx.EXPAND, 0)
+		__szr_box_review.Add(self._TCTRL_responsible, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.EXPAND, 0)
+		__szr_grid_review.Add(self._ChBOX_review, 0, 0, 0)
+		__szr_grid_review.Add((5, 5), 1, wx.EXPAND, 0)
+		__szr_grid_review.Add(self._ChBOX_abnormal, 0, wx.LEFT, 10)
+		__szr_grid_review.Add(self._ChBOX_responsible, 0, wx.LEFT, 10)
+		__szr_grid_review.Add(self._ChBOX_relevant, 0, wx.LEFT, 10)
+		__szr_grid_review.Add(self._ChBOX_sign_all_pages, 0, wx.LEFT, 10)
+		__szr_box_review.Add(__szr_grid_review, 1, wx.EXPAND, 0)
+		__szr_main.Add(__szr_box_review, 1, wx.EXPAND, 0)
+		__szr_bottom.Add(self._BTN_save, 0, 0, 0)
+		__szr_bottom.Add(self._BTN_cancel, 0, 0, 0)
+		__szr_main.Add(__szr_bottom, 0, wx.EXPAND, 0)
+		self.SetSizer(__szr_main)
+		__szr_main.Fit(self)
+		self.Layout()
+		self.Centre()
+		# end wxGlade
 
+	def _on_reviewed_box_checked(self, event):  # wxGlade: wxgReviewDocPartDlg.<event_handler>
+		print "Event handler '_on_reviewed_box_checked' not implemented!"
+		event.Skip()
 
+	def _on_save_button_pressed(self, event):  # wxGlade: wxgReviewDocPartDlg.<event_handler>
+		print "Event handler '_on_save_button_pressed' not implemented!"
+		event.Skip()
+
+# end of class wxgReviewDocPartDlg
diff --git a/client/wxpython/gmDocumentWidgets.py b/client/wxpython/gmDocumentWidgets.py
index f937da5..3ea3b6c 100644
--- a/client/wxpython/gmDocumentWidgets.py
+++ b/client/wxpython/gmDocumentWidgets.py
@@ -608,6 +608,7 @@ class cReviewDocPartDlg(wxgReviewDocPartDlg.wxgReviewDocPartDlg):
 			raise ValueError('<part> must be gmDocuments.cDocument or gmDocuments.cDocumentPart instance, got <%s>' % type(part))
 
 		self.__init_ui_data()
+
 	#--------------------------------------------------------
 	# internal API
 	#--------------------------------------------------------
@@ -625,6 +626,13 @@ class cReviewDocPartDlg(wxgReviewDocPartDlg.wxgReviewDocPartDlg):
 		else:
 			self._PRW_doc_comment.SetText(gmTools.coalesce(self.__part['obj_comment'], ''))
 
+		if self.__doc['pk_org_unit'] is not None:
+			self._PRW_org.SetText(value = u'%s @ %s' % (self.__doc['unit'], self.__doc['organization']), data = self.__doc['pk_org_unit'])
+		if self.__reviewing_doc:
+			self._PRW_org.Enable()
+		else:
+			self._PRW_org.Disable()
+
 		fts = gmDateTime.cFuzzyTimestamp(timestamp = self.__doc['clin_when'])
 		self._PhWheel_doc_date.SetText(fts.strftime('%Y-%m-%d'), fts)
 		self._TCTRL_reference.SetValue(gmTools.coalesce(self.__doc['ext_ref'], ''))
@@ -676,6 +684,7 @@ class cReviewDocPartDlg(wxgReviewDocPartDlg.wxgReviewDocPartDlg):
 			self._ChBOX_sign_all_pages.SetValue(self.__reviewing_doc)
 
 		return True
+
 	#--------------------------------------------------------
 	def __reload_existing_reviews(self):
 		self._LCTRL_existing_reviews.DeleteAllItems()
@@ -714,6 +723,7 @@ class cReviewDocPartDlg(wxgReviewDocPartDlg.wxgReviewDocPartDlg):
 				self._LCTRL_existing_reviews.SetStringItem(index = row_num, col=3, label=u'X')
 			self._LCTRL_existing_reviews.SetStringItem(index = row_num, col=4, label=rev[6])
 		return True
+
 	#--------------------------------------------------------
 	# event handlers
 	#--------------------------------------------------------
@@ -747,6 +757,7 @@ class cReviewDocPartDlg(wxgReviewDocPartDlg.wxgReviewDocPartDlg):
 		if self._PhWheel_doc_date.GetData() is not None:
 			self.__doc['clin_when'] = self._PhWheel_doc_date.GetData().get_pydt()
 		self.__doc['ext_ref'] = self._TCTRL_reference.GetValue().strip()
+		self.__doc['pk_org_unit'] = self._PRW_org.GetData()
 
 		success, data = self.__doc.save_payload()
 		if not success:
@@ -807,18 +818,21 @@ class cReviewDocPartDlg(wxgReviewDocPartDlg.wxgReviewDocPartDlg):
 				return False
 
 		return True
+
 	#--------------------------------------------------------
 	def _on_reviewed_box_checked(self, evt):
 		state = self._ChBOX_review.GetValue()
 		self._ChBOX_abnormal.Enable(enable = state)
 		self._ChBOX_relevant.Enable(enable = state)
 		self._ChBOX_responsible.Enable(enable = state)
+
 	#--------------------------------------------------------
 	def _on_doc_type_gets_focus(self):
 		"""Per Jim: Changing the doc type happens a lot more often
 		   then correcting spelling, hence select-all on getting focus.
 		"""
 		self._PhWheel_doc_type.SetSelection(-1, -1)
+
 	#--------------------------------------------------------
 	def _on_doc_type_loses_focus(self):
 		pk_doc_type = self._PhWheel_doc_type.GetData()
@@ -962,6 +976,8 @@ class cScanIdxDocsPnl(wxgScanIdxPnl.wxgScanIdxPnl, gmPlugin.cPatientChange_Plugi
 		self._LCTRL_doc_pages.set_columns([_('file'), _('path')])
 		self._LCTRL_doc_pages.set_column_widths()
 
+		self._TCTRL_metadata.SetValue(u'')
+
 		self._PhWheel_doc_type.SetFocus()
 
 	#--------------------------------------------------------
@@ -1736,7 +1752,7 @@ class cDocTree(wx.TreeCtrl, gmRegetMixin.cRegetOnPaintMixin, treemixin.Expansion
 					doc['clin_when'].strftime('%m/%Y'),
 					no_parts,
 					gmTools.coalesce(initial = doc['comment'], instead = u'', template_initial = u' %s'),
-					u'%s%s' % (doc['episode'], gmTools.coalesce(doc['health_issue'], u'', u' %s %%s' % gmTools.u_arrow2right))
+					u'%s%s' % (gmTools.coalesce(doc['health_issue'], u'', u'%s: '), doc['episode'])
 				)
 				if inter_label not in intermediate_nodes:
 					intermediate_nodes[inter_label] = self.AppendItem(parent = self.root, text = inter_label)
diff --git a/client/wxpython/gmHabitWidgets.py b/client/wxpython/gmHabitWidgets.py
index 7a3246a..82110b3 100644
--- a/client/wxpython/gmHabitWidgets.py
+++ b/client/wxpython/gmHabitWidgets.py
@@ -160,7 +160,7 @@ class cSubstanceAbuseEAPnl(wxgSubstanceAbuseEAPnl.wxgSubstanceAbuseEAPnl, gmEdit
 
 		elif self._RBTN_c2.GetValue() is True:
 			pk_substance = gmMedication.create_consumable_substance_by_atc (
-				substance = _('nicotine'),
+				substance = _('ethanol'),
 				atc = gmATC.ATC_ETHANOL,
 				amount = 1,
 				unit = _('units')
diff --git a/client/wxpython/gmListWidgets.py b/client/wxpython/gmListWidgets.py
index fa12810..579d338 100644
--- a/client/wxpython/gmListWidgets.py
+++ b/client/wxpython/gmListWidgets.py
@@ -1797,6 +1797,7 @@ class cReportListCtrl(listmixins.ListCtrlAutoWidthMixin, listmixins.ColumnSorter
 		self._context_menu.AppendMenu(-1, _('Append (&+) to clipboard...'), clip_add_menu)
 
 		if self.__extend_popup_menu_callback is not None:
+			self._context_menu.AppendSeparator()
 			self.__extend_popup_menu_callback(menu = self._context_menu)
 
 		# show menu
diff --git a/client/wxpython/gmPersonContactWidgets.py b/client/wxpython/gmPersonContactWidgets.py
index 191b9eb..709aa54 100644
--- a/client/wxpython/gmPersonContactWidgets.py
+++ b/client/wxpython/gmPersonContactWidgets.py
@@ -17,6 +17,8 @@ if __name__ == '__main__':
 from Gnumed.pycommon import gmTools
 from Gnumed.pycommon import gmNetworkTools
 
+from Gnumed.business import gmPraxis
+
 from Gnumed.wxpython import gmGuiHelpers
 from Gnumed.wxpython import gmListWidgets
 from Gnumed.wxpython import gmEditArea
@@ -146,6 +148,12 @@ class cPersonAddressesManagerPnl(gmListWidgets.cGenericListManagerPnl):
 			_('Show selected address on map'),
 			self._show_address_on_map
 		)
+		self.middle_extra_button = (
+			_('Distance'),
+			_('Show distance from your praxis'),
+			self._show_distance_on_map
+		)
+
 	#--------------------------------------------------------
 	def _add_address(self):
 		ea = gmAddressWidgets.cAddressEAPnl(self, -1)
@@ -189,6 +197,14 @@ class cPersonAddressesManagerPnl(gmListWidgets.cGenericListManagerPnl):
 		if address is None:
 			return False
 		gmNetworkTools.open_url_in_browser(address.as_map_url, new = 2, autoraise = True)
+
+	#--------------------------------------------------------
+	def _show_distance_on_map(self, address):
+		if address is None:
+			return False
+		praxis_branch = gmPraxis.gmCurrentPraxisBranch()
+		gmNetworkTools.open_url_in_browser(praxis_branch.get_distance2address_url(address), new = 2, autoraise = True)
+
 	#--------------------------------------------------------
 	def _calculate_tooltip(self, address):
 		tt = u'\n'.join(address.format())
@@ -196,6 +212,7 @@ class cPersonAddressesManagerPnl(gmListWidgets.cGenericListManagerPnl):
 		tt += u'%s\n' % (gmTools.u_box_horiz_single * 40)
 		tt += self.__static_tooltip_part
 		return tt
+
 	#--------------------------------------------------------
 	# properties
 	#--------------------------------------------------------

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/gnumed-client.git



More information about the debian-med-commit mailing list