[prev in list] [next in list] [prev in thread] [next in thread] 

List:       haiku-commits
Subject:    [Haiku-commits] r33375 - in haiku/trunk/src/preferences: appearance
From:       pulkomandy at BerliOS <pulkomandy () mail ! berlios ! de>
Date:       2009-09-30 21:03:21
Message-ID: 200909302103.n8UL3LTJ018040 () sheep ! berlios ! de
[Download RAW message or body]

Author: pulkomandy
Date: 2009-09-30 23:03:20 +0200 (Wed, 30 Sep 2009)
New Revision: 33375
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=33375&view=rev

Modified:
   haiku/trunk/src/preferences/appearance/APRMain.cpp
   haiku/trunk/src/preferences/appearance/APRMain.h
   haiku/trunk/src/preferences/bluetooth/BluetoothMain.cpp
   haiku/trunk/src/preferences/bluetooth/BluetoothMain.h
   haiku/trunk/src/preferences/bluetooth/BluetoothWindow.cpp
   haiku/trunk/src/preferences/bluetooth/fr.catkeys
Log:
-Fixed bluetooth and appearance preflet. The catalog need to stay in memory as it can \
                be used after the window construction.
-Re enabled the translation of the About alert in bluetooth, as it now works fine. \
                This means you have to update the bluetooth cataogs...
-Updated the french bluetooth catalog accordingly.


Modified: haiku/trunk/src/preferences/appearance/APRMain.cpp
===================================================================
--- haiku/trunk/src/preferences/appearance/APRMain.cpp	2009-09-30 20:26:42 UTC (rev \
                33374)
+++ haiku/trunk/src/preferences/appearance/APRMain.cpp	2009-09-30 21:03:20 UTC (rev \
33375) @@ -18,7 +18,6 @@
 {
 	// Do this now because we need to call BWindow constructor with a translated
 	// string.
-	BCatalog cat;
 	be_locale->GetAppCatalog(&cat);
 
 	fWindow = new APRWindow(BRect(100, 100, 550, 420));

Modified: haiku/trunk/src/preferences/appearance/APRMain.h
===================================================================
--- haiku/trunk/src/preferences/appearance/APRMain.h	2009-09-30 20:26:42 UTC (rev \
                33374)
+++ haiku/trunk/src/preferences/appearance/APRMain.h	2009-09-30 21:03:20 UTC (rev \
33375) @@ -20,6 +20,7 @@
 private:
 	
 	APRWindow *fWindow;
+	BCatalog cat;
 };
 
 #endif

Modified: haiku/trunk/src/preferences/bluetooth/BluetoothMain.cpp
===================================================================
--- haiku/trunk/src/preferences/bluetooth/BluetoothMain.cpp	2009-09-30 20:26:42 UTC \
                (rev 33374)
+++ haiku/trunk/src/preferences/bluetooth/BluetoothMain.cpp	2009-09-30 21:03:20 UTC \
(rev 33375) @@ -18,7 +18,6 @@
 BluetoothApplication::BluetoothApplication(void)
  :	BApplication(BLUETOOTH_APP_SIGNATURE)
 {
-	BCatalog cat;
 	be_locale->GetAppCatalog(&cat);
 
 	fWindow = new BluetoothWindow(BRect(100, 100, 550, 420));
@@ -30,7 +29,7 @@
 BluetoothApplication::AboutRequested()
 {
 	
-	(new BAlert("about", /*TR*/("Haiku Bluetooth System, (ARCE)\n\n"
+	(new BAlert("about", TR("Haiku Bluetooth System, (ARCE)\n\n"
                              "Created by Oliver Ruiz Dorantes\n\n"
                              "With support of:\n"
                              "	- Mika Lindqvist\n"
@@ -59,7 +58,7 @@
                              "	- Petter H. Juliussen\n"
                              "	- Adrien Destugues\n\n"
                              "Who gave me all the knowledge:\n"
-                             "	- the yellowTAB team"), /*TR*/("Ok")))->Go();
+                             "	- the yellowTAB team"), TR("Ok")))->Go();
 	
 }
 

Modified: haiku/trunk/src/preferences/bluetooth/BluetoothMain.h
===================================================================
--- haiku/trunk/src/preferences/bluetooth/BluetoothMain.h	2009-09-30 20:26:42 UTC \
                (rev 33374)
+++ haiku/trunk/src/preferences/bluetooth/BluetoothMain.h	2009-09-30 21:03:20 UTC \
(rev 33375) @@ -19,6 +19,7 @@
 	
 private:
 	BluetoothWindow *fWindow;
+	BCatalog cat;
 
 };
 

Modified: haiku/trunk/src/preferences/bluetooth/BluetoothWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/bluetooth/BluetoothWindow.cpp	2009-09-30 20:26:42 UTC \
                (rev 33374)
+++ haiku/trunk/src/preferences/bluetooth/BluetoothWindow.cpp	2009-09-30 21:03:20 UTC \
(rev 33375) @@ -33,7 +33,7 @@
 
 
 BluetoothWindow::BluetoothWindow(BRect frame)
