Changeset 10347 for modules

Timestamp:

10/04/10 14:34:58 (3 years ago)

Author:

p_lindheimer

Message:

Merged revisions 10305-10346 via svnmerge from
http://svn.freepbx.org/modules/branches/2.8

........

r10308 | p_lindheimer | 2010-09-23 11:37:02 -0700 (Thu, 23 Sep 2010) | 1 line

Module Publish Script: recordings 3.3.10.1

........

r10325 | mickecarlsson | 2010-09-27 11:00:45 -0700 (Mon, 27 Sep 2010) | 1 line

Re #4555, updated russian language for language module. Thank you ded.

........

r10326 | mickecarlsson | 2010-09-27 11:02:38 -0700 (Mon, 27 Sep 2010) | 1 line

Close #4555, updated russian language for fax module. Thank you ded.

........

r10338 | p_lindheimer | 2010-10-04 11:04:54 -0700 (Mon, 04 Oct 2010) | 1 line

fixes #4568 better validation

........

r10345 | p_lindheimer | 2010-10-04 11:21:35 -0700 (Mon, 04 Oct 2010) | 1 line

update module.xml re #4568

........

r10346 | p_lindheimer | 2010-10-04 11:30:31 -0700 (Mon, 04 Oct 2010) | 1 line

revert most of r10345 checked-in in error (still work in progress)

........

Files:

• modules/branches/2.9 (modified) (1 prop)
• modules/branches/2.9/fax/i18n/ru_RU/LC_MESSAGES/fax.mo (modified) (previous)
• modules/branches/2.9/fax/i18n/ru_RU/LC_MESSAGES/fax.po (modified) (26 diffs)
• modules/branches/2.9/languages/i18n/ru_RU/LC_MESSAGES/languages.mo (modified) (previous)
• modules/branches/2.9/languages/i18n/ru_RU/LC_MESSAGES/languages.po (modified) (11 diffs)
• modules/branches/2.9/recordings/module.xml (modified) (2 diffs)
• modules/branches/2.9/recordings/page.recordings.php (modified) (1 diff)

modules/branches/2.9/fax/i18n/ru_RU/LC_MESSAGES/fax.po

