Changeset 7088

Timestamp:

10/22/08 02:26:12 (5 years ago)

Author:

p_lindheimer

Message:

Merged revisions 6976-7087 via svnmerge from
http://svn.freepbx.org/freepbx/branches/2.5

........

r6982 | mickecarlsson | 2008-10-14 03:48:18 -0700 (Tue, 14 Oct 2008) | 1 line

New and modified versions of russian translation for modules from #3279

........

r6987 | mickecarlsson | 2008-10-15 08:41:38 -0700 (Wed, 15 Oct 2008) | 1 line

Add Hungarian as language choice in freepbx_admin.php

........

r7002 | p_lindheimer | 2008-10-18 10:18:15 -0700 (Sat, 18 Oct 2008) | 1 line

ref #3271 detect ABE Business Edition, tested against 1.4 non-business and nothing is broken, need confirmation from testing on BE that it does as adverstised, install_amp change still needs testing before checkin ing

........

r7003 | mickecarlsson | 2008-10-18 10:33:29 -0700 (Sat, 18 Oct 2008) | 1 line

Updated amp.pot and swedish language for amp

........

r7006 | p_lindheimer | 2008-10-18 11:10:33 -0700 (Sat, 18 Oct 2008) | 1 line

closes #3264 add languageprefix=yes and while we are at it, execincludes=yes

........

r7007 | mickecarlsson | 2008-10-18 14:05:26 -0700 (Sat, 18 Oct 2008) | 1 line

Swedish language for amp. All text is translated

........

r7009 | mickecarlsson | 2008-10-19 00:09:14 -0700 (Sun, 19 Oct 2008) | 1 line

Closes #3279, new russian translations for amp

........

r7052 | p_lindheimer | 2008-10-21 07:51:22 -0700 (Tue, 21 Oct 2008) | 1 line

closes #3309 have op_server.pl reload instead of killing and restarting

........

r7058 | p_lindheimer | 2008-10-21 11:11:41 -0700 (Tue, 21 Oct 2008) | 1 line

send raw asterisk version info if the parsed version is blank, and escape the & when sending to wget

........

r7059 | p_lindheimer | 2008-10-21 11:14:30 -0700 (Tue, 21 Oct 2008) | 1 line

revert r7058, should not have been checked in until we fix the css for the tabs

........

r7060 | p_lindheimer | 2008-10-21 11:32:25 -0700 (Tue, 21 Oct 2008) | 1 line

change default of MODULEADMINWGET to false, was set to true in amportal.conf

........

r7061 | sasargen | 2008-10-21 12:49:36 -0700 (Tue, 21 Oct 2008) | 1 line

fix text overflow in left nav tab menu

........

r7062 | p_lindheimer | 2008-10-21 13:16:55 -0700 (Tue, 21 Oct 2008) | 1 line

localize the Tool/Setup lnav tabs, they will be truncated if too wide so translators should review and consider abbreviating Tools and Setup which only appear in the tabs and not elsewhere

........

r7063 | p_lindheimer | 2008-10-21 22:10:22 -0700 (Tue, 21 Oct 2008) | 1 line

create 2.5.1 upgrade directory to bump version

........

r7064 | p_lindheimer | 2008-10-21 22:13:01 -0700 (Tue, 21 Oct 2008) | 1 line

closes #3271 allow install_amp for business edition

........

r7065 | p_lindheimer | 2008-10-21 22:16:00 -0700 (Tue, 21 Oct 2008) | 1 line

updated CHANGES for 2.5.1 release

........

r7066 | p_lindheimer | 2008-10-21 22:20:14 -0700 (Tue, 21 Oct 2008) | 1 line

fix spelling errors to keep mickecarlsson happy :-)

........

r7070 | p_lindheimer | 2008-10-21 22:36:53 -0700 (Tue, 21 Oct 2008) | 1 line

Creating release 2.5.1

........

Files:

• freepbx/trunk (modified) (1 prop)
• freepbx/trunk/CHANGES (modified) (1 diff)
• freepbx/trunk/amp_conf/bin/bounce_op.sh (modified) (1 diff)
• freepbx/trunk/amp_conf/htdocs/admin/common/mainstyle.css (modified) (1 diff)
• freepbx/trunk/amp_conf/htdocs/admin/functions.inc.php (modified) (3 diffs)
• freepbx/trunk/amp_conf/htdocs/admin/i18n/amp.pot (modified) (43 diffs)
• freepbx/trunk/amp_conf/htdocs/admin/i18n/ru_RU/LC_MESSAGES/amp.mo (modified) (previous)
• freepbx/trunk/amp_conf/htdocs/admin/i18n/ru_RU/LC_MESSAGES/amp.po (modified) (9 diffs)
• freepbx/trunk/amp_conf/htdocs/admin/i18n/sv_SE/LC_MESSAGES/amp.mo (modified) (previous)
• freepbx/trunk/amp_conf/htdocs/admin/i18n/sv_SE/LC_MESSAGES/amp.po (modified) (41 diffs)
• freepbx/trunk/amp_conf/htdocs/admin/views/freepbx_admin.php (modified) (2 diffs)
• freepbx/trunk/amportal.conf (modified) (1 diff)
• freepbx/trunk/asterisk.conf (modified) (1 diff)
• freepbx/trunk/install_amp (modified) (2 diffs)
• freepbx/trunk/upgrades/2.5.1 (copied) (copied from freepbx/branches/2.5/upgrades/2.5.1)
• freepbx/trunk/upgrades/2.5.1.md5 (copied) (copied from freepbx/branches/2.5/upgrades/2.5.1.md5)

freepbx/trunk/CHANGES

@@ +1 @@
+2.5.1
+- Biggest changes from 2.5.0 to 2.5.1 were many loose ends to handle localization
+  translations through out the code.
+
+- Added support to recognize Asterisk Business Edition versions and work properly
+  as if they were 1.2 or 1.4.
+
-2.5.0 Added in final
-- When using database mode there is a new option to allow a non-admin user to Add

freepbx/trunk/amp_conf/bin/bounce_op.sh

@@ -1 +1 @@
-#!/bin/bash
-
+-HUP 
-

freepbx/trunk/amp_conf/htdocs/admin/common/mainstyle.css

@@ -333 +333 @@
-#nav ul#nav-tabs {
-  padding: 0 0 0 0;
-
+
-}
-#nav #nav-tabs li, #nav #nav-tabs li a {

freepbx/trunk/amp_conf/htdocs/admin/functions.inc.php

@@ -1382 +1382 @@
-      } elseif (preg_match('/Asterisk SVN-.+-(\d+(\.\d+)*)-r(-?(\S*))-(.+)/', $verinfo, $matches)) {
-        return array('engine'=>'asterisk', 'version' => $matches[1], 'additional' => $matches[3], 'raw' => $verinfo);
+      } elseif (preg_match('/Asterisk [B].(\d+(\.\d+)*)(-?(\S*))/', $verinfo, $matches)) {
+        return array('engine'=>'asterisk', 'version' => '1.2', 'additional' => $matches[3], 'raw' => $verinfo);
+      } elseif (preg_match('/Asterisk [C].(\d+(\.\d+)*)(-?(\S*))/', $verinfo, $matches)) {
+        return array('engine'=>'asterisk', 'version' => '1.4', 'additional' => $matches[3], 'raw' => $verinfo);
-      }
-
@@ -3437 +3441 @@
-  }
-  $engver=engine_getinfo();
-
+ && trim($engver['engine']) != ""
-    $options .="&astver=".urlencode($engver['version']);
+  } else {
+    $options .="&astver=".urlencode($engver['raw']);
-  }
-
@@ -3448 +3454 @@
-  }
-  if (empty($announcement)) {
-
+
+
-    $announcement = implode("\n",$data_arr);
-  }

freepbx/trunk/amp_conf/htdocs/admin/i18n/amp.pot

