Changeset 31b542d


Ignore:
Timestamp:
11/18/13 16:01:50 (10 months ago)
Author:
git <git@…>
Branches:
master, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3
Children:
3a67109
Parents:
5c9fc8b (diff), 4ceb51a (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 remote-tracking branch 'upstream/master'

Files:
1 added
14 edited

Legend:

Unmodified
Added
Removed
  • build-files/conf/installcd-prunelist

    rb0808996 rbee6419  
    434434usr/local/bin/pc-x* 
    435435usr/local/sbin/pbi* 
     436usr/local/etc/fonts/conf.d/85-wqy.conf 
  • build-files/ports-overlay/graphics/linux-c6-cairo/Makefile

    r635ef28 rfe9cb19  
    2929DOCSDIR=        ${PREFIX}/usr/share/doc/cairo-${PORTVERSION} 
    3030PORTDOCS=       AUTHORS BIBLIOGRAPHY BUGS COPYING COPYING-LGPL-2.1 \ 
    31                 COPYING-MPL-1.1 ChangeLog NEWS PORTING_GUIDE README 
     31                COPYING-MPL-1.1 NEWS README 
    3232 
    33 NO_STAGE=       yes 
    3433.include <bsd.port.mk> 
  • build-files/ports-overlay/security/linux-c6-openssl-compat/Makefile

    r635ef28 rfe9cb19  
    2727DESCR=          ${.CURDIR}/../openssl/pkg-descr 
    2828 
    29 NO_STAGE=       yes 
    3029post-install: 
    31         @cd ${PREFIX}/usr/lib && ${LN} -sf libssl.so.6 libssl.so.7 
     30        ${LN} -sf libssl.so.6 ${STAGEDIR}${PREFIX}/usr/lib/libssl.so.7 
    3231 
    3332.include <bsd.port.mk> 
  • build-files/ports-overlay/www/linux-c6-flashplugin11/Makefile

    r635ef28 r675ff61  
    1717 
    1818ONLY_FOR_ARCHS= amd64 i386 
    19 USE_LINUX_APPS= openssl nspr nss gtk2 alsalib curl 
     19USE_LINUX_APPS= openssl nspr nss gtk2 alsalib curl cyrus-sasl2 
    2020WANT_GNOME=     yes 
    2121 
  • build-files/ports-overlay/www/linux-c6-qt47-webkit/pkg-plist

    r635ef28 r675ff61  
    44usr/lib/qt47/libQtWebKit.so.4.7.2 
    55usr/lib/qt47/plugins/designer/libqwebview.so 
    6 @dirrm usr/lib/qt47/imports/QtWebKit/qmldir 
    76@dirrm usr/lib/qt47/imports/QtWebKit 
    87@dirrmtry usr/lib/qt47/plugins/designer 
  • src-qt4/PCDM/src/pcdm-xprocess.cpp

    ra9ab1d6 r269e8ee  
    175175  environ.insert("PATH",environ.value("PATH")+":"+xhome+"/bin"); // Append the user's home dir to the path 
    176176  environ.insert("LANG",langCode); //Set the proper localized language 
     177  environ.insert("LC_ALL",langCode); //additional localization variable for some DE's 
    177178  environ.insert("MAIL","/var/mail/"+xuser); //Set the mail variable 
    178179  environ.insert("GROUP",xuser); //Set the proper group id 
  • src-qt4/pc-installgui/i18n/SysInstaller_fi.ts

    rf91dfa6 rca5ea40d  
    1414    <message> 
    1515        <source>&amp;Back</source> 
    16         <translation>&amp;Takaisin</translation> 
     16        <translation>&amp;Edellinen</translation> 
    1717    </message> 
    1818    <message> 
     
    2222    <message> 
    2323        <source>Welcome to PC-BSD! Please select your language and click next to continue.</source> 
    24         <translation>Tervetuloa PC-BSD:n pariin. Valitse kielesi ja paina Seuraava jatkaaksesi.</translation> 
     24        <translation>Tervetuloa PC-BSD:n pariin. Valitse asennuskieli ja paina Seuraava jatkaaksesi.</translation> 
    2525    </message> 
    2626    <message> 
     
    7878    <message> 
    7979        <source>Mount:</source> 
    80         <translation>Liitospiste:</translation> 
     80        <translation>Liitos:</translation> 
    8181    </message> 
    8282    <message> 
     
    134134    <message> 
    135135        <source>Display hardware compatibility diagnostic</source> 
    136         <translation type="unfinished"> 
    137             </translation> 
     136        <translation>NÀytÀ laitteiston yhteensopivuus diagnostiikka</translation> 
    138137    </message> 
    139138    <message> 
    140139        <source>System Selection</source> 
    141         <translation type="unfinished"> 
    142             </translation> 
     140        <translation>JÀrjestelmÀn valinta</translation> 
    143141    </message> 
    144142    <message> 
     
    159157    <message> 
    160158        <source>Display help for the current screen</source> 
    161         <translation type="unfinished"> 
    162             </translation> 
     159        <translation>NÀytÀ tÀmÀn nÀkymÀn ohjeet</translation> 
    163160    </message> 
    164161    <message> 
     
    359356    <message> 
    360357        <source>This screen allows you to select the language you wish to perform the install with.</source> 
    361         <translation type="unfinished"> 
    362             </translation> 
     358        <translation>TÀssÀ nÀkymÀssÀ voit valita asennusohjelmassa kÀytetyn kielen.</translation> 
    363359    </message> 
    364360    <message> 
    365361        <source>This screen allows you to select the type of system you wish to install. Clicking customize will allow you to change the selected packages for your system.</source> 
    366         <translation type="unfinished"> 
    367             </translation> 
     362        <translation>TÀssÀ nÀkymÀssÀ voit valita minkÀ tyyppisen jÀrjestelmÀn asennat. Painamalla Muokkaa, voit muokata asennettavia paketteja vielÀ tarkemmin.</translation> 
    368363    </message> 
    369364    <message> 
    370365        <source>This screen will display the currently selected disk options. Clicking customize will allow you to change the target disk, file-systems and more.</source> 
    371         <translation type="unfinished"> 
    372             </translation> 
     366        <translation>TÀssÀ nÀymÀssÀ nÀet miten jÀrjestelmÀ asennetaan levylle. Painamalla Muokkaa, voit muokata levyÀ, jolle asennus tehdÀÀn, tiedostojÀrjestelmÀÀ ja muitakin asetuksia.</translation> 
    373367    </message> 
    374368    <message> 
     
    511505    <message> 
    512506        <source>&amp;Close</source> 
    513         <translation type="unfinished"> 
    514             </translation> 
     507        <translation>&amp;Sulje</translation> 
    515508    </message> 
    516509</context> 
     
    519512    <message> 
    520513        <source>&amp;Close</source> 
    521         <translation type="unfinished"> 
    522             </translation> 
     514        <translation>&amp;Sulje</translation> 
    523515    </message> 
    524516</context> 
     
    527519    <message> 
    528520        <source>Keyboard Settings</source> 
    529         <translation type="unfinished"> 
    530             </translation> 
     521        <translation>NÀppÀimistön asetukset</translation> 
    531522    </message> 
    532523    <message> 
    533524        <source>Key Layout</source> 
    534         <translation type="unfinished"> 
    535             </translation> 
     525        <translation>NÀppÀinasettelu</translation> 
    536526    </message> 
    537527    <message> 
    538528        <source>Variant</source> 
    539         <translation type="unfinished"> 
    540             </translation> 
     529        <translation>Muunnos</translation> 
    541530    </message> 
    542531    <message> 
    543532        <source>Keyboard Model</source> 
    544         <translation type="unfinished"> 
    545             </translation> 
     533        <translation>NÀppÀimistön malli</translation> 
    546534    </message> 
    547535    <message> 
    548536        <source>( you may type into the space below to test your selected settings. )</source> 
    549         <translation type="unfinished"> 
    550             </translation> 
     537        <translation>( voit kirjoittaa alla olevaan tilaan testataksesi asetusia )</translation> 
    551538    </message> 
    552539    <message> 
    553540        <source>&amp;Apply</source> 
    554         <translation type="unfinished"> 
    555             </translation> 
     541        <translation>&amp;KÀytÀ</translation> 
    556542    </message> 
    557543    <message> 
    558544        <source>&amp;Close</source> 
    559         <translation type="unfinished"> 
    560             </translation> 
     545        <translation>&amp;Sulje</translation> 
    561546    </message> 
    562547</context> 
     
    565550    <message> 
    566551        <source>This wizard will walk you through the disk setup process. Please choose the setup mode you wish to use.</source> 
    567         <translation type="unfinished"> 
    568             </translation> 
     552        <translation>TÀmÀ avustaja kuljettaa sinut levyn asetusten valintaprosessin lÀpi. Ole hyvÀ, ja valitse missÀ moodissa haluat avustajan toimivan.</translation> 
    569553    </message> 
    570554    <message> 
    571555        <source>Setup Mode</source> 
    572         <translation type="unfinished"> 
    573             </translation> 
     556        <translation>Asennus moodi</translation> 
    574557    </message> 
    575558    <message> 
    576559        <source>Basic (New to BSD or disk partitioning)</source> 
    577         <translation type="unfinished"> 
    578             </translation> 
     560        <translation>Perus (Uusi BSD:n kÀyttÀjÀ tai levyn partitioimisessa)</translation> 
    579561    </message> 
    580562    <message> 
    581563        <source>Advanced (Experienced with file-systems)</source> 
    582         <translation type="unfinished"> 
    583             </translation> 
     564        <translation>Edistynyt (TiedostojÀrjestelmÀt ovat tuttuja)</translation> 
    584565    </message> 
    585566    <message> 
    586567        <source>FreeBSD Experts (CLI manual mode)</source> 
    587         <translation type="unfinished"> 
    588             </translation> 
     568        <translation>FreeBSD expertti (KomentoriviÀ kÀyttÀen)</translation> 
    589569    </message> 
    590570    <message> 
    591571        <source>Selected Disk</source> 
    592         <translation type="unfinished"> 
    593             </translation> 
     572        <translation>Valitty levy</translation> 
    594573    </message> 
    595574    <message> 
    596575        <source>Selected Partition</source> 
    597         <translation type="unfinished"> 
    598             </translation> 
     576        <translation>Valittu partitio</translation> 
    599577    </message> 
    600578    <message> 
    601579        <source>Partition disk with GPT</source> 
    602         <translation type="unfinished"> 
    603             </translation> 
     580        <translation>Tee GPT paritiointi</translation> 
    604581    </message> 
    605582    <message> 
    606583        <source>Below you may adjust the file-system mount points. For most users the defaults will work best. </source> 
    607         <translation type="unfinished"> 
    608             </translation> 
     584        <translation>Alla voit muokata tiedostojÀrjestelmÀn liitospisteitÀ. Useimmille kÀyttÀjille oletusasetukset toimivat parhaiten.</translation> 
    609585    </message> 
    610586    <message> 
    611587        <source>&amp;Add</source> 
    612         <translation type="unfinished"> 
    613             </translation> 
     588        <translation>&amp;LisÀÀ</translation> 
    614589    </message> 
    615590    <message> 
    616591        <source>&amp;Remove</source> 
    617         <translation type="unfinished"> 
    618             </translation> 
     592        <translation>&amp;Poista</translation> 
    619593    </message> 
    620594    <message> 
    621595        <source>You have chosen Expert mode. In this mode you are able to launch a terminal window and use the command-line to manually partition your disk. When you are finished, make sure to mount your filesystems to /mnt to begin the installation. </source> 
    622         <translation type="unfinished"> 
    623             </translation> 
     596        <translation>Olet valinnut experteille suunnatun kÀyttötilan. TÀssÀ kÀyttötilassa voit kÀynnistÀÀ komentorivin ja antaa partitointikomennot kÀsin. Kun olet valmis, varmista ettÀ olet liittÀnyt tiedostojÀrjestelmÀn liitospisteeseen /mnt ennen asennuksen aloittamista.</translation> 
    624597    </message> 
    625598    <message> 
    626599        <source>&amp;Launch terminal</source> 
    627         <translation type="unfinished"> 
    628             </translation> 
     600        <translation>&amp;KÀynnistÀ komentorivi</translation> 
    629601    </message> 
    630602    <message> 
    631603        <source>Please check the disk summary below and click finish to save your settings. </source> 
    632         <translation type="unfinished"> 
    633             </translation> 
     604        <translation>Ole hyvÀ, ja tarkista alla oleva levyn yhteenveto. Paina Lopeta tallentaaksesi asetukset.</translation> 
    634605    </message> 
    635606    <message> 
    636607        <source>Use entire disk</source> 
    637         <translation type="unfinished"> 
    638             </translation> 
     608        <translation>KÀytÀ levy kokonaan</translation> 
    639609    </message> 
    640610    <message> 
    641611        <source>ZFS Mounts</source> 
    642         <translation type="unfinished"> 
    643             </translation> 
     612        <translation>ZFS Liitokset</translation> 
    644613    </message> 
    645614    <message> 
     
    650619    <message> 
    651620        <source>Resizing</source> 
    652         <translation type="unfinished"> 
    653             </translation> 
     621        <translation>Muokkaa kokoa</translation> 
    654622    </message> 
    655623    <message> 
    656624        <source>Remove mount-point</source> 
    657         <translation type="unfinished"> 
    658             </translation> 
     625        <translation>Poista liitospiste</translation> 
    659626    </message> 
    660627    <message> 
    661628        <source>Are you sure you want to remove this mount point?</source> 
    662         <translation type="unfinished"> 
    663             </translation> 
     629        <translation>Oletko varma, ettÀ haluat poistaa tÀmÀn liitospisteen?</translation> 
    664630    </message> 
    665631    <message> 
    666632        <source>Enter mount-point</source> 
    667         <translation type="unfinished"> 
    668             </translation> 
     633        <translation>Kirjoita liitospiste</translation> 
    669634    </message> 
    670635    <message> 
    671636        <source>Please enter the new mount-point:</source> 
    672         <translation type="unfinished"> 
    673             </translation> 
     637        <translation>Ole hyvÀ, ja kirjoita uusi liitospiste:</translation> 
    674638    </message> 
    675639    <message> 
    676640        <source>Editing:</source> 
    677         <translation type="unfinished"> 
    678             </translation> 
     641        <translation>Muokkaa:</translation> 
    679642    </message> 
    680643    <message> 
  • src-qt4/port-files/pkg-plist

    re1feeb4 r42ea5b0  
    26922692share/applications/pc-pkgmanager.desktop 
    26932693share/applications/pc-updategui.desktop 
    2694 share/applications/pcgdmconf.desktop 
    26952694share/applications/pc-welcome.desktop 
    26962695share/applications/warden.desktop 
  • src-qt4/xtrafiles/local/bin/flashpluginctl

    r1620346 r5ea4441a  
    1717} 
    1818  
    19 check_file "/usr/local/lib/npapi/linux-f10-flashplugin/libflashplayer.so" "www/linux-f10-flashplugin10" 
     19check_file "/usr/local/lib/browser_plugins/libflashplayer.so" "www/linux-f10-flashplugin10" 
    2020check_file "/usr/local/bin/nspluginwrapper" "www/nspluginwrapper" 
    2121  
     
    3939                kldload linux 
    4040        fi 
    41         nspluginwrapper -i /usr/local/lib/npapi/linux-f10-flashplugin/libflashplayer.so 
     41        nspluginwrapper -i /usr/local/lib/browser_plugins/libflashplayer.so 
    4242        printf "\nFlash Plugin for user '`whoami`' enabled\n\n" 
    4343        ;; 
  • src-sh/pbi-manager10/pbi-manager

    re05c3a9 r0c07acc  
    31613161        fi 
    31623162        if [ -e "${1}/pbi_desc" ] ; then 
    3163                 PBI_DESC="`cat ${1}/pbi_desc | awk 1 ORS='<br>' | sed 's|*|-|g'`" 
     3163                PBI_DESC="`cat ${1}/pbi_desc | awk 1 ORS=' ' | sed 's|  |<br>|g' | sed 's|*|-|g'`" 
    31643164        fi 
    31653165        if [ -e "${1}/pbi_shortdesc" ] ; then 
    3166                 PBI_SHORTDESC="`cat ${1}/pbi_shortdesc | awk 1 ORS='<br>' | sed 's|*|-|g'`" 
     3166                PBI_SHORTDESC="`cat ${1}/pbi_shortdesc | awk 1 ORS=' ' | sed 's|  |<br>|g' | sed 's|*|-|g'`" 
    31673167        fi 
    31683168        if [ -e "${1}/pbi_maintainer" ] ; then 
  • src-sh/pc-extractoverlay/prune-port-files

    r1620346 re3cd77a  
    1818# Remove old xsessions 
    1919/usr/local/share/xsessions/[a-zA-Z]*.desktop 
     20 
     21# Remove font link which causes weird AA issues 
     22/usr/local/etc/fonts/conf.d/85-wqy.conf 
  • src-sh/pc-metapkgmanager/pc-metapkgmanager

    r4f3e4a0 r565a343  
    7979 
    8080        # Lets check for any conflicts doing this install 
    81         check_pkg_conflicts "install -U -F -y $pkgName" 
     81        check_pkg_conflicts "install -FUy $pkgName" 
    8282        if [ $? -ne 0 ] ; then 
    8383                exit 1 
     
    308308 
    309309   # Lets check for any conflicts doing this install 
    310    check_pkg_conflicts "${op} -F $flags" 
     310   check_pkg_conflicts "${op} -FUy $flags" 
    311311   if [ $? -ne 0 ] ; then 
    312312        exit 1 
  • src-sh/pc-updatemanager/pc-updatemanager

    r1211b75 r565a343  
    590590  fi 
    591591 
    592   check_pkg_conflicts "upgrade -U -F -y $1" 
     592  check_pkg_conflicts "upgrade -FUy $1" 
    593593  if [ $? -ne 0 ] ; then 
    594594     exit 1 
  • src-sh/xtrafiles/local/share/pcbsd/bin/pkg

    rc2bb59a r4ceb51a  
    3939   op="$1" 
    4040    
    41    # Make sure we insert some flags we need 
    42    while [ $# -gt 0 ]; do 
    43      if [ $count -gt 0 ] ; then 
    44         # If we are already using -n, we can skip downloading anything 
    45         if [ "$1" = "-n" ] ; then 
    46            pkg $fullopts 
    47            exit $? 
    48         fi 
    49         flags="$flags $1" 
    50      else 
    51         flags="-U -n" 
    52      fi 
    53      count=`expr $count + 1` 
    54      shift 
    55    done 
    56  
    57    # Lets pre-download all packages 
    58    download_cache_packages "pkg $op $flags" 
    59  
    60    # Lets check for any conflicts doing this install 
    61    check_pkg_conflicts "${op} -F $flags" 
    62    if [ $? -ne 0 ] ; then 
    63         exit 1 
    64    fi 
    65  
    6641   # Time to run pkgng and let it do its thing 
    67    pkg $fullopts  
     42   pkg-static $fullopts 
    6843   result=$? 
    6944 
Note: See TracChangeset for help on using the changeset viewer.