@@ -20 +20 @@
-# Copyright (c) 2006-2010 PostMet Corporation
-# This file is distributed under the same license as the freePBX package.
-08
+10
-#
-# žáßÞÛì×ÞÒÐâì ÚÞÝÒÕàâÕà iconv fax.pot -f UTF-8 -t ISO-8859-5 -o fax.po
@@ -27 +27 @@
-"Project-Id-Version: 1.3\n"
-"Report-Msgid-Bugs-To: \n"
-6-22 19:14
+7-01 21:30
-"PO-Revision-Date: 2010-06-23 04:00+0100\n"
-"Last-Translator: Alexander Kozyrev <ceo@postmet.com>\n"
@@ -42 +42 @@
-
-msgid "Adds configurations, options and GUI for inbound faxing"
-
+
+
-
-#, php-format
@@ -55 +56 @@
-msgstr "ÄÐÚá"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-msgid "Enabled"
@@ -94 +88 @@
-"Enter an email address where faxes sent to this extension will be delivered."
-msgstr ""
-ßÕàÕáëÛÐâìáï ßÞáÛÐÝÝëÕ 
-
+
+ßÕàÕáëÛÐâìáï ßÞáÛÐÝÝëÕ 
-
-msgid "Please Enter a valid email address for fax delivery."
-
+
+
+
-
-msgid "Fax Recipient"
@@ -113 +109 @@
-"destination to route calls detected as faxes to.\""
-msgstr ""
-
-
+
+
+
-
-msgid "Fax Detect"
@@ -122 +119 @@
-msgstr "ŽÕâÕÚâØàÞÒÐâì äÐÚáë"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-msgid ""
-"No fax detection methods found or no valid license. Faxing cannot be enabled."
-msgstr ""
-
-
+
+
+
-
-msgid "Fax Detection type"
-msgstr "ŒÕâÞÔ ÔÕâÕÚâØàÞÒÐÝØï äÐÚáÐ"
-
-<ul><li>
-ÞßàÕÔÕÛÕÝØï äÐÚáÐ ÑãÔÕâ ØáßÞÛì×ÞÒÐâìáï.<ul><li>
-
-: 
-: ØáßÞÛì×ÞÒÐâì 
+
+ÔÕâÕÚâØàÞÒÐÝØï ÑãÔÕâ ØáßÞÛì×ÞÒÐâìáï.
+
+
+ØáßÞÛì×ÞÒÐâì
-
-msgid ""
-" fax detection; requires 'faxdetect=' to be set to 'incoming' or 'both' in "
-msgstr ""
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-"çâÞÑë ÞÝ àÐáßÞ×ÝÐÒÐÛáï Ò Asterisk."
-
@@ -194 +200 @@
-msgid "How long to wait and try to detect fax. Please note that callers to a "
-msgstr ""
-
-
+
+
+
-
-msgid ""
@@ -201 +208 @@
-"\"answer\" the call, it will just play ringing)"
-msgstr ""
-
-
+
+
+
-
-msgid "Fax Email Destination"
@@ -218 +226 @@
-"previous versions of FreePBX only."
-msgstr ""
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-msgid "Fax Destination"
@@ -237 +248 @@
-msgstr "œÐÑàÐâì áØáâÕÜÝëÙ äÐÚá"
-
+#, fuzzy
-msgid "Migrating fax_incoming table..."
-
+ÃáßÕèÝÞ ßÕàÕÝÕáÕÝÐ âÐÑÛØæÐ fax_incoming!
-
-msgid "WARINING: fax_incoming table may still be using the 2.6 schema!"
-msgstr ""
+"²œžŒ°œžµ: âÐÑÛØæÐ fax_incoming ÜÞÖÕâ ØáßÞÛì×ÞÒÐâìáï "
+"âÞÛìÚÞ Ò áåÕÜÕ ÒÕàáØØ 2.6!"
-
-msgid "Sucsessfuly migraded fax_incoming table!"
-
+ÃáßÕèÝÞ ßÕàÕÝÕáÕÝÐ âÐÑÛØæÐ fax_incoming!
-
-msgid "Moving simu_fax feature code from core.."
@@ -250 +264 @@
-
-msgid "duplicate, removing old from core.."
-
+ÔãÑÛØÚÐæØï, ãÔÐÛïÕÜ áâÐàãî..
-
-msgid "unknown error"
@@ -301 +315 @@
-"remove this notice."
-msgstr ""
-
-
-
-
+
+
+
+
+
+
-
-msgid "blank"
@@ -316 +332 @@
-msgid "%s FAX Migrations Failed, check notification panel for details"
-msgstr ""
-
+
+
-
-msgid "all migrations succeeded successfully"
@@ -341 +358 @@
-"person or entity sending the fax."
-msgstr ""
-
-
-
+
+
+
+
-
-msgid "Default Local Station Identifier"
@@ -349 +367 @@
-
-msgid "The outgoing Fax Machine Identifier. This is usually your fax number."
-
+
+
+
-
-msgid "Outgoing Email address:"
@@ -358 +378 @@
-"chosen as the default fax extension."
-msgstr ""
-
-
+
+
+
-
-msgid "Fax Feature Code Options"
@@ -373 +394 @@
-"addresses specified."
-msgstr ""
-
-
-
-
+
+
+
+
+
+
-
-msgid "Fax Transport Options"
@@ -382 +405 @@
-
-msgid "Error Correction Mode"
-
+æ
-
-msgid ""
@@ -388 +411 @@
-"\t\t\t\t to use ecm mode or not."
-msgstr ""
-
+
+
-"\t\t\t\t ØÛØ ÝÕâ"
-
@@ -401 +425 @@
-
-msgid "Maximum transfer rate used during fax rate negotiation."
-
+
+
+
-
-msgid "Minimum transfer rate"
@@ -407 +433 @@
-
-msgid "Minimum transfer rate used during fax rate negotiation."
-
+
+
+
-
-msgid "Modem"
@@ -428 +456 @@
-"a physical fax machine"
-msgstr ""
+"²ëÑØàÐÙâÕ 'áØáâÕÜÝëÙ (ßÞ ãÜÞÛçÐÝØî)' ÕáÛØ ØáßÞÛì×ãÕâÕ ÒÐèã IP-PBX áâÐÝæØî Ò ÚÐçÕáâÒÕ "
+"äÐÚáØÜØÛìÝÞÙ ÜÐèØÝë ÔÛï ßàØñÜÐ Ø ÞâßàÐÒÚØ äÐÚáÞÒ. ²ë áÜÞÖÕâÕ ÜÐàèàãâØ×ØàÞÒÐâì äÐÚáë "
+"ÝÐ íâÞâ ÞÑêÕÚâ, ÐááÞæØØàÞÒÐÝÝÞÕ á íâÞÙ àÕÐÛØ×ÐæØÕÙ. ÍâÞ ÜÞÖÕâ Ñëâì áÐÜ °áâÕàØáÚ ØÛØ "
+"ÚÐÚÞÙ-ÛØÑÞ ÒÝãâàÕÝÝØÙ ÝÞÜÕà á ßÞÔÚÛîçÕÝÝÞÙ äØ×ØçÕáÚÞÙ äÐÚáØÜØÛìÝÞÙ ÜÐèØÝÞÙ."
-
-msgid "disabled"
@@ -442 +474 @@
-"extension."
-msgstr ""
-
-
+
+
+
-
-msgid "Fax Module Options"
@@ -460 +493 @@
-"always be present as an option."
-msgstr ""
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-msgid "Always Generate Detection Code"
-
+²áÕÓÔÐ ÓÕÝÕàØàÞÒÐâì ÚÞÔ àÐáßÞ×ÝÐÒÐÝØï
-
-msgid ""
@@ -478 +513 @@
-"to be generated here."
-msgstr ""
+"µáÛØ Ò áØáâÕÜÕ ÝÕâ ÝØÚÐÚÞÓÞ äÐÚá-ßàØÛÞÖÕÝØï, âÞ "
+"ÜÞÔãÛì ÝÕ ÓÕÝÕàØàãÕâ àÐáßÞ×ÝÐÒÐÝØï ÔØÐÛßÛÐÝÐ "
+"ßÞ ãÜÞÛçÐÝØî. µáÛØ áØáâÕÜÐ ØáßÞÛì×ãÕâ, ÝÐßàØÜÕà, "
+"äØ×ØçÕáÚØÕ äÐÚá-ÐßßÐàÐâë, ØÛØ áÒï×Úã hylafax + iaxmodem, "
+"ØÛØ ÚÐÚÞÕ-âÞ ÔàãÓÞÕ áâÞàÞÝÝÕÕ äÐÚá-àÕèÕÝØÕ, "
+"ÜÞÖÝÞ äÞàáØàÞÒÐâì àÐáßÞ×ÝÐÒÐÝØÕ Ò ÔØÐÛßÛÐÝÕ."
-
-msgid "Submit"

