Changeset 08694d9


Ignore:
Timestamp:
02/10/14 09:58:55 (11 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1
Children:
94eae48
Parents:
3fefcd7 (diff), d6eb409 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of github.com:pcbsd/pcbsd

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-controlpanel/items/software/pbi-wine64cfg.desktop

    rb8bb18a rd6eb409  
    2020Name[et]=Wine'i seadistamine 
    2121Name[fa]=ٟیکرؚندی Wine 
     22Name[fi]=Wine konfigurointi 
    2223Name[fr]=Configuration de Wine 
    2324Name[fr_CA]=Configuration de Wine 
     
    6364Comment[et]=Wine'i seadistamine 
    6465Comment[fa]=ٟیکرؚندی Wine 
     66Comment[fi]=Wine konfigurointi 
    6567Comment[fr]=Configuration de Wine 
    6668Comment[fr_CA]=Wine Configuration   
  • src-qt4/pc-controlpanel/items/software/pbi-winecfg.desktop

    r94237af rd6eb409  
    2020Name[et]=Wine'i seadistamine 
    2121Name[fa]=ٟیکرؚندی Wine 
     22Name[fi]=Wine konfigurointi 
    2223Name[fr]=Configuration de Wine 
    2324Name[fr_CA]=Configuration de Wine 
     
    6364Comment[et]=Wine'i seadistamine 
    6465Comment[fa]=ٟیکرؚندی Wine 
     66Comment[fi]=Wine konfigurointi 
    6567Comment[fr]=Configuration de Wine 
    6668Comment[fr_CA]=Wine Configuration   
  • src-qt4/pc-controlpanel/items/system/webmin.desktop

    rab1d5fd rd6eb409  
    2121Name[fa]=ؚرنا٠
    2222ه Webmin 
     23Name[fi]=Webmin 
    2324Name[fr]=Webmin 
    2425Name[fr_CA]=Webmin 
     
    6667دیریت سیست٠
    6768 Ù‡Ø§ÛŒ یونیکس 
     69Comment[fi]=Web-pohjainen kÀyttöliittymÀ Unix jÀrjestelmÀn hallintaan 
    6870Comment[fr]=Interface web pour la gestion de systÚme Unix 
    6971Comment[fr_CA]=Interface web pour la gestion de systÚme Unix 
  • src-sh/pbi-manager/pbi-manager

    r9874eb8 r3fefcd7  
    62186218  fi 
    62196219 
     6220  if [ "$PBI_AB_PKGBUILD" = "YES" -a -z "$PBI_AB_NOPKGBUILD"  ] ; then 
     6221     ttag="package" 
     6222     PBI_PKGNGBUILD="YES" 
     6223  else 
     6224     ttag="source" 
     6225     unset PBI_PKGNGBUILD 
     6226  fi 
     6227 
    62206228  # Get the prog version 
    62216229  get_pbi_progversion 
    6222  
    6223   if [ "$PBI_AB_PKGBUILD" = "YES" -a -z "$PBI_AB_NOPKGBUILD"  ] ; then 
    6224      ttag="package" 
    6225   else 
    6226      ttag="source" 
    6227   fi 
    62286230 
    62296231  echo "==> Starting $ttag build [$curBuilder]: $PBI_MAKEPORT" 
     
    63416343        # Add some header info to log file 
    63426344        echo "Starting build: `date`" >${_od}/build.log 
    6343         echo "For ${_mp} - ${PBI_PROGVERSION}" 
     6345        echo "For ${_mp} - ${PBI_PROGVERSION}" >>${_od}/build.log 
    63446346        echo "Build Command:" >>${_od}/build.log 
    63456347        echo "pbi_makeport ${_flags} ${_mp}" >>${_od}/build.log 
Note: See TracChangeset for help on using the changeset viewer.