Changeset 66f9603


Ignore:
Timestamp:
06/04/13 06:26:44 (18 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1
Children:
408fff7
Parents:
c9e754c (diff), 4be6e6e (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/newModuleDialog.cpp

    r1620346 r9209fef  
    11#include "newModuleDialog.h" 
    22#include "ui_newModuleDialog.h" 
     3#include <QDir> 
    34#include <QDebug> 
    45 
     
    3536  }else if(ui->radio_local->isChecked() ){ 
    3637    moduleType="local"; 
    37     moduleData = ui->line_sources->text(); 
     38    moduleData = ui->line_sources->text().replace("~",QDir::homePath()); 
    3839  }else{ 
    3940    moduleType.clear(); moduleData.clear(); 
    4041  } 
    41   moduleIcon = ui->line_icon->text(); 
    42   if(moduleIcon.isEmpty()){ moduleIcon = ui->line_icon->placeholderText(); } 
     42  moduleIcon = ui->line_icon->text().replace("~",QDir::homePath()); 
     43  if(moduleIcon.isEmpty()){ moduleIcon = ui->line_icon->placeholderText().replace("~",QDir::homePath()); } 
    4344  //Now close the UI 
    4445  this->close(); 
     
    8687  if(Sel.isEmpty()){return;} //action cancelled or closed        
    8788  else{ 
    88     ui->line_sources->setText(Sel); 
     89    ui->line_sources->setText(Sel.replace(QDir::homePath(),"~")); 
    8990  } 
    9091} 
     
    100101 
    101102void NewModuleDialog::setDefaultIconFile(QString icon){ 
    102   ui->line_icon->setPlaceholderText(icon); 
     103  ui->line_icon->setPlaceholderText(icon.replace(QDir::homePath(),"~")); 
    103104} 
  • src-qt4/libpcbsd/ui/i18n/libpcbsd_el.ts

    r7eb8911 r4be6e6e  
    66        <message> 
    77            <source>Dialog</source> 
    8             <translation type="unfinished"> 
    9             </translation> 
     8            <translation>Διάλογος            </translation> 
    109        </message> 
    1110        <message> 
     
    1918        <message> 
    2019            <source>System-Packages</source> 
    21             <translation type="unfinished"> 
    22             </translation> 
     20            <translation>Πακέτα σϠ
     21στήΌατος</translation> 
    2322        </message> 
    2423        <message> 
  • src-qt4/pc-firstbootgui/i18n/FirstBoot_el.ts

    r7eb8911 r4be6e6e  
    6161        <message> 
    6262            <source>Name</source> 
    63             <translation type="unfinished"> 
    64             </translation> 
     63            <translation>ΌΜοΌα</translation> 
    6564        </message> 
    6665        <message> 
  • src-sh/xtrafiles/local/share/pcbsd/conf/pcbsd-mirrors

    r538d2cc rc9e754c  
    2929http://ftp.free.org/pub/PC-BSD 
    3030http://stingray.cyber.net.pk/pub/pcbsd 
     31ftp://pcbsd.iqm.unicamp.br/pub/pcbsd 
     32http://mirror.klaus.priv.at/pub/PCBSD 
    3133ftp://ftp.isc-germany.biz/mirror/PcBSD.org 
Note: See TracChangeset for help on using the changeset viewer.