Permalink
Browse files

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

Conflicts:
	src-qt4/libpcbsd/utils/netif.cpp
  • Loading branch information...
Ken Moore
Ken Moore committed Mar 17, 2014
2 parents bc008ad + a81ef13 commit 15511928455317e0ee6e3b20ea1433bbd7a62825
Showing 591 changed files with 12,420 additions and 10,554 deletions.
@@ -79,6 +79,7 @@ jasperserver_SET=XLS
k3b_SET=SOX NORMALIZE TRANSCODE
kmymoney-kde4_SET=KBANKING OFX
kopete_SET=WEBCAM
+krdc_SET=FREERDP
libreoffice_SET=SYSTRAY
libxine_SET=LIBBLURAY VAAPI WAVPACK SMB XVMC
libxul_UNSET=ALSA
@@ -663,13 +663,11 @@
</message>
<message>
<source>Build PBI (Running)</source>
- <translation type="unfinished">
- </translation>
+ <translation>PBI erstellen (läuft)</translation>
</message>
<message>
<source>Build PBI (Done)</source>
- <translation type="unfinished">
- </translation>
+ <translation>PBI erstellen (beendet)</translation>
</message>
<message>
<source>Shift+S</source>
@@ -685,8 +683,7 @@
</message>
<message>
<source>Pkg Setup</source>
- <translation type="unfinished">
- </translation>
+ <translation>Pkg-Einstellungen</translation>
</message>
<message>
<source>Legacy Port-Build Options (optional)</source>
@@ -703,8 +700,7 @@
</message>
<message>
<source>Make Options</source>
- <translation type="unfinished">
- </translation>
+ <translation>Make-Optionen</translation>
</message>
<message>
<source>Enable %1</source>
@@ -718,38 +714,31 @@
</message>
<message>
<source>&amp;Build PBI</source>
- <translation type="unfinished">
- </translation>
+ <translation>PBI &amp;erstellen</translation>
</message>
<message>
<source>&amp;Cancel Build</source>
- <translation type="unfinished">
- </translation>
+ <translation>Erstellen &amp;abbrechen</translation>
</message>
<message>
<source>&amp;Save Build Log</source>
- <translation type="unfinished">
- </translation>
+ <translation>Erstellungsprotokoll &amp;speichern</translation>
</message>
<message>
<source>&amp;Save Configuration</source>
- <translation type="unfinished">
- </translation>
+ <translation>Konfiguration &amp;speichern</translation>
</message>
<message>
<source>&amp;Change</source>
- <translation type="unfinished">
- </translation>
+ <translation&amp;ndern</translation>
</message>
<message>
<source>&amp;Add File</source>
- <translation type="unfinished">
- </translation>
+ <translation>Datei &amp;hinzufügen</translation>
</message>
<message>
<source>&amp;Delete File</source>
- <translation type="unfinished">
- </translation>
+ <translation>Datei &amp;löschen</translation>
</message>
<message>
<source>&amp;Wrapper Script</source>
@@ -763,58 +752,47 @@
</message>
<message>
<source>&amp;Save</source>
- <translation type="unfinished">
- </translation>
+ <translation>&amp;Speichern </translation>
</message>
<message>
<source>&amp;Add</source>
- <translation type="unfinished">
- </translation>
+ <translation>&amp;Hinzufügen</translation>
</message>
<message>
<source>&amp;Create</source>
- <translation type="unfinished">
- </translation>
+ <translation>&amp;Erstellen</translation>
</message>
<message>
<source>&amp;Remove</source>
- <translation type="unfinished">
- </translation>
+ <translation>E&amp;ntfernen</translation>
</message>
<message>
<source>&amp;Remove Entry</source>
- <translation type="unfinished">
- </translation>
+ <translation>&amp;Eintrag entfernen</translation>
</message>
<message>
<source>&amp;Add Entry</source>
- <translation type="unfinished">
- </translation>
+ <translation>Eintrag &amp;hinzufügen</translation>
</message>
<message>
<source>&amp;File</source>
- <translation type="unfinished">
- </translation>
+ <translation>&amp;Datei</translation>
</message>
<message>
<source>&amp;Configure</source>
- <translation type="unfinished">
- </translation>
+ <translation>&amp;Konfiguration</translation>
</message>
<message>
<source>&amp;Help</source>
- <translation type="unfinished">
- </translation>
+ <translation>&amp;Hilfe</translation>
</message>
<message>
<source>&amp;Settings</source>
- <translation type="unfinished">
- </translation>
+ <translation>&amp;Einstellungen</translation>
</message>
<message>
<source>Free&amp;BSD Ports</source>
- <translation type="unfinished">
- </translation>
+ <translation>Free&amp;BSD-Ports</translation>
</message>
<message>
<source>&amp;PBI Modules</source>
@@ -153,28 +153,23 @@
<name>loginDelay</name>
<message>
<source>Dialog</source>
- <translation type="unfinished">
- </translation>
+ <translation>Dialog</translation>
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;PCDM Automatic Login&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished">
- </translation>
+ <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;PCDM Automyczne logowanie&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<source>%v/%m seconds</source>
- <translation type="unfinished">
- </translation>
+ <translation>%v/%m sekund</translation>
</message>
<message>
<source>Cancel Login</source>
- <translation type="unfinished">
- </translation>
+ <translation>Anuluj logowanie</translation>
</message>
<message>
<source>Login Now</source>
- <translation type="unfinished">
- </translation>
+ <translation>Teraz zaloguj</translation>
</message>
</context>
<context>
@@ -91,18 +91,15 @@
</message>
<message>
<source>&amp;System components...</source>
- <translation type="unfinished">
- </translation>
+ <translation>&amp;System-Komponenten...</translation>
</message>
<message>
<source>&amp;Desktop environments...</source>
- <translation type="unfinished">
- </translation>
+ <translation>&amp;Arbeitsplatz-Umgebungen...</translation>
</message>
<message>
<source>&amp;Close</source>
- <translation type="unfinished">
- </translation>
+ <translation>&amp;Beenden</translation>
</message>
<message>
<source>Utils:</source>
@@ -81,33 +81,27 @@
</message>
<message>
<source>Package set:</source>
- <translation type="unfinished">
- </translation>
+ <translation>Pakettien kokoonpano:</translation>
</message>
<message>
<source>(unstable)</source>
- <translation type="unfinished">
- </translation>
+ <translation>(epävakaa)</translation>
</message>
<message>
<source>&amp;System components...</source>
- <translation type="unfinished">
- </translation>
+ <translation>&amp;Järjestelmän komponentit</translation>
</message>
<message>
<source>&amp;Desktop environments...</source>
- <translation type="unfinished">
- </translation>
+ <translation>&amp;Työpöytäympäristöt</translation>
</message>
<message>
<source>&amp;Close</source>
- <translation type="unfinished">
- </translation>
+ <translation>&amp;Sulje</translation>
</message>
<message>
<source>Utils:</source>
- <translation type="unfinished">
- </translation>
+ <translation>Apuohjelmat:</translation>
</message>
</context>
</TS>
@@ -13,7 +13,7 @@
</message>
<message>
<source>&lt;Unknown&gt;</source>
- <translation>&lt;Unknown&gt;</translation>
+ <translation>Nieznane</translation>
</message>
<message>
<source>Host:</source>
@@ -81,33 +81,27 @@
</message>
<message>
<source>Package set:</source>
- <translation type="unfinished">
- </translation>
+ <translation>Zbiór pakietów:</translation>
</message>
<message>
<source>(unstable)</source>
- <translation type="unfinished">
- </translation>
+ <translation>(niestabilne)</translation>
</message>
<message>
<source>&amp;System components...</source>
- <translation type="unfinished">
- </translation>
+ <translation>&amp;Komponenty systemowe:</translation>
</message>
<message>
<source>&amp;Desktop environments...</source>
- <translation type="unfinished">
- </translation>
+ <translation>&amp;Środowiska graficzne...</translation>
</message>
<message>
<source>&amp;Close</source>
- <translation type="unfinished">
- </translation>
+ <translation>&amp;Zamknij</translation>
</message>
<message>
<source>Utils:</source>
- <translation type="unfinished">
- </translation>
+ <translation>Narzędzia:</translation>
</message>
</context>
</TS>
@@ -537,7 +537,6 @@ void NetworkInterface::wifiQuickConnect(QString SSID, QString netKey, QString De
//Set WEP Defaults
int WEPIndex = 0;
//bool WEPHex = true; //Use Hex WEP key
-
streamout << " key_mgmt=NONE\n";
streamout << " wep_tx_keyidx=" + tmp.setNum(WEPIndex) + "\n";
// Check if we are using a plaintext WEP or not
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>265</width>
- <height>263</height>
+ <height>266</height>
</rect>
</property>
<property name="windowTitle">
@@ -296,7 +296,7 @@
<item>
<widget class="QPushButton" name="push_stop">
<property name="text">
- <string>Stop</string>
+ <string>&amp;Stop</string>
</property>
<property name="icon">
<iconset resource="lPreserve.qrc">
@@ -320,7 +320,7 @@
<item>
<widget class="QPushButton" name="push_finished">
<property name="text">
- <string>Finished</string>
+ <string>&amp;Finished</string>
</property>
<property name="icon">
<iconset resource="lPreserve.qrc">
@@ -198,7 +198,7 @@
<item>
<widget class="QPushButton" name="push_scanNetwork">
<property name="text">
- <string>Scan Network</string>
+ <string>&amp;Scan Network</string>
</property>
<property name="icon">
<iconset resource="lPreserve.qrc">
@@ -431,7 +431,7 @@
<item>
<widget class="QToolButton" name="tool_apply">
<property name="text">
- <string>Apply</string>
+ <string>&amp;Apply</string>
</property>
<property name="icon">
<iconset resource="lPreserve.qrc">
@@ -445,7 +445,7 @@
<item>
<widget class="QToolButton" name="tool_cancel">
<property name="text">
- <string>Cancel</string>
+ <string>&amp;Close</string>
</property>
<property name="icon">
<iconset resource="lPreserve.qrc">
Oops, something went wrong.

0 comments on commit 1551192

Please sign in to comment.