Show
Ignore:
Timestamp:
01/23/10 17:48:55 (3 years ago)
Author:
mickecarlsson
Message:

Merged revisions 8662-8669 via svnmerge from
http://svn.freepbx.org/modules/branches/2.7

........

r8662 | mickecarlsson | 2010-01-23 17:21:59 +0100 (Sat, 23 Jan 2010) | 1 line


Fixed a couple of spelling errors, updated language files for announcements

........

r8663 | mickecarlsson | 2010-01-23 17:59:52 +0100 (Sat, 23 Jan 2010) | 1 line


Fixed spelling errors, moved spanish language file to correct place

........

r8664 | mickecarlsson | 2010-01-23 19:47:54 +0100 (Sat, 23 Jan 2010) | 1 line


Fixed spelling errors, enclosed text strings fo localization, updated language files for cidlookup

........

r8665 | mickecarlsson | 2010-01-23 20:32:46 +0100 (Sat, 23 Jan 2010) | 1 line


Updated language template file, updated languages for conferences

........

r8666 | mickecarlsson | 2010-01-23 22:35:37 +0100 (Sat, 23 Jan 2010) | 1 line


Fixed spelling error, updated language template file, updated all languages for daynight module

........

r8667 | mickecarlsson | 2010-01-23 22:48:09 +0100 (Sat, 23 Jan 2010) | 1 line


Fixed spelling error, updated language template file, updated language files for disa

........

r8668 | mickecarlsson | 2010-01-23 23:13:30 +0100 (Sat, 23 Jan 2010) | 1 line


Fixed spelling error, updated language template and swedish language

........

r8669 | mickecarlsson | 2010-01-23 23:25:59 +0100 (Sat, 23 Jan 2010) | 1 line


Fixed spelling error, updated language template and languages for irc

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.6

    • Property svnmerge-integrated changed from /modules/branches/2.7:1-8497,8576-8578,8581,8585 /modules/branches/2.5:1-7809,7812,7854,7858-7865,7878,7886,7890,7915,7967-7968,8036-8037 to /modules/branches/2.5:1-7809,7812,7854,7858-7865,7878,7886,7890,7915,7967-7968,8036-8037 /modules/branches/2.7:1-8497,8576-8578,8581,8585,8662-8669

  • modules/branches/2.6/daynight/functions.inc.php

    r8173 r8670  
    544544      $html .= '<tr>'; 
    545545      $html .= '<td><a href="#" class="info">'; 
    546       $html .= _("Associate with").'<span>'._("If a selection is made, this timecondition will be associated with that featurecode and will allow this timecondition to be direct overriden by that daynight mode featurecode").'.</span></a>:</td>'; 
     546      $html .= _("Associate with").'<span>'._("If a selection is made, this timecondition will be associated with that featurecode and will allow this timecondition to be direct overridden by that daynight mode featurecode").'.</span></a>:</td>'; 
    547547      $html .= '<td><select tabindex="'.++$tabindex.'" name="daynight_ref">'; 
    548548      $daynightcodes = daynight_list(); 

  • modules/branches/2.6/daynight/i18n/bg_BG/LC_MESSAGES/daynight.po

    r8175 r8670  
    5454msgid "" 
    5555"If a selection is made, this timecondition will be associated with that " 
    56 "featurecode and will allow this timecondition to be direct overriden by that " 
     56"featurecode and will allow this timecondition to be direct overridden by that " 
    5757"daynight mode featurecode" 
    5858msgstr "" 

  • modules/branches/2.6/daynight/i18n/daynight.pot

    r8175 r8670  
    1616# Copyright (C) 2009 FreePBX 
    1717# 
    18 #, fuzzy 
    1918msgid "" 
    2019msgstr "" 
    …… 
    5049msgid "" 
    5150"If a selection is made, this timecondition will be associated with that " 
    52 "featurecode and will allow this timecondition to be direct overriden by that " 
     51"featurecode and will allow this timecondition to be direct overridden by that " 
    5352"daynight mode featurecode" 
    5453msgstr "" 

  • modules/branches/2.6/daynight/i18n/es_ES/LC_MESSAGES/daynight.po

    r8175 r8670  
    5151msgid "" 
    5252"If a selection is made, this timecondition will be associated with that " 
    53 "featurecode and will allow this timecondition to be direct overriden by that " 
     53"featurecode and will allow this timecondition to be direct overridden by that " 
    5454"daynight mode featurecode" 
    5555msgstr "" 

  • modules/branches/2.6/daynight/i18n/it_IT/LC_MESSAGES/daynight.po

    r8175 r8670  
    5151msgid "" 
    5252"If a selection is made, this timecondition will be associated with that " 
    53 "featurecode and will allow this timecondition to be direct overriden by that " 
     53"featurecode and will allow this timecondition to be direct overridden by that " 
    5454"daynight mode featurecode" 
    5555msgstr "" 

  • modules/branches/2.6/daynight/i18n/ru_RU/LC_MESSAGES/daynight.po

    r8429 r8670  
    5454msgid "" 
    5555"If a selection is made, this timecondition will be associated with that " 
    56 "featurecode and will allow this timecondition to be direct overriden by that " 
     56"featurecode and will allow this timecondition to be direct overridden by that " 
    5757"daynight mode featurecode" 
    5858msgstr "" 

  • modules/branches/2.6/daynight/i18n/sv_SE/LC_MESSAGES/daynight.po

    r8175 r8670  
    5151msgid "" 
    5252"If a selection is made, this timecondition will be associated with that " 
    53 "featurecode and will allow this timecondition to be direct overriden by that " 
     53"featurecode and will allow this timecondition to be direct overridden by that " 
    5454"daynight mode featurecode" 
    5555msgstr "" 

  • modules/branches/2.6/daynight/i18n/zh_CN/LC_MESSAGES/daynight.po

    r8175 r8670  
    5454msgid "" 
    5555"If a selection is made, this timecondition will be associated with that " 
    56 "featurecode and will allow this timecondition to be direct overriden by that " 
     56"featurecode and will allow this timecondition to be direct overridden by that " 
    5757"daynight mode featurecode" 
    5858msgstr ""