Changeset 7272 for modules

Timestamp:

11/15/08 15:56:25 (5 years ago)

Author:

p_lindheimer

Message:

Merged revisions 7261 via svnmerge from
http://svn.freepbx.org/modules/branches/2.6

........

r7261 | mickecarlsson | 2008-11-12 13:41:50 -0800 (Wed, 12 Nov 2008) | 1 line

Closes #3380 fixes various string enclosures for localization. Thank you chocho

........

Files:

• modules/branches/2.5 (modified) (1 prop)
• modules/branches/2.5/core/functions.inc.php (modified) (2 diffs)
• modules/branches/2.5/core/page.did.php (modified) (1 diff)
• modules/branches/2.5/music/page.music.php (modified) (1 diff)
• modules/branches/2.5/queues/i18n/queues.pot (modified) (26 diffs)
• modules/branches/2.5/queues/page.queues.php (modified) (1 diff)
• modules/branches/2.5/ringgroups/i18n/ringgroups.pot (modified) (9 diffs)
• modules/branches/2.5/ringgroups/page.ringgroups.php (modified) (1 diff)

modules/branches/2.5/core/functions.inc.php

@@ -476 +476 @@
-  $extens = array();
-  $category = 'Terminate Call';
-'Hangup'
-'Congestion'
-'Busy'
-'Play SIT Tone (Zapateller)'
-'Put caller on hold forever'
-'Play ringtones to caller until they hangup'
+_("Hangup")
+_("Congestion")
+_("Busy")
+_("Play SIT Tone (Zapateller)")
+_("Put caller on hold forever")
+_("Play ringtones to caller until they hangup")
-  
-  //get the list of meetmes
@@ -4447 +4447 @@
-        $addURL = $_SERVER['PHP_SELF'].'?type=setup&display=did&&extdisplay='.$did['extension'].'/'.$did['cidnum'];
-        $did_icon = 'images/email_edit.png';
-Any DID'
+'._("Any DID")
-        if (trim($did['cidnum']) != '') {
-          $did_label .= ' / '.$did['cidnum'];

modules/branches/2.5/core/page.did.php

@@ -208 +208 @@
-          $tresults = music_list($amp_conf['ASTVARLIBDIR']."/mohmp3");
-          $cur = (isset($mohclass) && $mohclass != "" ? $mohclass : 'default');
-
+//
-          if (isset($tresults[0])) {
-            foreach ($tresults as $tresult) {
-
+
+
+
-            }
-          }

modules/branches/2.5/music/page.music.php

@@ -88 +88 @@
-  foreach ($tresults as $tresult) {
-    if ($tresult != "none") {
-
+
+
-    }
-  }

modules/branches/2.5/queues/i18n/queues.pot

@@ -9 +9 @@
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-0-06 00:04+02
+1-12 22:30+01
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -43 +43 @@
-msgstr ""
-
-1
-5 page.queues.php:470 page.queues.php:484
+4
+8 page.queues.php:473 page.queues.php:487
-msgid "seconds"
-msgstr ""
@@ -333 +333 @@
-msgstr ""
-
-397 page.queues.php:412
-2 page.queues.php:527 page.queues.php:542
-598 page.queues.php:611
+400 page.queues.php:415
+5 page.queues.php:530 page.queues.php:545
+601 page.queues.php:614
-msgid "Yes"
-msgstr ""
-
-397 page.queues.php:412
-0 page.queues.php:512 page.queues.php:527
-2 page.queues.php:599 page.queues.php:612
+400 page.queues.php:415
+3 page.queues.php:515 page.queues.php:530
+5 page.queues.php:602 page.queues.php:615
-msgid "No"
-msgstr ""
@@ -403 +403 @@
-msgstr ""
-
-0
+3
-msgid "None"
-msgstr ""
@@ -444 +444 @@
-msgstr ""
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-msgid "Ringing Instead of MoH:"
-msgstr ""
-
-5
+8
-msgid ""
-"Enabling this option make callers hear a ringing tone instead of Music on "
@@ -455 +467 @@
-msgstr ""
-
-2
+5
-msgid "Max Wait Time:"
-msgstr ""
-
-2
+5
-msgid ""
-"The maximum number of seconds a caller can wait in a queue before being "
@@ -465 +477 @@
-msgstr ""
-
-59 page.queues.php:453
+62 page.queues.php:456
-msgid "Unlimited"
-msgstr ""
-
-78
+81
-msgid "Max Callers:"
-msgstr ""
-
-78
+81
-msgid "Maximum number of people waiting in the queue (0 for unlimited)"
-msgstr ""
-
-2
+5
-msgid "Join Empty:"
-msgstr ""
-
-2
+5
-msgid ""
-"If you wish to allow callers to join queues that currently have no agents, "
@@ -488 +500 @@
-msgstr ""
-
-397 page.queues.php:412
+400 page.queues.php:415
-msgid "Strict"
-msgstr ""
-
-07
+10
-msgid "Leave When Empty:"
-msgstr ""
-
-07
+10
-msgid ""
-"If you wish to remove callers from the queue if there are no agents present, "
@@ -503 +515 @@
-msgstr ""
-
-3
+6
-msgid "Ring Strategy:"
-msgstr ""
-
-5
+8
-msgid "ringall"
-msgstr ""
-
-5
+8
-msgid "ring all available agents until one answers (default)"
-msgstr ""
-
-6
+9
-msgid "roundrobin"
-msgstr ""
-
-6
+9
-msgid "take turns ringing each available agent"
-msgstr ""
-
-27
+30
-msgid "leastrecent"
-msgstr ""
-
-27
+30
-msgid "ring agent which was least recently called by this queue"
-msgstr ""
-
-28
+31
-msgid "fewestcalls"
-msgstr ""
-
-28
+31
-msgid "ring the agent with fewest completed calls from this queue"
-msgstr ""
-
-29
+32
-msgid "random"
-msgstr ""
-
-29
+32
-msgid "ring random agent"
-msgstr ""
-
-0
+3
-msgid "rrmemory"
-msgstr ""
-
-0
+3
-msgid "round robin with memory, remember where we left off last ring pass"
-msgstr ""
-
-48
+51
-msgid "Agent Timeout:"
-msgstr ""
-
-48
+51
-msgid ""
-"The number of seconds an agent's phone can ring before we consider it a "
@@ -566 +578 @@
-msgstr ""
-
-3
+6
-msgid "Retry:"
-msgstr ""
-
-3
+6
-msgid ""
-"The number of seconds we wait before trying all the phones again. Choosing "
@@ -578 +590 @@
-msgstr ""
-
-68
+71
-msgid "No Retry"
-msgstr ""
-
-78
+81
-msgid "Wrap-Up-Time:"
-msgstr ""
-
-78
+81
-msgid ""
-"After a successful call, how many seconds to wait before sending a "
@@ -592 +604 @@
-msgstr ""
-
-2
+5
-msgid "Call Recording:"
-msgstr ""
-
-2
+5
-msgid ""
-"Incoming calls to agents can be recorded. (saved to /var/spool/asterisk/"
@@ -602 +614 @@
-msgstr ""
-
-497
+500
-msgid "wav49"
-msgstr ""
-
-498
+501
-msgid "wav"
-msgstr ""
-
-499
+502
-msgid "gsm"
-msgstr ""
-
-07
+10
-msgid "Event When Called:"
-msgstr ""
-
-07
+10
-msgid ""
-"When this option is set to YES, the following manager events will be "
@@ -624 +636 @@
-msgstr ""
-
-2
+5
-msgid "Member Status:"
-msgstr ""
-
-2
+5
-msgid ""
-"When if this is option is set to YES, the following manager event will be "
@@ -634 +646 @@
-msgstr ""
-
-37
+40
-msgid "Skip Busy Agents:"
-msgstr ""
-
-37
+40
-msgid ""
-"When set to Yes, agents who are on an occupied phone will be skipped as if "
@@ -646 +658 @@
-msgstr ""
-
-2
+5
-msgid "Queue Weight"
-msgstr ""
-
-2
+5
-msgid ""
-"Gives queues a 'weight' option, to ensure calls waiting in a higher priority "
@@ -656 +668 @@
-msgstr ""
-
-6
+9
-msgid "Autofill:"
-msgstr ""
-
-6
+9
-msgid ""
-"Starting with Asterisk 1.4, if this is checked, and multiple agents are "
@@ -670 +682 @@
-msgstr ""
-
-3
+6
-msgid "Agent Regex Filter"
-msgstr ""
-
-3
+6
-msgid ""
-"Provides an optional regex expression that will be applied against the agent "
@@ -687 +699 @@
-msgstr ""
-
-77
+80
-msgid "Caller Position Announcements"
-msgstr ""
-
-79
+82
-msgid "Frequency:"
-msgstr ""
-
-79
+82
-msgid ""
-"How often to announce queue position and estimated holdtime (0 to Disable "
@@ -701 +713 @@
-msgstr ""
-
-3
+6
-msgid "Announce Position:"
-msgstr ""
-
-3
+6
-msgid "Announce position of caller in the queue?"
-msgstr ""
-
-6
+9
-msgid "Announce Hold Time:"
-msgstr ""
-
-6
+9
-msgid ""
-"Should we include estimated hold time in position announcements?  Either "
@@ -719 +731 @@
-msgstr ""
-
-3
+6
-msgid "Once"
-msgstr ""
-
-19
+22
-msgid "Periodic Announcements"
-msgstr ""
-
-4
+7
-msgid "IVR Break Out Menu:"
-msgstr ""
-
-4
+7
-msgid ""
-"You can optionally present an existing IVR as a 'break out' menu."
@@ -739 +751 @@
-msgstr ""
-
-6 page.queues.php:651
+9 page.queues.php:654
-msgid "Menu ID "
-msgstr ""
-
-2
+5
-msgid "(**) ERRORS"
-msgstr ""
-
-2
+5
-msgid "(**) Warning Potential Errors"
-msgstr ""
-
-6
+9
-msgid ""
-"ERROR: You have selected an IVR's that use Announcements created from "
@@ -761 +773 @@
-msgstr ""
-
-6
+9
-msgid ""
-"Earlier versions of this module allowed such queues to be chosen, once "
@@ -767 +779 @@
-msgstr ""
-
-79
+82
-msgid "Repeat Frequency:"
-msgstr ""
-
-79
+82
-msgid ""
-"How often to announce a voice menu to the caller (0 to Disable "
@@ -777 +789 @@
-msgstr ""
-
-0
+3
-msgid "Fail Over Destination"
-msgstr ""
-
-6
+9
-msgid "Submit Changes"
-msgstr ""
-
-29
+32
-msgid ""
-"Using a Regex filter is fairly advanced, please confirm you know what you "
@@ -791 +803 @@
-msgstr ""
-
-0
+3
-msgid "Queue Number must not be blank"
-msgstr ""
-
-6
+9
-msgid ""
-"Queue name must not be blank and must contain only alpha-numeric characters"
-msgstr ""
-
-
+s
-msgid "Queues"
-msgstr ""

modules/branches/2.5/queues/page.queues.php

@@ -332 +332 @@
-        if (isset($tresults)) {
-          foreach ($tresults as $tresult) {
-
-
+
+
+
+
+
-          }
-        }

modules/branches/2.5/ringgroups/i18n/ringgroups.pot

@@ -9 +9 @@
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-0-06 00:29+02
+1-12 22:32+01
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -297 +297 @@
-msgstr ""
-
-
+
+
+
+
+
+
+
+
+
-msgid "CID Name Prefix"
-msgstr ""
-
-3
+5
-msgid ""
-"You can optionally prefix the Caller ID name when ringing extensions in this "
@@ -308 +316 @@
-msgstr ""
-
-28
+30
-msgid "Alert Info"
-msgstr ""
-
-28
+30
-msgid "ALERT_INFO can be used for distinctive ring with SIP devices."
-msgstr ""
-
-3
+5
-msgid "Ignore CF Settings"
-msgstr ""
-
-3
+5
-msgid ""
-"When checked, agents who attempt to Call Forward will be ignored, this "
@@ -327 +335 @@
-msgstr ""
-
-0
+2
-msgid "Skip Busy Agent"
-msgstr ""
-
-0
+2
-msgid ""
-"When checked, agents who are on an occupied phone will be skipped as if the "
@@ -339 +347 @@
-msgstr ""
-
-7
+9
-msgid "Confirm Calls"
-msgstr ""
-
-7
+9
-msgid ""
-"Enable this if you're calling external numbers that need confirmation - eg, "
@@ -351 +359 @@
-msgstr ""
-
-5
+7
-msgid "Remote Announce:"
-msgstr ""
-
-5
+7
-msgid ""
-"Message to be played to the person RECEIVING the call, if 'Confirm Calls' is "
@@ -362 +370 @@
-msgstr ""
-
-1 page.ringgroups.php:379
+3 page.ringgroups.php:381
-msgid "Default"
-msgstr ""
-
-3
+5
-msgid "Too-Late Announce:"
-msgstr ""
-
-3
+5
-msgid ""
-"Message to be played to the person RECEIVING the call, if the call has "
@@ -377 +385 @@
-msgstr ""
-
-6
+8
-msgid "Destination if no answer"
-msgstr ""
-
-4
+6
-msgid "Submit Changes"
-msgstr ""
-
-2
+4
-msgid "Invalid Group Number specified"
-msgstr ""
-
-3
+5
-msgid "Please enter an extension list."
-msgstr ""
-
-4
+6
-msgid "Invalid Caller ID prefix."
-msgstr ""
-
-5
+7
-msgid "Invalid time specified"
-msgstr ""
-
-6
+8
-msgid "Time must be between 1 and 60 seconds"
-msgstr ""
-
-7
+9
-msgid "Please enter a valid Group Description"
-msgstr ""
-
-38
+40
-msgid ""
-"Only ringall, ringallv2, hunt and the respective -prim versions are "
@@ -415 +423 @@
-msgstr ""
-
-
+s
-msgid "Ring Groups"
-msgstr ""

modules/branches/2.5/ringgroups/page.ringgroups.php

@@ -311 +311 @@
-            if (isset($tresults[0])) {
-              foreach ($tresults as $tresult) {
-
+
+
+
-              }
-            }