Changeset 6599

Timestamp:

09/07/08 15:25:41 (3 months ago)

Author:

p_lindheimer

Message:

Merged revisions 6502-6510,6513-6538,6540-6575 via svnmerge from
http://svn.freepbx.org/freepbx/trunk

........

r6502 | mickecarlsson | 2008-08-28 11:36:24 -0700 (Thu, 28 Aug 2008) | 1 line

Fixes #2609, moving files to correct location

........

r6503 | mickecarlsson | 2008-08-29 11:00:34 -0700 (Fri, 29 Aug 2008) | 1 line

Cleaned up the readme and locale, added zh_TW in scrip

........

r6530 | mickecarlsson | 2008-09-01 11:30:58 -0700 (Mon, 01 Sep 2008) | 1 line

New version of language template due to new text strings added

........

r6537 | mickecarlsson | 2008-09-02 12:19:57 -0700 (Tue, 02 Sep 2008) | 1 line

Changed from freePBX to FreePBX in some text strings

........

r6575 | mickecarlsson | 2008-09-05 00:32:33 -0700 (Fri, 05 Sep 2008) | 1 line

Enclosed text string for localization for page.modules.php

........

Files:

• freepbx/branches/2.5 (modified) (1 prop)
• freepbx/branches/2.5/amp_conf/htdocs/admin/views/welcome.php (modified) (3 diffs)
• freepbx/branches/2.5/amp_conf/htdocs/recordings/includes/zh_TW (deleted)
• freepbx/branches/2.5/amp_conf/htdocs/recordings/locale/locale.txt (modified) (3 diffs)
• freepbx/branches/2.5/amp_conf/htdocs/recordings/locale/readme.txt (modified) (3 diffs)
• freepbx/branches/2.5/amp_conf/htdocs/recordings/locale/zh_TW (copied) (copied from freepbx/trunk/amp_conf/htdocs/recordings/locale/zh_TW)
• freepbx/branches/2.5/amp_conf/htdocs/recordings/locale/zh_TW/LC_MESSAGES (copied) (copied from freepbx/trunk/amp_conf/htdocs/recordings/locale/zh_TW/LC_MESSAGES)
• freepbx/branches/2.5/amp_conf/htdocs/recordings/locale/zh_TW/LC_MESSAGES/ari.mo (copied) (copied from freepbx/trunk/amp_conf/htdocs/recordings/locale/zh_TW/LC_MESSAGES/ari.mo)
• freepbx/branches/2.5/amp_conf/htdocs/recordings/locale/zh_TW/LC_MESSAGES/ari.po (copied) (copied from freepbx/trunk/amp_conf/htdocs/recordings/locale/zh_TW/LC_MESSAGES/ari.po)
• freepbx/branches/2.5/freepbx.pot (modified) (58 diffs)

freepbx/branches/2.5/amp_conf/htdocs/admin/views/welcome.php

