Changeset dbe09b6


Ignore:
Timestamp:
11/06/13 08:31:36 (14 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1
Children:
b23bbe0, f8b7298
Parents:
fbbd5c0 (diff), 268e1e8 (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

Location:
src-qt4
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-zmanager/dialogprop.cpp

    r125dbc9 r268e1e8  
    149149 
    150150    tmp.Name="failmode"; 
    151     tmp.Description=tr("Controls the system behavior in the event of catastrophic pool fail‐\n" 
    152                        "ure. This condition is typically a result of a loss of connectivity\n" 
     151    tmp.Description=tr("Controls the system behavior in the event of catastrophic pool failure\n" 
     152                       "This condition is typically a result of a loss of connectivity\n" 
    153153                       "to the underlying storage device(s) or a failure of all devices\n" 
    154                        "within the pool. The behavior of such an event is determined as fol‐\n" 
    155                        "lows:\n\n" 
    156  
    157                        "wait    Blocks all I/O access until the device connectivity is recov‐\n" 
    158                        "        ered and the errors are cleared.  This is the default behav‐\n" 
    159                        "        ior.\n\n" 
    160  
     154                       "within the pool. The behavior of such an event is determined as follows\n" 
     155                       "wait\n" 
     156                       "Blocks all I/O access until the device connectivity is recovered\n" 
     157                       "and the errors are cleared. This is the default behavior\n" 
    161158                       "continue\n" 
    162                        "        Returns EIO to any new write I/O requests but allows reads to\n" 
    163                        "        any of the remaining healthy devices. Any write requests that\n" 
    164                        "        have yet to be committed to disk would be blocked.\n\n" 
    165  
    166                        "panic   Prints out a message to the console and generates a system\n" 
    167                        "        crash dump.\n"); 
     159                       "Returns EIO to any new write I/O requests but allows reads to\n" 
     160                       "any of the remaining healthy devices. Any write requests that\n" 
     161                       "have yet to be committed to disk would be blocked.\n\n" 
     162 
     163                       "panic\n"  
     164                       "Prints out a message to the console and generates a system\n" 
     165                       "crash dump.\n"); 
    168166    tmp.Flags=PROP_ISOPTION; 
    169167    tmp.ValidOptions.clear(); 
  • src-qt4/PCDM/src/pcdm-xprocess.cpp

    rb28c8d9 rfbbd5c0  
    170170  QLocale mylocale; 
    171171  QString langCode = mylocale.name(); 
    172   if( langCode.toLower() == "c" ){} // do nothing extra to it 
    173   else if(!environ.value("MM_CHARSET").isEmpty() ){ langCode.append( "."+environ.value("MM_CHARSET") ); } 
     172  if( langCode.toLower() == "c" ){ langCode = "en_US"; } // default to the US english (PCDM code default), LANG=C causes problems 
     173  if(!environ.value("MM_CHARSET").isEmpty() ){ langCode.append( "."+environ.value("MM_CHARSET") ); } 
    174174  else{ langCode.append(".UTF-8"); } 
    175175  // USER, HOME, and SHELL are set by the "su" login 
Note: See TracChangeset for help on using the changeset viewer.