modules/branches/2.9/languages/i18n/ru_RU/LC_MESSAGES/languages.po

@@ -1 +1 @@
-# Russian freePBX ver. translation
-08
+10
-# This file is distributed under the same license as the freePBX package.
-08
+10
-#
-amp.new -f UTF-8 -t ISO-8859-5 -o amp
+language.pot -f UTF-8 -t ISO-8859-5 -o language
-# fuzzy
-msgid ""
@@ -11 +11 @@
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-22 19:14+0200\n"
-08-01-16 16:38
+10-09-24 11:12
-"Last-Translator: Alexander Kozyrev <ceo@postmet.com>\n"
-"Language-Team: Russian <faq@postmet.com>\n"
@@ -20 +20 @@
-#, php-format
-msgid "Language: %s"
-
+Ï×ëÚ: %s
-
-msgid "Language"
-
+Ï×ëÚ
-
-msgid "Please enter a valid Language Code"
-
+²ÒÕÔØâÕ àÐ×àÕèñÝÝëÙ ÚÞÔ ï×ëÚÐ
-
-msgid "Language Code"
@@ -35 +35 @@
-"if installed."
-msgstr ""
-ãÚÐ×ÐÝÝÞÜ ï×ëÚÕ, ÕáÛØ ÞÝ 
-
+
+ãÚÐ×ÐÝÝÞÜ ï×ëÚÕ, ÕáÛØ ÞÝ 
-
-msgid "Allows you to set the language for this DID."
-
+ÃáâÐÝÐÒØâì ×ÝÐçÕÝØï ï×ëÚÐ ÔÛï íâÞÓÞ DID.
-
-#, php-format
-msgid "Language Change: %s"
-
+Ï×ëÚ Ø×ÜÕÝñÝ: %s
-
-msgid "Languages"
@@ -53 +53 @@
-" Configuration"
-msgstr ""
+"²ÝãâàÕÝÝØÕ ÞßæØØ \n"
+"&\n"
+" ºÞÝäØÓãàÐæØï"
-
-msgid ""
@@ -58 +61 @@
-"attribute to users."
-msgstr ""
+"ŽÞÑÐÒÛïÕâ ÒÞ×ÜÞÖÝÞáâì Ø×ÜÕÝïâì ï×ëÚ Ò ßàÞæÕááÕ ãáâÐÝÞÒÛÕÝØï áÞÕÔØÝÕÝØï Ø ÔÞÑÐÒØâì "
+"ÐâàØÑãâë ÒëÑÞàÐ ï×ëÚÐ ßÞÛì×ÞÒÐâÕÛïÜ."
-
-msgid "Add Language"
@@ -73 +78 @@
-"sounds being chosen if installed."
-msgstr ""
-
-ßÕàÕÝÐßàÐÒØâì ßÞ áÞÞâÒÕâáâÒÕÝÝÞÜã ÝÐ×ÝÐçÕÝØî. œÐßàØÜÕà, ÜÞÖÝÞ ØÜÕâì ÞßæØî
-ÒëÑÞàÐ ï×ëÚÐ Ò žÝâÕàÐÚâØÒÝÞÜ ÜÕÝî - \"For French Press 2 now\". ŽÛï íâÞÓÞ
-ÝãÖÝÞ áÞ×ÔÐâì ßÞÔÜÕÝî ÝÐ äàÐÝæã×áÚÞÜ ï×ëÚÕ, ÝÐ ÚÞâÞàÞÕ ÑãÔÕâ ÝÐßàÐÒÛÕÝ íâÞâ
-×ÒÞÝÞÚ ßÞ ÝÐÖÐâØî 2. ŽÛï íâÞÓÞ ÝãÖÝÞ ãáâÐÝÞÒØâì ÝÕÞÑåÞÔØÜëÕ äàÐÝæã×áÚØÕ
-
+ßÕàÕÝÐßàÐÒØâì ßÞ áÞÞâÒÕâáâÒÕÝÝÞÜã 
+ÝÐ×ÝÐçÕÝØî. œÐßàØÜÕà, ÜÞÖÝÞ ØÜÕâì ÞßæØî ÒëÑÞàÐ
+ï×ëÚÐ Ò žÝâÕàÐÚâØÒÝÞÜ ÜÕÝî - \"For French Press 2 now\".
+ŽÛï íâÞÓÞ ÝãÖÝÞ áÞ×ÔÐâì ßÞÔÜÕÝî ÝÐ äàÐÝæã×áÚÞÜ
+ï×ëÚÕ, ÝÐ ÚÞâÞàÞÕ ÑãÔÕâ ÝÐßàÐÒÛÕÝ íâÞâ ×ÒÞÝÞÚ
+ßÞ ÝÐÖÐâØî 2. ŽÛï íâÞÓÞ ÝãÖÝÞ ãáâÐÝÞÒØâì ÝÕÞÑåÞÔØÜëÕ äàÐÝæã×áÚØÕ 
-
-msgid "Edit Language Instance"
@@ -92 +97 @@
-"The descriptive name of this language instance. For example \"French Main IVR"
-"\""
-
+
+
+
-
-msgid ""
@@ -98 +105 @@
-"French, \"de\" for German"
-msgstr ""
-
-
+
+
+
-
-msgid "Destination"
@@ -105 +113 @@
-
-msgid "Submit Changes"
-
+¿ÞÔâÒÕàÔØâì Ø×ÜÕÝÕÝØï
-
-msgid "Delete"
@@ -111 +119 @@
-
-msgid "Invalid description specified"
-
+œÕÒÕàÝÞ ÒëÑàÐÝÞ ÞßØáÐÝØÕ

modules/branches/2.9/recordings/module.xml

@@ -2 +2 @@
-  <rawname>recordings</rawname>
-  <name>Recordings</name>
-1
+2
-  <publisher>FreePBX</publisher>
-  <license>GPLv2+</license>
@@ -11 +11 @@
-  <description>Creates and manages system recordings, used by many other modules (eg, IVR).</description>
-  <changelog>
+    *3.3.10.2* #4568 Security Patch
-    *3.3.10.1* #4553 Security Patch
-    *3.3.10.0* #4244, #4309

modules/branches/2.9/recordings/page.recordings.php

@@ -205 +205 @@
-      $dest = "{$usersnum}-";
-    }
-substr(strrchr($_FILES['ivrfile']['name'], "."), 1
+preg_replace('/[^0-9a-zA-Z]/','',substr(strrchr($_FILES['ivrfile']['name'], "."), 1)
-    $destfilename = $recordings_save_path.$dest."ivrrecording.".$suffix;
-    move_uploaded_file($_FILES['ivrfile']['tmp_name'], $destfilename);