@@ -9 +9 @@
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-05 11:30
+10 03:46
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -107 +107 @@
-
-#: amp_conf/htdocs/admin/views/freepbx_reloadbar.php:4
-6
+5
-#: amp_conf/htdocs/admin/views/freepbx_reload.php:107
-msgid "Apply Configuration Changes"
@@ -116 +116 @@
-msgid ""
-"You have made changes to the configuration that have not yet been applied. "
-
+
+
-msgstr ""
-
@@ -136 +137 @@
-#: amp_conf/htdocs/admin/modules/core/page.ampusers.php:223
-#: amp_conf/htdocs/admin/modules/core/page.ampusers.php:227
-37
-2
+41
+6
-msgid "name"
-msgstr ""
-
-6
+7
-msgid ""
-"WARNING: Javascript is disabled in your browser. The FreePBX administration "
@@ -148 +149 @@
-msgstr ""
-
-0
+1
-#, php-format
-msgid "%s is a registered trademark of %s"
-msgstr ""
-
-1
-4
+2
+5
-#: amp_conf/htdocs/admin/views/freepbx.php:140
-#: amp_conf/htdocs/admin/views/freepbx.php:149
@@ -160 +161 @@
-msgstr ""
-
-3
+4
-#, php-format
-msgid "%s is licensed under %s"
@@ -349 +350 @@
-msgstr ""
-
-4
+2
-#: amp_conf/htdocs/admin/modules/core/page.did.php:306
-msgid "Submit"
-msgstr ""
-
-#: amp_conf/htdocs/admin/components.class.php:653
-#: amp_conf/htdocs/admin/components.class.php:697
-msgid "text"
-msgstr ""
-
@@ -448 +444 @@
-#: amp_conf/htdocs/admin/functions.inc.php:1611
-#: amp_conf/htdocs/admin/modules/core/page.routing.php:578
-68
-70
+96
+98
-msgid "Add"
-msgstr ""
@@ -777 +773 @@
-
-#: amp_conf/htdocs/admin/modules/core/page.devices.php:18
-29
-46
-68
+57
+74
+96
-msgid "Device"
-msgstr ""
@@ -835 +831 @@
-
-#: amp_conf/htdocs/admin/modules/core/page.ampusers.php:101
-35
+62
-msgid "Add User"
-msgstr ""
@@ -899 +895 @@
-
-#: amp_conf/htdocs/admin/modules/core/page.ampusers.php:239
-24
+52
-msgid "Add Device"
-msgstr ""
-
-#: amp_conf/htdocs/admin/modules/core/page.ampusers.php:239
-33
+60
-msgid "Add Extension"
-msgstr ""
@@ -1112 +1108 @@
-
-#: amp_conf/htdocs/admin/modules/core/page.trunks.php:390
-10
-13
-2
+37
+40
+6
-msgid "Disable"
-msgstr ""
@@ -1130 +1126 @@
-
-#: amp_conf/htdocs/admin/modules/core/page.trunks.php:399
-09
-0
+36
+4
-msgid "Enable"
-msgstr ""
@@ -1554 +1550 @@
-
-#: amp_conf/htdocs/admin/modules/core/page.general.php:139
-598
+602
-msgid "Enabled"
-msgstr ""
@@ -1711 +1707 @@
-"any key (timeout) or press # which is interpreted as a timeout. Set this to "
-"'dovm' to go to voicemail (default)."
-msgstr ""
-
-#: amp_conf/htdocs/admin/modules/core/page.general.php:232
-#: amp_conf/htdocs/admin/modules/core/page.general.php:241
-msgid "exten"
-msgstr ""
-
@@ -2053 +2044 @@
-#: amp_conf/htdocs/admin/modules/core/page.zapchandids.php:99
-#: amp_conf/htdocs/admin/modules/core/page.did.php:176
-01
-2
+29
+6
-msgid "Description"
-msgstr ""
@@ -2078 +2069 @@
-
-#: amp_conf/htdocs/admin/modules/core/page.zapchandids.php:123
-2999
+3026
-msgid "Invalid Channel Number, must be numeric and not blank"
-msgstr ""
-
-#: amp_conf/htdocs/admin/modules/core/page.zapchandids.php:124
-03
+30
-msgid "Invalid DID, must be a non-blank DID"
-msgstr ""
@@ -2477 +2468 @@
-
-#: amp_conf/htdocs/admin/modules/core/page.did.php:126
-66
-18
+93
+46
-msgid "deleted"
-msgstr ""
-
-#: amp_conf/htdocs/admin/modules/core/page.did.php:151
-298
+325
-#: amp_conf/htdocs/admin/modules/core/page.users.php:21
-msgid "User"
@@ -2489 +2480 @@
-
-#: amp_conf/htdocs/admin/modules/core/page.did.php:155
-286
-70
+313
+98
-#: amp_conf/htdocs/admin/modules/core/page.extensions.php:18
-msgid "Extension"
@@ -2746 +2737 @@
-msgstr ""
-
-
-
+
+
+
+
+
+
+
-msgid "A route for this DID/CID already exists!"
-msgstr ""
-
-42
+69
-msgid "You must put in a device id"
-msgstr ""
-
-52
+79
-msgid "This device id is already in use"
-msgstr ""
-
-33
+60
-msgid "User Extension: "
-msgstr ""
-
-62
+89
-#, php-format
-msgid "Inbound Route: %s (%s)"
-msgstr ""
-
-696
+723
-msgid "You must put in an extension (or user) number"
-msgstr ""
-
-05
+32
-#, php-format
-msgid "This user/extension %s is already in use"
-msgstr ""
-
-24
-64
+51
+91
-#, php-format
-msgid "A route with this DID/CID: %s/%s already exists"
-msgstr ""
-
-15
+42
-msgid "Error Duplicate Channel Entry"
-msgstr ""
-
-179
+206
-#, php-format
-msgid ""
@@ -2794 +2790 @@
-msgstr ""
-
-180
+207
-msgid "Failed to write indications.conf"
-msgstr ""
-
-04
+31
-msgid "On Demand"
-msgstr ""
-
-05
+32
-msgid "Always"
-msgstr ""
-
-06
+33
-msgid "Never"
-msgstr ""
-
-14
+41
-msgid "Screen Caller: No Memory"
-msgstr ""
-
-15
+42
-msgid "Screen Caller: Memory"
-msgstr ""
-
-288
+315
-#, php-format
-msgid "Delete Extension %s"
-msgstr ""
-
-00
+27
-#, php-format
-msgid "Delete User %s"
-msgstr ""
-
-12
+39
-msgid "Add User/Extension"
-msgstr ""
-
-19
-688
+46
+716
-msgid "Please enter a valid extension number."
-msgstr ""
-
-20
+47
-msgid "Please enter a valid CID Num Alias (must be a valid number)."
-msgstr ""
-
-21
+48
-msgid "Please enter valid User Password using numbers only"
-msgstr ""
-
-22
+49
-msgid "Please enter a valid Display Name"
-msgstr ""
-
-23
+50
-msgid "Please enter a valid Outbound CID"
-msgstr ""
-
-24
+51
-msgid "Please enter a valid pause time in seconds, using digits only"
-msgstr ""
-
-25
+52
-msgid ""
-"You have entered a non-standard dialpattern for your DID. You can only enter "
@@ -2864 +2860 @@
-msgstr ""
-
-26
+53
-msgid ""
-"Please enter a valid Caller ID Number or leave it blank for your Assigned "
@@ -2870 +2866 @@
-msgstr ""
-
-33
+60
-msgid "Edit Extension"
-msgstr ""
-
-35
+62
-msgid "Edit User"
-msgstr ""
-
-40
+67
-msgid "User Extension"
-msgstr ""
-
-40
+67
-msgid "The extension number to dial to reach this user."
-msgstr ""
-
-43
+70
-msgid "User Password"
-msgstr ""
-
-43
+70
-msgid "A user will enter this password when logging onto a device."
-msgstr ""
-
-43
-03
+70
+31
-msgid "logs into a device."
-msgstr ""
-
-43
-03
+70
+31
-msgid "logs out of a device."
-msgstr ""
-
-47
+74
-msgid "Display Name"
-msgstr ""
-
-47
+74
-msgid ""
-"The caller id name for calls from this user will be set to this name. Only "
@@ -2914 +2910 @@
-msgstr ""
-
-49
+76
-msgid "CID Num Alias"
-msgstr ""
-
-49
+76
-msgid ""
-"The CID Number to use for internal calls, if different from the extension "
@@ -2927 +2923 @@
-msgstr ""
-
-50
+77
-msgid "SIP Alias"
-msgstr ""
-
-50
+77
-msgid ""
-"If you want to support direct sip dialing of users internally or through "
@@ -2938 +2934 @@
-msgstr ""
-
-55
+82
-msgid "User Devices"
-msgstr ""
-
-66
+93
-msgid "Edit:"
-msgstr ""
-
-378
-06
+405
+34
-msgid "Extension Options"
-msgstr ""
-
-379
+406
-msgid "Outbound CID"
-msgstr ""
-
-379
+406
-msgid ""
-"Overrides the caller id when dialing out a trunk. Any setting here will "
@@ -2963 +2959 @@
-msgstr ""
-
-381
+408
-msgid "Ring Time"
-msgstr ""
-
-381
+408
-msgid ""
-"Number of seconds to ring prior to going to voicemail. Default will use the "
@@ -2974 +2970 @@
-msgstr ""
-
-389
+416
-msgid "Call Waiting"
-msgstr ""
-
-389
+416
-msgid "Set the initial/current Call Waiting state for this user's extension"
-msgstr ""
-
-390
+417
-msgid "Call Screening"
-msgstr ""
-
-390
+417
-msgid ""
-"Call Screening requires external callers to say their name, which will be "
@@ -2999 +2995 @@
-msgstr ""
-
-392
+419
-msgid "Assigned DID/CID"
-msgstr ""
-
-393
+420
-msgid "DID Description"
-msgstr ""
-
-393
+420
-msgid "A description for this DID, such as \"Fax\""
-msgstr ""
-
-394
+421
-msgid "Add Inbound DID"
-msgstr ""
-
-394
+421
-msgid ""
-"A direct DID that is associated with this extension. The DID should be in "
@@ -3023 +3019 @@
-msgstr ""
-
-395
+422
-msgid "Add Inbound CID"
-msgstr ""
-
-395
+422
-msgid ""
-"Add a CID for more specific DID + CID routing. A DID must be specified in "
@@ -3035 +3031 @@
-msgstr ""
-
-03
+30
-msgid "DID / CID"
-msgstr ""
-
-23
+50
-msgid "Recording Options"
-msgstr ""
-
-24
+51
-msgid "Record Incoming"
-msgstr ""
-
-24
+51
-msgid "Record all inbound calls received at this extension."
-msgstr ""
-
-25
+52
-msgid "Record Outgoing"
-msgstr ""
-
-25
+52
-msgid "Record all outbound calls received at this extension."
-msgstr ""
-
-43
+70
-msgid "Warning! Extension"
-msgstr ""
-
-43
+70
-msgid "is not allowed for your account"
-msgstr ""
-
-57
+84
-msgid "Conflicting Extensions"
-msgstr ""
-
-57
+84
-msgid ""
-"The following extension numbers are in conflict, you can click on the item"
@@ -3077 +3073 @@
-msgstr ""
-
-61
+88
-msgid "Configure user again:"
-msgstr ""
-
-61
+88
-msgid "Configure extension again:"
-msgstr ""
-
-08
+35
-msgid "Please enter the dtmfmode for this device"
-msgstr ""
-
-09
+36
-msgid "Please enter the channel for this device"
-msgstr ""
-
-10
+37
-msgid ""
-"You have not entered a Secret for this device, although this is possible it "
@@ -3100 +3096 @@
-msgstr ""
-
-11
+38
-msgid "Please enter a Secret for this device"
-msgstr ""
-
-
+
+
+
+
+
+
+
+
+
-msgid "Generic SIP Device"
-msgstr ""
-
-579
+607
-msgid "Generic IAX2 Device"
-msgstr ""
-
-580
+608
-msgid "Generic ZAP Device"
-msgstr ""
-
-581
+609
-msgid "Other (Custom) Device"
-msgstr ""
-
-586
+614
-msgid "Fixed"
-msgstr ""
-
-587
+615
-msgid "Adhoc"
-msgstr ""
-
-590
+618
-msgid "none"
-msgstr ""
-
-591
+619
-msgid "New User"
-msgstr ""
-
-26
+54
-msgid "Add an Extension"
-msgstr ""
-
-28
+56
-msgid "Please select your Device below then click Submit"
-msgstr ""
-
-32
+60
-msgid "Edit existing Device"
-msgstr ""
-
-34
+62
-msgid "Edit existing Extension"
-msgstr ""
-
-49
+77
-#, php-format
-msgid "Delete Device %s"
-msgstr ""
-
-55
+83
-#, php-format
-msgid "Edit Default User: %s"
-msgstr ""
-
-55
+83
-#, php-format
-msgid "Edit Fixed User: %s"
-msgstr ""
-
-685
+713
-msgid "Please enter a device id."
-msgstr ""
-
-686
+714
-msgid "Please enter a valid Description for this device"
-msgstr ""
-
-687
+715
-msgid "Please enter a valid Emergency CID"
-msgstr ""
-
-695
+723
-msgid "Device Info"
-msgstr ""
-
-699
+727
-msgid "Device ID"
-msgstr ""
-
-699
+727
-msgid ""
-"Give your device a unique integer ID.  The device will use this ID to "
@@ -3193 +3197 @@
-msgstr ""
-
-01
+29
-msgid ""
-"The caller id name for this device will be set to this description until it "
@@ -3199 +3203 @@
-msgstr ""
-
-02
-07
+30
+35
-msgid "Emergency CID"
-msgstr ""
-
-02
-07
+30
+35
-msgid ""
-"This caller id will always be set when dialing out an Outbound Route flagged "
@@ -3211 +3215 @@
-msgstr ""
-
-03
+31
-msgid "Device Type"
-msgstr ""
-
-03
+31
-msgid ""
-"Devices can be fixed or adhoc. Fixed devices are always associated to the "
@@ -3222 +3226 @@
-msgstr ""
-
-04
+32
-msgid "Default User"
-msgstr ""
-
-04
+32
-msgid ""
-"Fixed devices will always mapped to this user.  Adhoc devices will be mapped "
@@ -3233 +3237 @@
-msgstr ""
-
-12
+40
-msgid "Device Options"
-msgstr ""
-
-14
+42
-#, php-format
-msgid "This device uses %s technology."
-msgstr ""
-
-14
+42
-msgid "Via DAHDI compatibility mode"
-msgstr ""
@@ -3416 +3420 @@
-#: amp_conf/htdocs/admin/page.modules.php:396
-msgid "Please confirm the following actions:"
+msgstr ""
+
+#: amp_conf/htdocs/admin/page.modules.php:403
+msgid "Confirm"
-msgstr ""
-
@@ -3489 +3497 @@
-
-#: amp_conf/htdocs/admin/page.modules.php:484
-4
+8
-msgid "Download all"
-msgstr ""
-
-#: amp_conf/htdocs/admin/page.modules.php:485
-5
+9
-msgid "Upgrade all"
-msgstr ""
-
-#: amp_conf/htdocs/admin/page.modules.php:487
-67
+71
-msgid "Reset"
-msgstr ""
-
-#: amp_conf/htdocs/admin/page.modules.php:488
-68
+72
-msgid "Process"
-msgstr ""
@@ -3520 +3528 @@
-msgstr ""
-
-
+
+
+
+
+
+
-msgid "Not Installed (Locally available)"
-msgstr ""
-
-0
+4
-#, php-format
-msgid "Not Installed (Available online: %s)"
-msgstr ""
-
-67
+71
-#, php-format
-msgid "Disabled; Online upgrade available (%s)"
-msgstr ""
-
-69
+73
-#, php-format
-msgid "Disabled; Newer than online version (%s)"
-msgstr ""
-
-1
+5
-msgid "Disabled; up to date"
-msgstr ""
-
-78
+82
-#, php-format
-msgid "Disabled; Pending upgrade to %s"
-msgstr ""
-
-
-
-
-
-
+
-#, php-format
-msgid "Online upgrade available (%s)"
-msgstr ""
-
-0
+4
-#, php-format
-msgid "Newer than online version (%s)"
-msgstr ""
-
-2
+6
-msgid "Enabled and up to date"
-msgstr ""
-
-596
+600
-msgid "Enabled; Not available online"
-msgstr ""
-
-16
+20
-msgid "Attention"
-msgstr ""
-
-17
+21
-msgid "attention"
-msgstr ""
-
-1
+5
-msgid "Action"
-msgstr ""
-
-4
+8
-msgid "No Action"
-msgstr ""
-
-1
-4
+5
+8
-msgid "Install"
-msgstr ""
-
-4
+8
-msgid "Download and Install"
-msgstr ""
-
-3
-58
-66
-86
+7
+62
+70
+90
-msgid "Uninstall"
-msgstr ""
-
-48
+52
-#, php-format
-msgid "Download %s, keep Disabled"
-msgstr ""
-
-56
+60
-#, php-format
-msgid "Upgrade to %s and Enable"
-msgstr ""
-
-76
+80
-#, php-format
-msgid "Download and Upgrade to %s"
-msgstr ""
-
-4
+8
-#, php-format
-msgid "Description for version %s"
-msgstr ""
-
-5
+9
-msgid "description"
-msgstr ""
-
-697
+701
-msgid "No description is available."
-msgstr ""
-
-0
-2
+4
+6
-msgid "More info"
-msgstr ""
-
-2
+6
-#, php-format
-msgid "Get help for %s"
-msgstr ""
-
-07
+11
-msgid "Changelog"
-msgstr ""
-
-08
+12
-#, php-format
-msgid "Change Log for version %s"
-msgstr ""
-
-28
+32
-msgid "Debug"
-msgstr ""
-
-3
+7
-msgid "All available modules are up-to-date and installed."
-msgstr ""
-
-5
+9
-msgid "No modules to display."
-msgstr ""
-
-5
+9
-msgid "Untarring.."
-msgstr ""
-
-5
+9
-msgid "Done."
-msgstr ""
@@ -3708 +3717 @@
-msgstr ""
-
-msgid "Confirm"
-msgstr ""
-
-msgid "Time Groups"
-msgstr ""
@@ -3722 +3728 @@
-msgid "Custom Applications"
-msgstr ""
+

