Changeset 08aeae3


Ignore:
Timestamp:
04/22/14 05:44:41 (15 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, enter/10, releng/10.0.2, releng/10.0.3, releng/10.1, releng/10.1.1, releng/10.1.2
Children:
59bd6842
Parents:
6c9f62c (diff), 757ca5f (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/EasyPBI/i18n/EasyPBI_de.ts

    rb43bbf0 r757ca5f  
    575575    <message> 
    576576        <source>Tags</source> 
    577         <translation>Marke     </translation> 
     577        <translation>Marke</translation> 
    578578    </message> 
    579579    <message> 
     
    612612    <message> 
    613613        <source>Revision #</source> 
    614         <translation type="unfinished"> 
    615             </translation> 
     614        <translation>Version #</translation> 
    616615    </message> 
    617616    <message> 
  • src-qt4/pc-updatecenter/pkgcontroller.cpp

    rd49234e r4c2de6c  
    419419{ 
    420420    SProgress progress; 
    421     progress.mMessage = tr("Downloading ") + other; 
    422     progress.mProgressMax = size.toInt(); 
    423     progress.mProgressCurr = (int)(size.toFloat() * percent.toFloat() / 100.); 
     421 
     422    static QString last_name; 
     423 
     424    //I can't catch pkg sownload finish event :( I just check file name 
     425    if (last_name != other) 
     426    { 
     427        mCurrentPkgNo++; 
     428        last_name= other; 
     429    } 
     430 
     431    progress.mItemNo = mCurrentPkgNo; 
     432    progress.mItemsCount = mUpdData.mCommonPkgsCount; 
     433    QString No = (mCurrentPkgNo<=mUpdData.mCommonPkgsCount)?QString(tr("[%1 of %2] ").arg(mCurrentPkgNo).arg(progress.mItemsCount)): 
     434                                                           QString("[%1] ").arg(mCurrentPkgNo); 
     435 
     436    size= size.left(size.indexOf(" ")); 
     437    progress.mMessage = No + tr("Downloading ") + other; 
     438    progress.mProgressMax = (int)(size.toFloat()*100); 
     439    progress.mProgressCurr = (int)((float)(progress.mProgressMax) * percent.toFloat() / 100.); 
    424440    progress.mSubstate = eDownload; 
    425441    progress.misCanCancel = true; 
  • src-sh/pc-adctl/scripts/pc-samba

    r1de2a92 r779b7c0  
    6060                        -w -m '+global:preferred master=no' \ 
    6161                        -w -m '+global:inherit acls=yes' \ 
    62                         -w -m '+global:acl compatibility=auto' \ 
    6362                        -w -m '+global:acl check permissions=true' \ 
    6463                        -w -m '+global:acl map full control=true' \ 
  • lumina/lumina-desktop/WMProcess.cpp

    r2f11cb1 r6c9f62c  
    2828  QString cmd = setupWM(); 
    2929  this->start(cmd); 
    30   ssaver->start("xscreensaver --no-splash"); 
     30  ssaver->start("xscreensaver -no-splash"); 
    3131} 
    3232 
Note: See TracChangeset for help on using the changeset viewer.