- :	BWindow(frame, "Bluetooth", B_TITLED_WINDOW,
+ :	BWindow(frame, TR("Bluetooth"), B_TITLED_WINDOW,
  		B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS,
  		B_ALL_WORKSPACES)
 {

Modified: haiku/trunk/src/preferences/bluetooth/fr.catkeys
===================================================================
--- haiku/trunk/src/preferences/bluetooth/fr.catkeys	2009-09-30 20:26:42 UTC (rev \
                33374)
+++ haiku/trunk/src/preferences/bluetooth/fr.catkeys	2009-09-30 21:03:20 UTC (rev \
33375) @@ -1,4 +1,4 @@
-1	french	x-vnd.Haiku-BluetoothPrefs	2566651844
+1	french	x-vnd.Haiku-BluetoothPrefs	406799883
 About…	Window		À propos…
 Handheld	Settings view		Appareil de poche
 Only from Trusted devices	Settings view		Seulement les appareils de confiance
@@ -22,6 +22,7 @@
 15 secs	Settings view		15 secs
 Policy...	Settings view		Attitude...
 61 secs	Settings view		61 secs
+Haiku Bluetooth System, (ARCE)\n\nCreated by Oliver Ruiz Dorantes\n\nWith support \
of:\n\t- Mika Lindqvist\n\t- Maksym Yevmenkin\n\nThanks to the individuals who \
helped...\n\nShipping/donating hardware:\n\t- Henry Jair Abril Florez(el \
Colombian)\n\t\t & Stefanie Bartolich\n\t- Edwin Erik Amsler\n\t- Dennis \
d'Entremont\n\t- Luroh\n\t- Pieter Panman\n\nEconomically:\n\t- Karl vom Dorff, \
Andrea Bernardi (OSDrawer),\n\t- Matt M, Doug F, Hubert H,\n\t- Sebastian B, Andrew \
M, Jared E,\n\t- Frederik H, Tom S, Ferry B,\n\t- Greg G, David F, Richard S, Martin \
W:\n\nWith patches:\n\t- Michael Weirauch\n\t- Fredrik Ekdahl\n\t- Raynald \
Lesieur\n\t- Andreas Färber\n\t- Joerg Meyer\nTesting:\n\t- Petter H. Juliussen\n\t- \
Adrien Destugues\n\nWho gave me all the knowledge:\n\t- the yellowTAB \
team	main		Système Bluetooth Haiku, (ARCE)\n\nCréé par Oliver Ruiz \
Dorantes\n\nAvec le soutien de :\n\t- Mika Lindqvist\n\t- Maksym Yevmenkin\n\nMerci à \
toutes les personnes qui ont aidé...\n\nDon!  s de matériel :\n\t- Henry Jair Abril \
Florez(el Colombian)\n\t\t & Stefanie Bartolich\n\t- Edwin Erik Amsler\n\t- Dennis \
d'Entremont\n\t- Luroh\n\t- Pieter Panman\n\nFinancièrement :\n\t- Karl vom Dorff, \
Andrea Bernardi (OSDrawer),\n\t- Matt M, Doug F, Hubert H,\n\t- Sebastian B, Andrew \
M, Jared E,\n\t- Frederik H, Tom S, Ferry B,\n\t- Greg G, David F, Richard S, Martin \
W:\n\nRustines :\n\t- Michael Weirauch\n\t- Fredrik Ekdahl\n\t- Raynald Lesieur\n\t- \
Andreas Färber\n\t- Joerg Meyer\nTests:\n\t- Petter H. Juliussen\n\t- Adrien \
Destugues\n\nQui m'ont tout appris :\n\t- l'équipe yellowTAB  Identify us \
as...	Settings view		S'identifier comme...  Remaining 	Inquiry panel		Restant 
 Connections & Channels list…	Window		Liste des canaux et connexions…
@@ -32,6 +33,7 @@
 Revert	Window		Défaire
 Laptop	Settings view		Portable
 Retrieving name of 	Inquiry panel		Récupérer le nom de 
+Bluetooth	Window		Bluetooth
 Local Devices found on system:	Settings view		Appareils locaux trouvés sur le \
système :  As Trusted	Remote devices		Comme de confiance
 Discoverable	Extended local device view		Découvrable
@@ -45,6 +47,7 @@
 Remote Devices List…	Window		Liste des appareils distants…
 Retrieving names...	Inquiry panel		Récupération des noms...
 Help	Window		Aide
+Ok	main		Ok
 Add…	Remote devices		Ajouter…
 There has not been found any bluetooth LocalDevice device registered on the \
system	Inquiry panel		Aucun matériel bluetooth trouvé sur le système  Stop \
Bluetooth Services…	Window		Arrêter les services bluetooth…

_______________________________________________
Haiku-commits mailing list
Haiku-commits@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/haiku-commits


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic