Menu
▾
▴
[Gemstracker-svn] SF.net SVN: gemstracker:[712] trunk/library
|
From: <gem...@li...> - 2012-05-31 08:11:12
|
Revision: 712
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=712&view=rev
Author: michieltcs
Date: 2012-05-31 08:11:00 +0000 (Thu, 31 May 2012)
Log Message:
-----------
Escape command & arguments, update translations
Modified Paths:
--------------
trunk/library/classes/Gems/Default/RespondentExportAction.php
trunk/library/languages/default-nl.mo
trunk/library/languages/default-nl.po
Modified: trunk/library/classes/Gems/Default/RespondentExportAction.php
===================================================================
--- trunk/library/classes/Gems/Default/RespondentExportAction.php 2012-05-30 14:16:07 UTC (rev 711)
+++ trunk/library/classes/Gems/Default/RespondentExportAction.php 2012-05-31 08:11:00 UTC (rev 712)
@@ -111,10 +111,11 @@
file_put_contents($tempInputFilename, $content);
- $lastLine = exec($this->_wkhtmltopdfLocation . ' ' . $tempInputFilename . ' ' . $tempOutputFilename, $outputLines, $return);
+ $lastLine = exec(escapeshellcmd($this->_wkhtmltopdfLocation) . ' ' . escapeshellarg($tempInputFilename)
+ . ' ' . escapeshellarg($tempOutputFilename), $outputLines, $return);
if ($return > 0) {
- throw new Exception("Unable to run PDF conversion: {$lastLine}");
+ throw new Exception(sprintf($this->_('Unable to run PDF conversion: "%s"'), $lastLine));
}
$pdfContents = file_get_contents($tempOutputFilename);
Modified: trunk/library/languages/default-nl.mo
===================================================================
(Binary files differ)
Modified: trunk/library/languages/default-nl.po
===================================================================
--- trunk/library/languages/default-nl.po 2012-05-30 14:16:07 UTC (rev 711)
+++ trunk/library/languages/default-nl.po 2012-05-31 08:11:00 UTC (rev 712)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: GemsTracker NL\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-30 16:11+0100\n"
+"POT-Creation-Date: 2012-05-31 10:10+0100\n"
"PO-Revision-Date: \n"
"Last-Translator: Michiel Rook <in...@to...>\n"
"Language-Team: Erasmus MGZ <mat...@ma...>\n"
@@ -1559,117 +1559,117 @@
msgid "Excel export"
msgstr "Excel export"
-#: classes/Gems/Menu/MenuAbstract.php:247
+#: classes/Gems/Menu/MenuAbstract.php:250
msgid "Activity log"
msgstr "Activiteit"
-#: classes/Gems/Menu/MenuAbstract.php:253
+#: classes/Gems/Menu/MenuAbstract.php:256
msgid "Automatic mail"
msgstr "Automatische mail"
-#: classes/Gems/Menu/MenuAbstract.php:254
+#: classes/Gems/Menu/MenuAbstract.php:257
msgid "Turn Automatic Mail Jobs OFF"
msgstr "Automatische mail opdrachten UITzetten"
-#: classes/Gems/Menu/MenuAbstract.php:255
+#: classes/Gems/Menu/MenuAbstract.php:258
msgid "Run"
msgstr "Uitvoeren"
-#: classes/Gems/Menu/MenuAbstract.php:258
+#: classes/Gems/Menu/MenuAbstract.php:261
msgid "Servers"
msgstr "Servers"
-#: classes/Gems/Menu/MenuAbstract.php:262
+#: classes/Gems/Menu/MenuAbstract.php:265
msgid "Templates"
msgstr "Sjablonen"
-#: classes/Gems/Menu/MenuAbstract.php:294
+#: classes/Gems/Menu/MenuAbstract.php:297
msgid "By period"
msgstr "Per periode"
-#: classes/Gems/Menu/MenuAbstract.php:295
+#: classes/Gems/Menu/MenuAbstract.php:298
msgid "By token"
msgstr "Per kenmerk"
-#: classes/Gems/Menu/MenuAbstract.php:296
+#: classes/Gems/Menu/MenuAbstract.php:299
msgid "By respondent"
msgstr "Per patiënt"
-#: classes/Gems/Menu/MenuAbstract.php:300
+#: classes/Gems/Menu/MenuAbstract.php:303
msgid "Bulk mail"
msgstr "Bulk mail"
-#: classes/Gems/Menu/MenuAbstract.php:318
+#: classes/Gems/Menu/MenuAbstract.php:321
msgid "Errors"
msgstr "Foutmeldingen"
-#: classes/Gems/Menu/MenuAbstract.php:319
+#: classes/Gems/Menu/MenuAbstract.php:322
msgid "PHP"
msgstr "PHP"
-#: classes/Gems/Menu/MenuAbstract.php:321
+#: classes/Gems/Menu/MenuAbstract.php:324
msgid "Session"
msgstr "Sessie"
-#: classes/Gems/Menu/MenuAbstract.php:322
+#: classes/Gems/Menu/MenuAbstract.php:325
msgid "Maintenance mode"
msgstr "Onderhoudsmodus"
-#: classes/Gems/Menu/MenuAbstract.php:323
+#: classes/Gems/Menu/MenuAbstract.php:326
msgid "Clean cache"
msgstr "Cache opruimen"
-#: classes/Gems/Menu/MenuAbstract.php:390
+#: classes/Gems/Menu/MenuAbstract.php:393
msgid "Reset password"
msgstr "Reset wachtwoord"
-#: classes/Gems/Menu/MenuAbstract.php:415
+#: classes/Gems/Menu/MenuAbstract.php:418
msgid "Survey Sources"
msgstr "Bronnen"
-#: classes/Gems/Menu/MenuAbstract.php:416
+#: classes/Gems/Menu/MenuAbstract.php:419
msgid "Check status"
msgstr "Status controle"
-#: classes/Gems/Menu/MenuAbstract.php:417
+#: classes/Gems/Menu/MenuAbstract.php:420
msgid "Synchronize surveys"
msgstr "Synchroniseer vragenlijsten"
-#: classes/Gems/Menu/MenuAbstract.php:418
-#: classes/Gems/Menu/MenuAbstract.php:430
+#: classes/Gems/Menu/MenuAbstract.php:421
+#: classes/Gems/Menu/MenuAbstract.php:433
msgid "Check answers"
msgstr "Antwoord controle"
-#: classes/Gems/Menu/MenuAbstract.php:419
+#: classes/Gems/Menu/MenuAbstract.php:422
msgid "Check attributes"
msgstr "Controleer attributen"
-#: classes/Gems/Menu/MenuAbstract.php:420
+#: classes/Gems/Menu/MenuAbstract.php:423
msgid "Synchronize all surveys"
msgstr "Synchroniseer alle vragenlijsten"
-#: classes/Gems/Menu/MenuAbstract.php:421
-#: classes/Gems/Menu/MenuAbstract.php:431
+#: classes/Gems/Menu/MenuAbstract.php:424
+#: classes/Gems/Menu/MenuAbstract.php:434
msgid "Check all answers"
msgstr "Controleer alle antwoorden"
-#: classes/Gems/Menu/MenuAbstract.php:427
+#: classes/Gems/Menu/MenuAbstract.php:430
msgid "PDF"
msgstr "PDF"
-#: classes/Gems/Menu/MenuAbstract.php:439
+#: classes/Gems/Menu/MenuAbstract.php:442
msgid "Fields"
msgstr "Velden"
-#: classes/Gems/Menu/MenuAbstract.php:446
+#: classes/Gems/Menu/MenuAbstract.php:449
msgid "Rounds"
msgstr "Rondes"
-#: classes/Gems/Menu/MenuAbstract.php:461
+#: classes/Gems/Menu/MenuAbstract.php:464
msgid "Check assignments"
msgstr "Controleer toewijzingen"
-#: classes/Gems/Menu/MenuAbstract.php:464
+#: classes/Gems/Menu/MenuAbstract.php:467
msgid "Check all assignments"
msgstr "Controleer alle toewijzingen"
@@ -2043,7 +2043,7 @@
#: classes/Gems/Default/GroupAction.php:89
#: classes/Gems/Default/LogAction.php:201
-#: classes/Gems/Default/RoleAction.php:257
+#: classes/Gems/Default/RoleAction.php:238
msgid "Role"
msgstr "Rol"
@@ -2120,31 +2120,36 @@
msgid "Export"
msgstr "Exporteer"
-#: classes/Gems/Default/RespondentExportAction.php:204
+#: classes/Gems/Default/RespondentExportAction.php:118
+#, php-format
+msgid "Unable to run PDF conversion: \"%s\""
+msgstr "Kan PDF conversie niet starten: \"%s\""
+
+#: classes/Gems/Default/RespondentExportAction.php:205
msgid "Track information"
msgstr "Traject informatie"
-#: classes/Gems/Default/RespondentExportAction.php:243
+#: classes/Gems/Default/RespondentExportAction.php:244
msgid "Respondent information"
msgstr "Patiënt informatie"
-#: classes/Gems/Default/RespondentExportAction.php:270
+#: classes/Gems/Default/RespondentExportAction.php:271
msgid "Respondent report"
msgstr "Patiënt rapportage"
-#: classes/Gems/Default/RespondentExportAction.php:274
+#: classes/Gems/Default/RespondentExportAction.php:275
msgid "Report information"
msgstr "Informatie over rapportage"
-#: classes/Gems/Default/RespondentExportAction.php:275
+#: classes/Gems/Default/RespondentExportAction.php:276
msgid "Generated by"
msgstr "Aangemaakt door"
-#: classes/Gems/Default/RespondentExportAction.php:277
+#: classes/Gems/Default/RespondentExportAction.php:278
msgid "Generated on"
msgstr "Aangemaakt op"
-#: classes/Gems/Default/RespondentExportAction.php:318
+#: classes/Gems/Default/RespondentExportAction.php:319
msgid "Export respondent"
msgstr "Exporteer patiënt"
@@ -2590,48 +2595,52 @@
msgid "The survey for token %s is no longer active."
msgstr "De vragenlijst voor kenmerk %s is niet meer in gebruik."
-#: classes/Gems/Default/RoleAction.php:175
+#: classes/Gems/Default/RoleAction.php:94
+#: classes/Gems/Default/RoleAction.php:242
+msgid "Inherited"
+msgstr "Overerfd"
+
+#: classes/Gems/Default/RoleAction.php:156
msgid "Illegal name"
msgstr "Naam niet toegestaan"
-#: classes/Gems/Default/RoleAction.php:199
-#: classes/Gems/Default/RoleAction.php:258
+#: classes/Gems/Default/RoleAction.php:180
+#: classes/Gems/Default/RoleAction.php:239
msgid "Parents"
msgstr "Afgeleid van"
-#: classes/Gems/Default/RoleAction.php:214
+#: classes/Gems/Default/RoleAction.php:195
msgid "Editing `master` is not allowed"
msgstr "Het wijzigen van `master` is niet toegestaan"
-#: classes/Gems/Default/RoleAction.php:232
+#: classes/Gems/Default/RoleAction.php:213
msgid "role"
msgid_plural "roles"
msgstr[0] "Rol"
msgstr[1] "Rollen"
-#: classes/Gems/Default/RoleAction.php:237
+#: classes/Gems/Default/RoleAction.php:218
msgid "Administrative roles"
msgstr "Beheer rollen en rechten"
-#: classes/Gems/Default/RoleAction.php:259
-#: classes/Gems/Default/RoleAction.php:275
+#: classes/Gems/Default/RoleAction.php:240
+#: classes/Gems/Default/RoleAction.php:258
msgid "Allowed"
msgstr "Toegestaan"
-#: classes/Gems/Default/RoleAction.php:260
-#: classes/Gems/Default/RoleAction.php:276
-msgid "Denied"
-msgstr "Geweigerd"
-
-#: classes/Gems/Default/RoleAction.php:264
+#: classes/Gems/Default/RoleAction.php:247
msgid "Project role overview"
msgstr "Project rollen"
-#: classes/Gems/Default/RoleAction.php:274
+#: classes/Gems/Default/RoleAction.php:257
msgid "Privilege"
msgstr "Privilége"
-#: classes/Gems/Default/RoleAction.php:280
+#: classes/Gems/Default/RoleAction.php:259
+msgid "Denied"
+msgstr "Geweigerd"
+
+#: classes/Gems/Default/RoleAction.php:263
msgid "Project privileges"
msgstr "Project priviléges"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