freepbx/trunk/amp_conf/htdocs/admin/i18n/ru_RU/LC_MESSAGES/amp.po

@@ -927 +927 @@
-msgstr "œÞÜÕà žŽ"
-
+#: amp_conf/htdocs/admin/modules/core/page.did.php:78
+msgid "View All DIDs"
+msgstr "¿ÞáÜÞâàÕâì ÒáÕ ÝÞÜÕàÐ DID"
+
+#: amp_conf/htdocs/admin/modules/core/page.did.php:79
+msgid "View User DIDs"
+msgstr "¿ÞáÜÞâàÕâì ßÞÛì×ÞÒÐâÕÛìáÚØÕ DID"
+
+#: amp_conf/htdocs/admin/modules/core/page.did.php:80
+msgid "View General DIDs"
+msgstr "¿ÞáÜÞâàÕâì ÞáÝÞÒÝëÕ DID"
+
+#: amp_conf/htdocs/admin/modules/core/page.did.php:81
+msgid "View Unused DIDs"
+msgstr "¿ÞáÜÞâàÕâì ÝÕØáßÞÛì×ãÕÜëÕ DID"
+
-#: modules/core/page.did.php:97
-msgid "Fax Handling"
@@ -1735 +1751 @@
-msgstr "ŽÞÑÐÒØâì âàÐÝÚ"
-
+#: amp_conf/htdocs/admin/modules/core/page.trunks.php:281
+#, php-format
+msgid "Delete Trunk %s"
+msgstr "ÃÔÐÛØâì âàÐÝÚ %s"
+
-#: modules/core/page.trunks.php:160
-msgid "Trunk"
@@ -1966 +1987 @@
-"another PBX or is a Centrex line, then you would put 9 here to access an "
-"outbound line. Another common use is to prefix calls with 'w' on a POTS line "
-
+ 
-"should leave this option blank."
-msgstr ""
@@ -2027 +2048 @@
-"Modify the default PEER connection parameters for your VoIP provider."
-"<br><br>You may need to add to the default lines listed below, depending on "
-e
+
-"retained. For example, if you use the \"allow/deny\" directives make sure "
-"deny comes first."
@@ -2693 +2714 @@
-"\"Sales: John Doe\" ÝÐ ×ÒÞÝïéÕÜ ÒÝãâàÕÝÝÕÜ ÝÞÜÕàÕ."
-
+msgid ""
+"You can optionally prefix the Caller ID name. ie: If you prefix with \"Sales:"
+"\", a call from John Doe would display as \"Sales:John Doe\" on the "
+"extensions that ring."
+msgstr ""
+"ŸßæØÞÝÐÛìÝÞ, Òë ÜÞÖÕâÕ ãÚÐ×Ðâì ßàÕäØÚá ÔÛï žŽ ÝÞÜÕàÐ. "
+"Â.Õ.: µáÛØ ÒÐè ØÔÕÝâØäØÚÐâÞà \"Sales:\", ·ÒÞÝÞÚ Þâ John Doe ÑãÔÕâ ÒëÓÛïÔÕâì ÚÐÚ "
+"\"Sales: John Doe\" ÝÐ ×ÒÞÝïéÕÜ ÒÝãâàÕÝÝÕÜ ÝÞÜÕàÕ."
+
-#: modules/queues/page.queues.php:167
-msgid "static agents"
@@ -3316 +3346 @@
-#: modules/core/page.did.php:91
-msgid ""
-
-
+
+
+
+
+
-msgstr ""
-"ÃÚÐÖØâÕ ÝÞÜÕà, ÚÞâÞàëÙ ÑãÔÕâ ßÕàÕÔÐÒÐâìáï Ò ÚÐçÕáâÒÕ ØáåÞÔïéÕÓÞ ßàØ "
-"×ÒÞÝÚÐå çÕàÕ× íâÞâ âàÐÝÚ, íâÞ ÜÞÖÕâ Ñëâì ßÞÛÕ×ÝëÜ ÔÛï Òë×ëÒÐÕÜÞÓÞ ÐÑÞÝÕÝâÐ.<br><br>"
-
+
+
+
+
-
-#: modules/core/page.did.php:148
-msgid ""
-
-
+
+
+
+
+
+
-msgstr ""
-"µáÛØ ÝÕ àÐáßÞ×ÝÐÝ ØÛØ ÞâáãâáâÒãÕâ žŽ ÝÞÜÕà ÒåÞÔïéÕÓÞ ×ÒÞÝÚÐ, \"ŒÕÝÕÔÖÕà ÑÕ×ÞßÐáÝÞáâØ\" ßàÕÔÛÞÖØâ ÝÐÑàÐâì 10-âØ "
-
+
+
+
-
-#: modules/core/page.did.php:162
@@ -4040 +4082 @@
-msgid "Music On Hold?"
-msgstr "Œã×ëÚã Ò ÞÖØÔÐÝØØ?"
+
+#: page.did.php:212
+msgid "Music On Hold"
+msgstr "Œã×ëÚã Ò ÞÖØÔÐÝØØ"
-
-msgid "Language"
@@ -4718 +4764 @@
-msgid "Provide a meaningful description of what this incoming route is"
-msgstr "²ÝïâÝÞÕ ÞßØáÐÝØÕ - çâÞ Ø× áÕÑï ßàÕÔáâÐÒÛïÕâ íâÞâ ÜÐàèàãâ"
+
+#: amp_conf/htdocs/admin/modules/core/page.did.php:189
+msgid "CID Priority Route"
+msgstr "ŒÐàèàãâ ßÞ ßàØÞàØâÕâã CID"
+
+#: amp_conf/htdocs/admin/modules/core/page.did.php:189
+msgid ""
+"This effects CID ONLY routes where no DID is specified. If checked, calls "
+"with this CID will be routed to this route, even if there is a route to the "
+"DID that was called. Normal behavior is for the DID route to take the calls. "
+"If there is a specific DID/CID route for this CID, that route will still "
+"take the call when that DID is called."
+msgstr ""
+"ŸßàÕÔÕÛïÕâ ÜÐàèàãâ ÞáÝÞÒëÒÐïáì Ÿ»ÌºŸ ÝÐ œÞÜÕàÕ žŽ ÕáÛØ ÔÐÖÕ ÝÕ ãÚÐ×ÐÝ ÝÞÜÕà DID. "
+"µáÛØ ÞâÜÕâØâì, âÞ ÒáÕ ×ÒÞÝÚØ á íâØÜ œÞÜÕàÞÜ žŽ ÑãÔãâ ÝÐßàÐÒÛÕÝë Ò íâÞâ ÜÐàèàãâ, "
+"ÔÐÖÕ ÕáÛØ ÜÐàèàãâ ØÔñâ ßÞ ßàØ×ÝÐÚã DID. œÞàÜÐÛìÝëÙ áæÕÝÐàØÙ - áÞ×ÔÐÒÐâì ÜÐàèàãâ "
+"ÞáÝÞÒëÒÐïáì ÝÐ DID. µáÛØ ÖÕ ãáâÐÝÞÒÛÕÝ áßÕæØäØçÝëÙ DID/CID ÜÐàèàãâ ÔÛï íâÞÓÞ œÞÜÕàÐ žŽ "
+"ÞÝ ÑãÔÕâ ÒëÑàÐÝ ÔÐÖÕ ÕáÛØ ØÔñâ ×ÒÞÝÞÚ ÝÐ ãÚÐ×ÐÝÝëÙ DID."
-
-#: page.did.php:98
@@ -4823 +4887 @@
-msgid "Languages"
-msgstr "Ï×ëÚØ"
+
+msgid "PIN Set"
+msgstr "ÁßØáÚØ PIN-ÚÞÔÞÒ"
-
-msgid "PIN Sets"

