[med-svn] [gnumed-client] 03/04: Imported Upstream version 1.6.3+dfsg
Andreas Tille
tille at debian.org
Thu Apr 7 20:07:02 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 41fcb08cd43ecef2e10cb996bf4eb61c947630c4
Author: Andreas Tille <tille at debian.org>
Date: Thu Apr 7 21:48:49 2016 +0200
Imported Upstream version 1.6.3+dfsg
---
client/CHANGELOG | 18 ++
client/business/gmDemographicRecord.py | 8 +-
client/doc/schema/gnumed-entire_schema.html | 2 +-
client/gnumed.py | 2 +-
client/po/ar-gnumed.mo | Bin 2373 -> 2373 bytes
client/po/ar.po | 66 +++--
client/po/bg-gnumed.mo | Bin 1340 -> 1340 bytes
client/po/bg.po | 62 ++--
client/po/ca-gnumed.mo | Bin 25469 -> 25469 bytes
client/po/ca.po | 73 +++--
client/po/cs-gnumed.mo | Bin 27310 -> 27310 bytes
client/po/cs.po | 73 +++--
client/po/da-gnumed.mo | Bin 3284 -> 3284 bytes
client/po/da.po | 65 +++--
client/po/de-gnumed.mo | Bin 474048 -> 475453 bytes
client/po/de.po | 104 ++++---
client/po/el-gnumed.mo | Bin 76625 -> 76625 bytes
client/po/el.po | 97 +++++--
client/po/en_AU-gnumed.mo | Bin 4988 -> 4988 bytes
client/po/en_AU.po | 62 ++--
client/po/en_CA-gnumed.mo | Bin 15065 -> 15065 bytes
client/po/en_CA.po | 68 +++--
client/po/es-gnumed.mo | Bin 511780 -> 510162 bytes
client/po/es.po | 104 +++++--
client/po/fr-gnumed.mo | Bin 152111 -> 152111 bytes
client/po/fr.po | 98 +++++--
client/po/id-gnumed.mo | Bin 4526 -> 4526 bytes
client/po/id.po | 72 +++--
client/po/it-gnumed.mo | Bin 101346 -> 101346 bytes
client/po/it.po | 73 +++--
client/po/ka-gnumed.mo | Bin 1928 -> 1928 bytes
client/po/ka.po | 62 ++--
client/po/nb-gnumed.mo | Bin 2194 -> 2194 bytes
client/po/nb.po | 70 +++--
client/po/nl-gnumed.mo | Bin 141901 -> 141901 bytes
client/po/nl.po | 73 +++--
client/po/pl-gnumed.mo | Bin 35554 -> 35554 bytes
client/po/pl.po | 73 +++--
client/po/pt-gnumed.mo | Bin 125025 -> 125025 bytes
client/po/pt.po | 73 +++--
client/po/pt_BR-gnumed.mo | Bin 148846 -> 148846 bytes
client/po/pt_BR.po | 73 +++--
client/po/ro-gnumed.mo | Bin 1311 -> 1311 bytes
client/po/ro.po | 62 ++--
client/po/ru-gnumed.mo | Bin 431809 -> 431809 bytes
client/po/ru.po | 74 +++--
client/po/ru_RU-gnumed.mo | Bin 451394 -> 451394 bytes
client/po/ru_RU.po | 74 +++--
client/po/sq-gnumed.mo | Bin 33489 -> 33489 bytes
client/po/sq.po | 73 +++--
client/po/sr-gnumed.mo | Bin 14583 -> 14583 bytes
client/po/sr.po | 68 +++--
client/po/sv-gnumed.mo | Bin 61655 -> 61655 bytes
client/po/sv.po | 97 +++++--
client/po/tr-gnumed.mo | Bin 1940 -> 1940 bytes
client/po/tr.po | 69 +++--
client/po/uk-gnumed.mo | Bin 862 -> 862 bytes
client/po/uk.po | 62 ++--
client/po/zh_TW-gnumed.mo | Bin 2740 -> 2740 bytes
client/po/zh_TW.po | 62 ++--
client/pycommon/gmI18N.py | 21 +-
client/pycommon/gmTools.py | 2 +-
.../wxGladeWidgets/wxgEMRListJournalPluginPnl.py | 10 +-
client/wxpython/gmBillingWidgets.py | 4 +-
client/wxpython/gmDocumentWidgets.py | 7 +
client/wxpython/gmListWidgets.py | 316 +++++++++++++++++++--
client/wxpython/gmMeasurementWidgets.py | 49 ++--
client/wxpython/gmPlugin.py | 2 +-
client/wxpython/gmProgressNotesEAWidgets.py | 1 +
client/wxpython/gmTextCtrl.py | 9 +-
external-tools/check-prerequisites.py | 10 +
71 files changed, 1927 insertions(+), 616 deletions(-)
diff --git a/client/CHANGELOG b/client/CHANGELOG
index 2511aa6..f2a542f 100644
--- a/client/CHANGELOG
+++ b/client/CHANGELOG
@@ -6,6 +6,20 @@
# rel-1-6-patches
------------------------------------------------
+ 1.6.3
+
+FIX: exception on creating invoice from bill [thanks Marc]
+FIX: faulty assumption on what %()s keys must exist in translations
+FIX: exception in expando SOAP editor when lines need wrapping [thanks Marc]
+FIX: exception on saving progress note under new episode [thanks Marc]
+FIX: exception on deleting list items [thanks Marc]
+FIX: exception on building list context menu [thanks Marc]
+FIX: exception in measurements widget on client idling w/o patient [thanks Marc]
+
+IMPROVED: add httplib2 to check-prerequisites.py [thanks Marc]
+IMPROVED: single-line formatting of addresses
+IMPROVED: enhance list context menu to selected rows
+
1.6.2
FIX: exception create consumable substance by ATC
@@ -1696,6 +1710,10 @@ FIX: missing cast to ::text in dem.date_trunc_utc() calls
# gnumed_v21
------------------------------------------------
+ 21.3
+
+FIX: GRANTs on demographics views [thanks Marc]
+
21.2
NEW: implement commenting out of plausibility checks
diff --git a/client/business/gmDemographicRecord.py b/client/business/gmDemographicRecord.py
index 04d2fa2..8fa0630 100644
--- a/client/business/gmDemographicRecord.py
+++ b/client/business/gmDemographicRecord.py
@@ -721,14 +721,14 @@ def format_address_single_line(address=None, verbose=False, show_type=False):
if verbose:
if show_type:
- template = _('%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, %(code_region)s, %(code_country)s')
+ template = _('%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, %(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)')
else:
- template = _('%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, %(code_region)s, %(code_country)s')
+ template = _('%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, %(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)')
else:
if show_type:
- template = _('%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, %(code_region)s, %(code_country)s')
+ template = _('%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, %(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)')
else:
- template = _('%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, %(code_region)s, %(code_country)s')
+ template = _('%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, %(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)')
return template % data
diff --git a/client/doc/schema/gnumed-entire_schema.html b/client/doc/schema/gnumed-entire_schema.html
index b4a23fa..95b0a78 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-03-25</p>
+ <p><br><br>Dumped on 2016-04-06</p>
<h1><a name="index">Index of database - gnumed_v21</a></h1>
<ul>
diff --git a/client/gnumed.py b/client/gnumed.py
index 1eea0e5..e7e7bca 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.2'
+current_client_version = u'1.6.3'
current_client_branch = u'1.6'
_log = None
diff --git a/client/po/ar-gnumed.mo b/client/po/ar-gnumed.mo
index 32eaca7..7cd468c 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 0555322..48c36cf 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-03-17 16:27+0100\n"
+"POT-Creation-Date: 2016-04-06 11:39+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"
@@ -5194,19 +5194,20 @@ msgstr ""
msgid "Channel"
msgstr ""
-msgid "&Last modification time"
-msgstr ""
+#, fuzzy
+msgid "&Modification"
+msgstr "الت"
-msgid "&Entry time"
+msgid "&Event"
msgstr ""
-msgid "Show journal ordered by encounter."
+msgid "Order by start of encounter a chart entry is linked to."
msgstr ""
-msgid "Show journal ordered by time of last modification."
+msgid "Order by time of most recent edit of each chart entry."
msgstr ""
-msgid "Show journal ordered by actual clinical time of each entry."
+msgid "Order by time documented as actual occurrence of each chart entry."
msgstr ""
msgid "Edit the selected chart entry."
@@ -6128,6 +6129,15 @@ msgid ""
"To disable that popup leave the message empty."
msgstr ""
+msgid "&Last modification time"
+msgstr ""
+
+msgid "Show journal ordered by encounter."
+msgstr ""
+
+msgid "Show journal ordered by time of last modification."
+msgstr ""
+
msgid "Show search dialog."
msgstr ""
@@ -6850,25 +6860,25 @@ msgstr ""
#, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, %(code_region)s, "
-"%(code_country)s"
+"%(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
@@ -12145,7 +12155,15 @@ msgid ""
msgstr ""
#, fuzzy
-msgid "List Item Actions:"
+msgid "List Item Actions"
+msgstr "الت"
+
+#, fuzzy
+msgid "List Item Actions (selected: 1 entry)"
+msgstr "الت"
+
+#, fuzzy, python-format
+msgid "List Item Actions (selected: %s entries)"
msgstr "الت"
msgid "Add (<INS>)"
@@ -12161,24 +12179,36 @@ msgstr ""
msgid "Find next [%s] (<CTRL-N>)"
msgstr ""
-msgid "Row tooltip"
+msgid "Tooltips of selected rows"
+msgstr ""
+
+msgid "Data (formatted as text) of selected rows"
+msgstr ""
+
+msgid "Content (as one line each) of selected rows"
msgstr ""
-msgid "Row data (formatted as text)"
+msgid "Tooltip of current row"
msgstr ""
-msgid "Row content (as one line)"
+msgid "Data (formatted as text) of current row"
msgstr ""
-msgid "Row content (one line per column)"
+msgid "Content (as one line) of current row"
+msgstr ""
+
+msgid "Content (one line per column) of current row"
msgstr ""
#, python-format
-msgid "Column &%s: \"%s\" [#%s]"
+msgid "Column &%s (current row): \"%s\" [#%s]"
msgstr ""
#, python-format
-msgid "Column &%s: %s"
+msgid "Column &%s (current row): %s"
+msgstr ""
+
+msgid "Copy to e&xport area..."
msgstr ""
msgid "&Copy to clipboard..."
diff --git a/client/po/bg-gnumed.mo b/client/po/bg-gnumed.mo
index 9a14cb8..72322ff 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 dfe2bcd..192b2d7 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-03-17 16:27+0100\n"
+"POT-Creation-Date: 2016-04-06 11:39+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"
@@ -5195,19 +5195,19 @@ msgstr ""
msgid "Channel"
msgstr ""
-msgid "&Last modification time"
+msgid "&Modification"
msgstr ""
-msgid "&Entry time"
+msgid "&Event"
msgstr ""
-msgid "Show journal ordered by encounter."
+msgid "Order by start of encounter a chart entry is linked to."
msgstr ""
-msgid "Show journal ordered by time of last modification."
+msgid "Order by time of most recent edit of each chart entry."
msgstr ""
-msgid "Show journal ordered by actual clinical time of each entry."
+msgid "Order by time documented as actual occurrence of each chart entry."
msgstr ""
msgid "Edit the selected chart entry."
@@ -6129,6 +6129,15 @@ msgid ""
"To disable that popup leave the message empty."
msgstr ""
+msgid "&Last modification time"
+msgstr ""
+
+msgid "Show journal ordered by encounter."
+msgstr ""
+
+msgid "Show journal ordered by time of last modification."
+msgstr ""
+
msgid "Show search dialog."
msgstr ""
@@ -6846,25 +6855,25 @@ msgstr ""
#, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, %(code_region)s, "
-"%(code_country)s"
+"%(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
@@ -12141,7 +12150,14 @@ msgid ""
"SHIFT> or <CTRL-ALT>) while clicking."
msgstr ""
-msgid "List Item Actions:"
+msgid "List Item Actions"
+msgstr ""
+
+msgid "List Item Actions (selected: 1 entry)"
+msgstr ""
+
+#, python-format
+msgid "List Item Actions (selected: %s entries)"
msgstr ""
msgid "Add (<INS>)"
@@ -12157,24 +12173,36 @@ msgstr ""
msgid "Find next [%s] (<CTRL-N>)"
msgstr ""
-msgid "Row tooltip"
+msgid "Tooltips of selected rows"
+msgstr ""
+
+msgid "Data (formatted as text) of selected rows"
msgstr ""
-msgid "Row data (formatted as text)"
+msgid "Content (as one line each) of selected rows"
msgstr ""
-msgid "Row content (as one line)"
+msgid "Tooltip of current row"
msgstr ""
-msgid "Row content (one line per column)"
+msgid "Data (formatted as text) of current row"
+msgstr ""
+
+msgid "Content (as one line) of current row"
+msgstr ""
+
+msgid "Content (one line per column) of current row"
msgstr ""
#, python-format
-msgid "Column &%s: \"%s\" [#%s]"
+msgid "Column &%s (current row): \"%s\" [#%s]"
msgstr ""
#, python-format
-msgid "Column &%s: %s"
+msgid "Column &%s (current row): %s"
+msgstr ""
+
+msgid "Copy to e&xport area..."
msgstr ""
msgid "&Copy to clipboard..."
diff --git a/client/po/ca-gnumed.mo b/client/po/ca-gnumed.mo
index 09e9498..0d6bfaa 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 3ac8d37..5f8e722 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-03-17 16:27+0100\n"
+"POT-Creation-Date: 2016-04-06 11:39+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"
@@ -5448,20 +5448,20 @@ msgid "Channel"
msgstr "Canal"
#, fuzzy
-msgid "&Last modification time"
-msgstr "Darrera modificació:"
+msgid "&Modification"
+msgstr "Instruccions"
#, fuzzy
-msgid "&Entry time"
-msgstr "Mostra l'hora"
+msgid "&Event"
+msgstr "Esdeveniments"
-msgid "Show journal ordered by encounter."
+msgid "Order by start of encounter a chart entry is linked to."
msgstr ""
-msgid "Show journal ordered by time of last modification."
+msgid "Order by time of most recent edit of each chart entry."
msgstr ""
-msgid "Show journal ordered by actual clinical time of each entry."
+msgid "Order by time documented as actual occurrence of each chart entry."
msgstr ""
#, fuzzy
@@ -6421,6 +6421,16 @@ msgid ""
"To disable that popup leave the message empty."
msgstr ""
+#, fuzzy
+msgid "&Last modification time"
+msgstr "Darrera modificació:"
+
+msgid "Show journal ordered by encounter."
+msgstr ""
+
+msgid "Show journal ordered by time of last modification."
+msgstr ""
+
msgid "Show search dialog."
msgstr ""
@@ -7165,25 +7175,25 @@ msgstr ""
#, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, %(code_region)s, "
-"%(code_country)s"
+"%(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
@@ -12623,7 +12633,15 @@ msgid ""
msgstr ""
#, fuzzy
-msgid "List Item Actions:"
+msgid "List Item Actions"
+msgstr "Direccions"
+
+#, fuzzy
+msgid "List Item Actions (selected: 1 entry)"
+msgstr "Direccions"
+
+#, fuzzy, python-format
+msgid "List Item Actions (selected: %s entries)"
msgstr "Direccions"
msgid "Add (<INS>)"
@@ -12640,27 +12658,40 @@ msgstr ""
msgid "Find next [%s] (<CTRL-N>)"
msgstr ""
-msgid "Row tooltip"
+msgid "Tooltips of selected rows"
+msgstr ""
+
+msgid "Data (formatted as text) of selected rows"
msgstr ""
-msgid "Row data (formatted as text)"
+msgid "Content (as one line each) of selected rows"
msgstr ""
-msgid "Row content (as one line)"
+msgid "Tooltip of current row"
msgstr ""
-msgid "Row content (one line per column)"
+msgid "Data (formatted as text) of current row"
+msgstr ""
+
+msgid "Content (as one line) of current row"
+msgstr ""
+
+msgid "Content (one line per column) of current row"
msgstr ""
#, python-format
-msgid "Column &%s: \"%s\" [#%s]"
+msgid "Column &%s (current row): \"%s\" [#%s]"
msgstr ""
#, fuzzy, python-format
-msgid "Column &%s: %s"
+msgid "Column &%s (current row): %s"
msgstr "Documents: %s"
#, fuzzy
+msgid "Copy to e&xport area..."
+msgstr "Llistat de vacunes buit"
+
+#, fuzzy
msgid "&Copy to clipboard..."
msgstr "Llistat de vacunes buit"
@@ -18623,6 +18654,10 @@ msgid "Abort and do NOT connect to GNUmed."
msgstr "Interromput i no connectat a GNUmed"
#, fuzzy
+#~ msgid "&Entry time"
+#~ msgstr "Mostra l'hora"
+
+#, fuzzy
#~ msgid ""
#~ "Health issue: %s%s%s (%s versions)\n"
#~ "\n"
diff --git a/client/po/cs-gnumed.mo b/client/po/cs-gnumed.mo
index 82c02d7..e7f9ce7 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 da3e81d..d1379ae 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-03-17 16:27+0100\n"
+"POT-Creation-Date: 2016-04-06 11:39+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"
@@ -5357,20 +5357,21 @@ msgstr ""
msgid "Channel"
msgstr ""
-msgid "&Last modification time"
-msgstr ""
+#, fuzzy
+msgid "&Modification"
+msgstr "Informace"
#, fuzzy
-msgid "&Entry time"
-msgstr "Koncový čas "
+msgid "&Event"
+msgstr "Události"
-msgid "Show journal ordered by encounter."
+msgid "Order by start of encounter a chart entry is linked to."
msgstr ""
-msgid "Show journal ordered by time of last modification."
+msgid "Order by time of most recent edit of each chart entry."
msgstr ""
-msgid "Show journal ordered by actual clinical time of each entry."
+msgid "Order by time documented as actual occurrence of each chart entry."
msgstr ""
#, fuzzy
@@ -6296,6 +6297,15 @@ msgid ""
"To disable that popup leave the message empty."
msgstr ""
+msgid "&Last modification time"
+msgstr ""
+
+msgid "Show journal ordered by encounter."
+msgstr ""
+
+msgid "Show journal ordered by time of last modification."
+msgstr ""
+
msgid "Show search dialog."
msgstr ""
@@ -7039,25 +7049,25 @@ msgstr ""
#, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, %(code_region)s, "
-"%(code_country)s"
+"%(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
@@ -12381,7 +12391,15 @@ msgid ""
"SHIFT> or <CTRL-ALT>) while clicking."
msgstr ""
-msgid "List Item Actions:"
+msgid "List Item Actions"
+msgstr ""
+
+#, fuzzy
+msgid "List Item Actions (selected: 1 entry)"
+msgstr "&Duplikovat vybranou událost..."
+
+#, python-format
+msgid "List Item Actions (selected: %s entries)"
msgstr ""
msgid "Add (<INS>)"
@@ -12398,27 +12416,40 @@ msgstr ""
msgid "Find next [%s] (<CTRL-N>)"
msgstr ""
-msgid "Row tooltip"
+msgid "Tooltips of selected rows"
+msgstr ""
+
+msgid "Data (formatted as text) of selected rows"
msgstr ""
-msgid "Row data (formatted as text)"
+msgid "Content (as one line each) of selected rows"
msgstr ""
-msgid "Row content (as one line)"
+msgid "Tooltip of current row"
msgstr ""
-msgid "Row content (one line per column)"
+msgid "Data (formatted as text) of current row"
+msgstr ""
+
+msgid "Content (as one line) of current row"
+msgstr ""
+
+msgid "Content (one line per column) of current row"
msgstr ""
#, python-format
-msgid "Column &%s: \"%s\" [#%s]"
+msgid "Column &%s (current row): \"%s\" [#%s]"
msgstr ""
#, fuzzy, python-format
-msgid "Column &%s: %s"
+msgid "Column &%s (current row): %s"
msgstr "Dokumenty: %s"
#, fuzzy
+msgid "Copy to e&xport area..."
+msgstr "Nelze kopírovat do schránky."
+
+#, fuzzy
msgid "&Copy to clipboard..."
msgstr "Nelze kopírovat do schránky."
@@ -18248,6 +18279,10 @@ msgid "Abort and do NOT connect to GNUmed."
msgstr ""
#, fuzzy
+#~ msgid "&Entry time"
+#~ msgstr "Koncový čas "
+
+#, fuzzy
#~ msgid ""
#~ "Health issue: %s%s%s (%s versions)\n"
#~ "\n"
diff --git a/client/po/da-gnumed.mo b/client/po/da-gnumed.mo
index c547e22..d498e5e 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 a4512dc..d2d1bef 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-03-17 16:27+0100\n"
+"POT-Creation-Date: 2016-04-06 11:39+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"
@@ -5201,19 +5201,20 @@ msgstr ""
msgid "Channel"
msgstr ""
-msgid "&Last modification time"
-msgstr ""
+#, fuzzy
+msgid "&Modification"
+msgstr "Internt patient ID"
-msgid "&Entry time"
+msgid "&Event"
msgstr ""
-msgid "Show journal ordered by encounter."
+msgid "Order by start of encounter a chart entry is linked to."
msgstr ""
-msgid "Show journal ordered by time of last modification."
+msgid "Order by time of most recent edit of each chart entry."
msgstr ""
-msgid "Show journal ordered by actual clinical time of each entry."
+msgid "Order by time documented as actual occurrence of each chart entry."
msgstr ""
msgid "Edit the selected chart entry."
@@ -6137,6 +6138,15 @@ msgid ""
"To disable that popup leave the message empty."
msgstr ""
+msgid "&Last modification time"
+msgstr ""
+
+msgid "Show journal ordered by encounter."
+msgstr ""
+
+msgid "Show journal ordered by time of last modification."
+msgstr ""
+
msgid "Show search dialog."
msgstr ""
@@ -6857,25 +6867,25 @@ msgstr ""
#, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, %(code_region)s, "
-"%(code_country)s"
+"%(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
@@ -12168,7 +12178,14 @@ msgid ""
"SHIFT> or <CTRL-ALT>) while clicking."
msgstr ""
-msgid "List Item Actions:"
+msgid "List Item Actions"
+msgstr ""
+
+msgid "List Item Actions (selected: 1 entry)"
+msgstr ""
+
+#, python-format
+msgid "List Item Actions (selected: %s entries)"
msgstr ""
msgid "Add (<INS>)"
@@ -12184,26 +12201,38 @@ msgstr ""
msgid "Find next [%s] (<CTRL-N>)"
msgstr ""
-msgid "Row tooltip"
+msgid "Tooltips of selected rows"
+msgstr ""
+
+msgid "Data (formatted as text) of selected rows"
+msgstr ""
+
+msgid "Content (as one line each) of selected rows"
msgstr ""
-msgid "Row data (formatted as text)"
+msgid "Tooltip of current row"
msgstr ""
-msgid "Row content (as one line)"
+msgid "Data (formatted as text) of current row"
msgstr ""
-msgid "Row content (one line per column)"
+msgid "Content (as one line) of current row"
+msgstr ""
+
+msgid "Content (one line per column) of current row"
msgstr ""
#, python-format
-msgid "Column &%s: \"%s\" [#%s]"
+msgid "Column &%s (current row): \"%s\" [#%s]"
msgstr ""
#, fuzzy, python-format
-msgid "Column &%s: %s"
+msgid "Column &%s (current row): %s"
msgstr "Dokumenter: %s"
+msgid "Copy to e&xport area..."
+msgstr ""
+
msgid "&Copy to clipboard..."
msgstr ""
diff --git a/client/po/de-gnumed.mo b/client/po/de-gnumed.mo
index 5de3baa..125790c 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 75c33e7..b42c304 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-03-17 16:20+0100\n"
-"PO-Revision-Date: 2016-03-24 16:37+0100\n"
+"POT-Creation-Date: 2016-04-06 11:40+0200\n"
+"PO-Revision-Date: 2016-04-06 11:50+0200\n"
"Last-Translator: Karsten Hilbert <Karsten.Hilbert at gmx.net>\n"
"Language-Team: Deutsch\n"
"Language: de_DE\n"
@@ -1877,7 +1877,7 @@ msgstr " Option [%s]: %s"
#, python-format
msgid " risk: %s"
-msgstr " Gefahr: %s"
+msgstr " Risiko: %s"
msgid "no hook specified, please report bug"
msgstr "Kein Hook definiert. Diesen Fehler bitte melden!"
@@ -5783,21 +5783,21 @@ msgstr ""
msgid "Channel"
msgstr "Kanal"
-msgid "&Last modification time"
-msgstr "&Letzter Bearbeitungszeitpunkt"
+msgid "&Modification"
+msgstr "&Bearbeitung"
-msgid "&Entry time"
-msgstr "&Ereigniszeit"
+msgid "&Event"
+msgstr "&Ereignis"
-msgid "Show journal ordered by encounter."
-msgstr "Zeige Journal nach APK sortiert."
+msgid "Order by start of encounter a chart entry is linked to."
+msgstr "Nach Beginn des APK, zu welchem ein Eintrag gehört, ordnen."
-msgid "Show journal ordered by time of last modification."
-msgstr "Karteijournal sortiert nach letztem Bearbeitungszeitpunkt zeigen."
+msgid "Order by time of most recent edit of each chart entry."
+msgstr "Nach Zeitpunkt der letzten Bearbeitung des jeweiligen Eintrags ordnen."
-msgid "Show journal ordered by actual clinical time of each entry."
+msgid "Order by time documented as actual occurrence of each chart entry."
msgstr ""
-"Zeige Journal nach klinisch relevantem Zeitpunkt der Einträge sortiert."
+"Nach Zeitpunkt des eigentlichen Geschehens des jeweiligen Eintrags ordnen."
msgid "Edit the selected chart entry."
msgstr "Den markierten Karteieintrag bearbeiten."
@@ -6903,6 +6903,15 @@ msgstr ""
"\n"
"Eine leere Nachricht unterdrückt die Begrüßung."
+msgid "&Last modification time"
+msgstr "&Letzter Bearbeitungszeitpunkt"
+
+msgid "Show journal ordered by encounter."
+msgstr "Zeige Journal nach APK sortiert."
+
+msgid "Show journal ordered by time of last modification."
+msgstr "Karteijournal sortiert nach letztem Bearbeitungszeitpunkt zeigen."
+
msgid "Show search dialog."
msgstr "Suchfunktion anzeigen."
@@ -7630,28 +7639,30 @@ msgstr "Fehler mit pdftk. Kann PDF-Formular nicht versiegeln."
#, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
+"%(type)s: %(street)s %(number)s, %(zip)s %(urb)s, %(l10n_region)s, "
+"%(l10n_country)s"
#, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
"%(street)s %(number)s, %(zip)s %(urb)s, %(l10n_region)s, %(l10n_country)s"
#, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
-"%(l10n_type)s: %(street)s %(number)s, %(zip)s %(urb)s, %(l10n_region)s, "
+"%(type)s: %(street)s %(number)s, %(zip)s %(urb)s, %(l10n_region)s, "
"%(l10n_country)s"
#, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, %(code_region)s, "
-"%(code_country)s"
+"%(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
"%(street)s %(number)s, %(zip)s %(urb)s, %(l10n_region)s, %(l10n_country)s"
@@ -13637,8 +13648,15 @@ msgstr ""
"Tastenkombinationen (z.B. <STRG-SHIFT> oder <STRG-ALT>) während des "
"Markierens."
-msgid "List Item Actions:"
-msgstr "Tabellenaktionen:"
+msgid "List Item Actions"
+msgstr "Tabellenaktionen"
+
+msgid "List Item Actions (selected: 1 entry)"
+msgstr "Tabellenaktionen (markiert: 1 Eintrag)"
+
+#, python-format
+msgid "List Item Actions (selected: %s entries)"
+msgstr "Tabellenaktionen (markiert: %s Einträge)"
msgid "Add (<INS>)"
msgstr "Hinzufügen (<Einfg>)"
@@ -13653,25 +13671,37 @@ msgstr "Finden (<STRG-F>)"
msgid "Find next [%s] (<CTRL-N>)"
msgstr "Finde nächste [%s] (<STRG-N>)"
-msgid "Row tooltip"
-msgstr "Tooltip des Eintrags"
+msgid "Tooltips of selected rows"
+msgstr "Tooltips der markierten Einträge"
+
+msgid "Data (formatted as text) of selected rows"
+msgstr "Zeilendaten (als Text) der markierten Einträge"
+
+msgid "Content (as one line each) of selected rows"
+msgstr "Inhalte (als Einzeiler) der markierten Einträge"
-msgid "Row data (formatted as text)"
-msgstr "Zeilendaten (als Text)"
+msgid "Tooltip of current row"
+msgstr "Tooltip des aktuellen Eintrags"
-msgid "Row content (as one line)"
-msgstr "Zeileninhalt (als Einzeiler)"
+msgid "Data (formatted as text) of current row"
+msgstr "Zeilendaten (als Text) des aktuellen Eintrags"
-msgid "Row content (one line per column)"
-msgstr "Zeileninhalt (pro Spalte eine Zeile)"
+msgid "Content (as one line) of current row"
+msgstr "Zeileninhalt (als Einzeiler) des aktuellen Eintrags"
+
+msgid "Content (one line per column) of current row"
+msgstr "Zeileninhalt (pro Spalte eine Zeile) des aktuellen Eintrags"
#, python-format
-msgid "Column &%s: \"%s\" [#%s]"
-msgstr "Spalte &%s: \"%s\" [#%s]"
+msgid "Column &%s (current row): \"%s\" [#%s]"
+msgstr "Spalte &%s (aktueller Eintrag): \"%s\" [#%s]"
#, python-format
-msgid "Column &%s: %s"
-msgstr "Spalte &%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 "&Copy to clipboard..."
msgstr "In Zwischenablage &kopieren..."
@@ -20518,6 +20548,16 @@ msgstr "Abbrechen"
msgid "Abort and do NOT connect to GNUmed."
msgstr "Abbrechen und keine Verbindung zu GNUmed herstellen."
+#~ msgid "Row tooltip"
+#~ msgstr "Tooltip des Eintrags"
+
+#~ msgid "&Entry time"
+#~ msgstr "&Ereigniszeit"
+
+#~ msgid "Show journal ordered by actual clinical time of each entry."
+#~ msgstr ""
+#~ "Zeige Journal nach klinisch relevantem Zeitpunkt der Einträge sortiert."
+
#, fuzzy
#~ msgid ""
#~ "Health issue: %s%s%s (%s versions)\n"
diff --git a/client/po/el-gnumed.mo b/client/po/el-gnumed.mo
index 8741fb9..a1504cc 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 7a8d463..087b93b 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-03-17 16:27+0100\n"
+"POT-Creation-Date: 2016-04-06 11:40+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"
@@ -5611,20 +5611,20 @@ msgid "Channel"
msgstr "Κανάλι"
#, fuzzy
-msgid "&Last modification time"
-msgstr "Τελευταία τροποποίηση:"
+msgid "&Modification"
+msgstr "Ένδειξη"
#, fuzzy
-msgid "&Entry time"
-msgstr "Άρχισε νέο"
+msgid "&Event"
+msgstr "Συμβάν"
-msgid "Show journal ordered by encounter."
+msgid "Order by start of encounter a chart entry is linked to."
msgstr ""
-msgid "Show journal ordered by time of last modification."
+msgid "Order by time of most recent edit of each chart entry."
msgstr ""
-msgid "Show journal ordered by actual clinical time of each entry."
+msgid "Order by time documented as actual occurrence of each chart entry."
msgstr ""
#, fuzzy
@@ -6619,6 +6619,16 @@ msgid ""
msgstr ""
#, fuzzy
+msgid "&Last modification time"
+msgstr "Τελευταία τροποποίηση:"
+
+msgid "Show journal ordered by encounter."
+msgstr ""
+
+msgid "Show journal ordered by time of last modification."
+msgstr ""
+
+#, fuzzy
msgid "Show search dialog."
msgstr "Κλείσιμο αυτού του διαλόγου."
@@ -7383,28 +7393,46 @@ msgid "Error running pdftk. Cannot flatten filled in PDF form."
msgstr ""
"Σφάλμα τρέξιμο pdftk. Δεν μπορεί απευθείαςς να συμπληρωθεί σε μορφή PDF."
-#, python-format
+#, fuzzy, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
+"Διεύθυνση [#%(pk_adr)s] \n"
+" Οδός: %(street)s%(notes_street)s\n"
+" Αριθμός / Μονάδα:: %(number)s%(subunit)s%(notes_subunit)s\n"
+" Τοποθεσία:%(zip)s %(urb)s%(suburb)s\n"
+" Περιοχή: %(l10n_region)s, %(code_region)s\n"
+" Χώρα: %(l10n_country)s, %(code_country)s"
-#, python-format
+#, fuzzy, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
+"Διεύθυνση [#%(pk_adr)s] \n"
+" Οδός: %(street)s%(notes_street)s\n"
+" Αριθμός / Μονάδα:: %(number)s%(subunit)s%(notes_subunit)s\n"
+" Τοποθεσία:%(zip)s %(urb)s%(suburb)s\n"
+" Περιοχή: %(l10n_region)s, %(code_region)s\n"
+" Χώρα: %(l10n_country)s, %(code_country)s"
-#, python-format
+#, fuzzy, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
+"Διεύθυνση [#%(pk_adr)s] \n"
+" Οδός: %(street)s%(notes_street)s\n"
+" Αριθμός / Μονάδα:: %(number)s%(subunit)s%(notes_subunit)s\n"
+" Τοποθεσία:%(zip)s %(urb)s%(suburb)s\n"
+" Περιοχή: %(l10n_region)s, %(code_region)s\n"
+" Χώρα: %(l10n_country)s, %(code_country)s"
#, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, %(code_region)s, "
-"%(code_country)s"
+"%(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, fuzzy, python-format
@@ -12932,7 +12960,15 @@ msgid ""
msgstr ""
#, fuzzy
-msgid "List Item Actions:"
+msgid "List Item Actions"
+msgstr "Κατευθύνσεις"
+
+#, fuzzy
+msgid "List Item Actions (selected: 1 entry)"
+msgstr "Κατευθύνσεις"
+
+#, fuzzy, python-format
+msgid "List Item Actions (selected: %s entries)"
msgstr "Κατευθύνσεις"
msgid "Add (<INS>)"
@@ -12949,27 +12985,40 @@ msgstr ""
msgid "Find next [%s] (<CTRL-N>)"
msgstr ""
-msgid "Row tooltip"
+msgid "Tooltips of selected rows"
+msgstr ""
+
+msgid "Data (formatted as text) of selected rows"
+msgstr ""
+
+msgid "Content (as one line each) of selected rows"
msgstr ""
-msgid "Row data (formatted as text)"
+msgid "Tooltip of current row"
msgstr ""
-msgid "Row content (as one line)"
+msgid "Data (formatted as text) of current row"
msgstr ""
-msgid "Row content (one line per column)"
+msgid "Content (as one line) of current row"
+msgstr ""
+
+msgid "Content (one line per column) of current row"
msgstr ""
#, python-format
-msgid "Column &%s: \"%s\" [#%s]"
+msgid "Column &%s (current row): \"%s\" [#%s]"
msgstr ""
#, fuzzy, python-format
-msgid "Column &%s: %s"
+msgid "Column &%s (current row): %s"
msgstr "Αρχεία:%s"
#, fuzzy
+msgid "Copy to e&xport area..."
+msgstr "Προσθήκη νέου ονόματος"
+
+#, fuzzy
msgid "&Copy to clipboard..."
msgstr "Εξαγωγή στο &πρόχειρο"
@@ -19047,6 +19096,10 @@ msgid "Abort and do NOT connect to GNUmed."
msgstr "Ματαίωση και ΔΕΝ θα συνδεθείτε με το GNUmed."
#, fuzzy
+#~ msgid "&Entry time"
+#~ msgstr "Άρχισε νέο"
+
+#, fuzzy
#~ msgid ""
#~ "Health issue: %s%s%s (%s versions)\n"
#~ "\n"
diff --git a/client/po/en_AU-gnumed.mo b/client/po/en_AU-gnumed.mo
index ad347ae..23040d0 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 08a2b75..793b938 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-03-17 16:27+0100\n"
+"POT-Creation-Date: 2016-04-06 11:40+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"
@@ -5201,19 +5201,19 @@ msgstr ""
msgid "Channel"
msgstr ""
-msgid "&Last modification time"
+msgid "&Modification"
msgstr ""
-msgid "&Entry time"
+msgid "&Event"
msgstr ""
-msgid "Show journal ordered by encounter."
+msgid "Order by start of encounter a chart entry is linked to."
msgstr ""
-msgid "Show journal ordered by time of last modification."
+msgid "Order by time of most recent edit of each chart entry."
msgstr ""
-msgid "Show journal ordered by actual clinical time of each entry."
+msgid "Order by time documented as actual occurrence of each chart entry."
msgstr ""
msgid "Edit the selected chart entry."
@@ -6136,6 +6136,15 @@ msgid ""
"To disable that popup leave the message empty."
msgstr ""
+msgid "&Last modification time"
+msgstr ""
+
+msgid "Show journal ordered by encounter."
+msgstr ""
+
+msgid "Show journal ordered by time of last modification."
+msgstr ""
+
msgid "Show search dialog."
msgstr ""
@@ -6856,25 +6865,25 @@ msgstr ""
#, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, %(code_region)s, "
-"%(code_country)s"
+"%(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
@@ -12179,7 +12188,14 @@ msgid ""
"SHIFT> or <CTRL-ALT>) while clicking."
msgstr ""
-msgid "List Item Actions:"
+msgid "List Item Actions"
+msgstr ""
+
+msgid "List Item Actions (selected: 1 entry)"
+msgstr ""
+
+#, python-format
+msgid "List Item Actions (selected: %s entries)"
msgstr ""
msgid "Add (<INS>)"
@@ -12195,26 +12211,38 @@ msgstr ""
msgid "Find next [%s] (<CTRL-N>)"
msgstr ""
-msgid "Row tooltip"
+msgid "Tooltips of selected rows"
+msgstr ""
+
+msgid "Data (formatted as text) of selected rows"
msgstr ""
-msgid "Row data (formatted as text)"
+msgid "Content (as one line each) of selected rows"
msgstr ""
-msgid "Row content (as one line)"
+msgid "Tooltip of current row"
msgstr ""
-msgid "Row content (one line per column)"
+msgid "Data (formatted as text) of current row"
+msgstr ""
+
+msgid "Content (as one line) of current row"
+msgstr ""
+
+msgid "Content (one line per column) of current row"
msgstr ""
#, python-format
-msgid "Column &%s: \"%s\" [#%s]"
+msgid "Column &%s (current row): \"%s\" [#%s]"
msgstr ""
#, fuzzy, python-format
-msgid "Column &%s: %s"
+msgid "Column &%s (current row): %s"
msgstr "Documents: %s"
+msgid "Copy to e&xport area..."
+msgstr ""
+
msgid "&Copy to clipboard..."
msgstr ""
diff --git a/client/po/en_CA-gnumed.mo b/client/po/en_CA-gnumed.mo
index 46ab247..90de363 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 6eafb2c..ed24636 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-03-17 16:27+0100\n"
+"POT-Creation-Date: 2016-04-06 11:40+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"
@@ -5292,19 +5292,20 @@ msgid "Channel"
msgstr ""
#, fuzzy
-msgid "&Last modification time"
+msgid "&Modification"
msgstr "Last worked on: %s\n"
-msgid "&Entry time"
-msgstr ""
+#, fuzzy
+msgid "&Event"
+msgstr "inactive"
-msgid "Show journal ordered by encounter."
+msgid "Order by start of encounter a chart entry is linked to."
msgstr ""
-msgid "Show journal ordered by time of last modification."
+msgid "Order by time of most recent edit of each chart entry."
msgstr ""
-msgid "Show journal ordered by actual clinical time of each entry."
+msgid "Order by time documented as actual occurrence of each chart entry."
msgstr ""
#, fuzzy
@@ -6249,6 +6250,16 @@ msgid ""
"To disable that popup leave the message empty."
msgstr ""
+#, fuzzy
+msgid "&Last modification time"
+msgstr "Last worked on: %s\n"
+
+msgid "Show journal ordered by encounter."
+msgstr ""
+
+msgid "Show journal ordered by time of last modification."
+msgstr ""
+
msgid "Show search dialog."
msgstr ""
@@ -6983,25 +6994,25 @@ msgstr ""
#, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, %(code_region)s, "
-"%(code_country)s"
+"%(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
@@ -12385,7 +12396,15 @@ msgid ""
"SHIFT> or <CTRL-ALT>) while clicking."
msgstr ""
-msgid "List Item Actions:"
+msgid "List Item Actions"
+msgstr ""
+
+#, fuzzy
+msgid "List Item Actions (selected: 1 entry)"
+msgstr "inactive"
+
+#, python-format
+msgid "List Item Actions (selected: %s entries)"
msgstr ""
msgid "Add (<INS>)"
@@ -12401,26 +12420,39 @@ msgstr ""
msgid "Find next [%s] (<CTRL-N>)"
msgstr ""
-msgid "Row tooltip"
+msgid "Tooltips of selected rows"
+msgstr ""
+
+msgid "Data (formatted as text) of selected rows"
msgstr ""
-msgid "Row data (formatted as text)"
+msgid "Content (as one line each) of selected rows"
msgstr ""
-msgid "Row content (as one line)"
+msgid "Tooltip of current row"
msgstr ""
-msgid "Row content (one line per column)"
+msgid "Data (formatted as text) of current row"
+msgstr ""
+
+msgid "Content (as one line) of current row"
+msgstr ""
+
+msgid "Content (one line per column) of current row"
msgstr ""
#, python-format
-msgid "Column &%s: \"%s\" [#%s]"
+msgid "Column &%s (current row): \"%s\" [#%s]"
msgstr ""
#, fuzzy, python-format
-msgid "Column &%s: %s"
+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 "&Copy to clipboard..."
msgstr ""
diff --git a/client/po/es-gnumed.mo b/client/po/es-gnumed.mo
index 02af57b..584d1d6 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 cea16c1..f42b49b 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-03-17 21:03+0100\n"
+"POT-Creation-Date: 2016-04-06 11:40+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"
@@ -6011,21 +6011,22 @@ msgstr ""
msgid "Channel"
msgstr "Canal"
-msgid "&Last modification time"
-msgstr "Ú<ima fecha de modificación"
+#, fuzzy
+msgid "&Modification"
+msgstr "&Medicación"
-msgid "&Entry time"
-msgstr "&Hora de ingreso"
+#, fuzzy
+msgid "&Event"
+msgstr "Evento"
-msgid "Show journal ordered by encounter."
-msgstr "Muestra diario ordenado por citas."
+msgid "Order by start of encounter a chart entry is linked to."
+msgstr ""
-msgid "Show journal ordered by time of last modification."
-msgstr "Muestra diario ordenado por fecha de últimas modificaciones."
+msgid "Order by time of most recent edit of each chart entry."
+msgstr ""
-msgid "Show journal ordered by actual clinical time of each entry."
+msgid "Order by time documented as actual occurrence of each chart entry."
msgstr ""
-"Muestra diario ordenado por la hora clínica concurrente de cada ingreso."
msgid "Edit the selected chart entry."
msgstr "Edito el ingreso de cartilla seleccionado."
@@ -7142,6 +7143,15 @@ msgstr ""
"\n"
"Si desea deshabilitar ese diálogo deje vacío el mensaje."
+msgid "&Last modification time"
+msgstr "Ú<ima fecha de modificación"
+
+msgid "Show journal ordered by encounter."
+msgstr "Muestra diario ordenado por citas."
+
+msgid "Show journal ordered by time of last modification."
+msgstr "Muestra diario ordenado por fecha de últimas modificaciones."
+
msgid "Show search dialog."
msgstr "Muestra diálogo de búsqueda."
@@ -7888,34 +7898,34 @@ msgstr "Error al correr pdftk. No se puede llenar plantilla PDF."
msgid "Error running pdftk. Cannot flatten filled in PDF form."
msgstr "Error corriendo pdftk. No puedo sellar formulario PDF."
-#, python-format
+#, fuzzy, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
"%(code_region)s, %(code_country)s"
-#, python-format
+#, fuzzy, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
"%(code_region)s, %(code_country)s"
-#, python-format
+#, fuzzy, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, "
"%(code_region)s, %(code_country)s"
-#, python-format
+#, fuzzy, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, %(code_region)s, "
-"%(code_country)s"
+"%(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, %(code_region)s, "
"%(code_country)s"
@@ -13922,7 +13932,16 @@ msgstr ""
"modificatoria en relación a la plataforma (<ctrl>,<alt>, etc) o combinación "
"de teclas (eg. <ctrl-shift> o <ctrl-alt>) al hacer click."
-msgid "List Item Actions:"
+#, fuzzy
+msgid "List Item Actions"
+msgstr "Despliego Acciones sobre los items:"
+
+#, fuzzy
+msgid "List Item Actions (selected: 1 entry)"
+msgstr "Despliego Acciones sobre los items:"
+
+#, fuzzy, python-format
+msgid "List Item Actions (selected: %s entries)"
msgstr "Despliego Acciones sobre los items:"
msgid "Add (<INS>)"
@@ -13938,26 +13957,43 @@ msgstr "Encuentra (<CTRL-F>)"
msgid "Find next [%s] (<CTRL-N>)"
msgstr "Encuentra siguiente [%s] (<CTRL-N>)"
-msgid "Row tooltip"
-msgstr "Fila de herramienta de ayuda"
+msgid "Tooltips of selected rows"
+msgstr ""
-msgid "Row data (formatted as text)"
+#, fuzzy
+msgid "Data (formatted as text) of selected rows"
msgstr "Datos de fila (en una linea)"
-msgid "Row content (as one line)"
+msgid "Content (as one line each) of selected rows"
+msgstr ""
+
+msgid "Tooltip of current row"
+msgstr ""
+
+#, fuzzy
+msgid "Data (formatted as text) of current row"
+msgstr "Datos de fila (en una linea)"
+
+#, fuzzy
+msgid "Content (as one line) of current row"
msgstr "Contenido de fila (como una linea)"
-msgid "Row content (one line per column)"
+#, fuzzy
+msgid "Content (one line per column) of current row"
msgstr "Contenido de linea (una linea por columna )"
-#, python-format
-msgid "Column &%s: \"%s\" [#%s]"
+#, fuzzy, python-format
+msgid "Column &%s (current row): \"%s\" [#%s]"
msgstr "Columna &%s: \"%s\" [#%s]"
-#, python-format
-msgid "Column &%s: %s"
+#, fuzzy, python-format
+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 "&Copy to clipboard..."
msgstr "&Copiar al portapapeles ..."
@@ -20858,6 +20894,16 @@ msgstr "Aborto"
msgid "Abort and do NOT connect to GNUmed."
msgstr "Aborto y NO conecto a GNUMed."
+#~ msgid "Row tooltip"
+#~ msgstr "Fila de herramienta de ayuda"
+
+#~ msgid "&Entry time"
+#~ msgstr "&Hora de ingreso"
+
+#~ msgid "Show journal ordered by actual clinical time of each entry."
+#~ msgstr ""
+#~ "Muestra diario ordenado por la hora clínica concurrente de cada ingreso."
+
#~ msgid "<type diff>"
#~ msgstr "<type diff>"
diff --git a/client/po/fr-gnumed.mo b/client/po/fr-gnumed.mo
index a86dcad..2dec24d 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 1c63005..8081fdf 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-03-17 16:27+0100\n"
+"POT-Creation-Date: 2016-04-06 11:40+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"
@@ -5974,20 +5974,20 @@ msgid "Channel"
msgstr "Canal"
#, fuzzy
-msgid "&Last modification time"
-msgstr "Dernière modification :"
+msgid "&Modification"
+msgstr "Médication"
#, fuzzy
-msgid "&Entry time"
-msgstr "Démarré"
+msgid "&Event"
+msgstr "Événements"
-msgid "Show journal ordered by encounter."
+msgid "Order by start of encounter a chart entry is linked to."
msgstr ""
-msgid "Show journal ordered by time of last modification."
+msgid "Order by time of most recent edit of each chart entry."
msgstr ""
-msgid "Show journal ordered by actual clinical time of each entry."
+msgid "Order by time documented as actual occurrence of each chart entry."
msgstr ""
#, fuzzy
@@ -7103,6 +7103,16 @@ msgstr ""
"Pour désactiver cette fenêtre, laissez le message vide."
#, fuzzy
+msgid "&Last modification time"
+msgstr "Dernière modification :"
+
+msgid "Show journal ordered by encounter."
+msgstr ""
+
+msgid "Show journal ordered by time of last modification."
+msgstr ""
+
+#, fuzzy
msgid "Show search dialog."
msgstr "Fermer cette boîte de dialogue."
@@ -7863,28 +7873,46 @@ msgstr "Erreur d'exécution de pdftk. Impossible de remplir le formulaire PDF"
msgid "Error running pdftk. Cannot flatten filled in PDF form."
msgstr "Erreur à l'exécution de pdftk : conversion en PDF impossible."
-#, python-format
+#, fuzzy, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
+"Addresse [#%(pk_adr)s]\n"
+" Rue: %(street)s%(notes_street)s\n"
+" Numéro/Bâtiment: %(number)s%(subunit)s%(notes_subunit)s\n"
+" Ville: %(zip)s %(urb)s%(suburb)s\n"
+" Code postal: %(l10n_region)s, %(code_region)s\n"
+" Pays: %(l10n_country)s, %(code_country)s"
-#, python-format
+#, fuzzy, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
+"Addresse [#%(pk_adr)s]\n"
+" Rue: %(street)s%(notes_street)s\n"
+" Numéro/Bâtiment: %(number)s%(subunit)s%(notes_subunit)s\n"
+" Ville: %(zip)s %(urb)s%(suburb)s\n"
+" Code postal: %(l10n_region)s, %(code_region)s\n"
+" Pays: %(l10n_country)s, %(code_country)s"
-#, python-format
+#, fuzzy, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
+"Addresse [#%(pk_adr)s]\n"
+" Rue: %(street)s%(notes_street)s\n"
+" Numéro/Bâtiment: %(number)s%(subunit)s%(notes_subunit)s\n"
+" Ville: %(zip)s %(urb)s%(suburb)s\n"
+" Code postal: %(l10n_region)s, %(code_region)s\n"
+" Pays: %(l10n_country)s, %(code_country)s"
#, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, %(code_region)s, "
-"%(code_country)s"
+"%(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, fuzzy, python-format
@@ -13566,7 +13594,15 @@ msgstr ""
"touches (<ctrl-shift>, <ctrl-alt>, etc.) pendant que vous cliquez."
#, fuzzy
-msgid "List Item Actions:"
+msgid "List Item Actions"
+msgstr "Directions"
+
+#, fuzzy
+msgid "List Item Actions (selected: 1 entry)"
+msgstr "Directions"
+
+#, fuzzy, python-format
+msgid "List Item Actions (selected: %s entries)"
msgstr "Directions"
msgid "Add (<INS>)"
@@ -13583,29 +13619,43 @@ msgstr ""
msgid "Find next [%s] (<CTRL-N>)"
msgstr ""
-msgid "Row tooltip"
+msgid "Tooltips of selected rows"
+msgstr ""
+
+#, fuzzy
+msgid "Data (formatted as text) of selected rows"
+msgstr "Ne pas reformater le texte"
+
+msgid "Content (as one line each) of selected rows"
+msgstr ""
+
+msgid "Tooltip of current row"
msgstr ""
#, fuzzy
-msgid "Row data (formatted as text)"
+msgid "Data (formatted as text) of current row"
msgstr "Ne pas reformater le texte"
#, fuzzy
-msgid "Row content (as one line)"
+msgid "Content (as one line) of current row"
msgstr "Ne pas reformater le texte"
-msgid "Row content (one line per column)"
+msgid "Content (one line per column) of current row"
msgstr ""
#, python-format
-msgid "Column &%s: \"%s\" [#%s]"
+msgid "Column &%s (current row): \"%s\" [#%s]"
msgstr ""
#, fuzzy, python-format
-msgid "Column &%s: %s"
+msgid "Column &%s (current row): %s"
msgstr "Documents: %s"
#, fuzzy
+msgid "Copy to e&xport area..."
+msgstr "Ajouter un nouveau vaccin"
+
+#, fuzzy
msgid "&Copy to clipboard..."
msgstr "Impossible de copier dans le presse-papier."
@@ -19789,6 +19839,10 @@ msgid "Abort and do NOT connect to GNUmed."
msgstr "Annuler et ne PAS se connecter a GNUmed."
#, fuzzy
+#~ msgid "&Entry time"
+#~ msgstr "Démarré"
+
+#, fuzzy
#~ msgid ""
#~ "Health issue: %s%s%s (%s versions)\n"
#~ "\n"
diff --git a/client/po/id-gnumed.mo b/client/po/id-gnumed.mo
index 976a982..7d79015 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 44c2e8a..1d1e0d1 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-03-17 16:27+0100\n"
+"POT-Creation-Date: 2016-04-06 11:40+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"
@@ -5227,20 +5227,21 @@ msgstr ""
msgid "Channel"
msgstr ""
-msgid "&Last modification time"
-msgstr ""
+#, fuzzy
+msgid "&Modification"
+msgstr "Informasi"
#, fuzzy
-msgid "&Entry time"
-msgstr "Waktu berakhir "
+msgid "&Event"
+msgstr "Acara"
-msgid "Show journal ordered by encounter."
+msgid "Order by start of encounter a chart entry is linked to."
msgstr ""
-msgid "Show journal ordered by time of last modification."
+msgid "Order by time of most recent edit of each chart entry."
msgstr ""
-msgid "Show journal ordered by actual clinical time of each entry."
+msgid "Order by time documented as actual occurrence of each chart entry."
msgstr ""
#, fuzzy
@@ -6165,6 +6166,15 @@ msgid ""
"To disable that popup leave the message empty."
msgstr ""
+msgid "&Last modification time"
+msgstr ""
+
+msgid "Show journal ordered by encounter."
+msgstr ""
+
+msgid "Show journal ordered by time of last modification."
+msgstr ""
+
msgid "Show search dialog."
msgstr ""
@@ -6889,25 +6899,25 @@ msgstr ""
#, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, %(code_region)s, "
-"%(code_country)s"
+"%(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
@@ -12192,7 +12202,15 @@ msgid ""
"SHIFT> or <CTRL-ALT>) while clicking."
msgstr ""
-msgid "List Item Actions:"
+msgid "List Item Actions"
+msgstr ""
+
+#, fuzzy
+msgid "List Item Actions (selected: 1 entry)"
+msgstr "Pilih acara"
+
+#, python-format
+msgid "List Item Actions (selected: %s entries)"
msgstr ""
msgid "Add (<INS>)"
@@ -12209,24 +12227,36 @@ msgstr ""
msgid "Find next [%s] (<CTRL-N>)"
msgstr ""
-msgid "Row tooltip"
+msgid "Tooltips of selected rows"
+msgstr ""
+
+msgid "Data (formatted as text) of selected rows"
msgstr ""
-msgid "Row data (formatted as text)"
+msgid "Content (as one line each) of selected rows"
msgstr ""
-msgid "Row content (as one line)"
+msgid "Tooltip of current row"
msgstr ""
-msgid "Row content (one line per column)"
+msgid "Data (formatted as text) of current row"
+msgstr ""
+
+msgid "Content (as one line) of current row"
+msgstr ""
+
+msgid "Content (one line per column) of current row"
msgstr ""
#, python-format
-msgid "Column &%s: \"%s\" [#%s]"
+msgid "Column &%s (current row): \"%s\" [#%s]"
msgstr ""
#, python-format
-msgid "Column &%s: %s"
+msgid "Column &%s (current row): %s"
+msgstr ""
+
+msgid "Copy to e&xport area..."
msgstr ""
msgid "&Copy to clipboard..."
@@ -18016,6 +18046,10 @@ msgstr ""
msgid "Abort and do NOT connect to GNUmed."
msgstr ""
+#, fuzzy
+#~ msgid "&Entry time"
+#~ msgstr "Waktu berakhir "
+
#~ msgid "soap_S"
#~ msgstr "soap_S"
diff --git a/client/po/it-gnumed.mo b/client/po/it-gnumed.mo
index 77a2ca8..d18c17c 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 f1d3d1f..bde9567 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-03-17 16:27+0100\n"
+"POT-Creation-Date: 2016-04-06 11:40+0200\n"
"PO-Revision-Date: 2012-06-01 01:22+0000\n"
"Last-Translator: ncq <Unknown>\n"
"Language-Team: GNUmed\n"
@@ -5661,20 +5661,20 @@ msgid "Channel"
msgstr "Canale"
#, fuzzy
-msgid "&Last modification time"
-msgstr "Ultima modifica:"
+msgid "&Modification"
+msgstr "Medicazione"
#, fuzzy
-msgid "&Entry time"
-msgstr "Incomincia nuovo"
+msgid "&Event"
+msgstr "non attivo"
-msgid "Show journal ordered by encounter."
+msgid "Order by start of encounter a chart entry is linked to."
msgstr ""
-msgid "Show journal ordered by time of last modification."
+msgid "Order by time of most recent edit of each chart entry."
msgstr ""
-msgid "Show journal ordered by actual clinical time of each entry."
+msgid "Order by time documented as actual occurrence of each chart entry."
msgstr ""
#, fuzzy
@@ -6706,6 +6706,16 @@ msgstr ""
"Per disabilitare il popup lasciare il messagio vuoto."
#, fuzzy
+msgid "&Last modification time"
+msgstr "Ultima modifica:"
+
+msgid "Show journal ordered by encounter."
+msgstr ""
+
+msgid "Show journal ordered by time of last modification."
+msgstr ""
+
+#, fuzzy
msgid "Show search dialog."
msgstr "Chiudi questa finestra"
@@ -7476,25 +7486,25 @@ msgstr ""
#, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, %(code_region)s, "
-"%(code_country)s"
+"%(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
@@ -13103,7 +13113,15 @@ msgid ""
msgstr ""
#, fuzzy
-msgid "List Item Actions:"
+msgid "List Item Actions"
+msgstr "Episodio %s"
+
+#, fuzzy
+msgid "List Item Actions (selected: 1 entry)"
+msgstr "Episodio %s"
+
+#, fuzzy, python-format
+msgid "List Item Actions (selected: %s entries)"
msgstr "Episodio %s"
msgid "Add (<INS>)"
@@ -13120,27 +13138,40 @@ msgstr ""
msgid "Find next [%s] (<CTRL-N>)"
msgstr ""
-msgid "Row tooltip"
+msgid "Tooltips of selected rows"
+msgstr ""
+
+msgid "Data (formatted as text) of selected rows"
msgstr ""
-msgid "Row data (formatted as text)"
+msgid "Content (as one line each) of selected rows"
msgstr ""
-msgid "Row content (as one line)"
+msgid "Tooltip of current row"
msgstr ""
-msgid "Row content (one line per column)"
+msgid "Data (formatted as text) of current row"
+msgstr ""
+
+msgid "Content (as one line) of current row"
+msgstr ""
+
+msgid "Content (one line per column) of current row"
msgstr ""
#, python-format
-msgid "Column &%s: \"%s\" [#%s]"
+msgid "Column &%s (current row): \"%s\" [#%s]"
msgstr ""
#, fuzzy, python-format
-msgid "Column &%s: %s"
+msgid "Column &%s (current row): %s"
msgstr "Documenti: %s"
#, fuzzy
+msgid "Copy to e&xport area..."
+msgstr "Aggiungi una nuova persona"
+
+#, fuzzy
msgid "&Copy to clipboard..."
msgstr "Muovi il paziente su."
@@ -19331,6 +19362,10 @@ msgid "Abort and do NOT connect to GNUmed."
msgstr "Annulla e NON connetti a GNUmed"
#, fuzzy
+#~ msgid "&Entry time"
+#~ msgstr "Incomincia nuovo"
+
+#, fuzzy
#~ msgid ""
#~ "Health issue: %s%s%s (%s versions)\n"
#~ "\n"
diff --git a/client/po/ka-gnumed.mo b/client/po/ka-gnumed.mo
index 53718b4..05bf22e 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 cd5cb00..292d839 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-03-17 16:27+0100\n"
+"POT-Creation-Date: 2016-04-06 11:40+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"
@@ -5198,19 +5198,19 @@ msgstr ""
msgid "Channel"
msgstr ""
-msgid "&Last modification time"
+msgid "&Modification"
msgstr ""
-msgid "&Entry time"
+msgid "&Event"
msgstr ""
-msgid "Show journal ordered by encounter."
+msgid "Order by start of encounter a chart entry is linked to."
msgstr ""
-msgid "Show journal ordered by time of last modification."
+msgid "Order by time of most recent edit of each chart entry."
msgstr ""
-msgid "Show journal ordered by actual clinical time of each entry."
+msgid "Order by time documented as actual occurrence of each chart entry."
msgstr ""
msgid "Edit the selected chart entry."
@@ -6132,6 +6132,15 @@ msgid ""
"To disable that popup leave the message empty."
msgstr ""
+msgid "&Last modification time"
+msgstr ""
+
+msgid "Show journal ordered by encounter."
+msgstr ""
+
+msgid "Show journal ordered by time of last modification."
+msgstr ""
+
msgid "Show search dialog."
msgstr ""
@@ -6868,25 +6877,25 @@ msgstr ""
#, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, %(code_region)s, "
-"%(code_country)s"
+"%(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
@@ -12181,7 +12190,14 @@ msgid ""
"SHIFT> or <CTRL-ALT>) while clicking."
msgstr ""
-msgid "List Item Actions:"
+msgid "List Item Actions"
+msgstr ""
+
+msgid "List Item Actions (selected: 1 entry)"
+msgstr ""
+
+#, python-format
+msgid "List Item Actions (selected: %s entries)"
msgstr ""
msgid "Add (<INS>)"
@@ -12197,24 +12213,36 @@ msgstr ""
msgid "Find next [%s] (<CTRL-N>)"
msgstr ""
-msgid "Row tooltip"
+msgid "Tooltips of selected rows"
+msgstr ""
+
+msgid "Data (formatted as text) of selected rows"
msgstr ""
-msgid "Row data (formatted as text)"
+msgid "Content (as one line each) of selected rows"
msgstr ""
-msgid "Row content (as one line)"
+msgid "Tooltip of current row"
msgstr ""
-msgid "Row content (one line per column)"
+msgid "Data (formatted as text) of current row"
+msgstr ""
+
+msgid "Content (as one line) of current row"
+msgstr ""
+
+msgid "Content (one line per column) of current row"
msgstr ""
#, python-format
-msgid "Column &%s: \"%s\" [#%s]"
+msgid "Column &%s (current row): \"%s\" [#%s]"
msgstr ""
#, python-format
-msgid "Column &%s: %s"
+msgid "Column &%s (current row): %s"
+msgstr ""
+
+msgid "Copy to e&xport area..."
msgstr ""
msgid "&Copy to clipboard..."
diff --git a/client/po/nb-gnumed.mo b/client/po/nb-gnumed.mo
index 9e7b9e4..8fe0b52 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 8b725d7..d161e07 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-03-17 16:27+0100\n"
+"POT-Creation-Date: 2016-04-06 11:40+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"
@@ -5334,19 +5334,20 @@ msgid "Channel"
msgstr ""
#, fuzzy
-msgid "&Last modification time"
-msgstr "etternavn"
+msgid "&Modification"
+msgstr "Vaksinasjon"
-msgid "&Entry time"
-msgstr ""
+#, fuzzy
+msgid "&Event"
+msgstr "inaktiv"
-msgid "Show journal ordered by encounter."
+msgid "Order by start of encounter a chart entry is linked to."
msgstr ""
-msgid "Show journal ordered by time of last modification."
+msgid "Order by time of most recent edit of each chart entry."
msgstr ""
-msgid "Show journal ordered by actual clinical time of each entry."
+msgid "Order by time documented as actual occurrence of each chart entry."
msgstr ""
#, fuzzy
@@ -6291,6 +6292,16 @@ msgid ""
"To disable that popup leave the message empty."
msgstr ""
+#, fuzzy
+msgid "&Last modification time"
+msgstr "etternavn"
+
+msgid "Show journal ordered by encounter."
+msgstr ""
+
+msgid "Show journal ordered by time of last modification."
+msgstr ""
+
msgid "Show search dialog."
msgstr ""
@@ -7036,25 +7047,25 @@ msgstr ""
#, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, %(code_region)s, "
-"%(code_country)s"
+"%(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
@@ -12456,7 +12467,15 @@ msgid ""
msgstr ""
#, fuzzy
-msgid "List Item Actions:"
+msgid "List Item Actions"
+msgstr "Vaksinasjon"
+
+#, fuzzy
+msgid "List Item Actions (selected: 1 entry)"
+msgstr "Vaksinasjon"
+
+#, fuzzy, python-format
+msgid "List Item Actions (selected: %s entries)"
msgstr "Vaksinasjon"
msgid "Add (<INS>)"
@@ -12472,27 +12491,40 @@ msgstr ""
msgid "Find next [%s] (<CTRL-N>)"
msgstr ""
-msgid "Row tooltip"
+msgid "Tooltips of selected rows"
+msgstr ""
+
+msgid "Data (formatted as text) of selected rows"
+msgstr ""
+
+msgid "Content (as one line each) of selected rows"
+msgstr ""
+
+msgid "Tooltip of current row"
msgstr ""
-msgid "Row data (formatted as text)"
+msgid "Data (formatted as text) of current row"
msgstr ""
-msgid "Row content (as one line)"
+msgid "Content (as one line) of current row"
msgstr ""
-msgid "Row content (one line per column)"
+msgid "Content (one line per column) of current row"
msgstr ""
#, python-format
-msgid "Column &%s: \"%s\" [#%s]"
+msgid "Column &%s (current row): \"%s\" [#%s]"
msgstr ""
#, fuzzy, python-format
-msgid "Column &%s: %s"
+msgid "Column &%s (current row): %s"
msgstr "Dokumenter: %s"
#, fuzzy
+msgid "Copy to e&xport area..."
+msgstr "Vaksinasjon"
+
+#, fuzzy
msgid "&Copy to clipboard..."
msgstr "Vaksinasjon"
diff --git a/client/po/nl-gnumed.mo b/client/po/nl-gnumed.mo
index 16c49e9..409fb09 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 6547cf1..945aed4 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-03-17 16:27+0100\n"
+"POT-Creation-Date: 2016-04-06 11:40+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"
@@ -5920,20 +5920,20 @@ msgid "Channel"
msgstr "Kanaal"
#, fuzzy
-msgid "&Last modification time"
-msgstr "Laatst gewijzigd:"
+msgid "&Modification"
+msgstr "Indicatie"
#, fuzzy
-msgid "&Entry time"
-msgstr "Begin nieuw"
+msgid "&Event"
+msgstr "toelichting"
-msgid "Show journal ordered by encounter."
+msgid "Order by start of encounter a chart entry is linked to."
msgstr ""
-msgid "Show journal ordered by time of last modification."
+msgid "Order by time of most recent edit of each chart entry."
msgstr ""
-msgid "Show journal ordered by actual clinical time of each entry."
+msgid "Order by time documented as actual occurrence of each chart entry."
msgstr ""
#, fuzzy
@@ -7003,6 +7003,16 @@ msgstr ""
"Om dit welkomsscherm uit te zetten kunt u het welkomsbericht leeg laten."
#, fuzzy
+msgid "&Last modification time"
+msgstr "Laatst gewijzigd:"
+
+msgid "Show journal ordered by encounter."
+msgstr ""
+
+msgid "Show journal ordered by time of last modification."
+msgstr ""
+
+#, fuzzy
msgid "Show search dialog."
msgstr "Sluit deze dialoog."
@@ -7768,25 +7778,25 @@ msgstr ""
#, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, %(code_region)s, "
-"%(code_country)s"
+"%(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
@@ -13758,7 +13768,15 @@ msgid ""
msgstr ""
#, fuzzy
-msgid "List Item Actions:"
+msgid "List Item Actions"
+msgstr "Episode %s"
+
+#, fuzzy
+msgid "List Item Actions (selected: 1 entry)"
+msgstr "Episode %s"
+
+#, fuzzy, python-format
+msgid "List Item Actions (selected: %s entries)"
msgstr "Episode %s"
msgid "Add (<INS>)"
@@ -13775,27 +13793,40 @@ msgstr ""
msgid "Find next [%s] (<CTRL-N>)"
msgstr ""
-msgid "Row tooltip"
+msgid "Tooltips of selected rows"
+msgstr ""
+
+msgid "Data (formatted as text) of selected rows"
msgstr ""
-msgid "Row data (formatted as text)"
+msgid "Content (as one line each) of selected rows"
msgstr ""
-msgid "Row content (as one line)"
+msgid "Tooltip of current row"
msgstr ""
-msgid "Row content (one line per column)"
+msgid "Data (formatted as text) of current row"
+msgstr ""
+
+msgid "Content (as one line) of current row"
+msgstr ""
+
+msgid "Content (one line per column) of current row"
msgstr ""
#, python-format
-msgid "Column &%s: \"%s\" [#%s]"
+msgid "Column &%s (current row): \"%s\" [#%s]"
msgstr ""
#, fuzzy, python-format
-msgid "Column &%s: %s"
+msgid "Column &%s (current row): %s"
msgstr "Documenten: %s"
#, fuzzy
+msgid "Copy to e&xport area..."
+msgstr "patiënt activeren van rapportresultaat"
+
+#, fuzzy
msgid "&Copy to clipboard..."
msgstr "Exporteren naar &clipboard"
@@ -20746,6 +20777,10 @@ msgid "Abort and do NOT connect to GNUmed."
msgstr "Afbreken en GEEN verbinding maken met GNUmed."
#, fuzzy
+#~ msgid "&Entry time"
+#~ msgstr "Begin nieuw"
+
+#, fuzzy
#~ msgid ""
#~ "Health issue: %s%s%s (%s versions)\n"
#~ "\n"
diff --git a/client/po/pl-gnumed.mo b/client/po/pl-gnumed.mo
index 74984e4..07024c2 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 790ab04..5f7402e 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-03-17 16:27+0100\n"
+"POT-Creation-Date: 2016-04-06 11:40+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"
@@ -5564,20 +5564,20 @@ msgid "Channel"
msgstr ""
#, fuzzy
-msgid "&Last modification time"
-msgstr "nazwisko"
+msgid "&Modification"
+msgstr "Opis"
#, fuzzy
-msgid "&Entry time"
-msgstr "Czas zakończenia "
+msgid "&Event"
+msgstr "Wydarzenia"
-msgid "Show journal ordered by encounter."
+msgid "Order by start of encounter a chart entry is linked to."
msgstr ""
-msgid "Show journal ordered by time of last modification."
+msgid "Order by time of most recent edit of each chart entry."
msgstr ""
-msgid "Show journal ordered by actual clinical time of each entry."
+msgid "Order by time documented as actual occurrence of each chart entry."
msgstr ""
#, fuzzy
@@ -6561,6 +6561,16 @@ msgstr ""
"Aby dezaktywować tą wiadomość pozostaw treść pustą."
#, fuzzy
+msgid "&Last modification time"
+msgstr "nazwisko"
+
+msgid "Show journal ordered by encounter."
+msgstr ""
+
+msgid "Show journal ordered by time of last modification."
+msgstr ""
+
+#, fuzzy
msgid "Show search dialog."
msgstr "Zamknij to okno."
@@ -7308,25 +7318,25 @@ msgstr ""
#, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, %(code_region)s, "
-"%(code_country)s"
+"%(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
@@ -12907,7 +12917,15 @@ msgid ""
msgstr ""
#, fuzzy
-msgid "List Item Actions:"
+msgid "List Item Actions"
+msgstr "Menu epizodu"
+
+#, fuzzy
+msgid "List Item Actions (selected: 1 entry)"
+msgstr "Menu epizodu"
+
+#, fuzzy, python-format
+msgid "List Item Actions (selected: %s entries)"
msgstr "Menu epizodu"
msgid "Add (<INS>)"
@@ -12924,27 +12942,40 @@ msgstr ""
msgid "Find next [%s] (<CTRL-N>)"
msgstr ""
-msgid "Row tooltip"
+msgid "Tooltips of selected rows"
+msgstr ""
+
+msgid "Data (formatted as text) of selected rows"
msgstr ""
-msgid "Row data (formatted as text)"
+msgid "Content (as one line each) of selected rows"
msgstr ""
-msgid "Row content (as one line)"
+msgid "Tooltip of current row"
msgstr ""
-msgid "Row content (one line per column)"
+msgid "Data (formatted as text) of current row"
+msgstr ""
+
+msgid "Content (as one line) of current row"
+msgstr ""
+
+msgid "Content (one line per column) of current row"
msgstr ""
#, python-format
-msgid "Column &%s: \"%s\" [#%s]"
+msgid "Column &%s (current row): \"%s\" [#%s]"
msgstr ""
#, fuzzy, python-format
-msgid "Column &%s: %s"
+msgid "Column &%s (current row): %s"
msgstr "Dokumenty: %s"
#, fuzzy
+msgid "Copy to e&xport area..."
+msgstr "Dodawanie nowego epizodu"
+
+#, fuzzy
msgid "&Copy to clipboard..."
msgstr "Dodawanie nowego epizodu"
@@ -19015,6 +19046,10 @@ msgid "Abort and do NOT connect to GNUmed."
msgstr "Przerwij i NIE łącz z GNUmed-em"
#, fuzzy
+#~ msgid "&Entry time"
+#~ msgstr "Czas zakończenia "
+
+#, fuzzy
#~ msgid ""
#~ "Health issue: %s%s%s (%s versions)\n"
#~ "\n"
diff --git a/client/po/pt-gnumed.mo b/client/po/pt-gnumed.mo
index 666a80c..8e1bd28 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 b95c452..1a1bd61 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-03-17 16:27+0100\n"
+"POT-Creation-Date: 2016-04-06 11:40+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"
@@ -5716,20 +5716,20 @@ msgid "Channel"
msgstr "Canal"
#, fuzzy
-msgid "&Last modification time"
-msgstr "Modificado em:"
+msgid "&Modification"
+msgstr "Medicação"
#, fuzzy
-msgid "&Entry time"
-msgstr "Iniciar Nova"
+msgid "&Event"
+msgstr "inactivo"
-msgid "Show journal ordered by encounter."
+msgid "Order by start of encounter a chart entry is linked to."
msgstr ""
-msgid "Show journal ordered by time of last modification."
+msgid "Order by time of most recent edit of each chart entry."
msgstr ""
-msgid "Show journal ordered by actual clinical time of each entry."
+msgid "Order by time documented as actual occurrence of each chart entry."
msgstr ""
#, fuzzy
@@ -6769,6 +6769,16 @@ msgstr ""
"Para desabilitar essa mensagem é só deixá-la em branco."
#, fuzzy
+msgid "&Last modification time"
+msgstr "Modificado em:"
+
+msgid "Show journal ordered by encounter."
+msgstr ""
+
+msgid "Show journal ordered by time of last modification."
+msgstr ""
+
+#, fuzzy
msgid "Show search dialog."
msgstr "Fechar essa janela"
@@ -7534,25 +7544,25 @@ msgstr ""
#, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, %(code_region)s, "
-"%(code_country)s"
+"%(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
@@ -13247,7 +13257,15 @@ msgid ""
msgstr ""
#, fuzzy
-msgid "List Item Actions:"
+msgid "List Item Actions"
+msgstr "Episódio %s"
+
+#, fuzzy
+msgid "List Item Actions (selected: 1 entry)"
+msgstr "Episódio %s"
+
+#, fuzzy, python-format
+msgid "List Item Actions (selected: %s entries)"
msgstr "Episódio %s"
msgid "Add (<INS>)"
@@ -13264,27 +13282,40 @@ msgstr ""
msgid "Find next [%s] (<CTRL-N>)"
msgstr ""
-msgid "Row tooltip"
+msgid "Tooltips of selected rows"
+msgstr ""
+
+msgid "Data (formatted as text) of selected rows"
msgstr ""
-msgid "Row data (formatted as text)"
+msgid "Content (as one line each) of selected rows"
msgstr ""
-msgid "Row content (as one line)"
+msgid "Tooltip of current row"
msgstr ""
-msgid "Row content (one line per column)"
+msgid "Data (formatted as text) of current row"
+msgstr ""
+
+msgid "Content (as one line) of current row"
+msgstr ""
+
+msgid "Content (one line per column) of current row"
msgstr ""
#, python-format
-msgid "Column &%s: \"%s\" [#%s]"
+msgid "Column &%s (current row): \"%s\" [#%s]"
msgstr ""
#, fuzzy, python-format
-msgid "Column &%s: %s"
+msgid "Column &%s (current row): %s"
msgstr "Documentos: %s"
#, fuzzy
+msgid "Copy to e&xport area..."
+msgstr "Adicionando novo nome"
+
+#, fuzzy
msgid "&Copy to clipboard..."
msgstr "Mover o paciente para cima."
@@ -19620,6 +19651,10 @@ msgid "Abort and do NOT connect to GNUmed."
msgstr "Imterromper e NÃO ligar ao GNUmed"
#, fuzzy
+#~ msgid "&Entry time"
+#~ msgstr "Iniciar Nova"
+
+#, fuzzy
#~ msgid ""
#~ "Health issue: %s%s%s (%s versions)\n"
#~ "\n"
diff --git a/client/po/pt_BR-gnumed.mo b/client/po/pt_BR-gnumed.mo
index c50faf0..be994ea 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 dab22dc..73c7346 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-03-17 16:27+0100\n"
+"POT-Creation-Date: 2016-04-06 11:40+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"
@@ -5871,20 +5871,20 @@ msgid "Channel"
msgstr "Canal"
#, fuzzy
-msgid "&Last modification time"
-msgstr "Modificado em:"
+msgid "&Modification"
+msgstr "Medicação atual"
#, fuzzy
-msgid "&Entry time"
-msgstr "Tempo de fim "
+msgid "&Event"
+msgstr "Eventos"
-msgid "Show journal ordered by encounter."
+msgid "Order by start of encounter a chart entry is linked to."
msgstr ""
-msgid "Show journal ordered by time of last modification."
+msgid "Order by time of most recent edit of each chart entry."
msgstr ""
-msgid "Show journal ordered by actual clinical time of each entry."
+msgid "Order by time documented as actual occurrence of each chart entry."
msgstr ""
#, fuzzy
@@ -6934,6 +6934,16 @@ msgstr ""
"Para desabilitar essa mensagem é só deixá-la em branco."
#, fuzzy
+msgid "&Last modification time"
+msgstr "Modificado em:"
+
+msgid "Show journal ordered by encounter."
+msgstr ""
+
+msgid "Show journal ordered by time of last modification."
+msgstr ""
+
+#, fuzzy
msgid "Show search dialog."
msgstr "Fechar essa janela"
@@ -7707,7 +7717,7 @@ msgstr ""
#, fuzzy, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
"%(code_region)s, %(code_country)s"
@@ -7715,7 +7725,7 @@ msgstr ""
#, fuzzy, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
"%(code_region)s, %(code_country)s"
@@ -7723,7 +7733,7 @@ msgstr ""
#, fuzzy, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, "
"%(code_region)s, %(code_country)s"
@@ -7731,7 +7741,7 @@ msgstr ""
#, fuzzy, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, %(code_region)s, "
-"%(code_country)s"
+"%(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, %(code_region)s, "
"%(code_country)s"
@@ -13425,7 +13435,15 @@ msgid ""
msgstr ""
#, fuzzy
-msgid "List Item Actions:"
+msgid "List Item Actions"
+msgstr "Episódio %s"
+
+#, fuzzy
+msgid "List Item Actions (selected: 1 entry)"
+msgstr "Episódio %s"
+
+#, fuzzy, python-format
+msgid "List Item Actions (selected: %s entries)"
msgstr "Episódio %s"
msgid "Add (<INS>)"
@@ -13442,27 +13460,40 @@ msgstr ""
msgid "Find next [%s] (<CTRL-N>)"
msgstr ""
-msgid "Row tooltip"
+msgid "Tooltips of selected rows"
+msgstr ""
+
+msgid "Data (formatted as text) of selected rows"
msgstr ""
-msgid "Row data (formatted as text)"
+msgid "Content (as one line each) of selected rows"
msgstr ""
-msgid "Row content (as one line)"
+msgid "Tooltip of current row"
msgstr ""
-msgid "Row content (one line per column)"
+msgid "Data (formatted as text) of current row"
+msgstr ""
+
+msgid "Content (as one line) of current row"
+msgstr ""
+
+msgid "Content (one line per column) of current row"
msgstr ""
#, python-format
-msgid "Column &%s: \"%s\" [#%s]"
+msgid "Column &%s (current row): \"%s\" [#%s]"
msgstr ""
#, fuzzy, python-format
-msgid "Column &%s: %s"
+msgid "Column &%s (current row): %s"
msgstr "Documentos: %s"
#, fuzzy
+msgid "Copy to e&xport area..."
+msgstr "Adicionando novo nome"
+
+#, fuzzy
msgid "&Copy to clipboard..."
msgstr "Mover o paciente para cima."
@@ -19803,6 +19834,10 @@ msgid "Abort and do NOT connect to GNUmed."
msgstr "Cancelar e NÃO conectar ao GNUmed."
#, fuzzy
+#~ msgid "&Entry time"
+#~ msgstr "Tempo de fim "
+
+#, fuzzy
#~ msgid ""
#~ "Health issue: %s%s%s (%s versions)\n"
#~ "\n"
diff --git a/client/po/ro-gnumed.mo b/client/po/ro-gnumed.mo
index fc07daa..3e41440 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 77199f9..67aadf8 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-03-17 16:27+0100\n"
+"POT-Creation-Date: 2016-04-06 11:40+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"
@@ -5190,19 +5190,19 @@ msgstr ""
msgid "Channel"
msgstr ""
-msgid "&Last modification time"
+msgid "&Modification"
msgstr ""
-msgid "&Entry time"
+msgid "&Event"
msgstr ""
-msgid "Show journal ordered by encounter."
+msgid "Order by start of encounter a chart entry is linked to."
msgstr ""
-msgid "Show journal ordered by time of last modification."
+msgid "Order by time of most recent edit of each chart entry."
msgstr ""
-msgid "Show journal ordered by actual clinical time of each entry."
+msgid "Order by time documented as actual occurrence of each chart entry."
msgstr ""
msgid "Edit the selected chart entry."
@@ -6123,6 +6123,15 @@ msgid ""
"To disable that popup leave the message empty."
msgstr ""
+msgid "&Last modification time"
+msgstr ""
+
+msgid "Show journal ordered by encounter."
+msgstr ""
+
+msgid "Show journal ordered by time of last modification."
+msgstr ""
+
msgid "Show search dialog."
msgstr ""
@@ -6840,25 +6849,25 @@ msgstr ""
#, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, %(code_region)s, "
-"%(code_country)s"
+"%(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
@@ -12134,7 +12143,14 @@ msgid ""
"SHIFT> or <CTRL-ALT>) while clicking."
msgstr ""
-msgid "List Item Actions:"
+msgid "List Item Actions"
+msgstr ""
+
+msgid "List Item Actions (selected: 1 entry)"
+msgstr ""
+
+#, python-format
+msgid "List Item Actions (selected: %s entries)"
msgstr ""
msgid "Add (<INS>)"
@@ -12150,24 +12166,36 @@ msgstr ""
msgid "Find next [%s] (<CTRL-N>)"
msgstr ""
-msgid "Row tooltip"
+msgid "Tooltips of selected rows"
+msgstr ""
+
+msgid "Data (formatted as text) of selected rows"
msgstr ""
-msgid "Row data (formatted as text)"
+msgid "Content (as one line each) of selected rows"
msgstr ""
-msgid "Row content (as one line)"
+msgid "Tooltip of current row"
msgstr ""
-msgid "Row content (one line per column)"
+msgid "Data (formatted as text) of current row"
+msgstr ""
+
+msgid "Content (as one line) of current row"
+msgstr ""
+
+msgid "Content (one line per column) of current row"
msgstr ""
#, python-format
-msgid "Column &%s: \"%s\" [#%s]"
+msgid "Column &%s (current row): \"%s\" [#%s]"
msgstr ""
#, python-format
-msgid "Column &%s: %s"
+msgid "Column &%s (current row): %s"
+msgstr ""
+
+msgid "Copy to e&xport area..."
msgstr ""
msgid "&Copy to clipboard..."
diff --git a/client/po/ru-gnumed.mo b/client/po/ru-gnumed.mo
index c8759ab..f7caeea 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 d8fd183..f2cd519 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-03-17 16:27+0100\n"
+"POT-Creation-Date: 2016-04-06 11:40+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"
@@ -6099,20 +6099,20 @@ msgid "Channel"
msgstr "Канал"
#, fuzzy
-msgid "&Last modification time"
-msgstr "Последнее изменение:"
+msgid "&Modification"
+msgstr "&Medication"
#, fuzzy
-msgid "&Entry time"
-msgstr "Время окончания "
+msgid "&Event"
+msgstr "Событие"
-msgid "Show journal ordered by encounter."
+msgid "Order by start of encounter a chart entry is linked to."
msgstr ""
-msgid "Show journal ordered by time of last modification."
+msgid "Order by time of most recent edit of each chart entry."
msgstr ""
-msgid "Show journal ordered by actual clinical time of each entry."
+msgid "Order by time documented as actual occurrence of each chart entry."
msgstr ""
#, fuzzy
@@ -7230,6 +7230,16 @@ msgstr ""
"Для отключения этого всплывающего приветствия оставьте его пустым."
#, fuzzy
+msgid "&Last modification time"
+msgstr "Последнее изменение:"
+
+msgid "Show journal ordered by encounter."
+msgstr ""
+
+msgid "Show journal ordered by time of last modification."
+msgstr ""
+
+#, fuzzy
msgid "Show search dialog."
msgstr "Закрывает этот диалог."
@@ -7989,7 +7999,7 @@ msgstr "Ошибка запуска pdftk. Невозможно выровнят
#, fuzzy, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
"%(typ)s: %(street)s %(no)s%(sub)s, %(zip)s %(urb)s, %(code_region)s, "
"%(ccountry)s"
@@ -7997,7 +8007,7 @@ msgstr ""
#, fuzzy, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
"%(typ)s: %(street)s %(no)s%(sub)s, %(zip)s %(urb)s, %(code_region)s, "
"%(ccountry)s"
@@ -8005,7 +8015,7 @@ msgstr ""
#, fuzzy, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
"%(typ)s: %(street)s %(no)s%(sub)s, %(zip)s %(urb)s, %(code_region)s, "
"%(ccountry)s"
@@ -8013,7 +8023,7 @@ msgstr ""
#, fuzzy, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, %(code_region)s, "
-"%(code_country)s"
+"%(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
"%(typ)s: %(street)s %(no)s%(sub)s, %(zip)s %(urb)s, %(code_region)s, "
"%(ccountry)s"
@@ -14166,7 +14176,15 @@ msgid ""
msgstr "Выбирите пункты, под которыми хотите работать."
#, fuzzy
-msgid "List Item Actions:"
+msgid "List Item Actions"
+msgstr "Операции с эпизодом:"
+
+#, fuzzy
+msgid "List Item Actions (selected: 1 entry)"
+msgstr "Операции с эпизодом:"
+
+#, fuzzy, python-format
+msgid "List Item Actions (selected: %s entries)"
msgstr "Операции с эпизодом:"
msgid "Add (<INS>)"
@@ -14183,29 +14201,43 @@ msgstr ""
msgid "Find next [%s] (<CTRL-N>)"
msgstr ""
-msgid "Row tooltip"
+msgid "Tooltips of selected rows"
msgstr ""
#, fuzzy
-msgid "Row data (formatted as text)"
+msgid "Data (formatted as text) of selected rows"
msgstr "Не переформатировать текст"
+msgid "Content (as one line each) of selected rows"
+msgstr ""
+
+msgid "Tooltip of current row"
+msgstr ""
+
#, fuzzy
-msgid "Row content (as one line)"
+msgid "Data (formatted as text) of current row"
msgstr "Не переформатировать текст"
-msgid "Row content (one line per column)"
+#, fuzzy
+msgid "Content (as one line) of current row"
+msgstr "Не переформатировать текст"
+
+msgid "Content (one line per column) of current row"
msgstr ""
#, python-format
-msgid "Column &%s: \"%s\" [#%s]"
+msgid "Column &%s (current row): \"%s\" [#%s]"
msgstr ""
#, fuzzy, python-format
-msgid "Column &%s: %s"
+msgid "Column &%s (current row): %s"
msgstr "Документы: %s"
#, fuzzy
+msgid "Copy to e&xport area..."
+msgstr "Активирование пациента из полученного списка"
+
+#, fuzzy
msgid "&Copy to clipboard..."
msgstr "Невозможно скопировать в буфер."
@@ -21175,6 +21207,10 @@ msgid "Abort and do NOT connect to GNUmed."
msgstr "Отменить и НЕ подключаться к GNUmed."
#, fuzzy
+#~ msgid "&Entry time"
+#~ msgstr "Время окончания "
+
+#, fuzzy
#~ msgid ""
#~ "Health issue: %s%s%s (%s versions)\n"
#~ "\n"
diff --git a/client/po/ru_RU-gnumed.mo b/client/po/ru_RU-gnumed.mo
index 64d3316..62b245e 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 092b94b..38e1599 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-03-17 16:27+0100\n"
+"POT-Creation-Date: 2016-04-06 11:40+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"
@@ -6097,20 +6097,20 @@ msgid "Channel"
msgstr "Канал"
#, fuzzy
-msgid "&Last modification time"
-msgstr "Последнее изменение:"
+msgid "&Modification"
+msgstr "&Medication"
#, fuzzy
-msgid "&Entry time"
-msgstr "Время окончания "
+msgid "&Event"
+msgstr "Событие"
-msgid "Show journal ordered by encounter."
+msgid "Order by start of encounter a chart entry is linked to."
msgstr ""
-msgid "Show journal ordered by time of last modification."
+msgid "Order by time of most recent edit of each chart entry."
msgstr ""
-msgid "Show journal ordered by actual clinical time of each entry."
+msgid "Order by time documented as actual occurrence of each chart entry."
msgstr ""
#, fuzzy
@@ -7219,6 +7219,16 @@ msgstr ""
"Для отключения этого всплывающего приветствия оставьте его пустым."
#, fuzzy
+msgid "&Last modification time"
+msgstr "Последнее изменение:"
+
+msgid "Show journal ordered by encounter."
+msgstr ""
+
+msgid "Show journal ordered by time of last modification."
+msgstr ""
+
+#, fuzzy
msgid "Show search dialog."
msgstr "Закрывает этот диалог."
@@ -7978,7 +7988,7 @@ msgstr "Ошибка запуска pdftk. Не удалось выровнят
#, fuzzy, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
"%(code_region)s, %(code_country)s"
@@ -7986,7 +7996,7 @@ msgstr ""
#, fuzzy, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
"%(code_region)s, %(code_country)s"
@@ -7994,7 +8004,7 @@ msgstr ""
#, fuzzy, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, "
"%(code_region)s, %(code_country)s"
@@ -8002,7 +8012,7 @@ msgstr ""
#, fuzzy, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, %(code_region)s, "
-"%(code_country)s"
+"%(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, %(code_region)s, "
"%(code_country)s"
@@ -14088,7 +14098,15 @@ msgstr ""
"(например, <ctrl-shift> или <ctrl-alt>) при нажатии."
#, fuzzy
-msgid "List Item Actions:"
+msgid "List Item Actions"
+msgstr "Действия с эпизодом:"
+
+#, fuzzy
+msgid "List Item Actions (selected: 1 entry)"
+msgstr "Действия с эпизодом:"
+
+#, fuzzy, python-format
+msgid "List Item Actions (selected: %s entries)"
msgstr "Действия с эпизодом:"
msgid "Add (<INS>)"
@@ -14105,29 +14123,43 @@ msgstr ""
msgid "Find next [%s] (<CTRL-N>)"
msgstr ""
-msgid "Row tooltip"
+msgid "Tooltips of selected rows"
msgstr ""
#, fuzzy
-msgid "Row data (formatted as text)"
+msgid "Data (formatted as text) of selected rows"
msgstr "Не переформатировать текст"
+msgid "Content (as one line each) of selected rows"
+msgstr ""
+
+msgid "Tooltip of current row"
+msgstr ""
+
#, fuzzy
-msgid "Row content (as one line)"
+msgid "Data (formatted as text) of current row"
msgstr "Не переформатировать текст"
-msgid "Row content (one line per column)"
+#, fuzzy
+msgid "Content (as one line) of current row"
+msgstr "Не переформатировать текст"
+
+msgid "Content (one line per column) of current row"
msgstr ""
#, python-format
-msgid "Column &%s: \"%s\" [#%s]"
+msgid "Column &%s (current row): \"%s\" [#%s]"
msgstr ""
#, fuzzy, python-format
-msgid "Column &%s: %s"
+msgid "Column &%s (current row): %s"
msgstr "Документы: %s"
#, fuzzy
+msgid "Copy to e&xport area..."
+msgstr "Активирование пациента из полученного списка"
+
+#, fuzzy
msgid "&Copy to clipboard..."
msgstr "Невозможно скопировать в буфер."
@@ -21065,6 +21097,10 @@ msgid "Abort and do NOT connect to GNUmed."
msgstr "Отменить и НЕ подключаться к GNUmed."
#, fuzzy
+#~ msgid "&Entry time"
+#~ msgstr "Время окончания "
+
+#, fuzzy
#~ msgid ""
#~ "Health issue: %s%s%s (%s versions)\n"
#~ "\n"
diff --git a/client/po/sq-gnumed.mo b/client/po/sq-gnumed.mo
index 71d18ad..170e91a 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 cbad975..189690d 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-03-17 16:27+0100\n"
+"POT-Creation-Date: 2016-04-06 11:40+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"
@@ -5365,20 +5365,21 @@ msgstr ""
msgid "Channel"
msgstr ""
-msgid "&Last modification time"
-msgstr ""
+#, fuzzy
+msgid "&Modification"
+msgstr "Informacion"
#, fuzzy
-msgid "&Entry time"
-msgstr "Koha e mbarimit "
+msgid "&Event"
+msgstr "Ngjarjet"
-msgid "Show journal ordered by encounter."
+msgid "Order by start of encounter a chart entry is linked to."
msgstr ""
-msgid "Show journal ordered by time of last modification."
+msgid "Order by time of most recent edit of each chart entry."
msgstr ""
-msgid "Show journal ordered by actual clinical time of each entry."
+msgid "Order by time documented as actual occurrence of each chart entry."
msgstr ""
#, fuzzy
@@ -6305,6 +6306,15 @@ msgid ""
"To disable that popup leave the message empty."
msgstr ""
+msgid "&Last modification time"
+msgstr ""
+
+msgid "Show journal ordered by encounter."
+msgstr ""
+
+msgid "Show journal ordered by time of last modification."
+msgstr ""
+
msgid "Show search dialog."
msgstr ""
@@ -7047,7 +7057,7 @@ msgstr ""
#, fuzzy, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
"%(code_region)s, %(code_country)s"
@@ -7055,7 +7065,7 @@ msgstr ""
#, fuzzy, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
"%(code_region)s, %(code_country)s"
@@ -7063,7 +7073,7 @@ msgstr ""
#, fuzzy, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, "
"%(code_region)s, %(code_country)s"
@@ -7071,7 +7081,7 @@ msgstr ""
#, fuzzy, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, %(code_region)s, "
-"%(code_country)s"
+"%(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, %(code_region)s, "
"%(code_country)s"
@@ -12449,7 +12459,15 @@ msgid ""
"SHIFT> or <CTRL-ALT>) while clicking."
msgstr ""
-msgid "List Item Actions:"
+msgid "List Item Actions"
+msgstr ""
+
+#, fuzzy
+msgid "List Item Actions (selected: 1 entry)"
+msgstr "&Duplicate ngjarjen e perzgjedhur..."
+
+#, python-format
+msgid "List Item Actions (selected: %s entries)"
msgstr ""
msgid "Add (<INS>)"
@@ -12466,27 +12484,40 @@ msgstr ""
msgid "Find next [%s] (<CTRL-N>)"
msgstr ""
-msgid "Row tooltip"
+msgid "Tooltips of selected rows"
+msgstr ""
+
+msgid "Data (formatted as text) of selected rows"
msgstr ""
-msgid "Row data (formatted as text)"
+msgid "Content (as one line each) of selected rows"
msgstr ""
-msgid "Row content (as one line)"
+msgid "Tooltip of current row"
msgstr ""
-msgid "Row content (one line per column)"
+msgid "Data (formatted as text) of current row"
+msgstr ""
+
+msgid "Content (as one line) of current row"
+msgstr ""
+
+msgid "Content (one line per column) of current row"
msgstr ""
#, python-format
-msgid "Column &%s: \"%s\" [#%s]"
+msgid "Column &%s (current row): \"%s\" [#%s]"
msgstr ""
#, fuzzy, python-format
-msgid "Column &%s: %s"
+msgid "Column &%s (current row): %s"
msgstr "Dokumente: %s"
#, fuzzy
+msgid "Copy to e&xport area..."
+msgstr "E pamundur te kopjoj"
+
+#, fuzzy
msgid "&Copy to clipboard..."
msgstr "E pamundur te kopjoj"
@@ -18325,6 +18356,10 @@ msgid "Abort and do NOT connect to GNUmed."
msgstr ""
#, fuzzy
+#~ msgid "&Entry time"
+#~ msgstr "Koha e mbarimit "
+
+#, fuzzy
#~ msgid ""
#~ "Health issue: %s%s%s (%s versions)\n"
#~ "\n"
diff --git a/client/po/sr-gnumed.mo b/client/po/sr-gnumed.mo
index f46b992..f3de810 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 41d5b1b..dd2fec8 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-03-17 16:28+0100\n"
+"POT-Creation-Date: 2016-04-06 11:40+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"
@@ -5317,19 +5317,20 @@ msgid "Channel"
msgstr ""
#, fuzzy
-msgid "&Last modification time"
+msgid "&Modification"
msgstr "Последње потрврђено:"
-msgid "&Entry time"
-msgstr ""
+#, fuzzy
+msgid "&Event"
+msgstr "неактиван"
-msgid "Show journal ordered by encounter."
+msgid "Order by start of encounter a chart entry is linked to."
msgstr ""
-msgid "Show journal ordered by time of last modification."
+msgid "Order by time of most recent edit of each chart entry."
msgstr ""
-msgid "Show journal ordered by actual clinical time of each entry."
+msgid "Order by time documented as actual occurrence of each chart entry."
msgstr ""
#, fuzzy
@@ -6268,6 +6269,16 @@ msgid ""
"To disable that popup leave the message empty."
msgstr ""
+#, fuzzy
+msgid "&Last modification time"
+msgstr "Последње потрврђено:"
+
+msgid "Show journal ordered by encounter."
+msgstr ""
+
+msgid "Show journal ordered by time of last modification."
+msgstr ""
+
msgid "Show search dialog."
msgstr ""
@@ -7003,25 +7014,25 @@ msgstr ""
#, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, %(code_region)s, "
-"%(code_country)s"
+"%(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
@@ -12422,7 +12433,15 @@ msgid ""
"SHIFT> or <CTRL-ALT>) while clicking."
msgstr ""
-msgid "List Item Actions:"
+msgid "List Item Actions"
+msgstr ""
+
+#, fuzzy
+msgid "List Item Actions (selected: 1 entry)"
+msgstr "Брисање вакцине"
+
+#, python-format
+msgid "List Item Actions (selected: %s entries)"
msgstr ""
msgid "Add (<INS>)"
@@ -12438,27 +12457,40 @@ msgstr ""
msgid "Find next [%s] (<CTRL-N>)"
msgstr ""
-msgid "Row tooltip"
+msgid "Tooltips of selected rows"
+msgstr ""
+
+msgid "Data (formatted as text) of selected rows"
msgstr ""
-msgid "Row data (formatted as text)"
+msgid "Content (as one line each) of selected rows"
msgstr ""
-msgid "Row content (as one line)"
+msgid "Tooltip of current row"
msgstr ""
-msgid "Row content (one line per column)"
+msgid "Data (formatted as text) of current row"
+msgstr ""
+
+msgid "Content (as one line) of current row"
+msgstr ""
+
+msgid "Content (one line per column) of current row"
msgstr ""
#, python-format
-msgid "Column &%s: \"%s\" [#%s]"
+msgid "Column &%s (current row): \"%s\" [#%s]"
msgstr ""
#, fuzzy, python-format
-msgid "Column &%s: %s"
+msgid "Column &%s (current row): %s"
msgstr "Документа: %s"
#, fuzzy
+msgid "Copy to e&xport area..."
+msgstr "Додавање нове вакцине"
+
+#, fuzzy
msgid "&Copy to clipboard..."
msgstr "Додавање нове вакцине"
diff --git a/client/po/sv-gnumed.mo b/client/po/sv-gnumed.mo
index 193d911..7607222 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 48c9cac..e2e1aa7 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-03-17 16:28+0100\n"
+"POT-Creation-Date: 2016-04-06 11:40+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"
@@ -5514,20 +5514,20 @@ msgid "Channel"
msgstr ""
#, fuzzy
-msgid "&Last modification time"
-msgstr "<senast verifierad>"
+msgid "&Modification"
+msgstr "Information"
#, fuzzy
-msgid "&Entry time"
-msgstr "Sluttid "
+msgid "&Event"
+msgstr "Händelser"
-msgid "Show journal ordered by encounter."
+msgid "Order by start of encounter a chart entry is linked to."
msgstr ""
-msgid "Show journal ordered by time of last modification."
+msgid "Order by time of most recent edit of each chart entry."
msgstr ""
-msgid "Show journal ordered by actual clinical time of each entry."
+msgid "Order by time documented as actual occurrence of each chart entry."
msgstr ""
#, fuzzy
@@ -6482,6 +6482,16 @@ msgid ""
"To disable that popup leave the message empty."
msgstr ""
+#, fuzzy
+msgid "&Last modification time"
+msgstr "<senast verifierad>"
+
+msgid "Show journal ordered by encounter."
+msgstr ""
+
+msgid "Show journal ordered by time of last modification."
+msgstr ""
+
msgid "Show search dialog."
msgstr ""
@@ -7241,28 +7251,46 @@ msgstr ""
"Fel från programmet pdftk. Kan inte formulera ifyllt PDF-formulär på "
"slutgiltig form."
-#, python-format
+#, fuzzy, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
+"Adress [#%(pk_adr)s]\n"
+" Gata: %(street)s%(notes_street)s\n"
+" Nummer/Uppgång: %(number)s%(subunit)s%(notes_subunit)s\n"
+" Postkod och ort: %(zip)s %(urb)s%(suburb)s\n"
+" Län: %(l10n_region)s, %(code_region)s\n"
+" Land: %(l10n_country)s, %(code_country)s"
-#, python-format
+#, fuzzy, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
+"Adress [#%(pk_adr)s]\n"
+" Gata: %(street)s%(notes_street)s\n"
+" Nummer/Uppgång: %(number)s%(subunit)s%(notes_subunit)s\n"
+" Postkod och ort: %(zip)s %(urb)s%(suburb)s\n"
+" Län: %(l10n_region)s, %(code_region)s\n"
+" Land: %(l10n_country)s, %(code_country)s"
-#, python-format
+#, fuzzy, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
+"Adress [#%(pk_adr)s]\n"
+" Gata: %(street)s%(notes_street)s\n"
+" Nummer/Uppgång: %(number)s%(subunit)s%(notes_subunit)s\n"
+" Postkod och ort: %(zip)s %(urb)s%(suburb)s\n"
+" Län: %(l10n_region)s, %(code_region)s\n"
+" Land: %(l10n_country)s, %(code_country)s"
#, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, %(code_region)s, "
-"%(code_country)s"
+"%(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, fuzzy, python-format
@@ -12690,7 +12718,15 @@ msgid ""
msgstr ""
#, fuzzy
-msgid "List Item Actions:"
+msgid "List Item Actions"
+msgstr "Undesökningsåtgärder:"
+
+#, fuzzy
+msgid "List Item Actions (selected: 1 entry)"
+msgstr "Undesökningsåtgärder:"
+
+#, fuzzy, python-format
+msgid "List Item Actions (selected: %s entries)"
msgstr "Undesökningsåtgärder:"
msgid "Add (<INS>)"
@@ -12707,27 +12743,40 @@ msgstr ""
msgid "Find next [%s] (<CTRL-N>)"
msgstr ""
-msgid "Row tooltip"
+msgid "Tooltips of selected rows"
+msgstr ""
+
+msgid "Data (formatted as text) of selected rows"
+msgstr ""
+
+msgid "Content (as one line each) of selected rows"
msgstr ""
-msgid "Row data (formatted as text)"
+msgid "Tooltip of current row"
msgstr ""
-msgid "Row content (as one line)"
+msgid "Data (formatted as text) of current row"
msgstr ""
-msgid "Row content (one line per column)"
+msgid "Content (as one line) of current row"
+msgstr ""
+
+msgid "Content (one line per column) of current row"
msgstr ""
#, python-format
-msgid "Column &%s: \"%s\" [#%s]"
+msgid "Column &%s (current row): \"%s\" [#%s]"
msgstr ""
#, fuzzy, python-format
-msgid "Column &%s: %s"
+msgid "Column &%s (current row): %s"
msgstr "Dokument: %s"
#, fuzzy
+msgid "Copy to e&xport area..."
+msgstr "Lägger till ny undersökningstyp"
+
+#, fuzzy
msgid "&Copy to clipboard..."
msgstr "Misslyckades med att kopiera till klippbordet"
@@ -18735,6 +18784,10 @@ msgid "Abort and do NOT connect to GNUmed."
msgstr "Avbryt och anslut EJ till GNUmed."
#, fuzzy
+#~ msgid "&Entry time"
+#~ msgstr "Sluttid "
+
+#, fuzzy
#~ msgid ""
#~ "Health issue: %s%s%s (%s versions)\n"
#~ "\n"
diff --git a/client/po/tr-gnumed.mo b/client/po/tr-gnumed.mo
index 25aed7b..41c3b68 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 09a80b0..492647c 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-03-17 16:28+0100\n"
+"POT-Creation-Date: 2016-04-06 11:40+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"
@@ -5208,20 +5208,20 @@ msgstr ""
msgid "Channel"
msgstr ""
-msgid "&Last modification time"
+msgid "&Modification"
msgstr ""
#, fuzzy
-msgid "&Entry time"
-msgstr "Bitiş zamanı "
+msgid "&Event"
+msgstr "Etkinlikler"
-msgid "Show journal ordered by encounter."
+msgid "Order by start of encounter a chart entry is linked to."
msgstr ""
-msgid "Show journal ordered by time of last modification."
+msgid "Order by time of most recent edit of each chart entry."
msgstr ""
-msgid "Show journal ordered by actual clinical time of each entry."
+msgid "Order by time documented as actual occurrence of each chart entry."
msgstr ""
#, fuzzy
@@ -6145,6 +6145,15 @@ msgid ""
"To disable that popup leave the message empty."
msgstr ""
+msgid "&Last modification time"
+msgstr ""
+
+msgid "Show journal ordered by encounter."
+msgstr ""
+
+msgid "Show journal ordered by time of last modification."
+msgstr ""
+
msgid "Show search dialog."
msgstr ""
@@ -6863,25 +6872,25 @@ msgstr ""
#, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, %(code_region)s, "
-"%(code_country)s"
+"%(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
@@ -12156,7 +12165,15 @@ msgid ""
"SHIFT> or <CTRL-ALT>) while clicking."
msgstr ""
-msgid "List Item Actions:"
+msgid "List Item Actions"
+msgstr ""
+
+#, fuzzy
+msgid "List Item Actions (selected: 1 entry)"
+msgstr "Etkinliği Düzelt"
+
+#, python-format
+msgid "List Item Actions (selected: %s entries)"
msgstr ""
msgid "Add (<INS>)"
@@ -12172,24 +12189,36 @@ msgstr ""
msgid "Find next [%s] (<CTRL-N>)"
msgstr ""
-msgid "Row tooltip"
+msgid "Tooltips of selected rows"
+msgstr ""
+
+msgid "Data (formatted as text) of selected rows"
msgstr ""
-msgid "Row data (formatted as text)"
+msgid "Content (as one line each) of selected rows"
msgstr ""
-msgid "Row content (as one line)"
+msgid "Tooltip of current row"
msgstr ""
-msgid "Row content (one line per column)"
+msgid "Data (formatted as text) of current row"
+msgstr ""
+
+msgid "Content (as one line) of current row"
+msgstr ""
+
+msgid "Content (one line per column) of current row"
msgstr ""
#, python-format
-msgid "Column &%s: \"%s\" [#%s]"
+msgid "Column &%s (current row): \"%s\" [#%s]"
msgstr ""
#, python-format
-msgid "Column &%s: %s"
+msgid "Column &%s (current row): %s"
+msgstr ""
+
+msgid "Copy to e&xport area..."
msgstr ""
msgid "&Copy to clipboard..."
@@ -17961,6 +17990,10 @@ msgid "Abort and do NOT connect to GNUmed."
msgstr ""
#, fuzzy
+#~ msgid "&Entry time"
+#~ msgstr "Bitiş zamanı "
+
+#, fuzzy
#~ msgid "&Unknown"
#~ msgstr "Bilinmeyen format"
diff --git a/client/po/uk-gnumed.mo b/client/po/uk-gnumed.mo
index e10c1fa..934f893 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 cc22a4b..13798fd 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-03-17 16:28+0100\n"
+"POT-Creation-Date: 2016-04-06 11:40+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"
@@ -5190,19 +5190,19 @@ msgstr ""
msgid "Channel"
msgstr ""
-msgid "&Last modification time"
+msgid "&Modification"
msgstr ""
-msgid "&Entry time"
+msgid "&Event"
msgstr ""
-msgid "Show journal ordered by encounter."
+msgid "Order by start of encounter a chart entry is linked to."
msgstr ""
-msgid "Show journal ordered by time of last modification."
+msgid "Order by time of most recent edit of each chart entry."
msgstr ""
-msgid "Show journal ordered by actual clinical time of each entry."
+msgid "Order by time documented as actual occurrence of each chart entry."
msgstr ""
msgid "Edit the selected chart entry."
@@ -6123,6 +6123,15 @@ msgid ""
"To disable that popup leave the message empty."
msgstr ""
+msgid "&Last modification time"
+msgstr ""
+
+msgid "Show journal ordered by encounter."
+msgstr ""
+
+msgid "Show journal ordered by time of last modification."
+msgstr ""
+
msgid "Show search dialog."
msgstr ""
@@ -6839,25 +6848,25 @@ msgstr ""
#, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, %(code_region)s, "
-"%(code_country)s"
+"%(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
@@ -12133,7 +12142,14 @@ msgid ""
"SHIFT> or <CTRL-ALT>) while clicking."
msgstr ""
-msgid "List Item Actions:"
+msgid "List Item Actions"
+msgstr ""
+
+msgid "List Item Actions (selected: 1 entry)"
+msgstr ""
+
+#, python-format
+msgid "List Item Actions (selected: %s entries)"
msgstr ""
msgid "Add (<INS>)"
@@ -12149,24 +12165,36 @@ msgstr ""
msgid "Find next [%s] (<CTRL-N>)"
msgstr ""
-msgid "Row tooltip"
+msgid "Tooltips of selected rows"
+msgstr ""
+
+msgid "Data (formatted as text) of selected rows"
msgstr ""
-msgid "Row data (formatted as text)"
+msgid "Content (as one line each) of selected rows"
msgstr ""
-msgid "Row content (as one line)"
+msgid "Tooltip of current row"
msgstr ""
-msgid "Row content (one line per column)"
+msgid "Data (formatted as text) of current row"
+msgstr ""
+
+msgid "Content (as one line) of current row"
+msgstr ""
+
+msgid "Content (one line per column) of current row"
msgstr ""
#, python-format
-msgid "Column &%s: \"%s\" [#%s]"
+msgid "Column &%s (current row): \"%s\" [#%s]"
msgstr ""
#, python-format
-msgid "Column &%s: %s"
+msgid "Column &%s (current row): %s"
+msgstr ""
+
+msgid "Copy to e&xport area..."
msgstr ""
msgid "&Copy to clipboard..."
diff --git a/client/po/zh_TW-gnumed.mo b/client/po/zh_TW-gnumed.mo
index 44140cf..932756f 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 85eed6c..cee1238 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-03-17 16:28+0100\n"
+"POT-Creation-Date: 2016-04-06 11:40+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"
@@ -5194,19 +5194,19 @@ msgstr ""
msgid "Channel"
msgstr ""
-msgid "&Last modification time"
+msgid "&Modification"
msgstr ""
-msgid "&Entry time"
+msgid "&Event"
msgstr ""
-msgid "Show journal ordered by encounter."
+msgid "Order by start of encounter a chart entry is linked to."
msgstr ""
-msgid "Show journal ordered by time of last modification."
+msgid "Order by time of most recent edit of each chart entry."
msgstr ""
-msgid "Show journal ordered by actual clinical time of each entry."
+msgid "Order by time documented as actual occurrence of each chart entry."
msgstr ""
msgid "Edit the selected chart entry."
@@ -6127,6 +6127,15 @@ msgid ""
"To disable that popup leave the message empty."
msgstr ""
+msgid "&Last modification time"
+msgstr ""
+
+msgid "Show journal ordered by encounter."
+msgstr ""
+
+msgid "Show journal ordered by time of last modification."
+msgstr ""
+
msgid "Show search dialog."
msgstr ""
@@ -6846,25 +6855,25 @@ msgstr ""
#, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s %(suburb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(type)s: %(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, "
-"%(code_region)s, %(code_country)s"
+"%(code_region)s, %(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
msgid ""
"%(street)s %(number)s%(subunit)s, %(zip)s %(urb)s, %(code_region)s, "
-"%(code_country)s"
+"%(code_country)s (%(l10n_region)s, %(l10n_country)s)"
msgstr ""
#, python-format
@@ -12148,7 +12157,14 @@ msgid ""
"SHIFT> or <CTRL-ALT>) while clicking."
msgstr ""
-msgid "List Item Actions:"
+msgid "List Item Actions"
+msgstr ""
+
+msgid "List Item Actions (selected: 1 entry)"
+msgstr ""
+
+#, python-format
+msgid "List Item Actions (selected: %s entries)"
msgstr ""
msgid "Add (<INS>)"
@@ -12164,24 +12180,36 @@ msgstr ""
msgid "Find next [%s] (<CTRL-N>)"
msgstr ""
-msgid "Row tooltip"
+msgid "Tooltips of selected rows"
+msgstr ""
+
+msgid "Data (formatted as text) of selected rows"
msgstr ""
-msgid "Row data (formatted as text)"
+msgid "Content (as one line each) of selected rows"
msgstr ""
-msgid "Row content (as one line)"
+msgid "Tooltip of current row"
msgstr ""
-msgid "Row content (one line per column)"
+msgid "Data (formatted as text) of current row"
+msgstr ""
+
+msgid "Content (as one line) of current row"
+msgstr ""
+
+msgid "Content (one line per column) of current row"
msgstr ""
#, python-format
-msgid "Column &%s: \"%s\" [#%s]"
+msgid "Column &%s (current row): \"%s\" [#%s]"
msgstr ""
#, python-format
-msgid "Column &%s: %s"
+msgid "Column &%s (current row): %s"
+msgstr ""
+
+msgid "Copy to e&xport area..."
msgstr ""
msgid "&Copy to clipboard..."
diff --git a/client/pycommon/gmI18N.py b/client/pycommon/gmI18N.py
index 4aed585..0bc32eb 100644
--- a/client/pycommon/gmI18N.py
+++ b/client/pycommon/gmI18N.py
@@ -111,6 +111,7 @@ def __split_locale_into_levels():
system_locale_level['language'] = system_locale.split('_', 1)[0]
_log.debug('system locale levels: %s', system_locale_level)
+
#---------------------------------------------------------------------------
def __log_locale_settings(message=None):
_setlocale_categories = {}
@@ -205,6 +206,7 @@ def __log_locale_settings(message=None):
_log.exception('this OS does not support nl_langinfo')
_log.debug('gmI18N.get_encoding(): %s', get_encoding())
+
#---------------------------------------------------------------------------
def _translate_protected(term):
"""This wraps _().
@@ -220,24 +222,17 @@ def _translate_protected(term):
_log.error('translation: %s', translation)
return term
- term_substitutes = _substitutes_regex.findall(term)
- trans_substitutes = _substitutes_regex.findall(translation)
+ substitution_keys_in_original = set(_substitutes_regex.findall(term))
+ substitution_keys_in_translation = set(_substitutes_regex.findall(translation))
- # different number of %(...)s substitutes ?
- if len(term_substitutes) != len(trans_substitutes):
- _log.error('count("%(...)s") mismatch, returning untranslated string')
- _log.error('original : %s', term)
- _log.error('translation: %s', translation)
- return term
-
- # different %(...)s substitutes ?
- if set(term_substitutes) != set(trans_substitutes):
- _log.error('"%(...)s" name mismatch, returning untranslated string')
+ if not substitution_keys_in_translation.issubset(substitution_keys_in_original):
+ _log.error('"%(...)s" keys in translation not a subset of keys in original, returning untranslated string')
_log.error('original : %s', term)
_log.error('translation: %s', translation)
return term
return translation
+
#---------------------------------------------------------------------------
# external API
#---------------------------------------------------------------------------
@@ -276,6 +271,7 @@ def activate_locale():
__split_locale_into_levels()
return True
+
#---------------------------------------------------------------------------
def install_domain(domain=None, language=None, prefer_local_catalog=False):
"""Install a text domain suitable for the main script."""
@@ -382,6 +378,7 @@ def install_domain(domain=None, language=None, prefer_local_catalog=False):
dummy = gettext.NullTranslations()
dummy.install()
return True
+
#===========================================================================
_encoding_mismatch_already_logged = False
_current_encoding = None
diff --git a/client/pycommon/gmTools.py b/client/pycommon/gmTools.py
index 20d7058..d1c20dc 100644
--- a/client/pycommon/gmTools.py
+++ b/client/pycommon/gmTools.py
@@ -653,7 +653,7 @@ def get_unique_filename(prefix=None, suffix=None, tmp_dir=None):
}
if prefix is None:
- kwargs['prefix'] = 'gnumed-'
+ kwargs['prefix'] = 'gmd-'
else:
kwargs['prefix'] = prefix
diff --git a/client/wxGladeWidgets/wxgEMRListJournalPluginPnl.py b/client/wxGladeWidgets/wxgEMRListJournalPluginPnl.py
index bd7132a..9ebf891 100644
--- a/client/wxGladeWidgets/wxgEMRListJournalPluginPnl.py
+++ b/client/wxGladeWidgets/wxgEMRListJournalPluginPnl.py
@@ -21,8 +21,8 @@ class wxgEMRListJournalPluginPnl(wx.ScrolledWindow):
kwds["style"] = wx.BORDER_NONE | wx.TAB_TRAVERSAL
wx.ScrolledWindow.__init__(self, *args, **kwds)
self._RBTN_by_encounter = wx.RadioButton(self, wx.ID_ANY, _("&Encounter"))
- self._RBTN_by_last_modified = wx.RadioButton(self, wx.ID_ANY, _("&Last modification time"))
- self._RBTN_by_item_time = wx.RadioButton(self, wx.ID_ANY, _("&Entry time"))
+ self._RBTN_by_last_modified = wx.RadioButton(self, wx.ID_ANY, _("&Modification"))
+ self._RBTN_by_item_time = wx.RadioButton(self, wx.ID_ANY, _("&Event"))
self._BTN_edit = wx.Button(self, wx.ID_ANY, _("&Edit"), style=wx.BU_EXACTFIT)
self._BTN_delete = wx.Button(self, wx.ID_ANY, _("&Delete"), style=wx.BU_EXACTFIT)
self._SLINE_top = wx.StaticLine(self, wx.ID_ANY)
@@ -42,10 +42,10 @@ class wxgEMRListJournalPluginPnl(wx.ScrolledWindow):
def __set_properties(self):
# begin wxGlade: wxgEMRListJournalPluginPnl.__set_properties
self.SetScrollRate(10, 10)
- self._RBTN_by_encounter.SetToolTipString(_("Show journal ordered by encounter."))
+ self._RBTN_by_encounter.SetToolTipString(_("Order by start of encounter a chart entry is linked to."))
self._RBTN_by_encounter.SetValue(1)
- self._RBTN_by_last_modified.SetToolTipString(_("Show journal ordered by time of last modification."))
- self._RBTN_by_item_time.SetToolTipString(_("Show journal ordered by actual clinical time of each entry."))
+ self._RBTN_by_last_modified.SetToolTipString(_("Order by time of most recent edit of each chart entry."))
+ self._RBTN_by_item_time.SetToolTipString(_("Order by time documented as actual occurrence of each chart entry."))
self._BTN_edit.SetToolTipString(_("Edit the selected chart entry."))
self._BTN_edit.Enable(False)
self._BTN_delete.SetToolTipString(_("Delete selected chart entry."))
diff --git a/client/wxpython/gmBillingWidgets.py b/client/wxpython/gmBillingWidgets.py
index 473b7a2..7a9b380 100644
--- a/client/wxpython/gmBillingWidgets.py
+++ b/client/wxpython/gmBillingWidgets.py
@@ -621,10 +621,10 @@ def create_invoice_from_bill(parent = None, bill=None, print_it=False, keep_a_co
filenames = files2import,
document_type = template['instance_type'],
review_as_normal = True,
- reference = bill['invoice_id']
+ reference = bill['invoice_id'],
+ pk_org_unit = gmPraxis.gmCurrentPraxisBranch()['pk_org_unit']
)
bill['pk_doc'] = doc['pk_doc']
- bill['pk_org_unit'] = gmPraxis.gmCurrentPraxisBranch()['pk_org_unit']
bill.save()
if not print_it:
diff --git a/client/wxpython/gmDocumentWidgets.py b/client/wxpython/gmDocumentWidgets.py
index 708fdf3..d497595 100644
--- a/client/wxpython/gmDocumentWidgets.py
+++ b/client/wxpython/gmDocumentWidgets.py
@@ -2966,6 +2966,7 @@ class cPACSPluginPnl(wxgPACSPluginPnl, gmRegetMixin.cRegetOnPaintMixin):
event.Skip()
if self.__pacs is None:
return
+
study_data = self._LCTRL_studies.get_selected_item_data(only_one = True)
if study_data is None:
return
@@ -3011,6 +3012,9 @@ class cPACSPluginPnl(wxgPACSPluginPnl, gmRegetMixin.cRegetOnPaintMixin):
#--------------------------------------------------------
def _on_modify_orthanc_content_button_pressed(self, event):
event.Skip()
+ if self.__pacs is None:
+ return
+
dlg = cModifyOrthancContentDlg(self, -1, server = self.__pacs)
dlg.ShowModal()
dlg.Destroy()
@@ -3019,6 +3023,9 @@ class cPACSPluginPnl(wxgPACSPluginPnl, gmRegetMixin.cRegetOnPaintMixin):
#--------------------------------------------------------
def _on_upload_button_pressed(self, event):
event.Skip()
+ if self.__pacs is None:
+ return
+
dlg = wx.DirDialog (
self,
message = _('Select the directory from which to recursively upload DICOM files.'),
diff --git a/client/wxpython/gmListWidgets.py b/client/wxpython/gmListWidgets.py
index 6dec3cc..14a70d5 100644
--- a/client/wxpython/gmListWidgets.py
+++ b/client/wxpython/gmListWidgets.py
@@ -23,14 +23,19 @@ import types
import logging
import thread
import time
-import re as regex
import locale
+import re as regex
+#import io
+#import csv
import wx
import wx.lib.mixins.listctrl as listmixins
+from Gnumed.pycommon import gmTools
+
+
_log = logging.getLogger('gm.list_ui')
#================================================================
# FIXME: configurable callback on double-click action
@@ -768,7 +773,7 @@ class cGenericListManagerPnl(wxgGenericListManagerPnl.wxgGenericListManagerPnl):
#------------------------------------------------------------
def _on_edit_button_pressed(self, event):
- item = self._LCTRL_items.get_selected_item_data(only_one=True)
+ item = self._LCTRL_items.get_selected_item_data(only_one = True)
if item is None:
return
if not self.__edit_callback(item):
@@ -783,13 +788,13 @@ class cGenericListManagerPnl(wxgGenericListManagerPnl.wxgGenericListManagerPnl):
#------------------------------------------------------------
def _on_remove_button_pressed(self, event):
- if len(self._LCTRL_items.get_selected_items(only_one = True)) == 0:
+ if self._LCTRL_items.get_selected_items(only_one = True) is None:
return
self.__do_delete()
#------------------------------------------------------------
def _on_left_extra_button_pressed(self, event):
- item_data = self._LCTRL_items.get_selected_item_data(only_one=True)
+ item_data = self._LCTRL_items.get_selected_item_data(only_one = True)
if not self.__left_extra_button_callback(item_data):
self._LCTRL_items.SetFocus()
return
@@ -806,7 +811,7 @@ class cGenericListManagerPnl(wxgGenericListManagerPnl.wxgGenericListManagerPnl):
#------------------------------------------------------------
def _on_middle_extra_button_pressed(self, event):
- item_data = self._LCTRL_items.get_selected_item_data(only_one=True)
+ item_data = self._LCTRL_items.get_selected_item_data(only_one = True)
if not self.__middle_extra_button_callback(item_data):
self._LCTRL_items.SetFocus()
return
@@ -1466,7 +1471,7 @@ class cReportListCtrl(listmixins.ListCtrlAutoWidthMixin, listmixins.ColumnSorter
#------------------------------------------------------------
def get_column_labels(self):
labels = []
- for col_idx in self.GetColumnCount():
+ for col_idx in range(self.ColumnCount):
col = self.GetColumn(col = col_idx)
labels.append(col.GetText())
return labels
@@ -1575,8 +1580,23 @@ class cReportListCtrl(listmixins.ListCtrlAutoWidthMixin, listmixins.ColumnSorter
#------------------------------------------------------------
def __show_context_menu(self, item_idx):
+ items = self.selected_items
+ if self.__is_single_selection:
+ if items is None:
+ no_of_selected_items = 0
+ else:
+ no_of_selected_items = 1
+ else:
+ no_of_selected_items = len(items)
+ if no_of_selected_items == 0:
+ title = _('List Item Actions')
+ elif no_of_selected_items == 1:
+ title = _('List Item Actions (selected: 1 entry)')
+ else:
+ title = _('List Item Actions (selected: %s entries)') % no_of_selected_items
+
# build context menu
- self._context_menu = wx.Menu(title = _('List Item Actions:'))
+ self._context_menu = wx.Menu(title = title)
needs_separator = False
if self.__new_callback is not None:
@@ -1602,32 +1622,54 @@ class cReportListCtrl(listmixins.ListCtrlAutoWidthMixin, listmixins.ColumnSorter
self.Bind(wx.EVT_MENU, self._on_search_match, menu_item)
self._context_menu.AppendSeparator()
- clip_menu = wx.Menu()
col_headers = []
self._rclicked_row_idx = item_idx
self._rclicked_row_data = self.get_item_data(item_idx = self._rclicked_row_idx)
self._rclicked_row_cells = []
self._rclicked_row_cells_w_hdr = []
for col_idx in range(self.ColumnCount):
- cell_content = self.GetItemText(self._rclicked_row_idx, col_idx).strip()
+ cell_content = self.GetItem(self._rclicked_row_idx, col_idx).Text.strip()
col_header = self.GetColumn(col_idx).m_text.strip()
col_headers.append(col_header)
self._rclicked_row_cells.append(cell_content)
self._rclicked_row_cells_w_hdr.append(u'%s: %s' % (col_header, cell_content))
+# # export area
+# exp_menu = wx.Menu()
+# menu_item = exp_menu.Append(-1, _('&All rows as CSV'))
+# self.Bind(wx.EVT_MENU, self._all_rows2export_area, menu_item)
+# menu_item = exp_menu.Append(-1, _('&Selected rows as CSV'))
+# self.Bind(wx.EVT_MENU, self._selected_rows2export_area, menu_item)
+
# 1) set clipboard to item
+ clip_menu = wx.Menu()
+
+ # items for all selected rows if > 1
+ if no_of_selected_items > 1:
+ # row tooltips
+ menu_item = clip_menu.Append(-1, _('Tooltips of selected rows'))
+ self.Bind(wx.EVT_MENU, self._tooltips2clipboard, menu_item)
+ # row data as formatted text if available
+ menu_item = clip_menu.Append(-1, _('Data (formatted as text) of selected rows'))
+ self.Bind(wx.EVT_MENU, self._datas2clipboard, menu_item)
+ # all fields of the list row as one line of text
+ menu_item = clip_menu.Append(-1, _('Content (as one line each) of selected rows'))
+ self.Bind(wx.EVT_MENU, self._rows2clipboard, menu_item)
+ clip_menu.AppendSeparator()
+
+ # items for the right-clicked row
# row tooltip
- menu_item = clip_menu.Append(-1, _('Row tooltip'))
+ menu_item = clip_menu.Append(-1, _('Tooltip of current row'))
self.Bind(wx.EVT_MENU, self._tooltip2clipboard, menu_item)
# row data as formatted text if available
if hasattr(self._rclicked_row_data, 'format'):
- menu_item = clip_menu.Append(-1, _('Row data (formatted as text)'))
+ menu_item = clip_menu.Append(-1, _('Data (formatted as text) of current row'))
self.Bind(wx.EVT_MENU, self._data2clipboard, menu_item)
# all fields of the list row as one line of text
- menu_item = clip_menu.Append(-1, _('Row content (as one line)'))
+ menu_item = clip_menu.Append(-1, _('Content (as one line) of current row'))
self.Bind(wx.EVT_MENU, self._row2clipboard, menu_item)
# all fields of the list row as multiple lines of text
- menu_item = clip_menu.Append(-1, _('Row content (one line per column)'))
+ menu_item = clip_menu.Append(-1, _('Content (one line per column) of current row'))
self.Bind(wx.EVT_MENU, self._row_list2clipboard, menu_item)
# each field of the list row as text with and without header
clip_menu.AppendSeparator()
@@ -1644,7 +1686,7 @@ class cReportListCtrl(listmixins.ListCtrlAutoWidthMixin, listmixins.ColumnSorter
#if len(col_content) == 1:
# continue
# without column header
- menu_item = clip_menu.Append(-1, _(u'Column &%s: "%s" [#%s]') % (col_idx+1, shorten_text(col_content, 35), col_idx))
+ menu_item = clip_menu.Append(-1, _(u'Column &%s (current row): "%s" [#%s]') % (col_idx+1, shorten_text(col_content, 35), col_idx))
self.Bind(wx.EVT_MENU, self._col2clipboard, menu_item)
else:
col_menu = wx.Menu()
@@ -1654,23 +1696,37 @@ class cReportListCtrl(listmixins.ListCtrlAutoWidthMixin, listmixins.ColumnSorter
# without column header
menu_item = col_menu.Append(-1, u'"%s" [#%s]' % (shorten_text(col_content, 35), col_idx))
self.Bind(wx.EVT_MENU, self._col2clipboard, menu_item)
- clip_menu.AppendMenu(-1, _(u'Column &%s: %s') % (col_idx+1, col_header), col_menu)
- clip_menu.AppendSeparator()
+ clip_menu.AppendMenu(-1, _(u'Column &%s (current row): %s') % (col_idx+1, col_header), col_menu)
# 2) append item to current clipboard item
clip_add_menu = wx.Menu()
+
+ # items for all selected rows if > 1
+ if no_of_selected_items > 1:
+ # row tooltips
+ menu_item = clip_add_menu.Append(-1, _('Tooltips of selected rows'))
+ self.Bind(wx.EVT_MENU, self._add_tooltips2clipboard, menu_item)
+ # row data as formatted text if available
+ menu_item = clip_add_menu.Append(-1, _('Data (formatted as text) of selected rows'))
+ self.Bind(wx.EVT_MENU, self._add_datas2clipboard, menu_item)
+ # all fields of the list row as one line of text
+ menu_item = clip_add_menu.Append(-1, _('Content (as one line each) of selected rows'))
+ self.Bind(wx.EVT_MENU, self._add_rows2clipboard, menu_item)
+ clip_add_menu.AppendSeparator()
+
+ # items for the right-clicked row
# row tooltip
- menu_item = clip_add_menu.Append(-1, _('Row tooltip'))
+ menu_item = clip_add_menu.Append(-1, _('Tooltip of current row'))
self.Bind(wx.EVT_MENU, self._add_tooltip2clipboard, menu_item)
# row data as formatted text if available
if hasattr(self._rclicked_row_data, 'format'):
- menu_item = clip_add_menu.Append(-1, _('Row data (formatted as text)'))
+ menu_item = clip_add_menu.Append(-1, _('Data (formatted as text) of current row'))
self.Bind(wx.EVT_MENU, self._add_data2clipboard, menu_item)
# all fields of the list row as one line of text
- menu_item = clip_add_menu.Append(-1, _('Row content (as one line)'))
+ menu_item = clip_add_menu.Append(-1, _('Content (as one line) of current row'))
self.Bind(wx.EVT_MENU, self._add_row2clipboard, menu_item)
# all fields of the list row as multiple lines of text
- menu_item = clip_add_menu.Append(-1, _('Row content (one line per column)'))
+ menu_item = clip_add_menu.Append(-1, _('Content (one line per column) of current row'))
self.Bind(wx.EVT_MENU, self._add_row_list2clipboard, menu_item)
# each field of the list row as text with and without header
clip_add_menu.AppendSeparator()
@@ -1682,7 +1738,7 @@ class cReportListCtrl(listmixins.ListCtrlAutoWidthMixin, listmixins.ColumnSorter
col_header = col_headers[col_idx]
if col_header == u'':
# without column header
- menu_item = clip_add_menu.Append(-1, _(u'Column &%s: "%s" [#%s]') % (col_idx+1, shorten_text(col_content, 35), col_idx))
+ menu_item = clip_add_menu.Append(-1, _(u'Column &%s (current row): "%s" [#%s]') % (col_idx+1, shorten_text(col_content, 35), col_idx))
self.Bind(wx.EVT_MENU, self._add_col2clipboard, menu_item)
else:
col_add_menu = wx.Menu()
@@ -1692,10 +1748,25 @@ class cReportListCtrl(listmixins.ListCtrlAutoWidthMixin, listmixins.ColumnSorter
# without column header
menu_item = col_add_menu.Append(-1, u'"%s" [#%s]' % (shorten_text(col_content, 35), col_idx))
self.Bind(wx.EVT_MENU, self._add_col2clipboard, menu_item)
- clip_add_menu.AppendMenu(-1, _(u'Column &%s: %s') % (col_idx+1, col_header), col_add_menu)
- clip_add_menu.AppendSeparator()
+ clip_add_menu.AppendMenu(-1, _(u'Column &%s (current row): %s') % (col_idx+1, col_header), col_add_menu)
+
+ # 3) copy item to export area
+ #export_area_menu = wx.Menu()
+ # put into export area
+ # current row
+ # - fields as one line
+ # - fields as list
+ # - data formatted
+ # - tooltip
+ # selected rows
+ # - fields as lines each
+ # - all data formatted
+ # - all tooltips
+ # - as CSV
+ # send signal
# show menu
+ self._context_menu.AppendMenu(-1, _('Copy to e&xport area...'), exp_menu)
self._context_menu.AppendMenu(-1, _('&Copy to clipboard...'), clip_menu)
self._context_menu.AppendMenu(-1, _('Append (&+) to clipboard...'), clip_add_menu)
@@ -1949,6 +2020,44 @@ class cReportListCtrl(listmixins.ListCtrlAutoWidthMixin, listmixins.ColumnSorter
evt.Skip()
self.__search_match()
+# #------------------------------------------------------------
+# def _all_rows2export_area(self, evt):
+# col_labels = self.column_labels
+#
+# csv_name = gmTools.get_unique_filename(suffix = '.csv')
+# csv_file = io.open(csv_name, mode = 'wt', encoding = 'utf8')
+# csv_writer = csv.DictWriter(csv_file, col_labels)
+# csv_writer.writeheader()
+#
+# for item_idx in range(self.ItemCount):
+# row_dict = {}
+# for col_idx in range(self.ColumnCount):
+# row_dict[col_labels[col_idx]] = self.GetItem(item_idx, col_idx).Text
+# csv_writer.writerow(row_dict)
+#
+# csv_file.close()
+#
+# # signal export area
+#
+# #------------------------------------------------------------
+# def _selected_rows2export_area(self, evt):
+# col_labels = self.column_labels
+#
+# csv_name = gmTools.get_unique_filename(suffix = '.csv')
+# csv_file = io.open(csv_name, mode = 'wb', encoding = 'utf8')
+# csv_writer = csv.DictWriter(csv_file, col_labels)
+# csv_writer.writeheader()
+#
+# for item_idx in self.selected_items:
+# row_dict = {}
+# for col_idx in range(self.ColumnCount):
+# row_dict[col_labels[col_idx]] = self.GetItem(item_idx, col_idx).Text
+# csv_writer.writerow(row_dict)
+#
+# csv_file.close()
+#
+# # signal export area
+#
#------------------------------------------------------------
def _tooltip2clipboard(self, evt):
if wx.TheClipboard.IsOpened():
@@ -1971,6 +2080,33 @@ class cReportListCtrl(listmixins.ListCtrlAutoWidthMixin, listmixins.ColumnSorter
wx.TheClipboard.Close()
#------------------------------------------------------------
+ def _tooltips2clipboard(self, evt):
+ if wx.TheClipboard.IsOpened():
+ _log.debug('clipboard already open')
+ return
+ if not wx.TheClipboard.Open():
+ _log.debug('cannot open clipboard')
+ return
+
+ if (self.__data is None) or (self.__item_tooltip_callback is None):
+ return
+
+ tts = []
+ for data in self.selected_item_data:
+ tt = self.__item_tooltip_callback(data)
+ if tt is None:
+ continue
+ tts.append(tt)
+
+ if len(tts) == 0:
+ return
+
+ data_obj = wx.TextDataObject()
+ data_obj.SetText(u'\n\n'.join(tts))
+ wx.TheClipboard.SetData(data_obj)
+ wx.TheClipboard.Close()
+
+ #------------------------------------------------------------
def _add_tooltip2clipboard(self, evt):
if wx.TheClipboard.IsOpened():
_log.debug('clipboard already open')
@@ -2002,6 +2138,40 @@ class cReportListCtrl(listmixins.ListCtrlAutoWidthMixin, listmixins.ColumnSorter
wx.TheClipboard.Close()
#------------------------------------------------------------
+ def _add_tooltips2clipboard(self, evt):
+ if wx.TheClipboard.IsOpened():
+ _log.debug('clipboard already open')
+ return
+ if not wx.TheClipboard.Open():
+ _log.debug('cannot open clipboard')
+ return
+
+ if (self.__data is None) or (self.__item_tooltip_callback is None):
+ return
+
+ tts = []
+ for data in self.selected_item_data:
+ tt = self.__item_tooltip_callback(data)
+ if tt is None:
+ continue
+ tts.append(tt)
+
+ if len(tts) == 0:
+ return
+
+ data_obj = wx.TextDataObject()
+ txt = u''
+ # get previous text
+ got_it = wx.TheClipboard.GetData(data_obj)
+ if got_it:
+ txt = data_obj.Text + u'\n\n'
+ txt += u'\n\n'.join(tts)
+
+ data_obj.SetText(txt)
+ wx.TheClipboard.SetData(data_obj)
+ wx.TheClipboard.Close()
+
+ #------------------------------------------------------------
def _row2clipboard(self, evt):
if wx.TheClipboard.IsOpened():
_log.debug('clipboard already open')
@@ -2015,6 +2185,24 @@ class cReportListCtrl(listmixins.ListCtrlAutoWidthMixin, listmixins.ColumnSorter
wx.TheClipboard.Close()
#------------------------------------------------------------
+ def _rows2clipboard(self, evt):
+ if wx.TheClipboard.IsOpened():
+ _log.debug('clipboard already open')
+ return
+ if not wx.TheClipboard.Open():
+ _log.debug('cannot open clipboard')
+ return
+
+ rows = []
+ for item_idx in self.selected_items:
+ rows.append(u' // '.join([ self.GetItem(item_idx, col_idx).Text.strip() for col_idx in range(self.ColumnCount) ]))
+
+ data_obj = wx.TextDataObject()
+ data_obj.SetText(u'\n\n'.join(rows))
+ wx.TheClipboard.SetData(data_obj)
+ wx.TheClipboard.Close()
+
+ #------------------------------------------------------------
def _add_row2clipboard(self, evt):
if wx.TheClipboard.IsOpened():
_log.debug('clipboard already open')
@@ -2039,6 +2227,32 @@ class cReportListCtrl(listmixins.ListCtrlAutoWidthMixin, listmixins.ColumnSorter
wx.TheClipboard.Close()
#------------------------------------------------------------
+ def _add_rows2clipboard(self, evt):
+ if wx.TheClipboard.IsOpened():
+ _log.debug('clipboard already open')
+ return
+ if not wx.TheClipboard.Open():
+ _log.debug('cannot open clipboard')
+ return
+
+ rows = []
+ for item_idx in self.selected_items:
+ rows.append(u' // '.join([ self.GetItem(item_idx, col_idx).Text.strip() for col_idx in range(self.ColumnCount) ]))
+
+ data_obj = wx.TextDataObject()
+
+ txt = u''
+ # get previous text
+ got_it = wx.TheClipboard.GetData(data_obj)
+ if got_it:
+ txt = data_obj.Text + u'\n'
+ txt += u'\n\n'.join(rows)
+
+ data_obj.SetText(txt)
+ wx.TheClipboard.SetData(data_obj)
+ wx.TheClipboard.Close()
+
+ #------------------------------------------------------------
def _row_list2clipboard(self, evt):
if wx.TheClipboard.IsOpened():
_log.debug('clipboard already open')
@@ -2092,6 +2306,30 @@ class cReportListCtrl(listmixins.ListCtrlAutoWidthMixin, listmixins.ColumnSorter
wx.TheClipboard.Close()
#------------------------------------------------------------
+ def _datas2clipboard(self, evt):
+ if wx.TheClipboard.IsOpened():
+ _log.debug('clipboard already open')
+ return
+ if not wx.TheClipboard.Open():
+ _log.debug('cannot open clipboard')
+ return
+
+ data_as_txt = []
+ for data in self.selected_item_data:
+ if hasattr(data, 'format'):
+ txt = data.format()
+ if type(txt) is list:
+ txt = u'\n'.join(txt)
+ else:
+ txt = u'%s' % data
+ data_as_txt.append(txt)
+
+ data_obj = wx.TextDataObject()
+ data_obj.SetText(u'\n\n'.join(data_as_txt))
+ wx.TheClipboard.SetData(data_obj)
+ wx.TheClipboard.Close()
+
+ #------------------------------------------------------------
def _add_data2clipboard(self, evt):
if wx.TheClipboard.IsOpened():
_log.debug('clipboard already open')
@@ -2120,6 +2358,38 @@ class cReportListCtrl(listmixins.ListCtrlAutoWidthMixin, listmixins.ColumnSorter
wx.TheClipboard.Close()
#------------------------------------------------------------
+ def _add_datas2clipboard(self, evt):
+ if wx.TheClipboard.IsOpened():
+ _log.debug('clipboard already open')
+ return
+ if not wx.TheClipboard.Open():
+ _log.debug('cannot open clipboard')
+ return
+
+ data_as_txt = []
+ for data in self.selected_item_data:
+ if hasattr(data, 'format'):
+ txt = data.format()
+ if type(txt) is list:
+ txt = u'\n'.join(txt)
+ else:
+ txt = u'%s' % data
+ data_as_txt.append(txt)
+
+ data_obj = wx.TextDataObject()
+ txt = u''
+ # get previous text
+ got_it = wx.TheClipboard.GetData(data_obj)
+ if got_it:
+ txt = data_obj.Text + u'\n'
+ txt += u'\n'.join(data_as_txt)
+
+ # set text
+ data_obj.SetText(txt)
+ wx.TheClipboard.SetData(data_obj)
+ wx.TheClipboard.Close()
+
+ #------------------------------------------------------------
def _col2clipboard(self, evt):
if wx.TheClipboard.IsOpened():
_log.debug('clipboard already open')
diff --git a/client/wxpython/gmMeasurementWidgets.py b/client/wxpython/gmMeasurementWidgets.py
index 75c4831..64536b9 100644
--- a/client/wxpython/gmMeasurementWidgets.py
+++ b/client/wxpython/gmMeasurementWidgets.py
@@ -646,14 +646,16 @@ def plot_adjacent_measurements(parent=None, test=None, format=None, show_year=Tr
from Gnumed.wxGladeWidgets import wxgMeasurementsAsListPnl
class cMeasurementsAsListPnl(wxgMeasurementsAsListPnl.wxgMeasurementsAsListPnl, gmRegetMixin.cRegetOnPaintMixin):
+ """A class for displaying all measurement results as a simple list.
+ - operates on a cPatient instance handed to it and NOT on the currently active patient
+ """
def __init__(self, *args, **kwargs):
wxgMeasurementsAsListPnl.wxgMeasurementsAsListPnl.__init__(self, *args, **kwargs)
gmRegetMixin.cRegetOnPaintMixin.__init__(self)
self.__patient = None
-# self.__date_format = str('%Y %b %d')
self.__init_ui()
self.__register_events()
@@ -764,7 +766,10 @@ class cMeasurementsAsListPnl(wxgMeasurementsAsListPnl.wxgMeasurementsAsListPnl,
from Gnumed.wxGladeWidgets import wxgMeasurementsByDayPnl
class cMeasurementsByDayPnl(wxgMeasurementsByDayPnl.wxgMeasurementsByDayPnl, gmRegetMixin.cRegetOnPaintMixin):
+ """A class for displaying measurement results as a list partitioned by day.
+ - operates on a cPatient instance handed to it and NOT on the currently active patient
+ """
def __init__(self, *args, **kwargs):
wxgMeasurementsByDayPnl.wxgMeasurementsByDayPnl.__init__(self, *args, **kwargs)
@@ -895,7 +900,10 @@ class cMeasurementsByDayPnl(wxgMeasurementsByDayPnl.wxgMeasurementsByDayPnl, gmR
from Gnumed.wxGladeWidgets import wxgMeasurementsByBatteryPnl
class cMeasurementsByBatteryPnl(wxgMeasurementsByBatteryPnl.wxgMeasurementsByBatteryPnl, gmRegetMixin.cRegetOnPaintMixin):
+ """A grid class for displaying measurement results filtered by battery/panel.
+ - operates on a cPatient instance handed to it and NOT on the currently active patient
+ """
def __init__(self, *args, **kwargs):
wxgMeasurementsByBatteryPnl.wxgMeasurementsByBatteryPnl.__init__(self, *args, **kwargs)
@@ -936,7 +944,6 @@ class cMeasurementsByBatteryPnl(wxgMeasurementsByBatteryPnl.wxgMeasurementsByBat
u''
))
self._GRID_results_battery.panel_to_show = pnl
-# self._GRID_results_battery.Fit()
# self.Layout()
#--------------------------------------------------------
@@ -944,7 +951,6 @@ class cMeasurementsByBatteryPnl(wxgMeasurementsByBatteryPnl.wxgMeasurementsByBat
self._TCTRL_panel_comment.SetValue(u'')
if self._PRW_panel.GetValue().strip() == u'':
self._GRID_results_battery.panel_to_show = None
-# self._GRID_results_battery.Fit()
# self.Layout()
#------------------------------------------------------------
@@ -1007,7 +1013,10 @@ class cMeasurementsByBatteryPnl(wxgMeasurementsByBatteryPnl.wxgMeasurementsByBat
from Gnumed.wxGladeWidgets import wxgMeasurementsAsTablePnl
class cMeasurementsAsTablePnl(wxgMeasurementsAsTablePnl.wxgMeasurementsAsTablePnl, gmRegetMixin.cRegetOnPaintMixin):
+ """A panel for holding a grid displaying all measurement results.
+ - operates on a cPatient instance handed to it and NOT on the currently active patient
+ """
def __init__(self, *args, **kwargs):
wxgMeasurementsAsTablePnl.wxgMeasurementsAsTablePnl.__init__(self, *args, **kwargs)
@@ -1111,12 +1120,6 @@ class cMeasurementsAsTablePnl(wxgMeasurementsAsTablePnl.wxgMeasurementsAsTablePn
elif self._RBTN_all_unsigned.GetValue() is True:
self._GRID_results_all.select_cells(unsigned_only = True, accountables_only = False, keep_preselections = False)
- #--------------------------------------------------------
- # implement as notebook page
-# def _on_list_button_pressed(self, event):
-# event.Skip()
-# manage_measurements(parent = self, single_selection = True)#, emr = pat.emr)
-
#------------------------------------------------------------
# reget mixin API
#------------------------------------------------------------
@@ -1156,6 +1159,8 @@ class cMeasurementsNb(wx.Notebook, gmPlugin.cPatientChange_PluginMixin):
- full list
Used as a main notebook plugin page.
+
+ Operates on the active patient.
"""
#--------------------------------------------------------
def __init__(self, parent, id):
@@ -1184,15 +1189,19 @@ class cMeasurementsNb(wx.Notebook, gmPlugin.cPatientChange_PluginMixin):
def _post_patient_selection(self, **kwds):
for page_idx in range(self.GetPageCount()):
page = self.GetPage(page_idx)
- page.patient = self.__patient
+ page.patient = self.__patient.patient
#--------------------------------------------------------
# notebook plugin API
#--------------------------------------------------------
def repopulate_ui(self):
+ if self.__patient.connected:
+ pat = self.__patient.patient
+ else:
+ pat = None
for page_idx in range(self.GetPageCount()):
page = self.GetPage(page_idx)
- page.patient = self.__patient
+ page.patient = pat
return True
@@ -1203,7 +1212,7 @@ class cMeasurementsNb(wx.Notebook, gmPlugin.cPatientChange_PluginMixin):
# by day
new_page = cMeasurementsByDayPnl(self, -1)
- new_page.patient = self.__patient
+ new_page.patient = None
self.AddPage (
page = new_page,
text = _('Days'),
@@ -1212,7 +1221,7 @@ class cMeasurementsNb(wx.Notebook, gmPlugin.cPatientChange_PluginMixin):
# by test panel
new_page = cMeasurementsByBatteryPnl(self, -1)
- new_page.patient = self.__patient
+ new_page.patient = None
self.AddPage (
page = new_page,
text = _('Panels'),
@@ -1221,7 +1230,7 @@ class cMeasurementsNb(wx.Notebook, gmPlugin.cPatientChange_PluginMixin):
# full grid
new_page = cMeasurementsAsTablePnl(self, -1)
- new_page.patient = self.__patient
+ new_page.patient = None
self.AddPage (
page = new_page,
text = _('Table'),
@@ -1230,7 +1239,7 @@ class cMeasurementsNb(wx.Notebook, gmPlugin.cPatientChange_PluginMixin):
# full list
new_page = cMeasurementsAsListPnl(self, -1)
- new_page.patient = self.__patient
+ new_page.patient = None
self.AddPage (
page = new_page,
text = _('List'),
@@ -1245,13 +1254,21 @@ class cMeasurementsNb(wx.Notebook, gmPlugin.cPatientChange_PluginMixin):
def _set_patient(self, patient):
self.__patient = patient
+ if self.__patient.connected:
+ pat = self.__patient.patient
+ else:
+ pat = None
+ for page_idx in range(self.GetPageCount()):
+ page = self.GetPage(page_idx)
+ page.patient = pat
patient = property(_get_patient, _set_patient)
#================================================================
class cMeasurementsGrid(wx.grid.Grid):
- """A grid class for displaying measurment results.
+ """A grid class for displaying measurement results.
+ - operates on a cPatient instance handed to it
- does NOT listen to the currently active patient
- thereby it can display any patient at any time
"""
diff --git a/client/wxpython/gmPlugin.py b/client/wxpython/gmPlugin.py
index 210494a..7dbab2d 100644
--- a/client/wxpython/gmPlugin.py
+++ b/client/wxpython/gmPlugin.py
@@ -252,7 +252,7 @@ class cPatientChange_PluginMixin:
# -----------------------------------------------------
def _on_current_patient_unset(self, **kwds):
# print "%s._on_current_patient_unset() not implemented" % self.__class__.__name__
-# print "should usually be used to empty to UI"
+# print "should usually be used to empty the UI"
pass
# -----------------------------------------------------
diff --git a/client/wxpython/gmProgressNotesEAWidgets.py b/client/wxpython/gmProgressNotesEAWidgets.py
index 113bada..70b2ddc 100644
--- a/client/wxpython/gmProgressNotesEAWidgets.py
+++ b/client/wxpython/gmProgressNotesEAWidgets.py
@@ -32,6 +32,7 @@ from Gnumed.business import gmClinNarrative
from Gnumed.wxpython import gmGuiHelpers
from Gnumed.wxpython import gmTextCtrl
from Gnumed.wxpython import gmVisualProgressNoteWidgets
+from Gnumed.wxpython import gmEMRStructWidgets
_log = logging.getLogger('gm.ui')
diff --git a/client/wxpython/gmTextCtrl.py b/client/wxpython/gmTextCtrl.py
index e0321ae..99361ab 100644
--- a/client/wxpython/gmTextCtrl.py
+++ b/client/wxpython/gmTextCtrl.py
@@ -385,10 +385,13 @@ class cExpandoTextCtrl(gmKeywordExpansionWidgets.cKeywordExpansion_TextCtrlMixin
#------------------------------------------------
# fix platform expando.py if needed
#------------------------------------------------
- def _wrapLine(self, line, dc, width):
+ def _wrapLine(self, line, dc, max_width):
- if (wx.MAJOR_VERSION >= 2) and (wx.MINOR_VERSION > 8):
- return wx.lib.expando.ExpandoTextCtrl._wrapLine(line, dc, width)
+ if wx.MAJOR_VERSION > 2:
+ return wx.lib.expando.ExpandoTextCtrl._wrapLine(self, line, dc, max_width)
+
+ if (wx.MAJOR_VERSION == 2) and (wx.MINOR_VERSION > 8):
+ return wx.lib.expando.ExpandoTextCtrl._wrapLine(self, line, dc, max_width)
# THIS FIX LIFTED FROM TRUNK IN SVN:
# Estimate where the control will wrap the lines and
diff --git a/external-tools/check-prerequisites.py b/external-tools/check-prerequisites.py
index 09364f6..964bee2 100644
--- a/external-tools/check-prerequisites.py
+++ b/external-tools/check-prerequisites.py
@@ -233,6 +233,16 @@ except ImportError:
print " INFO : this is used to transliterate names"
print " INFO : GNUmed will still work without it"
+print " httplib2...",
+try:
+ import httplib2
+ print "found"
+except ImportError:
+ missing = True
+ print ""
+ print " ERROR: httplib2 not installed"
+ print " INFO : this is used to access the Orthanc DICOM server"
+
if missing:
print ""
print "sys.path is currently set as follows:"
--
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