Permalink
Browse files

Merge branch 'master' of github.com:pcbsd/pcbsd

  • Loading branch information...
2 parents 2a412cf + ab1d5fd commit 61bd3c6f10bc06b04ae183890bc0ca2039f82f8d @kmoore134 kmoore134 committed Nov 13, 2013
Showing with 650 additions and 580 deletions.
  1. +1 −0 retired/pc-gdmconf/pcgdmconf.desktop
  2. +9 −1 src-qt4/PCDM/src/pcdm-backend.cpp
  3. +1 −0 src-qt4/about-gui/about.desktop
  4. +10 −12 src-qt4/about-gui/i18n/AboutGui_lv.ts
  5. +2 −0 src-qt4/pc-bugreport/pcbugreport.desktop
  6. +1 −1 src-qt4/pc-controlpanel/items/de/gnome-alecarte.desktop
  7. +1 −1 src-qt4/pc-controlpanel/items/de/gnome-at-properties.desktop
  8. +1 −1 src-qt4/pc-controlpanel/items/de/gnome-gconf-editor.desktop
  9. +2 −2 src-qt4/pc-controlpanel/items/de/gnome-keybinding-properies.desktop
  10. +2 −0 src-qt4/pc-controlpanel/items/de/gnome-obconf.desktop
  11. +2 −0 src-qt4/pc-controlpanel/items/de/gnome-screensaver.desktop
  12. +72 −72 src-qt4/pc-controlpanel/items/de/gnome-session-properties.desktop
  13. +87 −87 src-qt4/pc-controlpanel/items/de/gnome-window-properties.desktop
  14. +2 −2 src-qt4/pc-controlpanel/items/de/kde-systemsettings.desktop
  15. +1 −0 src-qt4/pc-controlpanel/items/de/lxde-desktop-prefs.desktop
  16. +3 −0 src-qt4/pc-controlpanel/items/de/lxde-lxappearance.desktop
  17. +1 −0 src-qt4/pc-controlpanel/items/de/lxde-xscreensaver.desktop
  18. +2 −2 src-qt4/pc-controlpanel/items/de/xfce-settings-manager.desktop
  19. +1 −1 src-qt4/pc-controlpanel/items/de/xfce-ui-settings.desktop
  20. +1 −1 src-qt4/pc-controlpanel/items/de/xfce-wm-settings.desktop
  21. +2 −2 src-qt4/pc-controlpanel/items/de/xfce-workspaces-settings.desktop
  22. +1 −1 src-qt4/pc-controlpanel/items/de/xfce4-accessibility-settings.desktop
  23. +2 −2 src-qt4/pc-controlpanel/items/de/xfce4-settings-editor.desktop
  24. +93 −93 src-qt4/pc-controlpanel/items/hardware/gnome-keyboard.desktop
  25. +1 −1 src-qt4/pc-controlpanel/items/hardware/gnome-volume-control.desktop
  26. +2 −0 src-qt4/pc-controlpanel/items/hardware/lxde-lxinput.desktop
  27. +2 −0 src-qt4/pc-controlpanel/items/hardware/nvidia-settings.desktop
  28. +31 −30 src-qt4/pc-controlpanel/items/hardware/pc-bluetoothmanager.desktop
  29. +2 −0 src-qt4/pc-controlpanel/items/hardware/pc-soundconfig.desktop
  30. +39 −38 src-qt4/pc-controlpanel/items/hardware/pc-xgui.desktop
  31. +2 −0 src-qt4/pc-controlpanel/items/hardware/pc-zmanager.desktop
  32. +2 −2 src-qt4/pc-controlpanel/items/hardware/system-config-printer.desktop
  33. +1 −1 src-qt4/pc-controlpanel/items/hardware/xfce-keyboard-settings.desktop
  34. +1 −1 src-qt4/pc-controlpanel/items/hardware/xfce-mouse-settings.desktop
  35. +1 −0 src-qt4/pc-controlpanel/items/hardware/xsane.desktop
  36. +41 −40 src-qt4/pc-controlpanel/items/network/pfmanager.desktop
  37. +1 −0 src-qt4/pc-controlpanel/items/software/easypbi.desktop
  38. +1 −0 src-qt4/pc-controlpanel/items/software/pbi-bpm.desktop
  39. +2 −0 src-qt4/pc-controlpanel/items/software/pbi-dbsd-tools.desktop
  40. +1 −0 src-qt4/pc-controlpanel/items/software/pbi-q4wine.desktop
  41. +2 −0 src-qt4/pc-controlpanel/items/software/pbi-wine64cfg.desktop
  42. +2 −0 src-qt4/pc-controlpanel/items/software/pbi-winecfg.desktop
  43. +2 −0 src-qt4/pc-controlpanel/items/system/about.desktop
  44. +1 −1 src-qt4/pc-controlpanel/items/system/gnome-system-log.desktop
  45. +2 −1 src-qt4/pc-controlpanel/items/system/ksystemlog.desktop
  46. +3 −0 src-qt4/pc-controlpanel/items/system/lxde-lxtask.desktop
  47. +1 −0 src-qt4/pc-controlpanel/items/system/pc-checkhw.desktop
  48. +41 −40 src-qt4/pc-controlpanel/items/system/pc-servicemanager.desktop
  49. +1 −0 src-qt4/pc-controlpanel/items/system/webmin.desktop
  50. +2 −0 src-qt4/pc-controlpanel/items/tools/flash-player-properties.desktop
  51. +2 −0 src-qt4/pc-controlpanel/items/tools/pcbugreport.desktop
  52. +1 −0 src-qt4/pc-controlpanel/items/tools/warden.desktop
  53. +1 −0 src-qt4/pc-servicemanager/pc-servicemanager.desktop
  54. +1 −0 src-qt4/pc-welcome/pc-welcome.desktop
  55. +1 −0 src-qt4/xtrafiles/local/share/wallpapers/pcbsd10-default/metadata.desktop
  56. +1 −1 src-sh/pbi-manager10/pbi-manager
  57. +2 −0 src-sh/pc-extractoverlay/ports-overlay/usr/local/share/applications/gksu.desktop
  58. +2 −0 src-sh/pc-extractoverlay/ports-overlay/usr/local/share/applications/kde4/kcmgtk4.desktop
  59. +2 −2 src-sh/pc-extractoverlay/ports-overlay/usr/local/share/applications/system-config-printer.desktop
  60. +1 −1 src-sh/pc-extractoverlay/ports-overlay/usr/local/share/applications/time.desktop
  61. +84 −84 src-sh/pc-extractoverlay/ports-overlay/usr/local/share/xsessions/02gnome.desktop
  62. +1 −0 src-sh/pc-extractoverlay/ports-overlay/usr/local/share/xsessions/03lxde.desktop
  63. +56 −56 src-sh/pc-extractoverlay/ports-overlay/usr/local/share/xsessions/04xfce.desktop
  64. +1 −0 src-sh/pc-extractoverlay/ports-overlay/usr/local/share/xsessions/05icewm.desktop
  65. +1 −0 src-sh/pc-extractoverlay/ports-overlay/usr/local/share/xsessions/08enlightenment.desktop
  66. +1 −0 src-sh/pc-extractoverlay/ports-overlay/usr/local/share/xsessions/14openbox.desktop
  67. +1 −0 src-sh/pc-extractoverlay/ports-overlay/usr/local/share/xsessions/15fluxbox.desktop
  68. +1 −0 src-sh/pc-extractoverlay/ports-overlay/usr/local/share/xsessions/16WindowLab.desktop
  69. +1 −0 src-sh/pc-extractoverlay/ports-overlay/usr/local/share/xsessions/19EvilWM.desktop
  70. +1 −0 src-sh/pc-extractoverlay/ports-overlay/usr/local/share/xsessions/20EDE.desktop
  71. +1 −0 src-sh/pc-extractoverlay/ports-overlay/usr/local/share/xsessions/30xbmc.desktop
