Changeset a096958


Ignore:
Timestamp:
Nov 5, 2013 9:12:31 AM (5 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1
Children:
107dc59
Parents:
ef691e9 (diff), df22bfe (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
  • build-files/ports-overlay/misc/pcbsd-base/Makefile

    rad23101 r788061c  
    126126                tk86>=0:${PORTSDIR}/x11-toolkits/tk86 \ 
    127127                gdm>=0:${PORTSDIR}/x11/gdm \ 
     128                panicmail>=0:${PORTSDIR}/sysutils/panicmail \ 
    128129                grub-mkconfig:${PORTSDIR}/sysutils/grub2 \ 
    129130                grub2-efi>=0:${PORTSDIR}/sysutils/grub2-efi 
  • build-files/ports-overlay/misc/trueos-base/Makefile

    r531a959d rdf22bfe  
    3838                zfs-stats:${PORTSDIR}/sysutils/zfs-stats \ 
    3939                ataidle>=0:${PORTSDIR}/sysutils/ataidle \ 
     40                panicmail>=0:${PORTSDIR}/sysutils/panicmail \ 
    4041                grub-mkconfig:${PORTSDIR}/sysutils/grub2 \ 
    4142                grub2-efi>=0:${PORTSDIR}/sysutils/grub2-efi 
  • src-qt4/pc-installgui/i18n/SysInstaller_pl.ts

    r9617171 r36a3b28  
    280280    <message> 
    281281        <source>Restore from Life-Preserver backup</source> 
    282         <translation type="unfinished"> 
    283             </translation> 
     282        <translation type="unfinished">Przywróć kopię z programu Life-Preserver</translation> 
    284283    </message> 
    285284    <message> 
    286285        <source>Manage network connectivity</source> 
    287         <translation type="unfinished"> 
    288             </translation> 
     286        <translation>ZarzÄ 
     287dzaj połĠ
     288czeniami sieciowymi</translation> 
    289289    </message> 
    290290    <message> 
    291291        <source>ZFS Datasets:</source> 
    292         <translation type="unfinished"> 
    293             </translation> 
     292        <translation>Zbiory danych ZFS:</translation> 
    294293    </message> 
    295294    <message> 
  • src-qt4/PCDM/PCDMd

    rb6cbe03 ref691e9  
    4545  setenv XAUTHORITY ${PCDMAUTHFILE} #Set the auth file location 
    4646  touch ${PCDMAUTHFILE} #Create the (empty) authorization file 
    47   xauth add :0 MIT-MAGIC-COOKIE-1 `openssl rand -hex 64` #Add a default entry to the file (randomized) 
     47  xauth -f ${PCDMAUTHFILE} add :0 MIT-MAGIC-COOKIE-1 `openssl rand -hex 64` #Add a  
     48default entry to the file (randomized) 
    4849  if [ -n "$vnccmd" ] ; then 
    4950    # Start VNC 
Note: See TracChangeset for help on using the changeset viewer.