Changeset 7202

Show
Ignore:
Timestamp:
10/31/08 18:37:12 (5 years ago)
Author:
p_lindheimer
Message:

Merged revisions 7186-7201 via svnmerge from
http://svn.freepbx.org/modules/branches/2.5

........

r7193 | mickecarlsson | 2008-10-30 12:55:49 -0700 (Thu, 30 Oct 2008) | 1 line


Closes #3351 adds spanish langauge to conferences. Thank you lucas

........

r7195 | mickecarlsson | 2008-10-30 14:40:26 -0700 (Thu, 30 Oct 2008) | 1 line


Closes #3352 adds spanish language to cidlookup. Thanks lucas

........

r7197 | mickecarlsson | 2008-10-30 23:26:23 -0700 (Thu, 30 Oct 2008) | 1 line


Fixed type in code for fw_fop

........

r7198 | mickecarlsson | 2008-10-31 12:39:14 -0700 (Fri, 31 Oct 2008) | 1 line


Closes #3354 adds spanish language to daynight. Thank you lucas

........

r7199 | mickecarlsson | 2008-10-31 12:48:34 -0700 (Fri, 31 Oct 2008) | 1 line


Added translated swedish speeddial.po to speeddial

........

r7200 | p_lindheimer | 2008-10-31 15:29:51 -0700 (Fri, 31 Oct 2008) | 1 line


fix publishing tool to check for php errors in framework modules

........

r7201 | p_lindheimer | 2008-10-31 15:32:14 -0700 (Fri, 31 Oct 2008) | 1 line


Module Publish Script: fw_fop 2.5.0.1

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.6

    • Property svnmerge-integrated changed from /modules/branches/2.5:1-7185 to /modules/branches/2.5:1-7201

  • modules/branches/2.6/fw_fop/module.xml

    r6495 r7202  
    22  <rawname>fw_fop</rawname> 
    33  <name>FreePBX FOP Framework</name> 
    4   <version>2.5.0</version> 
     4  <version>2.5.0.1</version> 
    55  <candisable>no</candisable> 
    66  <canuninstall>no</canuninstall> 
    77  <changelog> 
     8    *2.5.0.1* typo in install script 
    89    *2.5.0* First release of fw_fop 
    910  </changelog> 
    …… 
    1314  <type>setup</type> 
    1415  <category>Basic</category> 
    15   <location>release/2.5/fw_fop-2.5.0.tgz</location> 
    16   <md5sum>8e0813a411d46cd23f180b89ddc56b44</md5sum> 
     16  <location>release/2.5/fw_fop-2.5.0.1.tgz</location> 
     17  <md5sum>ecf693452056196ccdd83115f552e457</md5sum> 
    1718</module> 

  • modules/branches/2.6/publish.pl

    r7087 r7202  
    219219      next if ($x =~ /svnversion.txt/); 
    220220      $files .= "$x "; 
     221      if (-f $x && $checkphp) { 
     222        if (system("php -l $x")) { 
     223          die "FATAL: php syntax error detected in $x\n"; 
     224        } 
     225      } 
    221226    } 
    222227  } elsif ($moddir =~ /$fw_fop/) { 
     228    while ($x = shift @arr) { 
    223229      next if ($x =~ /module.xml/); 
    224230      next if ($x =~ /htdocs_panel/); 
    225231      next if ($x =~ /svnversion.txt/); 
    226232      $files .= "$x "; 
     233      if (-f $x && $checkphp) { 
     234        if (system("php -l $x")) { 
     235          die "FATAL: php syntax error detected in $x\n"; 
     236        } 
     237      } 
     238    } 
    227239  } elsif ($moddir =~ /$fw_ari/) { 
     240    while ($x = shift @arr) { 
    228241      next if ($x =~ /module.xml/); 
    229242      next if ($x =~ /htdocs_ari/); 
    230243      next if ($x =~ /svnversion.txt/); 
    231244      $files .= "$x "; 
     245      if (-f $x && $checkphp) { 
     246        if (system("php -l $x")) { 
     247          die "FATAL: php syntax error detected in $x\n"; 
     248        } 
     249      } 
     250    } 
    232251  } elsif ($moddir =~ /$fw_langpacks/) { 
     252    while ($x = shift @arr) { 
    233253      next if ($x =~ /module.xml/); 
    234254      next if ($x =~ /htdocs/); 
    235255      next if ($x =~ /svnversion.txt/); 
    236256      $files .= "$x "; 
     257      if (-f $x && $checkphp) { 
     258        if (system("php -l $x")) { 
     259          die "FATAL: php syntax error detected in $x\n"; 
     260        } 
     261      } 
     262    } 
    237263  } else { 
    238264    while ($x = shift @arr) { 

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

    r6852 r7202  
    44# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. 
    55# 
    6 #, fuzzy 
    76msgid "" 
    87msgstr "" 
    9 "Project-Id-Version: PACKAGE VERSION\n" 
     8"Project-Id-Version: FreePBX speeddial\n" 
    109"Report-Msgid-Bugs-To: \n" 
    11 "POT-Creation-Date: 2008-09-26 21:59+0200\n" 
    12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 
    13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 
    14 "Language-Team: LANGUAGE <LL@li.org>\n" 
     10"POT-Creation-Date: 2008-09-09 09:24+0200\n" 
     11"PO-Revision-Date: 2008-09-16 11:48+0100\n" 
     12"Last-Translator: Mikael Carlsson <mickecamino@gmail.com>\n" 
     13"Language-Team: \n" 
    1514"MIME-Version: 1.0\n" 
    16 "Content-Type: text/plain; charset=CHARSET\n" 
     15"Content-Type: text/plain; charset=utf-8\n" 
    1716"Content-Transfer-Encoding: 8bit\n" 
     17"X-Poedit-Language: Swedish\n" 
     18"X-Poedit-Country: SWEDEN\n" 
    1819 
    1920#: install.php:4 
    2021msgid "Speeddial prefix" 
    21 msgstr "" 
     22msgstr "Prefix för kortnummer" 
    2223 
    2324#: install.php:11 
    2425msgid "Set user speed dial" 
    25 msgstr "" 
     26msgstr "Skriv in kortnummer" 
    2627 
    2728#: module.xml 
    2829msgid "Speed Dial Functions" 
    29 msgstr "" 
     30msgstr "Kortnummer" 
     31