@@ -30,6 +30,7 @@ Name[hu]=GDM-beállítás
Name[it]=Configurazione GDM
Name[ja]=GDM の設定
Name[ko]=GDM 설정
+Name[lv]=GDM konfigurācija
Name[mn]=GDM тохиргоо
Name[nl]=GDM-configuratie
Name[pl]=Konfiguracja GDM
@@ -262,6 +262,8 @@ void Backend::loadXSessionsData(){
instXCommentList.clear(); instXIconList.clear();
//Load the default paths/locale
QString xDir = Config::xSessionsDir();
+ QStringList paths = QString(getenv("PATH")).split(":");
+ if(paths.isEmpty()){ paths <<"/usr/local/bin" << "/usr/local/sbin" << "/usr/bin" << "/usr/sbin" << "/bin" << "/sbin"; }
if(!xDir.endsWith("/")){ xDir.append("/"); }
QString xIconDir = Config::xSessionsImageDir();
if(!xIconDir.endsWith("/")){ xIconDir.append("/"); }
@@ -278,7 +280,13 @@ void Backend::loadXSessionsData(){
//Complete file paths if necessary
//if(!tmp[0].startsWith("/")){ tmp[0] = "/usr/local/bin/"+tmp[0]; }
if(!tmp[3].startsWith("/")&&!tmp[3].startsWith(":")&&!tmp[3].isEmpty()){ tmp[3] = xIconDir+tmp[3]; }
- if(!tmp[4].startsWith("/")){ tmp[4] = "/usr/local/bin/"+tmp[4]; }
+ if(!tmp[4].startsWith("/") && !QFile::exists(tmp[4])){
+ for(int p=0; p<paths.length(); p++){
+ if(QFile::exists(paths[p]+"/"+tmp[4])){
+ tmp[4] = paths[p]+"/"+tmp[4];
+ }
+ }
+ }
//Check for valid DE using the "tryexec" line
//this allows for special startup commands on the "exec" line
if(QFile::exists(tmp[4])){
@@ -23,6 +23,7 @@ Name[hr]=O
Name[hu]=Névjegy
Name[it]=A riguardo
Name[ja]=バージョン情報
+Name[lv]=Par
Name[nl]=Over
Name[pl]=O
Name[pt_BR]=Sobre
@@ -5,20 +5,15 @@
<name>MainWindow</name>
<message>
<source>About</source>
- <translation type="unfinished">About</translation>
+ <translation>Par</translation>
</message>
<message>
<source>Version:</source>
<translation>Versija:</translation>
</message>
<message>
<source>&lt;Unknown&gt;</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Host:</source>
- <translation type="unfinished">Host:</translation>
+ <translation>&lt;Unknown&gt;</translation>
</message>
<message>
<source>????</source>
@@ -34,12 +29,11 @@
</message>
<message>
<source>ident</source>
- <translation type="unfinished">
- </translation>
+ <translation type="unfinished">identifikācija</translation>
</message>
<message>
<source>Hardware</source>
- <translation type="unfinished">Detaļas</translation>
+ <translation>Aparatūra</translation>
</message>
<message>
<source>CPU:</source>
@@ -55,7 +49,7 @@
</message>
<message>
<source>Desktop environments:</source>
- <translation>Darbavirsmas vides:</translation>
+ <translation>Darbvirsmas vides:</translation>
</message>
<message>
<source>(Please wait...)</source>
@@ -88,7 +82,7 @@
</message>
<message>
<source>Desktop environments...</source>
- <translation>Darbavirsmas vides...</translation>
+ <translation>Darbvirsmas vides...</translation>
</message>
<message>
<source>PC-BSD CLI utilities:</source>
@@ -98,5 +92,9 @@
<source>PC-BSD UI utilities:</source>
<translation>PC-BSD UI rīki:</translation>
</message>
+ <message>
+ <source>Host:</source>
+ <translation type="unfinished">Resursdators:</translation>
+ </message>
</context>
</TS>
@@ -23,6 +23,7 @@ Name[fr_CA]=PC-BSD outils rapport de bug
Name[hr]=PC-BSD alat za izveštaj o greškama
Name[it]=Strumento di segnalazione dei bug di PC-BSD
Name[ja]=PC-BSD バグ報告ツール
+Name[lv]=PC-BSD kļūdu ziņošanas rīks
Name[nl]=Foutmeldingshulpmiddel voor PC-BSD
Name[pl]=PC-BSD - Narzędzie do raportowania błędów.
Name[pt_BR]=Ferramenta de relatório de erro do PC-BSD
@@ -51,6 +52,7 @@ GenericName[fr_CA]=PC-BSD outils rapport de bug
GenericName[hr]=PC-BSD alat za izveštaj o greškama
GenericName[it]=Strumento di segnalazione dei bug di PC-BSD
GenericName[ja]=PC-BSD バグ報告ツール
+GenericName[lv]=PC-BSD kļūdu ziņošanas rīks
GenericName[nl]=Foutmeldingshulpmiddel voor PC-BSD
GenericName[pl]=PC-BSD - Narzędzie do raportowania błędów.
GenericName[pt_BR]=Ferramenta de relatório de erro do PC-BSD
@@ -159,7 +159,7 @@ Comment[kk]=Бас мәзірде көрсетілген қолданбалар
Comment[kn]=ಮುಖ್ಯ ಪರಿವಿಡಿಯಲ್ಲಿ ಯಾವ ಅನ್ವಯವನ್ನು ತೋರಿಸಬೇಕು ಎಂಬುದನ್ನು ಬದಲಾಯಿಸಿ
Comment[ko]=주메뉴에 보여질 프로그램을 설정
Comment[lt]=Pakeisti programų, rodomų pagrindiniame meniu, sąrašą
-Comment[lv]=Izmainīt kuras programmas ir redzamas galvenajā izvēlnē
+Comment[lv]=Mainīt kuras aplikācijas rādīt galvenajā izvēlnē
Comment[mai]=जकरा मुख्य मेन्यूमे देखाओल गेल अछि अनुप्रयोग केँ बदलू
Comment[mg]=Ovay ireo rindran'asa miseo amin'ny tolotra fototra
Comment[mk]=Променете кои апликации се прикажани во главното мени
@@ -129,7 +129,7 @@ Comment[ja]=ログイン時に有効にするユーザー補助機能を選択
Comment[kn]=ನೀವು ಪ್ರವೇಶಿಸಿದಾಗ ಯಾವ ನಿಲುಕಣಾ ಸವಲತ್ತುಗಳನ್ನು ಶಕ್ತಗೊಳಿಸಬೇಕು ಎಂದು ಆಯ್ಕೆ ಮಾಡಿ
Comment[ko]=로그인할 때 활성화할 접근성 기능을 설정
Comment[lt]=Pasirinkti, kurias pritaikymo neįgaliesiems savybes įjungti prisijungiant
-Comment[lv]=Izvēlieties, kādas pieejamības iespējas aktivizēt, kad jūs pieslēdzaties sistēmai
+Comment[lv]=Izvēlieties kādas pieejamības pazīmes ieslēgt kad jūs piesakāties
Comment[mk]=Изберете која опција за пристапност да биде вклучена кога ќе се најавите
Comment[ml]=ലോഗിന്‍ ചെയ്യമ്പോള്‍ ഏതു് ആക്സസിബിളിറ്റി വിശേഷതയാണു് തെരഞ്ഞെടുക്കേണ്ടതു്
Comment[mn]=Нэвтрэх явцад ашиглагдах хялбар байх боломжуудыг сонгох
@@ -144,7 +144,7 @@ Comment[kn]=ನೇರವಾಗಿ ನಿಮ್ಮ ಸಂಪೂರ್ಣ ಸಂ
Comment[ko]=전체 설정 데이터베이스를 직접 수정
Comment[li]=De ganse kóngfiggerasie-database direk bewirke
Comment[lt]=Tiesiogiai redaguoti visą konfigūracijos duomenų bazę
-Comment[lv]=Pa tiešo rediģē visu konfigurācijas datubāzi
+Comment[lv]=Tieši labot visu jūsu konfigurācijas datubāzi
Comment[mai]=अपन सम्पूर्ण बिन्यास डाटाबेसकेँ सीधे संपादित करू
Comment[mg]=Manova avy hatrany ny soratra fototry ny kirakiranao manontolo
Comment[mk]=Директно изменување на целосната база на конфигурација
@@ -63,7 +63,7 @@ Name[kn]=ಕೀಲಿಮಣೆ ಶಾರ್ಟ್-ಕಟ್‍ಗಳು
Name[ko]=키보드 단축키
Name[ku]=Kurteriyên Klavyeyê
Name[lt]=Klavišų susiejimai
-Name[lv]=Tastatūras saīsnes
+Name[lv]=Klaviatūras saīsnes
Name[mai]=कुंजीपटल शार्टकट
Name[mg]=Hintsin-dàlan'ny kitendry
Name[mk]=Кратенки за тастатурата
@@ -157,7 +157,7 @@ Comment[kn]=ಆಜ್ಞೆಗಳಿಗೆ ಶಾರ್ಟ್-ಕಟ್ ಕೀ
Comment[ko]=명령에 단축키를 할당
Comment[ku]=Kurteriyan li fermanan tayîn bike
Comment[lt]=Priskirti sparčiuosius klavišus komandoms
-Comment[lv]=Piesaistīt komandām saīsņu taustiņus
+Comment[lv]=Nozīmēt īsinājumtaustiņus komandām
Comment[mai]=कमाँड लेल शार्टकट कुँजीसभ नियत करू
Comment[mg]=Hamorona kitendry hitsin-dàlana ho ana baiko
Comment[mk]=Додели кратенки за команди
@@ -29,6 +29,7 @@ Name[id]=Pengatur Konfigurasi Openbox
Name[it]=Gestore della Configurazione di Openbox
Name[ja]=Openbox の設定マネージャー
Name[ko]=Openbox 설정 관리자
+Name[lv]=Openbox konfigurācijas pārvaldnieks
Name[mn]=Опенбокс тохируулга хийх удирдагч
Name[nl]=Openbox configuratiebeheerder
Name[pl]=Konfiguracja Openbox
@@ -68,6 +69,7 @@ Comment[id]=Pengatur konfigurasi Openbox
Comment[it]=Gestore della configurazione di openbox
Comment[ja]=Openbox の設定マネージャー
Comment[ko]=Openbox 설정 관리자
+Comment[lv]=Openbox konfigurācijas pārvaldnieks
Comment[mn]=Опенбокс тохируулга хийх удирдагч
Comment[nl]=Openbox configuratiebeheerder
Comment[pl]=menadżer konfiguracji Openbox
@@ -32,6 +32,7 @@ Name[hu]=Gnome képernyőkímélő beállításai
Name[it]=Preferenze Screensaver Gnome
Name[ja]=Gnome スクリーンセイバーの設定
Name[ko]=그놈 화면 보호기 설정
+Name[lv]=Gnome ekrānsaudzētāja iestatījumi
Name[mn]=ГНОМ дэлгэц хадгалагчийн тохиргоо
Name[nl]=Voorkeuren van GNOME schermbeveiliging
Name[pl]=Ustawienia wygaszacza ekranu Gnome
@@ -67,6 +68,7 @@ Comment[hu]=Gnome asztal képernyőkímélő beállításainak megváltoztatása
Comment[it]=Cambia le impostazioni dello screensaver per il desktop Gnome
Comment[ja]=Gnome デスクトップのスクリーンセイバー設定を変更します
Comment[ko]=그놈 바탕화면의 화면 보호기 설정을 바꿉니다.
+Comment[lv]=Mainīt ekrānsaudzētāja iestatījumus Gnome darbvirsmai
Comment[mn]=ГНОМ горим дахь дэлгэц хадгалагчийн тохиргоог өөрчлөх
Comment[nl]=Verander de schermbeveiligingsinstellingen voor de GNOME-werkomgeving
Comment[pl]=Zmień ustawienia wygaszacza ekranu dla Gnome
Oops, something went wrong.

0 comments on commit 61bd3c6

Please sign in to comment.