Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/DEV-capside/release-3.9.0:6365-6370
/branches/DEV-extra-notification-data:6734-6746
/branches/DEV-odw-calculations:9016-9160
/branches/DEV-restapi-monitoringservers:9778
/branches/DEV-snmp-multi:7324-7376
/branches/US187:9403-9479
/branches/US198b:8875-8994
/branches/US310:9851-9873
/branches/enterprise/BRAN-3.14:6874,6882,6956
/branches/enterprise/DEV-professional:6494-8475,8477-8478,8486,8490,8492,8494,8499-8500,8515,8518-8519,8524,8527-8529,8531-8532,8536,8538,8540-8544,8547-8552,8554,8557,8600-8601,8637,8749,8772,8897,8917,8944-8945,8947,8950-8952,8967,8969,8979,8982,8987,8998,9006,9008,9011,9013,9026,9033-9036,9038,9040,9042,9044,9048,9050-9053,9062,9064-9065,9069,9078,9081,9088,9096,9099-9101,9103,9105,9115,9118,9347,9353-9354,9411,9432,9445,9486,9538-9550,9569-9571,9620,9635,9637-9638,9645-9647,9693,9699,9721,9814,9825,9857,9879,9881,9939,10002,10029,10038-10041
/branches/nagvis-iframe:9764-9786
/branches/us168:8759,8762-8763,8766-8768,8770,8774-8777,8794,8798-8799,8801-8803,8821-8822,8834,8837-8838,8932,8937,8947,8969,8977,8981,9004,9007,9009-9010,9012,9024,9049
/commercial/branches/US306-slaves:9804-9823
/commercial/branches/US307-network-map:9685-9837
+ /branches/DEV-capside/release-3.9.0:6365-6370
/branches/DEV-extra-notification-data:6734-6746
/branches/DEV-odw-calculations:9016-9160
/branches/DEV-restapi-monitoringservers:9778
/branches/DEV-snmp-multi:7324-7376
/branches/US187:9403-9479
/branches/US198b:8875-8994
/branches/US310:9851-9873
/branches/enterprise/BRAN-3.14:6874,6882,6956
/branches/enterprise/DEV-professional:6494-8475,8477-8478,8486,8490,8492,8494,8499-8500,8515,8518-8519,8524,8527-8529,8531-8532,8536,8538,8540-8544,8547-8552,8554,8557,8600-8601,8637,8749,8772,8897,8917,8944-8945,8947,8950-8952,8967,8969,8979,8982,8987,8998,9006,9008,9011,9013,9026,9033-9036,9038,9040,9042,9044,9048,9050-9053,9062,9064-9065,9069,9078,9081,9088,9096,9099-9101,9103,9105,9115,9118,9347,9353-9354,9411,9432,9445,9486,9538-9550,9569-9571,9620,9635,9637-9638,9645-9647,9693,9699,9721,9814,9825,9857,9879,9881,9939,10002,10029,10038-10041,10070
/branches/nagvis-iframe:9764-9786
/branches/us168:8759,8762-8763,8766-8768,8770,8774-8777,8794,8798-8799,8801-8803,8821-8822,8834,8837-8838,8932,8937,8947,8969,8977,8981,9004,9007,9009-9010,9012,9024,9049
/commercial/branches/US306-slaves:9804-9823
/commercial/branches/US307-network-map:9685-9837
Modified: trunk/opsview-web/Makefile
===================================================================
--- trunk/opsview-web/Makefile 2012-09-16 22:30:31 UTC (rev 10070)
+++ trunk/opsview-web/Makefile 2012-09-16 22:33:10 UTC (rev 10071)
@@ -67,7 +67,7 @@
prove t/*.t
gettext:
- xgettext.pl -P perl=* -P tt2=* --output=lib/Opsview/Web/I18N/messages.pot --directory=lib/ --directory=root/
+ find lib root -type f | grep -v .svn | grep -v /discovery/ | xgettext.pl -P perl=* -P tt2=* --output=lib/Opsview/Web/I18N/messages.pot
msgmerge --no-location --no-wrap --no-fuzzy-matching --update lib/Opsview/Web/I18N/i_default.po lib/Opsview/Web/I18N/messages.pot
# This is quick, so run it everytime
$(MAKE) gettext-test
Modified: trunk/opsview-web/lib/Opsview/Web/I18N/de.po
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/I18N/de.po 2012-09-16 22:30:31 UTC (rev 10070)
+++ trunk/opsview-web/lib/Opsview/Web/I18N/de.po 2012-09-16 22:33:10 UTC (rev 10071)
@@ -1406,6 +1406,9 @@
msgid "ui.admin.notificationmethods.edit.html.aqlSignUp %1 %2"
msgstr ""
+msgid "ui.admin.notificationmethods.edit.html.iosCredentials %1"
+msgstr ""
+
msgid "ui.admin.notificationmethods.edit.html.smsgateway %1"
msgstr ""
Modified: trunk/opsview-web/lib/Opsview/Web/I18N/es.po
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/I18N/es.po 2012-09-16 22:30:31 UTC (rev 10070)
+++ trunk/opsview-web/lib/Opsview/Web/I18N/es.po 2012-09-16 22:33:10 UTC (rev 10071)
@@ -1423,6 +1423,9 @@
msgid "ui.admin.notificationmethods.edit.html.aqlSignUp %1 %2"
msgstr "AQL proporciona una forma fácil de transmisión de alertas vía SMS desde Opsview. Este servicio funciona para la mayoría de los países - todo lo que necesita es una cuenta AQL. Dése de alta <a href=''>aquí</a> con el código <em>%2</em> para recibir descuentos y crédito gratis\""
+msgid "ui.admin.notificationmethods.edit.html.iosCredentials %1"
+msgstr ""
+
msgid "ui.admin.notificationmethods.edit.html.smsgateway %1"
msgstr ""
Modified: trunk/opsview-web/lib/Opsview/Web/I18N/fr.po
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/I18N/fr.po 2012-09-16 22:30:31 UTC (rev 10070)
+++ trunk/opsview-web/lib/Opsview/Web/I18N/fr.po 2012-09-16 22:33:10 UTC (rev 10071)
@@ -1404,6 +1404,9 @@
msgid "ui.admin.notificationmethods.edit.html.aqlSignUp %1 %2"
msgstr "AQL fournit une méthode simple et efficace pour l'envoi d'alertes SMS à partir d'Opsview. Ce service fonctionne dans plusieurs pays - il suffit d'avoir un compte AQL.<a href=''>Cliquez-ici</a> pour vous enregistrer avec le code <em>%2</em> et recevoir des tarifs promotionnels ainsi que des crédits gratuit."
+msgid "ui.admin.notificationmethods.edit.html.iosCredentials %1"
+msgstr ""
+
msgid "ui.admin.notificationmethods.edit.html.smsgateway %1"
msgstr ""
Modified: trunk/opsview-web/lib/Opsview/Web/I18N/i_default.po
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/I18N/i_default.po 2012-09-16 22:30:31 UTC (rev 10070)
+++ trunk/opsview-web/lib/Opsview/Web/I18N/i_default.po 2012-09-16 22:33:10 UTC (rev 10071)
@@ -10,10 +10,10 @@
"PO-Revision-Date: 2009-06-09 14:10+0000\n"
"Last-Translator: Ton Voon <[email protected]>\n"
"Language-Team: English <[email protected]>\n"
-"Language: en\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
msgid "messages.access.noAuthToChangeService"
msgstr "You are not authorised to change the state of this service"
@@ -146,8 +146,8 @@
msgid "messages.auditlog.submitServiceCheck.failed %1"
msgstr "Failed to submit service check result: %1"
-#. ($s->servicename, $s->hostname, $states_by_id->{$state}, $comment,)
#. ($c->stash->{object}->name, $c->stash->{object}->host_object_id->name, $states_by_id->{$state}, $comment,)
+#. ($s->servicename, $s->hostname, $states_by_id->{$state}, $comment,)
msgid "messages.auditlog.submittingServiceCheckResultOnAs %1 %2 %3 %4"
msgstr "Submitting service check result: %1 on %2 as %3: %4"
@@ -1368,8 +1368,8 @@
msgid "ui.admin.list.label.delete.confirm %1"
msgstr "Are you sure you want to delete `%1`?"
-#. ($c->stash->{object}->name)
#. ($o->name)
+#. ($c->stash->{object}->name)
#. (object_name)
msgid "ui.admin.list.label.edit %1"
msgstr "Edit %1"
@@ -1480,6 +1480,10 @@
msgid "ui.admin.notificationmethods.edit.html.aqlSignUp %1 %2"
msgstr "AQL provide a simple way of transmitting SMS alerts from Opsview. This service works from most countries - all you need is an AQL account. Sign up <a href=''>here</a> with the code <em>%2</em> to receive discounted rates and free credits"
+#. ("http://opsview.com/opsview-mobile/download")
+msgid "ui.admin.notificationmethods.edit.html.iosCredentials %1"
+msgstr "Enter your opsview.com credentials to send Push Notifications. <a href=''>Click here to download from the app store</a>"
+
#. (smsgateway_info_link)
msgid "ui.admin.notificationmethods.edit.html.smsgateway %1"
msgstr "%1 module is available with an Opsview Enterprise Subscription and provides a resilient SMS notification gateway for use with directly attached GSM modems."
@@ -2487,9 +2491,9 @@
msgid "ui.downtime.help.commentEmpty"
msgstr "Comment is empty"
-#. (join( "::", $c->stash->{object}->hostname, $c->stash->{object}->name)
-#. ($c->stash->{object}->name)
#. (join( "::", $c->stash->{object}->hostname, $c->stash->{object}->name)
+#. ($c->stash->{object}->name)
+#. (join( "::", $c->stash->{object}->hostname, $c->stash->{object}->name)
msgid "ui.downtime.help.downtimeDeletedFor %1"
msgstr "Downtime delete for %1"
@@ -4375,8 +4379,8 @@
msgid "ui.status.service.label.summary.forDowntime %1"
msgstr "Service Status for Downtime Starting At %1"
-#. (host.services.size)
#. (failed_services)
+#. (host.services.size)
msgid "ui.status.service.servicesFailed %1"
msgstr "Services failed: %1"
@@ -4614,381 +4618,3 @@
msgid "ui.welcome.title"
msgstr "Welcome to Opsview!"
-
-#~ msgid "ui.set.message.missingComments"
-#~ msgstr "You must enter a comment"
-
-#~ msgid "ui.set.message.submittedForHostsAndServices %1 %2"
-#~ msgstr "Acknowledgements submitted for hosts: %1, services: %2"
-
-#~ msgid "messages.auditlog.submittingHostCheckResultOnAs %1 %2 %3"
-#~ msgstr "Submitting host check result: %1 as %2: %3"
-
-#~ msgid "ui.admin.monitoringserver.edit.help.clusterNodesDisabled"
-#~ msgstr "Cluster nodes are disabled"
-
-#~ msgid "ui.admin.monitoringserver.edit.label.activated"
-#~ msgstr "Activated"
-
-#~ msgid "ui.admin.monitoringserver.edit.label.clusterNodes"
-#~ msgstr "Cluster Nodes"
-
-#~ msgid "ui.admin.monitoringserver.edit.label.host"
-#~ msgstr "Host"
-
-#~ msgid "ui.admin.monitoringserver.edit.label.name"
-#~ msgstr "Name"
-
-#~ msgid "ui.admin.monitoringserver.edit.label.passive"
-#~ msgstr "Passive"
-
-#~ msgid "ui.admin.monitoringserver.edit.message.isMasterMonitoringServer"
-#~ msgstr "This is the master monitoring server"
-
-#~ msgid "ui.admin.monitoringserver.edit.message.isSlave"
-#~ msgstr "This is a slave"
-
-#~ msgid "ui.admin.monitoringserver.edit.message.isSlaveCluster"
-#~ msgstr "This is a slave cluster"
-
-#~ msgid "ui.admin.monitoringserver.edit.message.willBeMasterMonitoringServer"
-#~ msgstr "This will be a master monitoring server"
-
-#~ msgid "ui.admin.monitoringserver.edit.message.willBeSlave"
-#~ msgstr "This will be a slave"
-
-#~ msgid "ui.admin.monitoringserver.error.atLeastOneNode"
-#~ msgstr "Must choose at least 1 node"
-
-#~ msgid "ui.admin.monitoringserver.help.active.slaveClustersLicenseRequired"
-#~ msgstr "Disabled - Slave server clustering license required"
-
-#~ msgid "ui.admin.monitoringserver.help.active.slavesLicenseRequired"
-#~ msgstr "Disabled - Distributed monitoring license required"
-
-#~ msgid "ui.admin.monitoringserver.message.alwaysActivated"
-#~ msgstr "Always"
-
-#~ msgid "ui.admin.monitoringserver.message.cannotDeleteAsMasterMonitoringServer"
-#~ msgstr "Cannot delete as this is the master monitoring server"
-
-#~ msgid "ui.admin.monitoringserver.message.cannotDeleteRoleLinked"
-#~ msgstr "Cannot delete this monitoring server as a role is linked to it"
-
-#~ msgid "ui.admin.monitoringserver.message.showSlaveStatus"
-#~ msgstr "Slave Status"
-
-#~ msgid "ui.admin.monitoringserver.message.slavePort %1"
-#~ msgstr "Slave port %1"
-
-#~ msgid "ui.admin.monitoringserver.table.title.activated"
-#~ msgstr "Activated"
-
-#~ msgid "ui.admin.monitoringserver.table.title.monitoringserver"
-#~ msgstr "Monitoring Server"
-
-#~ msgid "ui.admin.monitoringserver.table.title.monitors"
-#~ msgstr "Monitors"
-
-#~ msgid "ui.admin.monitoringserver.table.title.nodes"
-#~ msgstr "Nodes"
-
-#~ msgid "ui.message.disabled"
-#~ msgstr "Disabled"
-
-#~ msgid "ui.admin.servicecheck.edit.help.sensitiveArguments"
-#~ msgstr "Contains sensitive arguments. Will be hidden from users unless they have TESTCHANGE access"
-
-#~ msgid "ui.admin.servicecheck.edit.label.sensitiveArguments"
-#~ msgstr "Sensitive Arguments"
-
-#~ msgid "ui.admin.sharednotificationprofile.title.createNewProfileForContact %1"
-#~ msgstr "Create new shared notification profile for %1"
-
-#~ msgid "ui.admin.sharednotificationprofile.title.editContactNotificationVariables"
-#~ msgstr "Edit Contact Variables"
-
-#~ msgid "ui.admin.sharednotificationprofile.title.useSharedNotificationProfile"
-#~ msgstr "Use Shared Notification Profile"
-
-#~ msgid "ui.user.sharednotificationprofile.title.editMyNotificationVariables"
-#~ msgstr "Edit my notification variables"
-
-#~ msgid "ui.menu.navigation.settings.submenu.administration.element.notificationProfiles.title"
-#~ msgstr "Personal Notification Profiles"
-
-#~ msgid "ui.about.system.slaves"
-#~ msgstr "Number of slaves"
-
-#~ msgid "ui.admin.role.edit.help.monitoringservers"
-#~ msgstr "Blank selection means no restrictions"
-
-#~ msgid "ui.admin.role.edit.label.monitoringservers"
-#~ msgstr "Monitoring Servers"
-
-#~ msgid "ui.admin.servicecheck.edit.label.checktypeSnmpTrap"
-#~ msgstr "SNMP Traps are disabled"
-
-#~ msgid "ui.header.logo"
-#~ msgstr "Logo"
-
-#~ msgid "ui.menu.navigation.help.submenu.documentation.element.user.title"
-#~ msgstr "User"
-
-#~ msgid "messages.auditlog.collectingTrapsForHost %1 %2"
-#~ msgstr "Collecting traps for host %1. Collected: %2"
-
-#~ msgid "messages.auditlog.snmptrapexception.deleteSimilar %1"
-#~ msgstr "Deleting snmptrapexception %1 and all similar ones"
-
-#~ msgid "messages.auditlog.snmptrapexception.reprocessingAll"
-#~ msgstr "Reprocessing all SNMP traps"
-
-#~ msgid "messages.auditlog.snmptrapexception.runningPromoteMibForOid %1"
-#~ msgstr "Running promote mib for OID %1"
-
-#~ msgid "messages.generic.cannotExecute %1"
-#~ msgstr "Cannot execute %1"
-
-#~ msgid "messages.generic.errorRunning %1"
-#~ msgstr "Error running %1"
-
-#~ msgid "ui.admin.snmptrap.summary.title"
-#~ msgstr "SNMP Trap Summary"
-
-#~ msgid "ui.admin.snmptrap.tracing.cannotGenerateNewConfigurationFile"
-#~ msgstr "Cannot generate new SNMP trap configuration file"
-
-#~ msgid "ui.admin.snmptrap.tracing.noTrapsCollected"
-#~ msgstr "No traps collected"
-
-#~ msgid "ui.admin.snmptrap.tracing.setForHosts %1"
-#~ msgstr "Set snmptrap tracing for hosts: %1"
-
-#~ msgid "ui.admin.snmptrap.tracing.title"
-#~ msgstr "SNMP Trap Tracing"
-
-#~ msgid "ui.admin.snmptrap.tracing.trapsCollected %1"
-#~ msgstr "Collected and debugged %1 traps"
-
-#~ msgid "ui.admin.snmptrapexception.help.mibAlreadyPromoted"
-#~ msgstr "MIB already promoted; waiting re-processing"
-
-#~ msgid "ui.admin.snmptrapexception.help.noSnmpTrapExceptionById %1"
-#~ msgstr "No SNMP trap exception by id %1 found"
-
-#~ msgid "ui.objecttype.snmptrapdebug"
-#~ msgstr "SNMP Trap Debug"
-
-#~ msgid "ui.objecttype.snmptrapexception"
-#~ msgstr "SNMP Trap Exceptions"
-
-#~ msgid "ui.menu.navigation.settings.submenu.advanced.element.snmp_traps.title"
-#~ msgstr "SNMP Traps"
-
-#~ msgid "ui.objecttype.snmptrapruledebug"
-#~ msgstr "SNMP Trap Rule Debug"
-
-#~ msgid "messages.auditlog.admin.monitoringserver.movingHostToNewMonitoringserver %1 %2 %3"
-#~ msgstr "Moving host %1 from monitoring server %2 to %3"
-
-#~ msgid "messages.servicecheck.notExist"
-#~ msgstr "Service check does not exist"
-
-#~ msgid "ui.admin.monitoringserver.list.title"
-#~ msgstr "Monitoring Servers"
-
-#~ msgid "ui.admin.snmptraprule.list.title"
-#~ msgstr "SNMP Trap Rules"
-
-#~ msgid "ui.admin.snmptraprule.title.createNewRuleForServicecheck %1"
-#~ msgstr "Create new rule for %1"
-
-#~ msgid "ui.admin.systempreference.help.odwLicenseRequired"
-#~ msgstr "Required license for ODW was not found!"
-
-#~ msgid "ui.auto.tab.odw"
-#~ msgstr "ODW"
-
-#~ msgid "ui.objecttype.monitoringserver"
-#~ msgstr "Monitoring Server"
-
-#~ msgid "ui.objecttype.snmptraprule"
-#~ msgstr "SNMP Trap Rule"
-
-#~ msgid "ui.about.addEntitlement"
-#~ msgstr "Add an entitlement"
-
-#~ msgid "ui.about.entitlementSummary"
-#~ msgstr "Entitlement Summary"
-
-#~ msgid "ui.about.licenseTable.Details"
-#~ msgstr "Details"
-
-#~ msgid "ui.about.licenseTable.Disabled"
-#~ msgstr "Disabled"
-
-#~ msgid "ui.about.licenseTable.Enabled"
-#~ msgstr "Enabled"
-
-#~ msgid "ui.about.licenseTable.ExpiryDate"
-#~ msgstr "Expiry Date"
-
-#~ msgid "ui.about.licenseTable.Feature"
-#~ msgstr "Feature"
-
-#~ msgid "ui.about.licenseTable.N/A"
-#~ msgstr "N/A"
-
-#~ msgid "ui.about.licenseTable.Status"
-#~ msgstr "Status"
-
-#~ msgid "ui.about.licenseTable.assignedContact"
-#~ msgstr "Assigned contact for this entitlement"
-
-#~ msgid "ui.about.licenseTable.details.limited %1"
-#~ msgstr "Limited to %1"
-
-#~ msgid "ui.about.licenseTable.details.unlimited"
-#~ msgstr "Unlimited"
-
-#~ msgid "ui.about.licenseTable.licenseValid %1"
-#~ msgstr "Your %1 entitlement is valid"
-
-#~ msgid "ui.about.licenseTable.licenseValidUntil %1"
-#~ msgstr "Your %1 entitlement is valid until"
-
-#~ msgid "ui.activation.automatic.title"
-#~ msgstr "Activation"
-
-#~ msgid "ui.activation.button.ok"
-#~ msgstr "OK"
-
-#~ msgid "ui.activation.button.submit"
-#~ msgstr "Submit"
-
-#~ msgid "ui.activation.help.assistance"
-#~ msgstr "If you need assistance with your entitlement, please contact <a href=''>Opsview Support</a>"
-
-#~ msgid "ui.activation.help.entitlement_summary"
-#~ msgstr "Entitlement summary"
-
-#~ msgid "ui.activation.manual.enterLicenseString"
-#~ msgstr "<b>Once you have obtained your license string, please enter it here:</b>"
-
-#~ msgid "ui.activation.manual.text.client_info"
-#~ msgstr "The <b>client info</b> string for this system is:"
-
-#~ msgid "ui.activation.manual.text.couldnotactivate"
-#~ msgstr "Sorry, we couldn't activate your entitlement. This is most likely because your Opsview system could not communicate with our License Management server."
-
-#~ msgid "ui.activation.manual.text.instructions"
-#~ msgstr "Manual activation instructions can be found in the <a href='' target='_new'>Opsview Documentation</a>"
-
-#~ msgid "ui.activation.manual.title"
-#~ msgstr "Manual Activation"
-
-#~ msgid "ui.activation.message.badData"
-#~ msgstr "There was a problem activating your product."
-
-#~ msgid "ui.activation.message.cantConnect"
-#~ msgstr "There was a problem communicating with the License Management system. Please retry."
-
-#~ msgid "ui.activation.message.contactSupport"
-#~ msgstr "There was a problem activating your product - please contact Opsview Support."
-
-#~ msgid "ui.activation.message.enterCode"
-#~ msgstr "To get started, please enter your Entitlement ID (EID)"
-
-#~ msgid "ui.activation.message.enterCodeToResume"
-#~ msgstr "To resume, please enter your new activation code"
-
-#~ msgid "ui.activation.message.httpError"
-#~ msgstr "Communications error"
-
-#~ msgid "ui.activation.message.invalidEid"
-#~ msgstr "Invalid activation code"
-
-#~ msgid "ui.activation.message.invalidEidString"
-#~ msgstr "Invalid activation string"
-
-#~ msgid "ui.activation.message.invalidLicenseString"
-#~ msgstr "Invalid license string"
-
-#~ msgid "ui.activation.message.licenseExpired"
-#~ msgstr "Your Opsview core license has expired!"
-
-#~ msgid "ui.activation.message.opsviewActivated"
-#~ msgstr "Congratulations! You have successfully activated your Opsview system."
-
-#~ msgid "ui.activation.message.validationError"
-#~ msgstr "Sorry, we were unable to validate your entitlement for the following reason:"
-
-#~ msgid "ui.admin.hosts_count.learnAboutYourLicense"
-#~ msgstr "Learn more about your license"
-
-#~ msgid "ui.admin.list.createNewDisabled.hostLimitReached"
-#~ msgstr "is disabled - host limit reached"
-
-#~ msgid "ui.admin.list.host.cloneDisabled"
-#~ msgstr "The clone option is disabled"
-
-#~ msgid "ui.admin.list.host.hostLimitReached"
-#~ msgstr "Host limit reached"
-
-#~ msgid "ui.admin.monitoringserver.edit.help.clusterNodes"
-#~ msgstr "Use CNTRL to select multiple nodes"
-
-#~ msgid "ui.admin.notificationmethods.servicedeskDisabled"
-#~ msgstr "Service Desk Connector Module is disabled "
-
-#~ msgid "ui.admin.servicecheck.edit.message.cloneSnmpTrapRules"
-#~ msgstr "Rules will be cloned. Next page will show all the rules to edit"
-
-#~ msgid "ui.admin.servicecheck.edit.message.nextPageForSnmpTrapRules"
-#~ msgstr "Next page will be the edit rules page for this servicecheck"
-
-#~ msgid "ui.admin.servicecheck.edit.message.snmpTrapRules"
-#~ msgstr "Edit rules"
-
-#~ msgid "ui.admin.servicecheck.label.editSnmpTrapRules %1"
-#~ msgstr "Edit SNMP Trap Rules: %1"
-
-#~ msgid "ui.admin.systempreference.edit.help.odwRetention"
-#~ msgstr "In months. 0 means do not prune data"
-
-#~ msgid "ui.admin.systempreference.edit.label.importOdw"
-#~ msgstr "Enable ODW Import"
-
-#~ msgid "ui.admin.systempreference.edit.label.importOdwFull"
-#~ msgstr "Enable Extended Import"
-
-#~ msgid "ui.admin.systempreference.edit.label.odwRetentionLarge"
-#~ msgstr "Retention"
-
-#~ msgid "ui.admin.systempreference.edit.label.odwRetentionSmall"
-#~ msgstr "Retention"
-
-#~ msgid "ui.admin.systempreference.help.odwExtendedImport"
-#~ msgstr "The import will include every service result and every performance plot"
-
-#~ msgid "ui.admin.systempreference.help.odwStandardImport"
-#~ msgstr "ODW will be populated with events and summarised availability and performance statistics"
-
-#~ msgid "ui.admin.toolbar.hostLimitSummary"
-#~ msgstr "Monitoring %quant(%1, host, hosts, no hosts) out of %2"
-
-#~ msgid "ui.menu.help.licenseValidUntil"
-#~ msgstr "Entitlement valid until %1"
-
-#~ msgid "ui.menu.help.stats.hostsWithLimits"
-#~ msgstr "%quant(%1, host, hosts, No hosts) out of %2"
-
-#~ msgid "ui.menu.help.stats.slaves"
-#~ msgstr "%quant(%1, slave, slaves, No slaves)"
-
-#~ msgid "ui.systemmessage.EntitlementExpireCritical %1"
-#~ msgstr "Your Opsview entitlement is due to expire, please take immediate action: %1"
-
-#~ msgid "ui.systemmessage.EntitlementExpireWarning %1"
-#~ msgstr "Your Opsview entitlement is due to expire: %1"
Modified: trunk/opsview-web/lib/Opsview/Web/I18N/it.po
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/I18N/it.po 2012-09-16 22:30:31 UTC (rev 10070)
+++ trunk/opsview-web/lib/Opsview/Web/I18N/it.po 2012-09-16 22:33:10 UTC (rev 10071)
@@ -1404,6 +1404,9 @@
msgid "ui.admin.notificationmethods.edit.html.aqlSignUp %1 %2"
msgstr "AQL permette di inviare alert SMS in maniera semplice da Opsview. Questo servizio funziona dalla maggioranza dei paesi, basta avere un account AQL. Registrati <a href=''>qui</a> con il codice <em>%2</em> per avere tariffe scontate e crediti gratis."
+msgid "ui.admin.notificationmethods.edit.html.iosCredentials %1"
+msgstr ""
+
msgid "ui.admin.notificationmethods.edit.html.smsgateway %1"
msgstr "il modulo %1 è disponibile sottoscrivendo Opsview Enterprise e fornisce un robusto gateway SMS per le notifiche da utilizzare con modem GSM connessi direttamente."
Modified: trunk/opsview-web/lib/Opsview/Web/I18N/pl.po
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/I18N/pl.po 2012-09-16 22:30:31 UTC (rev 10070)
+++ trunk/opsview-web/lib/Opsview/Web/I18N/pl.po 2012-09-16 22:33:10 UTC (rev 10071)
@@ -1402,6 +1402,9 @@
msgid "ui.admin.notificationmethods.edit.html.aqlSignUp %1 %2"
msgstr ""
+msgid "ui.admin.notificationmethods.edit.html.iosCredentials %1"
+msgstr ""
+
msgid "ui.admin.notificationmethods.edit.html.smsgateway %1"
msgstr ""
Modified: trunk/opsview-web/lib/Opsview/Web/I18N/sv.po
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/I18N/sv.po 2012-09-16 22:30:31 UTC (rev 10070)
+++ trunk/opsview-web/lib/Opsview/Web/I18N/sv.po 2012-09-16 22:33:10 UTC (rev 10071)
@@ -1403,6 +1403,9 @@
msgid "ui.admin.notificationmethods.edit.html.aqlSignUp %1 %2"
msgstr ""
+msgid "ui.admin.notificationmethods.edit.html.iosCredentials %1"
+msgstr ""
+
msgid "ui.admin.notificationmethods.edit.html.smsgateway %1"
msgstr ""
Modified: trunk/opsview-web/root/admin/notificationmethods/com.opsview.notificationmethods.iospush
===================================================================
--- trunk/opsview-web/root/admin/notificationmethods/com.opsview.notificationmethods.iospush 2012-09-16 22:30:31 UTC (rev 10070)
+++ trunk/opsview-web/root/admin/notificationmethods/com.opsview.notificationmethods.iospush 2012-09-16 22:33:10 UTC (rev 10071)
@@ -1,3 +1,6 @@
+<div class="helpline">
+[% c.loc("ui.admin.notificationmethods.edit.html.iosCredentials [_1]", "http://opsview.com/opsview-mobile/download") # Cannot use | html %]
+</div>
[%
field_label(
