diff --git a/packages/web/commons/schema.php b/packages/web/commons/schema.php index 2d9b056bd1..a354ad9715 100644 --- a/packages/web/commons/schema.php +++ b/packages/web/commons/schema.php @@ -346,7 +346,7 @@ ); // 8 $this->schema[] = array( - "INSERT IGNORE INTO `supportedOS` (`osName`, `osValue`) VALUES ('" + "INSERT IGNORE INTO `supportedOS` (`osName`, `osValue`) VALUES " . "('Windows 98','3')," . "('Windows (other)','4')," . "('Linux','50')", @@ -729,7 +729,7 @@ // 14 $this->schema[] = array( "INSERT IGNORE INTO `globalSettings` " - . "(`settingKey`,`settingDesc`,`settingValue`,`settingCategory`) " + . "(`settingKey`,`settingDesc`,`settingValue`,`settingCategory`) VALUES " . "('FOG_UTIL_DIR','This setting defines the location of the fog " . "utility directory.','/opt/fog/utils','FOG Utils')", "ALTER TABLE `users` ADD COLUMN `uType` VARCHAR(2) NOT NULL AFTER `uCreateBy`", @@ -1026,7 +1026,7 @@ "ALTER TABLE `inventory` ADD INDEX (`iHostID`)", "UPDATE `globalSettings` set `settingKey`='FOG_HOST_LOOKUP' " . "WHERE `settingKey`='FOG_HOST_LOCKUP'", - "UPDATE `schemaVersion` set `vValue`=`'22'", + "UPDATE `schemaVersion` set `vValue`='22'", ); // 23 $this->schema[] = array( @@ -1247,7 +1247,7 @@ . "\"Active Tasks\" and clicking on the \"Kill Task\" button.', " . "'memtest.png', '', 'fog', '1', 'both')," . "(6, 'Disk Surface Test', 'Disk Surface Test checks the hard " - . "drive's surface sector by sector for any errors and reports " + . "drives surface sector by sector for any errors and reports " . "back if errors are present.', 'surfacetest.png', ''," . "'fog', '1', 'both')," . "(7, 'Recover', 'Recover loads the photorec utility that can " @@ -2876,7 +2876,7 @@ $this->schema[] = array( "ALTER TABLE `nfsGroupMembers` CHANGE `ngmInterface` " . "`ngmInterface` VARCHAR (25) CHARACTER SET utf8 " - . "COLLATE utf8_general_ci NOT NULL DEFAULT" + . "COLLATE utf8_general_ci NOT NULL DEFAULT '" . STORAGE_INTERFACE . "'", ); @@ -3447,14 +3447,16 @@ . "PRIMARY KEY(`uId`)," . "UNIQUE INDEX `name` (`uName`)" . ") ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC", - "INSERT IGNORE INTO `users_new` SELECT * FROM `users`", + "INSERT IGNORE INTO `users_new` (SELECT * FROM `users`)", "DROP TABLE `users`", "RENAME TABLE `users_new` TO `users`", ); // 236 $this->schema[] = array( + self::$DB->getColumns('multicastSessions', 'msAnon1') > 0 ? 'ALTER TABLE `multicastSessions`' - . 'CHANGE `msAnon1` `msIsDD` INTEGER NOT NULL', + . 'CHANGE `msAnon1` `msIsDD` INTEGER NOT NULL' : + '', "ALTER TABLE `imageGroupAssoc` CHANGE `igaPrimary` `igaPrimary` " . "ENUM('0','1') NOT NULL", "ALTER TABLE `snapinGroupAssoc` CHANGE `sgaPrimary` `sgaPrimary` " @@ -3586,8 +3588,7 @@ 'globalSettings', array( 'settingKey' - ), - 'settingKey' + ) ), true ); diff --git a/packages/web/lib/fog/schema.class.php b/packages/web/lib/fog/schema.class.php index 59df3eaa61..ee7323c208 100644 --- a/packages/web/lib/fog/schema.class.php +++ b/packages/web/lib/fog/schema.class.php @@ -109,7 +109,7 @@ public function dropDuplicateData( return; } elseif (count($indexes) === 1) { $ending = sprintf( - 'INDEX `%s`', + 'INDEX (`%s`)', array_shift($indexes) ); } else { diff --git a/packages/web/lib/fog/system.class.php b/packages/web/lib/fog/system.class.php index 771e391ce6..bbcee3cc48 100644 --- a/packages/web/lib/fog/system.class.php +++ b/packages/web/lib/fog/system.class.php @@ -53,7 +53,7 @@ private static function _versionCompare() public function __construct() { self::_versionCompare(); - define('FOG_VERSION', '9'); + define('FOG_VERSION', '10'); define('FOG_SCHEMA', 245); define('FOG_BCACHE_VER', 111); define('FOG_SVN_REVISION', 6052); diff --git a/packages/web/lib/pages/schemaupdaterpage.class.php b/packages/web/lib/pages/schemaupdaterpage.class.php index 1db82b084a..c9e6cf2be1 100644 --- a/packages/web/lib/pages/schemaupdaterpage.class.php +++ b/packages/web/lib/pages/schemaupdaterpage.class.php @@ -152,8 +152,12 @@ public function indexPost() null, true ); + $newSchema = self::getClass('Schema', 1); foreach ((array)$items as $version => &$updates) { foreach ((array)$updates as &$update) { + if (!$update) { + continue; + } if (is_callable($update)) { $result = $update(); if (is_string($result)) { @@ -165,14 +169,15 @@ public function indexPost() . '
%s