@@ -1 +1 @@
-<?php
-
-f
+F
-        
-$notify =& notifications::create($db);
@@ -34 +34 @@
-
-
-f
+F
-
-echo "<p>";
@@ -64 +64 @@
-echo "<p>";
-printf( dgettext( "welcome page",
-f
+F
-questions and search for answers for any problems you may be having."),
-"http://forums.freepbx.org"  );
-echo "</p>\n";
-
-f
+F
-?>

freepbx/branches/2.5/amp_conf/htdocs/recordings/locale/locale.txt

@@ -1 +1 @@
-// To create the .po (write your translations to this file):
-*.php ../includes/* ../modules/*.module ../misc/*.php ../theme/*
+../includes/*.php ../modules/*.module ../misc/*.php ../theme/*.php
-
-// To create the utf-8 .po  
@@ -16 +16 @@
-//   for this to work all translated files need to be converted to utf-8 (use iconv)
-//
-*.php ../includes/* ../modules/*.module ../misc/*.php ../theme/*.css
+includes/*.php ../modules/*.module ../misc/*.php ../theme/*.php
-iconv -f iso-8859-1 -t utf-8 -o ari.utf-8.po ari.po
-msgmerge el_GR/LC_MESSAGES/ari.po ari.utf-8.po --output-file=el_GR/LC_MESSAGES/ari.po
@@ -32 +32 @@
-msgmerge pt_BR/LC_MESSAGES/ari.po ari.utf-8.po --output-file=pt_BR/LC_MESSAGES/ari.po
-msgfmt -v pt_BR/LC_MESSAGES/ari.po -o pt_BR/LC_MESSAGES/ari.mo 
-
+
+
+
-msgfmt -v sv_SE/LC_MESSAGES/ari.po -o sv_SE/LC_MESSAGES/ari.mo 
-

freepbx/branches/2.5/amp_conf/htdocs/recordings/locale/readme.txt

@@ -1 +1 @@
-// To create the .po (write your translations to this file):
-*.php ../includes/* ../modules/*.module ../misc/*.php ../theme/*
+../includes/*.php ../modules/*.module ../misc/*.php ../theme/*.php
-
-// To create the utf-8 .po  
@@ -16 +16 @@
-//   for this to work all translated files need to be converted to utf-8 (use iconv)
-//
-*.php ../includes/* ../modules/*.module ../misc/*.php ../theme/*
+../includes/*.php ../modules/*.module ../misc/*.php ../theme/*.php
-iconv -f iso-8859-1 -t utf-8 -o ari.utf-8.po ari.po
-msgmerge el_GR/LC_MESSAGES/ari.po ari.utf-8.po --output-file=el_GR/LC_MESSAGES/ari.po
@@ -32 +32 @@
-msgmerge pt_BR/LC_MESSAGES/ari.po ari.utf-8.po --output-file=pt_BR/LC_MESSAGES/ari.po
-msgfmt -v pt_BR/LC_MESSAGES/ari.po -o pt_BR/LC_MESSAGES/ari.mo
+msgmerge zh_TW/LC_MESSAGES/ari.po ari.utf-8.po --output-file=zh_TW/LC_MESSAGES/ari.po
+msgfmt -v zh_TW/LC_MESSAGES/ari.po -o zh_TW/LC_MESSAGES/ari.mo
-msgmerge sv_SE/LC_MESSAGES/ari.po ari.utf-8.po --output-file=sv_SE/LC_MESSAGES/ari.po
-msgfmt -v sv_SE/LC_MESSAGES/ari.po -o sv_SE/LC_MESSAGES/ari.mo

freepbx/branches/2.5/freepbx.pot

@@ -9 +9 @@
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-8-27 19:56
+9-01 20:21
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -331 +331 @@
-msgstr ""
-
+#: amp_conf/htdocs/admin/common/db_connect.php:99
+msgid "Magic Quotes GPC"
+msgstr ""
+
+#: amp_conf/htdocs/admin/common/db_connect.php:99
+msgid ""
+"You have magic_quotes_gpc enabled in your php.ini, http or .htaccess file "
+"which will cause errors in some modules. FreePBX expects this to be off and "
+"runs under that assumption"
+msgstr ""
+
-#: amp_conf/htdocs/admin/common/script.js.php:36
-msgid "Please select a \"Destination\""
@@ -431 +442 @@
-#: amp_conf/htdocs/admin/functions.inc.php:1272
-#: amp_conf/htdocs/admin/modules/core/page.routing.php:578
-51
-53
+90
+92
-msgid "Add"
-msgstr ""
@@ -570 +581 @@
-msgstr ""
-
-86
+90
-msgid "Module not found in repository"
-msgstr ""
-
-#: amp_conf/htdocs/admin/functions.inc.php:2719
-#: amp_conf/htdocs/admin/functions.inc.php:2815
-#: amp_conf/htdocs/admin/functions.inc.php:2893
-#, php-format
-msgid "Could not remove %s to install new version"
-msgstr ""
-
@@ -585 +589 @@
-#: amp_conf/htdocs/admin/functions.inc.php:2897
-#, php-format
-untar %s to %s
+remove %s to install new version
-msgstr ""
-
@@ -592 +596 @@
-#: amp_conf/htdocs/admin/functions.inc.php:2901
-#, php-format
-remove old module %s to install new version
+untar %s to %s
-msgstr ""
-
@@ -599 +603 @@
-#: amp_conf/htdocs/admin/functions.inc.php:2905
-#, php-format
+msgid "Could not remove old module %s to install new version"
+msgstr ""
+
+#: amp_conf/htdocs/admin/functions.inc.php:2735
+#: amp_conf/htdocs/admin/functions.inc.php:2831
+#: amp_conf/htdocs/admin/functions.inc.php:2909
+#, php-format
-msgid "Could not move %s to %s"
-msgstr ""
-
-2
+6
-#, php-format
-msgid "Error opening %s for writing"
-msgstr ""
-
-68
-1
+72
+5
-#, php-format
-msgid "Error opening %s for reading"
-msgstr ""
-
-1
+5
-#, php-format
-msgid "Unable to save %s"
-msgstr ""
-
-799
+803
-#, php-format
-msgid "File Integrity failed for %s - aborting"
-msgstr ""
-
-4
+8
-msgid ""
-"Error finding uploaded file - check your PHP and/or web server configuration"
-msgstr ""
-
-49
+53
-msgid "File must be in tar+gzip (.tgz or .tar.gz) format"
-msgstr ""
-
-4
+8
-msgid ""
-"Filename not in correct format: must be modulename-version.tar.gz (eg. "
@@ -638 +649 @@
-msgstr ""
-
-3
+7
-#, php-format
-msgid "Error creating temporary directory: %s"
-msgstr ""
-
-1
+5
-msgid "Error untaring uploaded file. Must be a tar+gzip file"
-msgstr ""
-
-0
+4
-#, php-format
-msgid "Error removing temporary directory: %s"
-msgstr ""
-
-35
+44
-msgid "Cannot find module"
-msgstr ""
-
-41
+50
-msgid "Could not read module.xml"
-msgstr ""
-
-46
+55
-msgid ""
-"This module is broken and cannot be installed. You should try to download it "
@@ -666 +677 @@
-msgstr ""
-
-65
+74
-msgid "Failed to run installation scripts"
-msgstr ""
-
-2993
+3002
-#, php-format
-msgid "Error updating database. Command was: %s; error was: %s "
-msgstr ""
-
-#: amp_conf/htdocs/admin/functions.inc.php:3025
-#: amp_conf/htdocs/admin/functions.inc.php:3053
-#: amp_conf/htdocs/admin/functions.inc.php:3090
-msgid "Specified module not found"
-msgstr ""
-
-#: amp_conf/htdocs/admin/functions.inc.php:3030
-msgid "Module not enabled: cannot disable"
-msgstr ""
-
-#: amp_conf/htdocs/admin/functions.inc.php:3034
-#: amp_conf/htdocs/admin/functions.inc.php:3062
+#: amp_conf/htdocs/admin/functions.inc.php:3099
+msgid "Specified module not found"
+msgstr ""
+
+#: amp_conf/htdocs/admin/functions.inc.php:3039
+msgid "Module not enabled: cannot disable"
+msgstr ""
+
+#: amp_conf/htdocs/admin/functions.inc.php:3043
+#: amp_conf/htdocs/admin/functions.inc.php:3071
-msgid "Cannot disable: The following modules depend on this one: "
-msgstr ""
-
-58
+67
-msgid "Module not installed: cannot uninstall"
-msgstr ""
-
-69
+78
-msgid "Error updating database: "
-msgstr ""
-
-73
+82
-msgid "Failed to run un-installation scripts"
-msgstr ""
-
-03
+12
-#, php-format
-msgid "Cannot delete directory %s"
-msgstr ""
-
-0
+9
-#, php-format
-msgid "Error deleting directory %s (code %d)"
-msgstr ""
-
-88
+97
-#, php-format
-msgid "You have %s disabled modules"
-msgstr ""
-
-88
+97
-msgid "You have a disabled module"
-msgstr ""
-
-89
+98
-msgid "The following modules are disabled because they need to be upgraded:"
-msgstr ""
-
-0
-498
+9
+507
-msgid "You should go to the module admin page to fix these."
-msgstr ""
-
-496
+505
-#, php-format
-msgid "You have %s broken modules"
-msgstr ""
-
-496
+505
-msgid "You have a broken module"
-msgstr ""
-
-497
+506
-msgid "The following modules are disabled because they are broken:"
-msgstr ""
@@ -768 +779 @@
-
-#: amp_conf/htdocs/admin/modules/core/page.devices.php:18
-19
-29
-51
+58
+68
+90
-msgid "Device"
-msgstr ""
-
-#: amp_conf/htdocs/admin/modules/core/page.ampusers.php:100
-26
+65
-msgid "Add User"
-msgstr ""
@@ -849 +860 @@
-#: amp_conf/htdocs/admin/modules/core/page.ampusers.php:242
-#: amp_conf/htdocs/admin/modules/core/page.trunks.php:765
-399
+451
-#: amp_conf/htdocs/admin/modules/core/page.zapchandids.php:108
-#: amp_conf/htdocs/admin/modules/core/page.routing.php:584
@@ -1038 +1049 @@
-
-#: amp_conf/htdocs/admin/modules/core/page.trunks.php:388
-04
-07
+43
+46
-#: amp_conf/htdocs/admin/page.modules.php:786
-msgid "Disable"
@@ -1056 +1067 @@
-
-#: amp_conf/htdocs/admin/modules/core/page.trunks.php:397
-03
+42
-#: amp_conf/htdocs/admin/page.modules.php:744
-msgid "Enable"
@@ -1415 +1426 @@
-msgstr ""
-
-5
+6
-msgid "Dialing Options"
-msgstr ""
-
-7
+9
-msgid "Asterisk Dial command options:"
-msgstr ""
-
-08
-17
+10
+21
-msgid "t: Allow the called user to transfer the call by hitting #"
-msgstr ""
-
-09
-18
+11
+22
-msgid "T: Allow the calling user to transfer the call by hitting #"
-msgstr ""
-
-0
+2
-msgid "r: Generate a ringing tone for the calling party"
-msgstr ""
-
-1
-19
+3
+23
-msgid ""
-"w: Allow the called user to start recording after pressing *1 (Asterisk v1.2)"
-msgstr ""
-
-2
-0
+4
+4
-msgid ""
-"W: Allow the calling user to start recording after pressing *1 (Asterisk "
@@ -1450 +1461 @@
-msgstr ""
-
-16
+20
-msgid "Asterisk Outbound Dial command options:"
-msgstr ""
-
-1
+5
-msgid "r: You SHOULD NOT use this option on outbound trunks"
-msgstr ""
-
-26
+32
-msgid "Call Recording"
-msgstr ""
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-msgid "Call recording format:"
-msgstr ""
-
-29
+45
-msgid "Pick the format in which to save recorded calls"
-msgstr ""
-
-32
+49
-msgid "WAV"
-msgstr ""
-
-33
+50
-msgid "wav"
-msgstr ""
-
-34
+51
-msgid "ulaw"
-msgstr ""
-
-35
+52
-msgid "alaw"
-msgstr ""
-
-36
+53
-msgid "sln"
-msgstr ""
-
-37
+54
-msgid "gsm"
-msgstr ""
-
-38
+55
-msgid "g729"
-msgstr ""
-
-41
+59
-msgid "Recording Location:"
-msgstr ""
-
-42
+60
-msgid ""
-"Override the default location where asterisk will store call recordings. "
@@ -1509 +1544 @@
-msgstr ""
-
-4
+6
-msgid "Run after record:"
-msgstr ""
-
-4
+6
-msgid ""
-"An optional script to be run after the call is hungup. You can include "
@@ -1521 +1556 @@
-msgstr ""
-
-53
+74
-msgid "Voicemail"
-msgstr ""
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-msgid "Direct Dial to Voicemail message type:"
-msgstr ""
-
-63
+94
-msgid "Default"
-msgstr ""
-
-
-
+
-msgid "Unavailable"
-msgstr ""
-
-
-
-
-
-
-
-
+
-msgid "Busy"
-msgstr ""
-
-17
-Use gain when recording the voicemail message (optional)
-
-
-17
+20
+Optional Voicemail Recording Gain
+
+
+20
-msgid "Use the specified amount of gain when recording the voicemail message."
-msgstr ""
-
-17
+20
-msgid "The units are whole-number decibels (dB)."
-msgstr ""
-
-176
+208
-msgid "Do Not Play"
-msgstr ""
-
-176
+208
-msgid ""
-"Check this to remove the default message \"Please leave your message after "
@@ -1579 +1620 @@
-msgstr ""
-
-176
-please leave message after tone to caller
-
-
-179
+208
+\"please leave message after tone to caller\"
+
+
+214
-msgid "Voicemail VmX Locator"
-msgstr ""
-
-183
+218
-msgid "Default Context & Pri:"
-msgstr ""
-
-184
-n
-
-
-186
-195
-04
+219
+
+
+
+221
+229
+38
-msgid "context"
-msgstr ""
-
-188
-197
-06
+222
+231
+40
-msgid "pri"
-msgstr ""
-
-192
+226
-msgid "Timeout/#-press default:"
-msgstr ""
-
-193
+227
-msgid ""
-"This is the default location that a caller will be sent if they don't press "
@@ -1618 +1659 @@
-msgstr ""
-
-196
-05
+230
+39
-msgid "exten"
-msgstr ""
-
-01
+35
-msgid "Loop Exceed default:"
-msgstr ""
-
-02
+36
-msgid ""
-"This is the default location that a caller will be sent if they press an "
@@ -1634 +1675 @@
-msgstr ""
-
-10
+44
-msgid "Timeout VM Msg:"
-msgstr ""
-
-11
-23
+45
+57
-msgid ""
-"If this destination is voicemail, select whether or not to play the standard "
@@ -1645 +1686 @@
-msgstr ""
-
-15
-27
-39
+49
+61
+73
-msgid "Std Instructions"
-msgstr ""
-
-16
-28
-40
+50
+62
+74
-msgid "Beep Only"
-msgstr ""
-
-22
+56
-msgid "Max Loop VM Msg:"
-msgstr ""
-
-34
+68
-msgid "Direct VM Option"
-msgstr ""
-
-35
+69
-msgid ""
-"If a user defined option is to go to voicemail (using the 'dovm' extension) "
@@ -1671 +1712 @@
-msgstr ""
-
-46
+80
-msgid "Msg Timeout:"
-msgstr ""
-
-47
+81
-msgid ""
-"Time ot wait after message has played to timeout and/or repeat the message "
@@ -1681 +1722 @@
-msgstr ""
-
-59
+93
-msgid "seconds"
-msgstr ""
-
-64
+98
-msgid "Msg Play:"
-msgstr ""
-
-65
+99
-msgid ""
-"Number of times to play the recorded message if the caller does not press "
@@ -1695 +1736 @@
-msgstr ""
-
-277
-295
+311
+329
-msgid "times"
-msgstr ""
-
-282
+316
-msgid "Error Re-tries:"
-msgstr ""
-
-283
+317
-msgid ""
-"Number of times to play invalid options and repeat the message upon "
@@ -1710 +1751 @@
-msgstr ""
-
-03
+34
-msgid "Company Directory"
-msgstr ""
-
-05
+37
-msgid "Find users in the Company Directory by:"
-msgstr ""
-
-
+
+
+
+
+
+
+
+
-msgid "first name"
-msgstr ""
-
-08
+41
-msgid "last name"
-msgstr ""
-
-09
+42
-msgid "first or last name"
-msgstr ""
-
-12
-Play extension number
-
-
-12
+46
+Announce Extension:
+
+
+46
-msgid ""
-"Plays a message \"Please hold while I transfer you to extension xxx\" that "
-
-
-
-
-
-
-
-
+
+
+
+
+
-msgid "Operator Extension:"
-msgstr ""
-
-14
+52
-msgid ""
-"When users hit '0' in the directory, they are put through to this number. "
@@ -1754 +1799 @@
-msgstr ""
-
-15
+53
-msgid ""
-" does NOT need to be an extension, it can be a Ring Group, or even an "
@@ -1760 +1805 @@
-msgstr ""
-
-18
+59
-msgid "Fax Machine"
-msgstr ""
-
-20
+62
-msgid "Extension of"
-msgstr ""
-
-20
+62
-msgid "fax machine"
-msgstr ""
-
-20
+62
-msgid ""
-"Select 'system' to have the system receive and email faxes.<br>Selecting "
@@ -1778 +1823 @@
-msgstr ""
-
-20
+62
-msgid "for receiving faxes:"
-msgstr ""
-
-23
+66
-#: amp_conf/htdocs/admin/modules/core/page.did.php:251
-msgid "disabled"
-msgstr ""
-
-24
+67
-#: amp_conf/htdocs/admin/modules/core/page.did.php:252
-msgid "system"
-msgstr ""
-
-38
-42
+80
+85
-msgid "Email address"
-msgstr ""
-
-38
+80
-msgid ""
-"Email address used if 'system' has been chosen for the fax extension above."
-msgstr ""
-
-38
+80
-msgid "to have faxes emailed to:"
-msgstr ""
-
-42
+85
-msgid ""
-"Email address that faxes appear to come from if 'system' has been chosen for "
@@ -1812 +1857 @@
-msgstr ""
-
-42
+85
-msgid "that faxes appear to come from:"
-msgstr ""
-
-45
+90
-msgid "International Settings"
-msgstr ""
-
-47
+93
-msgid "Country"
-msgstr ""
-
-47
+93
-msgid "Indications"
-msgstr ""
-
-47
+93
-msgid "Select which country you are in"
-msgstr ""
-
-355
+402
-msgid "24-hour format"
-msgstr ""
-
-355
+402
-msgid ""
-"Select Yes if you use 24-hour format or No if you are using 12-hour am/pm "
@@ -1842 +1887 @@
-msgstr ""
-
-357
-369
+405
+420
-msgid "no"
-msgstr ""
-
-358
-370
+406
+421
-msgid "yes"
-msgstr ""
-
-361
+410
-msgid "Security Settings"
-msgstr ""
-
-36
+41
-msgid "Allow Anonymous Inbound SIP Calls?"
-msgstr ""
-
-36
+41
-msgid "** WARNING **"
-msgstr ""
-
-36
+41
-msgid ""
-"Setti