freepbx/trunk/amp_conf/htdocs/admin/i18n/sv_SE/LC_MESSAGES/amp.po

@@ -8 +8 @@
-"Project-Id-Version: FreePBX amp\n"
-"Report-Msgid-Bugs-To: \n"
-05 11:30
-2 22:56
+10 03:46
+8 23:02
-"Last-Translator: Mikael Carlsson <mickecamino@gmail.com>\n"
-"Language-Team: Swedish\n"
@@ -110 +110 @@
-
-#: amp_conf/htdocs/admin/views/freepbx_reloadbar.php:4
-6
+5
-#: amp_conf/htdocs/admin/views/freepbx_reload.php:107
-msgid "Apply Configuration Changes"
@@ -137 +137 @@
-#: amp_conf/htdocs/admin/modules/core/page.ampusers.php:223
-#: amp_conf/htdocs/admin/modules/core/page.ampusers.php:227
-37
-2
+41
+6
-msgid "name"
-msgstr "namn"
-
-6
+7
-msgid "WARNING: Javascript is disabled in your browser. The FreePBX administration interface requires Javascript to run properly. Please enable javascript or switch to another  browser that supports it."
-msgstr "VARNING: Javaskript Àr avstÀngt i din webblÀsare. Administrationsverktyget krÀver javaskript för att fungera. Aktivera javaskript eller byt till en webblÀsare som stöder det."
-
-0
+1
-#, php-format
-msgid "%s is a registered trademark of %s"
-msgstr "%s Àr ett registrerat varumÀrke av %s"
-
-1
-4
+2
+5
-#: amp_conf/htdocs/admin/views/freepbx.php:140
-#: amp_conf/htdocs/admin/views/freepbx.php:149
@@ -158 +158 @@
-msgstr "FreePBX"
-
-3
+4
-#, php-format
-msgid "%s is licensed under %s"
@@ -330 +330 @@
-msgstr "Anpassade Gå-till sammanhang måste innehålla strÀngen \"custom\". T.ex. custom-app,s,1"
-
-4
+2
-#: amp_conf/htdocs/admin/modules/core/page.did.php:306
-msgid "Submit"
-msgstr "Spara"
-
-#: amp_conf/htdocs/admin/components.class.php:653
-#: amp_conf/htdocs/admin/components.class.php:697
-msgid "text"
-msgstr "text"
-
-#: amp_conf/htdocs/admin/header_auth.php:43
@@ -424 +419 @@
-#: amp_conf/htdocs/admin/functions.inc.php:1611
-#: amp_conf/htdocs/admin/modules/core/page.routing.php:578
-68
-70
+96
+98
-msgid "Add"
-msgstr "LÀgg till"
@@ -741 +736 @@
-
-#: amp_conf/htdocs/admin/modules/core/page.devices.php:18
-29
-46
-68
+57
+74
+96
-msgid "Device"
-msgstr "Enhet"
@@ -799 +794 @@
-
-#: amp_conf/htdocs/admin/modules/core/page.ampusers.php:101
-35
+62
-msgid "Add User"
-msgstr "LÀgg till anvÀndare"
@@ -853 +848 @@
-
-#: amp_conf/htdocs/admin/modules/core/page.ampusers.php:239
-24
+52
-msgid "Add Device"
-msgstr "LÀgg till enhet"
-
-#: amp_conf/htdocs/admin/modules/core/page.ampusers.php:239
-33
+60
-msgid "Add Extension"
-msgstr "LÀgg till anknytning"
@@ -948 +943 @@
-#: amp_conf/htdocs/admin/modules/core/page.trunks.php:280
-msgid "DAHDI compatibility Mode"
-
+t
-
-#: amp_conf/htdocs/admin/modules/core/page.trunks.php:281
@@ -1032 +1027 @@
-
-#: amp_conf/htdocs/admin/modules/core/page.trunks.php:390
-10
-13
-2
+37
+40
+6
-msgid "Disable"
-msgstr "Avaktivera"
@@ -1047 +1042 @@
-
-#: amp_conf/htdocs/admin/modules/core/page.trunks.php:399
-09
-0
+36
+4
-msgid "Enable"
-msgstr "Aktivera"
@@ -1138 +1133 @@
-#: amp_conf/htdocs/admin/modules/core/page.trunks.php:437
-msgid "This looks up your local number on www.localcallingguide.com (NA-only), and sets up so you can dial either 7 or 10 digits (regardless of what your PSTN is) on a local trunk (where you have to dial 1+area code for long distance, but only 5551234 (7-digit dialing) or 6135551234 (10-digit dialing) for local calls"
-
+r
-
-#: amp_conf/htdocs/admin/modules/core/page.trunks.php:440
@@ -1291 +1286 @@
-#: amp_conf/htdocs/admin/modules/core/page.trunks.php:706
-msgid "Give this trunk a unique name.  Example: myiaxtel"
-miniaxtel
+Till-Tele2
-
-#: amp_conf/htdocs/admin/modules/core/page.trunks.php:713
@@ -1432 +1427 @@
-
-#: amp_conf/htdocs/admin/modules/core/page.general.php:139
-598
+602
-msgid "Enabled"
-msgstr "Aktiverad"
@@ -1572 +1567 @@
-msgid "This is the default location that a caller will be sent if they don't press any key (timeout) or press # which is interpreted as a timeout. Set this to 'dovm' to go to voicemail (default)."
-msgstr "Detta Àr standardplatsen en uppringare kommer att skickas till om de inte trycker någon knapp (tidsutlösning) eller trycker # som kommer att behandlas som en tidsutlösning. SÀtt detta till 'dovm' för att skicka till röstbrevlådan (förvalt). "
-
-#: amp_conf/htdocs/admin/modules/core/page.general.php:232
-#: amp_conf/htdocs/admin/modules/core/page.general.php:241
-msgid "exten"
-msgstr "anknytning"
-
-#: amp_conf/htdocs/admin/modules/core/page.general.php:237
@@ -1842 +1832 @@
-#: amp_conf/htdocs/admin/modules/core/page.zapchandids.php:79
-msgid "Zap Channel DIDs allow you to assign a DID to specific Zap Channels. You can supply the same DID to multiple channels. This would be a common scenario if you have multiple POTS lines that are on a hunt group from your provider. You MUST assign the channel's context to from-zaptel for these settings to have effect. It will be a line that looks like:<br /><br />context = from-zaptel<br /><br />in your zapata.conf configuration effecting the specified channel(s). Once you have assigned DIDs you can use standard Inbound Routes with the specified DIDs to route your calls."
-
+
+
-
-#: amp_conf/htdocs/admin/modules/core/page.zapchandids.php:87
@@ -1858 +1849 @@
-#: amp_conf/htdocs/admin/modules/core/page.zapchandids.php:99
-#: amp_conf/htdocs/admin/modules/core/page.did.php:176
-01
-2
+29
+6
-msgid "Description"
-msgstr "Beskrivning"
@@ -1880 +1871 @@
-
-#: amp_conf/htdocs/admin/modules/core/page.zapchandids.php:123
-2999
+3026
-msgid "Invalid Channel Number, must be numeric and not blank"
-msgstr "Ogiltigt kanalnummer, det kan inte vara blankt och måste innehålla siffror"
-
-#: amp_conf/htdocs/admin/modules/core/page.zapchandids.php:124
-03
+30
-msgid "Invalid DID, must be a non-blank DID"
-msgstr "Ogiltigt direktnummer, kan inte vara tomt"
@@ -1905 +1896 @@
-#: amp_conf/htdocs/admin/modules/core/page.zapchandids.php:126
-msgid "You appear to be using a converted DID in the form of zapchanNN that was automatically generated during an upgrade. You should consider assigning the DID that is normally associated with this channel to take full advantage of the inbound routing abilities. Changing the DID here will require you to make changes in the Inbound Routes tab. Do you want to continue?"
-
+Du verkar anvÀnda ett konverterat direktnummer i form av zapchanNN som automatiskt skapades vid en uppgradering. Du bör övervÀga att tilldela det direktnummer som normalt Àr associerat med denna kanal för att fullt utnyttja möjligheterna med inkommande vÀgar. Om du Àndrar direktnumret hÀr måste du Àndra i Inkommade vÀgar. Vill du fortsÀtta?
-
-#: amp_conf/htdocs/admin/modules/core/install.php:5
@@ -1949 +1940 @@
-#: amp_conf/htdocs/admin/modules/core/install.php:15
-msgid "In-Call Asterisk Toggle Call Recording"
-
+StÀll om inspelning under samtal
-
-#: amp_conf/htdocs/admin/modules/core/install.php:16
-msgid "In-Call Asterisk Disconnect Code"
-
+Avsluta samtal
-
-#: amp_conf/htdocs/admin/modules/core/install.php:43
@@ -2106 +2097 @@
-#: amp_conf/htdocs/admin/modules/core/page.routing.php:318
-msgid "Optional: A route can prompt users for a password before allowing calls to progress.  This is useful for restricting calls to international destinations or 1-900 numbers.<br><br>A numerical password, or the path to an Authenticate password file can be used.<br><br>Leave this field blank to not prompt for password.</span>"
-
+Valfritt: En vÀg kan fråga efter ett lösenord innan samtalet skickas genom. Detta kan anvÀndas för att för att begrÀnsa utlandssamtal eller betalnummer.<br><br>Ett numeriskt lösenord. eller en sökvÀg till en fil med lösenord kan anvÀndas.<br><br>LÀmna detta fÀlt tomt för att inte få fråga om lösenord.</span>
-
-#: amp_conf/htdocs/admin/modules/core/page.routing.php:327
@@ -2114 +2105 @@
-#: amp_conf/htdocs/admin/modules/core/page.routing.php:327
-msgid "Optional: Selecting this option will enforce the use of a device's Emergency CID setting (if set).  Select this option if this set of routes is used for emergency dialing (ie: 911).</span>"
-
+Valfritt: VÀljs detta kommer nummerpresentationen för nödsamtal att sÀttas till det som Àr angivet på en enhet eller anknytning. VÀlj detta om denna vÀg anvÀnds för nödsamtal, t.ex. 112</span>
-
-#: amp_conf/htdocs/admin/modules/core/page.routing.php:331
@@ -2130 +2121 @@
-#: amp_conf/htdocs/admin/modules/core/page.routing.php:336
-msgid "You can choose which music category to use. For example, choose a type appropriate for a destination country which may have announcements in the appropriate language."
-
+Du kan vÀlja vilken musikkategori som ska anvÀndas för denna vÀg. Kan anvÀndas för internationella samtal då engelsk musik kan vara lÀmplig.
-
-#: amp_conf/htdocs/admin/modules/core/page.routing.php:354
@@ -2138 +2129 @@
-#: amp_conf/htdocs/admin/modules/core/page.routing.php:354
-msgid "A Dial Pattern is a unique set of digits that will select this trunk. Enter one dial pattern per line."
-
+Ett nummermönster Àr ett antal siffror som matchar om denna trunk ska anvÀndas. Ett mönster per rad.
-
-#: amp_conf/htdocs/admin/modules/core/page.routing.php:359
@@ -2146 +2137 @@
-#: amp_conf/htdocs/admin/modules/core/page.routing.php:360
-msgid "separates a dialing prefix from the number (for example, 9|NXXXXXX would match when some dialed \"95551234\" but would only pass \"5551234\" to the trunks)"
-
+separerar ett prefix från numret (t.ex. 9|NXXXXXX matchar nÀr någon slår \"95551234\" men kommer då att bara skicka \"5551234\" till trunken)
-
-#: amp_conf/htdocs/admin/modules/core/page.routing.php:402
@@ -2163 +2154 @@
-#: amp_conf/htdocs/admin/modules/core/page.routing.php:404
-msgid "This looks up your local number on www.localcallingguide.com (NA-only), and sets up so you can dial either 7, 10 or 11 digits (5551234, 6135551234, 16135551234) to access this route."
-
+Detta slår upp ditt lokala nummer på www.localcallingguide.com (endast Nord-Amerika), om gör så att du kan slå 7, 10 eller 11 siffror  (5551234, 6135551234, 16135551234) för att få tillgång till denna vÀg.
-
-#: amp_conf/htdocs/admin/modules/core/page.routing.php:483
@@ -2175 +2166 @@
-#: amp_conf/htdocs/admin/modules/core/page.routing.php:485
-msgid "Toll-free"
-
+Gratisnummer
-
-#: amp_conf/htdocs/admin/modules/core/page.routing.php:486
@@ -2199 +2190 @@
-#: amp_conf/htdocs/admin/modules/core/page.routing.php:496
-msgid "The Trunk Sequence controls the order of trunks that will be used when the above Dial Patterns are matched. <br><br>For Dial Patterns that match long distance numbers, for example, you'd want to pick the cheapest routes for long distance (ie, VoIP trunks first) followed by more expensive routes (POTS lines)."
-
+Trunksekvensen kontrollerar i vilken ordning trunkarna kommer att anvÀndas nÀr nummermönstret ovan matchas.<br><br>För nummermönster som matchar en viss typ av samtal skickas samtalen ut på den första trunken, om den Àr upptagen, skicka ut på nÀsta.
-
-#: amp_conf/htdocs/admin/modules/core/page.routing.php:618
@@ -2248 +2239 @@
-
-#: amp_conf/htdocs/admin/modules/core/page.did.php:126
-66
-18
+93
+46
-msgid "deleted"
-msgstr "borttagen"
-
-#: amp_conf/htdocs/admin/modules/core/page.did.php:151
-298
+325
-#: amp_conf/htdocs/admin/modules/core/page.users.php:21
-msgid "User"
@@ -2260 +2251 @@
-
-#: amp_conf/htdocs/admin/modules/core/page.did.php:155
-286
-70
+313
+98
-#: amp_conf/htdocs/admin/modules/core/page.extensions.php:18
-msgid "Extension"
@@ -2302 +2293 @@
-#: amp_conf/htdocs/admin/modules/core/page.did.php:189
-msgid "CID Priority Route"
-stvÀg för direktnummer
+tsvÀg för nummerpresentation
-
-#: amp_conf/htdocs/admin/modules/core/page.did.php:189
-msgid "This effects CID ONLY routes where no DID is specified. If checked, calls with this CID will be routed to this route, even if there is a route to the DID that was called. Normal behavior is for the DID route to take the calls. If there is a specific DID/CID route for this CID, that route will still take the call when that DID is called."
-
+Detta påverkar ENDAST vÀgar med nummerpresentation dÀr inget direktnummer Àr angivet. Om detta vÀljs kommer samtal med denna nummerpresentation att skickas via denna vÀg Àven om det finns en vÀg med det direktnummer som ringdes upp. Normalt Àr det vÀgen med direktnumret som hanterar samtalet. Om det finns en specifik vÀg med direktnummer/nummerpresentation för denna nummerpresentation, kommer den vÀgen att vÀljas nÀr direktnumret rings upp.
-
-#: amp_conf/htdocs/admin/modules/core/page.did.php:193
@@ -2334 +2325 @@
-#: amp_conf/htdocs/admin/modules/core/page.did.php:204
-msgid "Set the MoH class that will be used for calls that come in on this route. For example, choose a type appropriate for routes coming in from a country which may have announcements in their language."
-
+VÀljer klassen på pausmusiken som kommer att anvÀndas på samtal som kommer in via denna vÀg. Kan anvÀndas för internationella samtal då engelsk musik kan vara lÀmplig.
-
-#: amp_conf/htdocs/admin/modules/core/page.did.php:210
@@ -2458 +2449 @@
-"Are you sure?"
-msgstr ""
+"Att ange en inkommande vÀg utan direktnummer eller nummerpresentation kommer att matcha alla samtal som inte hanteras av andra angivna inkommande vÀgar.\\n"
+"\\n"
+"Är du sÀker?"
-
-#: amp_conf/htdocs/admin/modules/core/page.did.php:325
@@ -2467 +2461 @@
-"Are you sure this is correct?"
-msgstr ""
+"`Direktnummer Àr normalt ett telefonnummer för ditt abbonnemang eller ett giltigt nummermönster för Astersk\\n"
+"\\n"
+"Du har skrivit in ett direktnummer som inte Àr standard.\\n"
+"\\n"
+"Är du sÀker pÃ¥ att detta Àr rÀtt?"
-
-#: amp_conf/htdocs/admin/modules/core/page.did.php:326
@@ -2476 +2475 @@
-msgstr "Ogiltigt prefix för nummerpresentation."
-
-
-
+
+
+
+
+
+
+
-msgid "A route for this DID/CID already exists!"
-msgstr "En vÀg för detta direktnummer/nummerpresentation finns redan!"
-
-42
+69
-msgid "You must put in a device id"
-msgstr "Du måste ange en enhets id"
-
-52
+79
-msgid "This device id is already in use"
-msgstr "Denna enhets id anvÀnd redan"
-
-33
+60
-msgid "User Extension: "
-msgstr "AnvÀndaranknytning: "
-
-62
+89
-#, php-format
-msgid "Inbound Route: %s (%s)"
-msgstr "Inkommande vÀg: %s (%s)"
-
-696
+723
-msgid "You must put in an extension (or user) number"
-msgstr "Du måste ange ett nummer för anknytningen (eller anvÀndaren)"
-
-05
+32
-#, php-format
-msgid "This user/extension %s is already in use"
-msgstr "Denna anknytning %s anvÀnds redan"
-
-24
-64
+51
+91
-#, php-format
-msgid "A route with this DID/CID: %s/%s already exists"
-msgstr "En vÀg med detta direktnummer/nummerpresentation: %s/%s finns redan"
-
-15
+42
-msgid "Error Duplicate Channel Entry"
-msgstr "Fel, kanalen Àr en dubblett"
-
-179
+206
-#, php-format
-msgid "Failed to open %s for writing, aborting attempt to write the country indications. The file may be readonly or the permissions may be incorrect."
-msgstr "Kunde inte öppna %s för skrivning, avbryter försöket att skriva indikationer för lÀnder. Filen Àr troligtvis skrivskyddad eller så Àr rÀttigheterna inte korrekta."
-
-180
+207
-msgid "Failed to write indications.conf"
-msgstr "Kunde inte skriva till filen indications.conf"
-
-04
+31
-msgid "On Demand"
-msgstr "På begÀran"
-
-05
+32
-msgid "Always"
-msgstr "Alltid"
-
-06
+33
-msgid "Never"
-msgstr "Aldrig"
-
-14
+41
-msgid "Screen Caller: No Memory"
-msgstr "Sålla samtal: Kom inte ihåg"
-
-15
+42
-msgid "Screen Caller: Memory"
-msgstr "Sålla samtal: Kom ihåg"
-
-288
+315
-#, php-format
-msgid "Delete Extension %s"
-msgstr "Ta bort anknytning %s"
-
-00
+27
-#, php-format
-msgid "Delete User %s"
-msgstr "Ta bort anvÀndare %s"
-
-12
+39
-msgid "Add User/Extension"
-msgstr "LÀgg till anvÀndare/anknytning"
-
-19
-688
+46
+716
-msgid "Please enter a valid extension number."
-msgstr "Ange ett giltigt anknytningsnummer"
-
-20
+47
-msgid "Please enter a valid CID Num Alias (must be a valid number)."
-msgstr "Ange ett giltigt CID alias (måste vara ett giltigt nummer)."
-
-21
+48
-msgid "Please enter valid User Password using numbers only"
-msgstr "Ange ett giltigt anvÀndarlösenord, endast siffror"
-
-22
+49
-msgid "Please enter a valid Display Name"
-msgstr "Ange ett giltigt namn"
-
-23
+50
-msgid "Please enter a valid Outbound CID"
-msgstr "Ange ett giltigt nummer för utgående nummerpresentation"
-
-24
+51
-msgid "Please enter a valid pause time in seconds, using digits only"
-msgstr "Ange en giltig paustid i sekunder, endast siffror"
-
-25
+52
-msgid "You have entered a non-standard dialpattern for your DID. You can only enter standard dialpatterns. You must use the inbound routing form to enter non-standard patterns"
-msgstr "Du har angett ett mönster som inte Àr standard för ditt direktnummer. Du kan bara ange standard mönster hÀr. Du måste anvÀnda inkommande vÀg för att ange mönster utanför standard."
-
-26
+53
-msgid "Please enter a valid Caller ID Number or leave it blank for your Assigned DID/CID pair"
-msgstr "Ange ett giltigt nummer för nummerpresentation eller lÀmna det blankt för ditt tilldelade direktnummer/nummerpresentation"
-
-33
+60
-msgid "Edit Extension"
-msgstr "Redigera anknytning"
-
-35
+62
-msgid "Edit User"
-msgstr "Redigera anvÀndare"
-
-40
+67
-msgid "User Extension"
-msgstr "AnvÀndaranknytning: "
-
-40
+67
-msgid "The extension number to dial to reach this user."
-¶
-
-43
+¥
+
+70
-msgid "User Password"
-msgstr "AnvÀndarlösenord"
-
-43
+70
-msgid "A user will enter this password when logging onto a device."
-msgstr "En anvÀndare måste anvÀnda detta lösenord nÀr han loggar in på sin enhet"
-
-43
-03
+70
+31
-msgid "logs into a device."
-msgstr "loggar in på en enhet."
-
-43
-03
+70
+31
-msgid "logs out of a device."
-msgstr "loggar ut ur en enhet."
-
-47
+74
-msgid "Display Name"
-msgstr "Visningsnamn"
-
-47
+74
-msgid "The caller id name for calls from this user will be set to this name. Only enter the name, NOT the number."
-msgstr "Nummerpresentationen för samtal från denna anvÀndare kommer att sÀttas till detta namn. Skriv endast namnet, INTE numret."
-
-49
+76
-msgid "CID Num Alias"
-msgstr "Alias för nummerpresentation"
-
-49
+76
-msgid "The CID Number to use for internal calls, if different from the extension number. This is used to masquerade as a different user. A common example is a team of support people who would like their internal callerid to display the general support number (a ringgroup or queue). There will be no effect on external calls."
-msgstr "Nummerpresentation att anvÀndas för interna samtal om det skiljer sig från anknytningsnumret. Detta anvÀnds för att maskera nummerpresentationen. Ett exempel Àr att en grupp av telefoner kommer att visa samma nummer vid interna samtal, t.ex. Supportavdelningen."
-
-50
+77
-msgid "SIP Alias"
-msgstr "Alias för SIP"
-
-50
+77
-msgid "If you want to support direct sip dialing of users internally or through anonymous sip calls, you can supply a friendly name that can be used in addition to the users extension to call them."
-msgstr "Om du vill anvÀnda samtal via sip internt eller genom anonyma samtal, ange då ett namn hÀr. Detta namn, eller anknytningen, kan anvÀndas för att ringa upp anknytningen."
-
-55
+82
-msgid "User Devices"
-msgstr "AnvÀndarenhet"
-
-66
+93
-msgid "Edit:"
-msgstr "Redigera:"
-
-378
-06
+405
+34
-msgid "Extension Options"
-msgstr "Anknytningsval"
-
-379
+406
-msgid "Outbound CID"
-msgstr "Utgående nummerpresentation"
-
-379
+406
-msgid "Overrides the caller id when dialing out a trunk. Any setting here will override the common outbound caller id set in the Trunks admin.<br><br>Format: <b>\"caller name\" &lt;#######&gt;</b><br><br>Leave this field blank to disable the outbound callerid feature for this user."
-msgstr "AnvÀnd denna nummerpresentation för samtal. Denna instÀllning anvÀnds i stÀllet för den generella utgående nummerpresentationen satt för utgående samtal.<br><br>Format: <b>\"namn\" &lt;#######&gt;</b><br><br>LÀmna detta fÀlt tomt för att stÀnga av nummerpresentation för denna anvÀndare."
-
-381
+408
-msgid "Ring Time"
-msgstr "Ringtid"
-
-381
+408
-msgid "Number of seconds to ring prior to going to voicemail. Default will use the value set in the General Tab. If no voicemail is configured this will be ignored."
-msgstr "Antal sekunder att ringa före samtalet kopplas till röstbrevlåda. Standard Àr vÀrdet som Àr satt i <b>Generella instÀllningar</b>. Om ingen röstbrevlåda Àr angiven har instÀllningen ingen funktion."
-
-389
+416
-msgid "Call Waiting"
-msgstr "Samtal vÀntar"
-
-389
+416
-msgid "Set the initial/current Call Waiting state for this user's extension"
-msgstr "SÀtter valet för Samtal vÀntar för denna anknytning."
-
-390
+417
-msgid "Call Screening"
-msgstr "SÃ¥lla samtal"
-
-390
+417
-msgid "Call Screening requires external callers to say their name, which will be played back to the user and allow the user to accept or reject the call.  Screening with memory only verifies a caller for their caller-id once. Screening without memory always requires a caller to say their name. Either mode will always announce the caller based on the last introduction saved with that callerid. If any user on the system uses the memory option, when that user is called, the caller will be required to re-introduce themselves and all users on the system will have that new introduction associated with the caller's CallerId."
-
-
-392
+Sålla samtal krÀver att externa uppringare måste ange sitt namn som kommer att spelas upp för den uppringde och ger denna då möjlighet att ta samtalet eller avböja det. Sålla samtal  - kom ihåg verifierar inkommande nummerpresentation endast första gången. Sålla samtal - kom inte ihåg krÀver att uppringaren varje gång måste ange sitt namn. BÀgge valen kommer att kommer att spela upp det sist inspelade namnet sparat med nummerpresentationen. 
+
+419
-msgid "Assigned DID/CID"
-msgstr "Tilldela direktnummer/nummerpresentation"
-
-393
+420
-msgid "DID Description"
-msgstr "Beskrivning för direktnummer"
-
-393
+420
-msgid "A description for this DID, such as \"Fax\""
-msgstr "Ett kort namn för detta direktnummer, t.ex. \"Fax\""
-
-394
+421
-msgid "Add Inbound DID"
-msgstr "LÀgg till inkommande direktnummer"
-
-394
+421
-msgid "A direct DID that is associated with this extension. The DID should be in the same format as provided by the provider (e.g. full number, 4 digits for 10x4, etc).<br><br>Format should be: <b>XXXXXXXXXX</b><br><br>.An optional CID can also be associated with this DID by setting the next box"
-
-
-395
+Ett direktnummer som Àr knutet till denna anknytning. Direktnumret ska vara i samma format som det kommer ifrån din operatör.<br><br>Formatet ska vara: <b>XXXXXXXXXX</b><br><br>En nummerpresentation kan också anges för detta direktnummer genom att skriva in det i nÀsta fÀlt.
+
+422
-msgid "Add Inbound CID"
-msgstr "LÀgg till inkommande nummerpresentation"
-
-395
+422
-msgid "Add a CID for more specific DID + CID routing. A DID must be specified in the above Add DID box. In addition to standard dial sequences, you can also put Private, Blocked, Unknown, Restricted, Anonymous and Unavailable in order to catch these special cases if the Telco transmits them."
-msgstr "LÀgg till en nummerpresentation för en mer specifik vÀg för nummerpresentation + direktnummer. Ett direktnummer måste anges i ovanstående <b>LÀgg till direktnummer</b>. Förutom telefonnummer kan du ange Private, Blocked, Unknown, Restricted, Anonymous eller Unavailable för att fånga dessa specialvarianter om din operatör skickar med dom."
-
-03
+30
-msgid "DID / CID"
-msgstr "Direktnummer / Nummerpresentation"
-
-23
+50
-msgid "Recording Options"
-msgstr "Inspelningsval"
-
-24
+51
-msgid "Record Incoming"
-msgstr "Spela in inkommande samtal"
-
-24
+51
-msgid "Record all inbound calls received at this extension."
-msgstr "Spela in alla inkommande samtal för denna anknytning."
-
-25
+52
-msgid "Record Outgoing"
-msgstr "Spela in utgående samtal"
-
-25
+52
-msgid "Record all outbound calls received at this extension."
-msgstr "Spela in alla utgående samtal för denna anknytning."
-
-43
+70
-msgid "Warning! Extension"
-msgstr "Varning! Anknytning"
-
-43
+70
-msgid "is not allowed for your account"
-msgstr "Àr inte tillåtet för din anknytning"
-
-57
+84
-msgid "Conflicting Extensions"
-msgstr "Konfliktande anknytningar"
-
-57
+84
-msgid "The following extension numbers are in conflict, you can click on the item(s) below to edit the conflicting entity."
-msgstr "Följande anknytningar Àr i konflikt, du kan klicka på valen nedan för att redigera lösa upp konflikten."
-
-61
+88
-msgid "Configure user again:"
-msgstr "Konfigurera anvÀndare igen:"
-
-61
+88
-msgid "Configure extension again:"
-msgstr "Konfigurera anknytningen igen:"
-
-08
+35
-msgid "Please enter the dtmfmode for this device"
-msgstr "Skriv in enhetens dtmflÀge"
-
-09
+36
-msgid "Please enter the channel for this device"
-msgstr "Skriv in kanalen för denna enhet"
-
-10
+37
-msgid "You have not entered a Secret for this device, although this is possible it is generally bad practice to not assign a Secret to a device. Are you sure you want to leave the Secret empty?"
-msgstr "Du har inte satt ett lösenord för denna enhet, i och för sig Àr detta inget fel, men det Àr dÃ¥lig sÀkerhet att inte sÀtta lösenord. Är du sÀker pÃ¥ att du vill lÀmna lösenordsfÀltet tomt?"
-
-11
+38
-msgid "Please enter a Secret for this device"
-msgstr "Skriv in ett lösen för denna enhet"
-
-
+
+
+
+
+
-msgid "Generic SIP Device"
-msgstr "Generell SIP enhet"
-
-579
+607
-msgid "Generic IAX2 Device"
-msgstr "Generell IAX2 enhet"
-
-580
+608
-msgid "Generic ZAP Device"
-msgstr "Generell ZAP enhet"
-
-581
+609
-msgid "Other (Custom) Device"
-msgstr "Annan (anpassad) enhet"
-
-586
+614
-msgid "Fixed"
-msgstr "Fast"
-
-587
+615
-msgid "Adhoc"
-msgstr "Ad-hoc"
-
-590
+618
-msgid "none"
-msgstr "ingen"
-
-591
+619
-msgid "New User"
-msgstr "Ny anvÀndare"
-
-26
+54
-msgid "Add an Extension"
-msgstr "LÀgg till en anknytning"
-
-28
+56
-msgid "Please select your Device below then click Submit"
-msgstr "VÀlj din enhet nedan och klicka på Spara"
-
-32
+60
-msgid "Edit existing Device"
-msgstr "Redigera existerande enheter"
-
-34
+62
-msgid "Edit existing Extension"
-msgstr "Redigera existerande anknytning"
-
-49
+77
-#, php-format
-msgid "Delete Device %s"
-msgstr "Ta bort enhet %s"
-
-55
+83
-#, php-format
-msgid "Edit Default User: %s"
-msgstr "Redigera standard anvÀndare: %s"
-
-55
+83
-#, php-format
-msgid "Edit Fixed User: %s"
-msgstr "Redigera fast anvÀndare: %s"
-
-685
+713
-msgid "Please enter a device id."
-msgstr "Ange en giltig enhets id"
-
-686
+714
-msgid "Please enter a valid Description for this device"
-msgstr "Ange en giltig benÀmning för denna enhet"
-
-687
+715
-msgid "Please enter a valid Emergency CID"
-msgstr "Ange en giltig nummerpresentation för nödsamtal"
-
-695
+723
-msgid "Device Info"
-msgstr "Enhetsinfo"
-
-699
+727
-msgid "Device ID"
-msgstr "Enhetsid"
-
-699
+727
-msgid "Give your device a unique integer ID.  The device will use this ID to authenticate to the system."
-msgstr "Ange en unik enhets id. Enheten kommer att anvÀnda denna för att autentisera till systemet."
-
-01
+29
-msgid "The caller id name for this device will be set to this description until it is logged into."
-msgstr "Nummerpresentationsnamnet för denna enhet kommer att vara detta man tills någon logga in på enheten."
-
-02
-07
+30
+35
-msgid "Emergency CID"
-msgstr "Nummerpresentation för nödsamtal"
-
-02
-07
+30
+35
-msgid "This caller id will always be set when dialing out an Outbound Route flagged as Emergency.  The Emergency CID overrides all other caller id settings."
-msgstr "Nummerpresentationen kommer att sÀttas till detta nÀr ett samtal markerat som ett nödsamtal ringer ut. Denna nummerpresentation skriver över all annan nummerpresentation."
-
-03
+31
-msgid "Device Type"
-msgstr "Enhetstyp"
-
-03
+31
-msgid "Devices can be fixed or adhoc. Fixed devices are always associated to the same extension/user. Adhoc devices can be logged into and logged out of by users."
-msgstr "Enheter kan vara fasta eller adhoc. Fasta enheter Àr alltid kopplade till samma anknytning/anvÀndare. På adhoc-enheter kan anvÀndare logga in eller logga ut på."
-
-04
+32
-msgid "Default User"
-msgstr "StandardanvÀndare"
-
-04
+32
-msgid "Fixed devices will always mapped to this user.  Adhoc devices will be mapped to this user by default.<br><br>If selecting 'New User', a new User Extension of the same Device ID will be set as the Default User."
-msgstr "Fasta enheter kommer alltid att vara kopplade till denna anvÀndare. Adhoc-enheter kommer som standard att kopplas till denna anvÀndare.<br><br>Om en 'Ny anvÀndare' vÀljs, kommer en ny anknytning med samma Device-id att sÀttas som Standard anvÀndare."
-
-12
+40
-msgid "Device Options"
-msgstr "Enhetsval"
-
-14
+42
-#, php-format
-msgid "This device uses %s technology."
-msgstr "Denna enhet anvÀnder %s teknologi."
-
-14
+42
-msgid "Via DAHDI compatibility mode"
-msgstr "Genom DAHDI kompatibilitetstlÀge"
@@ -3078 +3086 @@
-msgstr "BekrÀfta följande val:"
-
+#: amp_conf/htdocs/admin/page.modules.php:403
+msgid "Confirm"
+msgstr "BekrÀfta"
+
-#: amp_conf/htdocs/admin/page.modules.php:405
-msgid "No actions to perform"
@@ -3138 +3150 @@
-
-#: amp_conf/htdocs/admin/page.modules.php:484
-4
+8
-msgid "Download all"
-msgstr "Ladda ner allt"
-
-#: amp_conf/htdocs/admin/page.modules.php:485
-5
+9
-msgid "Upgrade all"
-msgstr "Uppgradera allt"
-
-#: amp_conf/htdocs/admin/page.modules.php:487
-67
+71
-msgid "Reset"
-msgstr "Ã
@@ -3154 +3166 @@
-
-#: amp_conf/htdocs/admin/page.modules.php:488
-68
+72
-msgid "Process"
-msgstr "Utför"
@@ -3170 +3182 @@
-msgstr "Version"
-
-
+
+
+
+
+
+
-msgid "Not Installed (Locally available)"
-msgstr "Inte installerad (lokalt tillgÀnglig)"
-
-0
+4
-#, php-format
-msgid "Not Installed (Available online: %s)"
-msgstr "Inte installerad (tillgÀnglig on-line: %s"
-
-67
+71
-#, php-format
-msgid "Disabled; Online upgrade available (%s)"
-msgstr "Avaktiverad; On-lineuppgradering tillgÀnglig (%s)"
-
-69
+73
-#, php-format
-msgid "Disabled; Newer than online version (%s)"
-msgstr "Avaktiverad; Nyare Àn on-line (%s)"
-
-1
+5
-msgid "Disabled; up to date"
-msgstr "Avaktiverad; Senaste version"
-
-78
+82
-#, php-format
-msgid "Disabled; Pending upgrade to %s"
-msgstr "Avaktiverad; VÀntar på att uppgraderas till %s"
-
-
-
-
-
-
+
-#, php-format
-msgid "Online upgrade available (%s)"
-msgstr "On-line uppgradering tillgÀnglig (%s)"
-
-0
+4
-#, php-format
-msgid "Newer than online version (%s)"
-msgstr "Nyare Àn on-lineversionen (%s)"
-
-2
+6
-msgid "Enabled and up to date"
-msgstr "Aktiverad och senaste version"
-
-596
+600
-msgid "Enabled; Not available online"
-msgstr "Aktiverad; Inte tillgÀnglig on-line"
-
-16
+20
-msgid "Attention"
-msgstr "OBS"
-
-17
+21
-msgid "attention"
-msgstr "OBS"
-
-1
+5
-msgid "Action"
-msgstr "Val"
-
-4
+8
-msgid "No Action"
-msgstr "Inget val"
-
-1
-4
+5
+8
-msgid "Install"
-msgstr "Installera"
-
-4
+8
-msgid "Download and Install"
-msgstr "Ladda ner och installera"
-
-3
-58
-66
-86
+7
+62
+70
+90
-msgid "Uninstall"
-msgstr "Avinstallera"
-
-48
+52
-#, php-format
-msgid "Download %s, keep Disabled"
-msgstr "Ladda ner %s, behåll avaktiverad"
-
-56
+60
-#, php-format
-msgid "Upgrade to %s and Enable"
-msgstr "Uppgradera till %s och aktivera"
-
-76
+80
-#, php-format
-msgid "Download and Upgrade to %s"
-msgstr "Ladda ner och uppgradera till %s"
-
-4
+8
-#, php-format
-msgid "Description for version %s"
-msgstr "Beskrivning för version %s"
-
-5
+9
-msgid "description"
-msgstr "beskrivning"
-
-697
+701
-msgid "No description is available."
-msgstr "Ingen beskrivning tillgÀnglig."
-
-0
-2
+4
+6
-msgid "More info"
-msgstr "Mer information"
-
-2
+6
-#, php-format
-msgid "Get help for %s"
-msgstr "HÀmta hjÀlp för %s"
-
-07
+11
-msgid "Changelog"
-msgstr "Ändringlogg"
-
-08
+12
-#, php-format
-msgid "Change Log for version %s"
-msgstr "Ändringslogg för version %s"
-
-28
+32
-msgid "Debug"
-msgstr "Avlusa"
-
-3
+7
-msgid "All available modules are up-to-date and installed."
-msgstr "Alla tillgÀngliga moduler Àr de senaste och de Àr installerade"
-
-5
+9
-msgid "No modules to display."
-msgstr "Inga moduler att visa"
-
-5
+9
-msgid "Untarring.."
-msgstr "Packar upp (untarring).."
-
-5
+9
-msgid "Done."
-msgstr "Klar."
@@ -3358 +3371 @@
-msgstr "Administrera A2Billing"
-
-msgid "Confirm"
-msgstr "BekrÀfta"
-
-msgid "Time Groups"
-msgstr "Tidgrupper"

freepbx/trunk/amp_conf/htdocs/admin/views/freepbx_admin.php

@@ -55 +55 @@
-  foreach ($fpbx_types as $key=>$val) {
-    $type_name = (isset($fpbx_type_names[$val]) ? $fpbx_type_names[$val] : ucfirst($val));
-$type_name
+_($type_name)
-    if ($val == $fpbx_type) {
-      $tab_num = $key+1;
@@ -154 +154 @@
-    <option value="he_IL" <?php echo ($_COOKIE['lang']=="he_IL" ? "selected" : "") ?> >Hebrew</option>
-    <option value="sv_SE" <?php echo ($_COOKIE['lang']=="sv_SE" ? "selected" : "") ?> >Svenska</option>
+    <option value="hu_HU" <?php echo ($_COOKIE['lang']=="hu_HU" ? "selected" : "") ?> >Hungarian</option>
-    </select>
-<?php

freepbx/trunk/amportal.conf

@@ -162 +162 @@
-# will force FreePBX to avoid the attempt to open the URL and go straight to the wget calls.
-#
-tru
+fals
-
-# AMPDISABLELOG=true|false # DEFAULT VALUE true

freepbx/trunk/asterisk.conf

@@ -10 +10 @@
-[options]
-transmit_silence_during_record = yes 
+languageprefix=yes
+execincludes=yes

freepbx/trunk/install_amp

@@ -875 +875 @@
-    (preg_match('/^Asterisk SVN-(\d+(\.\d+)*)(-?(.*))$/', $verinfo, $matches))) {
-
-version_compare($matches[1], "1.2") < 0
- or 1.4
+(version_compare($matches[1], "1.2") < 0)
+, 1.4, or 1.6
-  }
-  if (version_compare($matches[1], "1.7", "ge")) {
@@ -882 +882 @@
-  }
-  out("{$matches[1]}");
+
+} elseif (preg_match('/^Asterisk ([ABC]\.\d+(\.\d+)*)(-?(.*))$/', $verinfo, $matches)) { 
+  if (substr($matches[1], 0, 1) == "A") {
+    fatal("Asterisk Business Edition B or C is required for this version of FreePBX. Detected version is: ".$matches[1]);
+  }
+  out("{$matches[1]}");
+
-} elseif (preg_match('/^Asterisk SVN.+/', $verinfo)) {
-  out("FAIL");