', _('Update'), _('ID'), - $version, + $version + 1, _('Function'), _('Error'), $result, _('Function'), print_r($update, 1) ); - break; + unset($update); + break 2; } } elseif (false !== self::$DB->query($update)->error) { $errors[] = sprintf( @@ -180,23 +185,26 @@ public function indexPost() . ' %s

%s %s:' . '
%s

' . '

%s:' + . '

%s

' + . '

%s:' . '

%s

', _('Update'), _('ID'), - $version, + $version + 1, _('Database'), _('Error'), self::$DB->error, + _('Variable contains'), + print_r($this->schema[$version], 1), _('Database SQL'), $update ); - break; + unset($update); + break 2; } else { - if (!isset($newSchema)) { - $newSchema = self::getClass('Schema', 1); - } - $newSchema->set('version', ++$version); + $newSchema->set('version', $version + 1); } + unset($update); } } if (!$newSchema->save() diff --git a/packages/web/management/languages/de_DE.UTF-8/LC_MESSAGES/messages.po b/packages/web/management/languages/de_DE.UTF-8/LC_MESSAGES/messages.po index 0e1cb39cc7..0fdfc742f9 100644 --- a/packages/web/management/languages/de_DE.UTF-8/LC_MESSAGES/messages.po +++ b/packages/web/management/languages/de_DE.UTF-8/LC_MESSAGES/messages.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: fog-project-2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-13 23:53-0500\n" +"POT-Creation-Date: 2017-01-14 01:08-0500\n" "PO-Revision-Date: 2016-05-23 07:36-0400\n" "Last-Translator: vspushbullet \n" "Language-Team: German\n" @@ -128,8 +128,8 @@ msgstr "Drucker konnte nicht erstellt werden." #: /var/www/fog/lib/fog/fogcontroller.class.php:951 #: /var/www/fog/lib/fog/foggetset.class.php:92 #: /var/www/fog/lib/fog/fogpage.class.php:2293 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:170 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:188 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:174 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:195 #: /var/www/fog/lib/db/pdodb.class.php:177 #: /var/www/fog/lib/db/pdodb.class.php:216 #: /var/www/fog/lib/db/pdodb.class.php:272 @@ -340,8 +340,8 @@ msgstr "Objekt" #: /var/www/fog/lib/fog/fogcontroller.class.php:787 #: /var/www/fog/lib/fog/fogcontroller.class.php:799 #: /var/www/fog/lib/fog/fogcontroller.class.php:811 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:167 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:185 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:171 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:192 #: /var/www/fog/commons/text.php:302 msgid "ID" msgstr "ID" @@ -1545,8 +1545,8 @@ msgstr "Hinzufügen" #: /var/www/fog/lib/pages/groupmanagementpage.class.php:929 #: /var/www/fog/lib/pages/groupmanagementpage.class.php:978 #: /var/www/fog/lib/pages/usermanagementpage.class.php:284 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:166 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:184 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:170 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:191 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:799 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:1049 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:1316 @@ -2211,13 +2211,13 @@ msgstr "Ausstehende Gastgeber" #: /var/www/fog/lib/pages/dashboardpage.class.php:137 #: /var/www/fog/lib/pages/dashboardpage.class.php:146 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:223 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:231 msgid "Click" msgstr "Klicken Sie auf" #: /var/www/fog/lib/pages/dashboardpage.class.php:140 #: /var/www/fog/lib/pages/dashboardpage.class.php:149 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:224 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:232 #: /var/www/fog/commons/text.php:92 msgid "here" msgstr "Hier" @@ -4577,38 +4577,42 @@ msgstr "Keine Verbindung verfügbar" msgid "Update not required!" msgstr "Update wird nicht benötigt!" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:169 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:172 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:173 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:176 #, fuzzy msgid "Function" msgstr "Aktion" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:187 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:194 #, fuzzy msgid "Database" msgstr "Datum" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:190 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:197 +msgid "Variable contains" +msgstr "" + +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:199 msgid "Database SQL" msgstr "" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:208 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:216 msgid "Install / Update Failed!" msgstr "Installation / Update fehlgeschlagen!" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:213 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:221 msgid "The following errors occurred" msgstr "Der folgende Fehler aufgetreten" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:222 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:230 msgid "Install / Update Successful!" msgstr "Installation / Update erfolgreich!" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:225 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:233 msgid "to login" msgstr "anmelden" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:230 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:238 msgid "The following errors occured" msgstr "Der folgende Fehler aufgetreten" diff --git a/packages/web/management/languages/en_US.UTF-8/LC_MESSAGES/messages.po b/packages/web/management/languages/en_US.UTF-8/LC_MESSAGES/messages.po index ed07a08013..6425c87ada 100644 --- a/packages/web/management/languages/en_US.UTF-8/LC_MESSAGES/messages.po +++ b/packages/web/management/languages/en_US.UTF-8/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-13 23:53-0500\n" +"POT-Creation-Date: 2017-01-14 01:08-0500\n" "PO-Revision-Date: 2016-05-22 15:14-0400\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -127,8 +127,8 @@ msgstr "Could not create printer" #: /var/www/fog/lib/fog/fogcontroller.class.php:951 #: /var/www/fog/lib/fog/foggetset.class.php:92 #: /var/www/fog/lib/fog/fogpage.class.php:2293 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:170 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:188 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:174 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:195 #: /var/www/fog/lib/db/pdodb.class.php:177 #: /var/www/fog/lib/db/pdodb.class.php:216 #: /var/www/fog/lib/db/pdodb.class.php:272 @@ -339,8 +339,8 @@ msgstr "Object" #: /var/www/fog/lib/fog/fogcontroller.class.php:787 #: /var/www/fog/lib/fog/fogcontroller.class.php:799 #: /var/www/fog/lib/fog/fogcontroller.class.php:811 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:167 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:185 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:171 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:192 #: /var/www/fog/commons/text.php:302 msgid "ID" msgstr "ID" @@ -1537,8 +1537,8 @@ msgstr "Add" #: /var/www/fog/lib/pages/groupmanagementpage.class.php:929 #: /var/www/fog/lib/pages/groupmanagementpage.class.php:978 #: /var/www/fog/lib/pages/usermanagementpage.class.php:284 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:166 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:184 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:170 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:191 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:799 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:1049 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:1316 @@ -2201,13 +2201,13 @@ msgstr "Pending hosts" #: /var/www/fog/lib/pages/dashboardpage.class.php:137 #: /var/www/fog/lib/pages/dashboardpage.class.php:146 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:223 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:231 msgid "Click" msgstr "Click" #: /var/www/fog/lib/pages/dashboardpage.class.php:140 #: /var/www/fog/lib/pages/dashboardpage.class.php:149 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:224 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:232 #: /var/www/fog/commons/text.php:92 msgid "here" msgstr "here" @@ -4562,38 +4562,42 @@ msgstr "No connection available" msgid "Update not required!" msgstr "Update not required!" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:169 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:172 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:173 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:176 #, fuzzy msgid "Function" msgstr "Action" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:187 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:194 #, fuzzy msgid "Database" msgstr "Date" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:190 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:197 +msgid "Variable contains" +msgstr "" + +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:199 msgid "Database SQL" msgstr "" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:208 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:216 msgid "Install / Update Failed!" msgstr "Install / Update Failed!" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:213 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:221 msgid "The following errors occurred" msgstr "The following errors occurred" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:222 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:230 msgid "Install / Update Successful!" msgstr "Install / Update Successful!" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:225 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:233 msgid "to login" msgstr "to login" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:230 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:238 msgid "The following errors occured" msgstr "The following errors occured" diff --git a/packages/web/management/languages/es_ES.UTF-8/LC_MESSAGES/messages.po b/packages/web/management/languages/es_ES.UTF-8/LC_MESSAGES/messages.po index b4664d1147..ed501a616d 100755 --- a/packages/web/management/languages/es_ES.UTF-8/LC_MESSAGES/messages.po +++ b/packages/web/management/languages/es_ES.UTF-8/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-13 23:53-0500\n" +"POT-Creation-Date: 2017-01-14 01:08-0500\n" "PO-Revision-Date: 2016-05-22 15:14-0400\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -130,8 +130,8 @@ msgstr "No se pudo crear la impresora" #: /var/www/fog/lib/fog/fogcontroller.class.php:951 #: /var/www/fog/lib/fog/foggetset.class.php:92 #: /var/www/fog/lib/fog/fogpage.class.php:2293 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:170 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:188 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:174 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:195 #: /var/www/fog/lib/db/pdodb.class.php:177 #: /var/www/fog/lib/db/pdodb.class.php:216 #: /var/www/fog/lib/db/pdodb.class.php:272 @@ -342,8 +342,8 @@ msgstr "Objeto" #: /var/www/fog/lib/fog/fogcontroller.class.php:787 #: /var/www/fog/lib/fog/fogcontroller.class.php:799 #: /var/www/fog/lib/fog/fogcontroller.class.php:811 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:167 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:185 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:171 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:192 #: /var/www/fog/commons/text.php:302 msgid "ID" msgstr "CARNÉ DE IDENTIDAD" @@ -1542,8 +1542,8 @@ msgstr "Añadir" #: /var/www/fog/lib/pages/groupmanagementpage.class.php:929 #: /var/www/fog/lib/pages/groupmanagementpage.class.php:978 #: /var/www/fog/lib/pages/usermanagementpage.class.php:284 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:166 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:184 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:170 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:191 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:799 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:1049 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:1316 @@ -2207,13 +2207,13 @@ msgstr "anfitriones pendientes" #: /var/www/fog/lib/pages/dashboardpage.class.php:137 #: /var/www/fog/lib/pages/dashboardpage.class.php:146 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:223 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:231 msgid "Click" msgstr "Hacer clic" #: /var/www/fog/lib/pages/dashboardpage.class.php:140 #: /var/www/fog/lib/pages/dashboardpage.class.php:149 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:224 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:232 #: /var/www/fog/commons/text.php:92 msgid "here" msgstr "aquí" @@ -4572,38 +4572,42 @@ msgstr "No hay conexión disponible" msgid "Update not required!" msgstr "No es necesario actualizar!" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:169 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:172 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:173 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:176 #, fuzzy msgid "Function" msgstr "Acción" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:187 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:194 #, fuzzy msgid "Database" msgstr "Fecha" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:190 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:197 +msgid "Variable contains" +msgstr "" + +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:199 msgid "Database SQL" msgstr "" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:208 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:216 msgid "Install / Update Failed!" msgstr "Instalar / Actualizar Error!" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:213 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:221 msgid "The following errors occurred" msgstr "Los siguientes errores ocurrieron" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:222 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:230 msgid "Install / Update Successful!" msgstr "Instalar / Actualización correcta!" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:225 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:233 msgid "to login" msgstr "iniciar sesión" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:230 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:238 msgid "The following errors occured" msgstr "los siguientes errores ocurrieron" diff --git a/packages/web/management/languages/fr_FR.UTF-8/LC_MESSAGES/messages.po b/packages/web/management/languages/fr_FR.UTF-8/LC_MESSAGES/messages.po index 498760eb16..1792b6afef 100644 --- a/packages/web/management/languages/fr_FR.UTF-8/LC_MESSAGES/messages.po +++ b/packages/web/management/languages/fr_FR.UTF-8/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-13 23:53-0500\n" +"POT-Creation-Date: 2017-01-14 01:08-0500\n" "PO-Revision-Date: 2016-05-22 15:14-0400\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -130,8 +130,8 @@ msgstr "Impossible de créer l'imprimante" #: /var/www/fog/lib/fog/fogcontroller.class.php:951 #: /var/www/fog/lib/fog/foggetset.class.php:92 #: /var/www/fog/lib/fog/fogpage.class.php:2293 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:170 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:188 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:174 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:195 #: /var/www/fog/lib/db/pdodb.class.php:177 #: /var/www/fog/lib/db/pdodb.class.php:216 #: /var/www/fog/lib/db/pdodb.class.php:272 @@ -342,8 +342,8 @@ msgstr "Objet" #: /var/www/fog/lib/fog/fogcontroller.class.php:787 #: /var/www/fog/lib/fog/fogcontroller.class.php:799 #: /var/www/fog/lib/fog/fogcontroller.class.php:811 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:167 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:185 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:171 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:192 #: /var/www/fog/commons/text.php:302 msgid "ID" msgstr "ID" @@ -1548,8 +1548,8 @@ msgstr "Ajouter" #: /var/www/fog/lib/pages/groupmanagementpage.class.php:929 #: /var/www/fog/lib/pages/groupmanagementpage.class.php:978 #: /var/www/fog/lib/pages/usermanagementpage.class.php:284 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:166 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:184 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:170 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:191 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:799 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:1049 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:1316 @@ -2212,13 +2212,13 @@ msgstr "hôtes en attente" #: /var/www/fog/lib/pages/dashboardpage.class.php:137 #: /var/www/fog/lib/pages/dashboardpage.class.php:146 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:223 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:231 msgid "Click" msgstr "Cliquez" #: /var/www/fog/lib/pages/dashboardpage.class.php:140 #: /var/www/fog/lib/pages/dashboardpage.class.php:149 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:224 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:232 #: /var/www/fog/commons/text.php:92 msgid "here" msgstr "ici" @@ -4580,38 +4580,42 @@ msgstr "Aucune connexion disponible" msgid "Update not required!" msgstr "Mettre à jour pas nécessaire!" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:169 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:172 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:173 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:176 #, fuzzy msgid "Function" msgstr "action" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:187 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:194 #, fuzzy msgid "Database" msgstr "date" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:190 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:197 +msgid "Variable contains" +msgstr "" + +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:199 msgid "Database SQL" msgstr "" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:208 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:216 msgid "Install / Update Failed!" msgstr "Installation / mise à jour a échoué!" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:213 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:221 msgid "The following errors occurred" msgstr "Les erreurs suivantes sont survenues" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:222 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:230 msgid "Install / Update Successful!" msgstr "Installation / Mise à jour réussie!" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:225 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:233 msgid "to login" msgstr "ouvrir une session" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:230 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:238 msgid "The following errors occured" msgstr "Les erreurs suivantes se sont produites" diff --git a/packages/web/management/languages/it_IT.UTF-8/LC_MESSAGES/messages.po b/packages/web/management/languages/it_IT.UTF-8/LC_MESSAGES/messages.po index c650a7f450..08ed11f0fc 100644 --- a/packages/web/management/languages/it_IT.UTF-8/LC_MESSAGES/messages.po +++ b/packages/web/management/languages/it_IT.UTF-8/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-13 23:53-0500\n" +"POT-Creation-Date: 2017-01-14 01:08-0500\n" "PO-Revision-Date: 2016-05-22 15:14-0400\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -130,8 +130,8 @@ msgstr "Impossibile creare la stampante" #: /var/www/fog/lib/fog/fogcontroller.class.php:951 #: /var/www/fog/lib/fog/foggetset.class.php:92 #: /var/www/fog/lib/fog/fogpage.class.php:2293 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:170 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:188 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:174 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:195 #: /var/www/fog/lib/db/pdodb.class.php:177 #: /var/www/fog/lib/db/pdodb.class.php:216 #: /var/www/fog/lib/db/pdodb.class.php:272 @@ -342,8 +342,8 @@ msgstr "Oggetto" #: /var/www/fog/lib/fog/fogcontroller.class.php:787 #: /var/www/fog/lib/fog/fogcontroller.class.php:799 #: /var/www/fog/lib/fog/fogcontroller.class.php:811 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:167 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:185 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:171 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:192 #: /var/www/fog/commons/text.php:302 msgid "ID" msgstr "ID" @@ -1542,8 +1542,8 @@ msgstr "Aggiungere" #: /var/www/fog/lib/pages/groupmanagementpage.class.php:929 #: /var/www/fog/lib/pages/groupmanagementpage.class.php:978 #: /var/www/fog/lib/pages/usermanagementpage.class.php:284 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:166 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:184 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:170 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:191 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:799 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:1049 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:1316 @@ -2206,13 +2206,13 @@ msgstr "host in sospeso" #: /var/www/fog/lib/pages/dashboardpage.class.php:137 #: /var/www/fog/lib/pages/dashboardpage.class.php:146 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:223 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:231 msgid "Click" msgstr "Clic" #: /var/www/fog/lib/pages/dashboardpage.class.php:140 #: /var/www/fog/lib/pages/dashboardpage.class.php:149 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:224 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:232 #: /var/www/fog/commons/text.php:92 msgid "here" msgstr "Qui" @@ -4569,38 +4569,42 @@ msgstr "Nessuna connessione disponibile" msgid "Update not required!" msgstr "Aggiornamento non richiesto!" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:169 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:172 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:173 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:176 #, fuzzy msgid "Function" msgstr "Azione" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:187 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:194 #, fuzzy msgid "Database" msgstr "Data" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:190 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:197 +msgid "Variable contains" +msgstr "" + +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:199 msgid "Database SQL" msgstr "" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:208 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:216 msgid "Install / Update Failed!" msgstr "Installare / Aggiornamento non riuscito!" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:213 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:221 msgid "The following errors occurred" msgstr "Si sono verificati i seguenti errori" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:222 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:230 msgid "Install / Update Successful!" msgstr "Installare / Aggiornamento di successo!" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:225 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:233 msgid "to login" msgstr "il login" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:230 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:238 msgid "The following errors occured" msgstr "I seguenti errori si è verificato" diff --git a/packages/web/management/languages/messages.pot b/packages/web/management/languages/messages.pot index febfa03496..7efc9afab6 100644 --- a/packages/web/management/languages/messages.pot +++ b/packages/web/management/languages/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-13 23:53-0500\n" +"POT-Creation-Date: 2017-01-14 01:11-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -119,8 +119,8 @@ msgstr "" #: /var/www/fog/lib/fog/fogcontroller.class.php:951 #: /var/www/fog/lib/fog/foggetset.class.php:92 #: /var/www/fog/lib/fog/fogpage.class.php:2293 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:170 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:188 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:174 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:195 #: /var/www/fog/lib/db/pdodb.class.php:177 #: /var/www/fog/lib/db/pdodb.class.php:216 #: /var/www/fog/lib/db/pdodb.class.php:272 @@ -317,8 +317,8 @@ msgstr "" #: /var/www/fog/lib/fog/fogcontroller.class.php:787 #: /var/www/fog/lib/fog/fogcontroller.class.php:799 #: /var/www/fog/lib/fog/fogcontroller.class.php:811 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:167 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:185 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:171 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:192 #: /var/www/fog/commons/text.php:302 msgid "ID" msgstr "" @@ -1442,8 +1442,8 @@ msgstr "" #: /var/www/fog/lib/pages/groupmanagementpage.class.php:929 #: /var/www/fog/lib/pages/groupmanagementpage.class.php:978 #: /var/www/fog/lib/pages/usermanagementpage.class.php:284 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:166 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:184 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:170 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:191 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:799 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:1049 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:1316 @@ -2085,13 +2085,13 @@ msgstr "" #: /var/www/fog/lib/pages/dashboardpage.class.php:137 #: /var/www/fog/lib/pages/dashboardpage.class.php:146 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:223 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:231 msgid "Click" msgstr "" #: /var/www/fog/lib/pages/dashboardpage.class.php:140 #: /var/www/fog/lib/pages/dashboardpage.class.php:149 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:224 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:232 #: /var/www/fog/commons/text.php:92 msgid "here" msgstr "" @@ -4370,36 +4370,40 @@ msgstr "" msgid "Update not required!" msgstr "" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:169 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:172 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:173 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:176 msgid "Function" msgstr "" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:187 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:194 msgid "Database" msgstr "" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:190 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:197 +msgid "Variable contains" +msgstr "" + +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:199 msgid "Database SQL" msgstr "" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:208 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:216 msgid "Install / Update Failed!" msgstr "" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:213 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:221 msgid "The following errors occurred" msgstr "" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:222 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:230 msgid "Install / Update Successful!" msgstr "" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:225 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:233 msgid "to login" msgstr "" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:230 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:238 msgid "The following errors occured" msgstr "" diff --git a/packages/web/management/languages/pt_BR.UTF-8/LC_MESSAGES/messages.po b/packages/web/management/languages/pt_BR.UTF-8/LC_MESSAGES/messages.po index 2c1cb5b05e..cf180bd9d1 100644 --- a/packages/web/management/languages/pt_BR.UTF-8/LC_MESSAGES/messages.po +++ b/packages/web/management/languages/pt_BR.UTF-8/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-13 23:53-0500\n" +"POT-Creation-Date: 2017-01-14 01:08-0500\n" "PO-Revision-Date: 2016-05-22 15:14-0400\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -129,8 +129,8 @@ msgstr "Não foi possível criar impressora" #: /var/www/fog/lib/fog/fogcontroller.class.php:951 #: /var/www/fog/lib/fog/foggetset.class.php:92 #: /var/www/fog/lib/fog/fogpage.class.php:2293 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:170 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:188 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:174 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:195 #: /var/www/fog/lib/db/pdodb.class.php:177 #: /var/www/fog/lib/db/pdodb.class.php:216 #: /var/www/fog/lib/db/pdodb.class.php:272 @@ -341,8 +341,8 @@ msgstr "Objeto" #: /var/www/fog/lib/fog/fogcontroller.class.php:787 #: /var/www/fog/lib/fog/fogcontroller.class.php:799 #: /var/www/fog/lib/fog/fogcontroller.class.php:811 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:167 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:185 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:171 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:192 #: /var/www/fog/commons/text.php:302 msgid "ID" msgstr "identidade" @@ -1540,8 +1540,8 @@ msgstr "Adicionar" #: /var/www/fog/lib/pages/groupmanagementpage.class.php:929 #: /var/www/fog/lib/pages/groupmanagementpage.class.php:978 #: /var/www/fog/lib/pages/usermanagementpage.class.php:284 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:166 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:184 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:170 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:191 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:799 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:1049 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:1316 @@ -2204,13 +2204,13 @@ msgstr "anfitriões pendentes" #: /var/www/fog/lib/pages/dashboardpage.class.php:137 #: /var/www/fog/lib/pages/dashboardpage.class.php:146 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:223 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:231 msgid "Click" msgstr "Clique" #: /var/www/fog/lib/pages/dashboardpage.class.php:140 #: /var/www/fog/lib/pages/dashboardpage.class.php:149 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:224 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:232 #: /var/www/fog/commons/text.php:92 msgid "here" msgstr "Aqui" @@ -4567,38 +4567,42 @@ msgstr "Nenhuma conexão disponível" msgid "Update not required!" msgstr "Atualize não é necessário!" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:169 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:172 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:173 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:176 #, fuzzy msgid "Function" msgstr "Açao" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:187 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:194 #, fuzzy msgid "Database" msgstr "Encontro" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:190 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:197 +msgid "Variable contains" +msgstr "" + +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:199 msgid "Database SQL" msgstr "" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:208 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:216 msgid "Install / Update Failed!" msgstr "Instalar / Atualizar Falha!" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:213 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:221 msgid "The following errors occurred" msgstr "Ocorreram os seguintes erros" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:222 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:230 msgid "Install / Update Successful!" msgstr "Instalar / Atualizar sucesso!" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:225 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:233 msgid "to login" msgstr "Entrar" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:230 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:238 msgid "The following errors occured" msgstr "Os seguintes erros ocorreram" diff --git a/packages/web/management/languages/zh_CN.UTF-8/LC_MESSAGES/messages.po b/packages/web/management/languages/zh_CN.UTF-8/LC_MESSAGES/messages.po index 0475a910eb..1c63ac84f9 100644 --- a/packages/web/management/languages/zh_CN.UTF-8/LC_MESSAGES/messages.po +++ b/packages/web/management/languages/zh_CN.UTF-8/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-13 23:53-0500\n" +"POT-Creation-Date: 2017-01-14 01:08-0500\n" "PO-Revision-Date: 2016-05-22 15:14-0400\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -127,8 +127,8 @@ msgstr "无法创建打印机" #: /var/www/fog/lib/fog/fogcontroller.class.php:951 #: /var/www/fog/lib/fog/foggetset.class.php:92 #: /var/www/fog/lib/fog/fogpage.class.php:2293 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:170 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:188 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:174 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:195 #: /var/www/fog/lib/db/pdodb.class.php:177 #: /var/www/fog/lib/db/pdodb.class.php:216 #: /var/www/fog/lib/db/pdodb.class.php:272 @@ -339,8 +339,8 @@ msgstr "目的" #: /var/www/fog/lib/fog/fogcontroller.class.php:787 #: /var/www/fog/lib/fog/fogcontroller.class.php:799 #: /var/www/fog/lib/fog/fogcontroller.class.php:811 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:167 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:185 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:171 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:192 #: /var/www/fog/commons/text.php:302 msgid "ID" msgstr "ID" @@ -1533,8 +1533,8 @@ msgstr "加" #: /var/www/fog/lib/pages/groupmanagementpage.class.php:929 #: /var/www/fog/lib/pages/groupmanagementpage.class.php:978 #: /var/www/fog/lib/pages/usermanagementpage.class.php:284 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:166 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:184 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:170 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:191 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:799 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:1049 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:1316 @@ -2197,13 +2197,13 @@ msgstr "待主机" #: /var/www/fog/lib/pages/dashboardpage.class.php:137 #: /var/www/fog/lib/pages/dashboardpage.class.php:146 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:223 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:231 msgid "Click" msgstr "点击" #: /var/www/fog/lib/pages/dashboardpage.class.php:140 #: /var/www/fog/lib/pages/dashboardpage.class.php:149 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:224 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:232 #: /var/www/fog/commons/text.php:92 msgid "here" msgstr "这里" @@ -4550,38 +4550,42 @@ msgstr "没有可用的连接" msgid "Update not required!" msgstr "更新不需要!" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:169 -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:172 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:173 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:176 #, fuzzy msgid "Function" msgstr "行动" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:187 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:194 #, fuzzy msgid "Database" msgstr "日期" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:190 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:197 +msgid "Variable contains" +msgstr "" + +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:199 msgid "Database SQL" msgstr "" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:208 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:216 msgid "Install / Update Failed!" msgstr "安装/更新失败!" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:213 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:221 msgid "The following errors occurred" msgstr "出现以下错误" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:222 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:230 msgid "Install / Update Successful!" msgstr "安装/升级成功!" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:225 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:233 msgid "to login" msgstr "登陆" -#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:230 +#: /var/www/fog/lib/pages/schemaupdaterpage.class.php:238 msgid "The following errors occured" msgstr "下面的错误发生"