[Haiku-commits] r33256 - haiku/trunk/src/preferences/bluetooth

pulkomandy at BerliOS pulkomandy at mail.berlios.de
Wed Sep 23 21:40:39 CEST 2009


Author: pulkomandy
Date: 2009-09-23 21:40:38 +0200 (Wed, 23 Sep 2009)
New Revision: 33256
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=33256&view=rev

Modified:
   haiku/trunk/src/preferences/bluetooth/BluetoothMain.cpp
   haiku/trunk/src/preferences/bluetooth/BluetoothSettingsView.cpp
   haiku/trunk/src/preferences/bluetooth/BluetoothWindow.cpp
   haiku/trunk/src/preferences/bluetooth/ExtendedLocalDeviceView.cpp
   haiku/trunk/src/preferences/bluetooth/InquiryPanel.cpp
   haiku/trunk/src/preferences/bluetooth/RemoteDevicesView.cpp
   haiku/trunk/src/preferences/bluetooth/fr.catkeys
Log:
Should make the bluetooth preflet compile and run better.


Modified: haiku/trunk/src/preferences/bluetooth/BluetoothMain.cpp
===================================================================
--- haiku/trunk/src/preferences/bluetooth/BluetoothMain.cpp	2009-09-23 19:17:35 UTC (rev 33255)
+++ haiku/trunk/src/preferences/bluetooth/BluetoothMain.cpp	2009-09-23 19:40:38 UTC (rev 33256)
@@ -13,6 +13,7 @@
 #include "defs.h"
 
 
+#define TR_CONTEXT "main"
 
 BluetoothApplication::BluetoothApplication(void)
  :	BApplication(BLUETOOTH_APP_SIGNATURE)
@@ -58,7 +59,7 @@
                              "	- Petter H. Juliussen\n"
                              "	- Adrien Destugues\n\n"
                              "Who gave me all the knowledge:\n"
-                             "	- the yellowTAB team", "OK")))->Go();
+                             "	- the yellowTAB team"), TR("Ok")))->Go();
 	
 }
 

Modified: haiku/trunk/src/preferences/bluetooth/BluetoothSettingsView.cpp
===================================================================
--- haiku/trunk/src/preferences/bluetooth/BluetoothSettingsView.cpp	2009-09-23 19:17:35 UTC (rev 33255)
+++ haiku/trunk/src/preferences/bluetooth/BluetoothSettingsView.cpp	2009-09-23 19:40:38 UTC (rev 33256)
@@ -8,8 +8,10 @@
 #include <stdlib.h>
 
 #include <Box.h>
+#include <Catalog.h>
 #include <GridLayoutBuilder.h>
 #include <GroupLayoutBuilder.h>
+#include <Locale.h>
 #include <MenuField.h>
 #include <MenuItem.h>
 #include <PopUpMenu.h>
@@ -23,6 +25,8 @@
 
 #include "defs.h"
 #include "BluetoothWindow.h"
+
+#define TR_CONTEXT "Settings view"
 	
 static const int32 kMsgSetAntialiasing = 'anti';
 static const int32 kMsgSetDeviceClassDesktop = 'sDCd';

Modified: haiku/trunk/src/preferences/bluetooth/BluetoothWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/bluetooth/BluetoothWindow.cpp	2009-09-23 19:17:35 UTC (rev 33255)
+++ haiku/trunk/src/preferences/bluetooth/BluetoothWindow.cpp	2009-09-23 19:40:38 UTC (rev 33256)
@@ -20,6 +20,8 @@
 
 #include "defs.h"
 
+#define TR_CONTEXT "Window"
+
 static const uint32 kMsgSetDefaults = 'dflt';
 static const uint32 kMsgRevert = 'rvrt';
 

Modified: haiku/trunk/src/preferences/bluetooth/ExtendedLocalDeviceView.cpp
===================================================================
--- haiku/trunk/src/preferences/bluetooth/ExtendedLocalDeviceView.cpp	2009-09-23 19:17:35 UTC (rev 33255)
+++ haiku/trunk/src/preferences/bluetooth/ExtendedLocalDeviceView.cpp	2009-09-23 19:40:38 UTC (rev 33256)
@@ -16,6 +16,7 @@
 #include <SpaceLayoutItem.h>
 #include <StringView.h>
 
+#define TR_CONTEXT "Extended local device view"
 
 ExtendedLocalDeviceView::ExtendedLocalDeviceView(BRect frame, LocalDevice* bDevice, uint32 resizingMode, uint32 flags)
  :	BView(frame,"ExtendedLocalDeviceView", resizingMode, flags | B_WILL_DRAW),

Modified: haiku/trunk/src/preferences/bluetooth/InquiryPanel.cpp
===================================================================
--- haiku/trunk/src/preferences/bluetooth/InquiryPanel.cpp	2009-09-23 19:17:35 UTC (rev 33255)
+++ haiku/trunk/src/preferences/bluetooth/InquiryPanel.cpp	2009-09-23 19:40:38 UTC (rev 33256)
@@ -26,6 +26,8 @@
 #include "DeviceListItem.h"
 #include "defs.h"
 
+#define TR_CONTEXT "Inquiry panel"
+
 using Bluetooth::DeviceListItem;
 
 // private funcionaility provided by kit

Modified: haiku/trunk/src/preferences/bluetooth/RemoteDevicesView.cpp
===================================================================
--- haiku/trunk/src/preferences/bluetooth/RemoteDevicesView.cpp	2009-09-23 19:17:35 UTC (rev 33255)
+++ haiku/trunk/src/preferences/bluetooth/RemoteDevicesView.cpp	2009-09-23 19:40:38 UTC (rev 33256)
@@ -22,6 +22,8 @@
 
 #include "RemoteDevicesView.h"
 
+#define TR_CONTEXT "Remote devices"
+
 static const uint32 kMsgAddDevices = 'ddDv';
 static const uint32 kMsgRemoveDevice = 'rmDv';
 static const uint32 kMsgTrustDevice = 'trDv';

Modified: haiku/trunk/src/preferences/bluetooth/fr.catkeys
===================================================================
--- haiku/trunk/src/preferences/bluetooth/fr.catkeys	2009-09-23 19:17:35 UTC (rev 33255)
+++ haiku/trunk/src/preferences/bluetooth/fr.catkeys	2009-09-23 19:40:38 UTC (rev 33256)
@@ -1,50 +1,53 @@
-1	french	x-vnd.Haiku-BluetoothPrefs	698965680
-Defaults	Device View		Défaut
-Refresh LocalDevicesxE2x80xA6	Device View		Rafraîchir LocalDevicesxE2x80xA6
-Scanning progress	Device View		Avancée du balayage
-Discoverable	Device View		Découvrable
-Stop Bluetooth ServicesxE2x80xA6	Device View		Arrêter les services bluetoothxE2x80xA6
-Remove	Device View		Enlever
-As Blocked	Device View		Bloqué
-Always ask	Device View		Toujours demander
-Settings	Device View		Réglages
-As Trusted	Device View		De confiance
-Server	Device View		Serveur
-Check that the bluetooth capabilities of your remote device are activated. Press Inquiry to start scanning. The needed time for the retrieval of the names is unknown, although should not take more than 3 seconds per device. Afterwards you will be able to add them to your main list, where you will be able to pair with them	Device View		Vérifiez que les fonctionalités bluetooth de votre appareil distant sont activées. Appuyez sur Recherche pour lancer un balayage. Le temps nécessaire pour récupérer les noms est inconnu, mais ne devrait pas dépasser 3 secondes par appareil. Ensuite vous pourrez les ajouter à la liste principale, puis vous associer avec eux.
-Identify host as:	Device View		Identifier l'hôte comme :
-Incoming connections policy:	Device View		Attitude pour les connexiosn entrantes :
-There has not been found any bluetooth LocalDevice device registered on the system	Device View		Aucun LocalDevice bluetooth n'est enregistré sur ce système
-Local Devices found on system:	Device View		Appareils locaux trouvés sur le système :
-Only from Trusted devices	Device View		Seulement les appareils de confiance
-Add device to list	Device View		Ajouter l'appareil à la liste
-Inquiry	Device View		Recherche
-Remote Devices	Device View		Appareils distants
-Retrieving name of 	Device View		Récupère le nom de 
-Smart Phone	Device View		Smart Phone
-Identify us as...	Device View		S'identifier comme...
-Scanning completed.	Device View		Balayage complet.
-Show Bluetooth consolexE2x80xA6	Device View		Afficher la console bluetoothxE2x80xA6
-Handheld	Device View		PDA
-15 secs	Device View		15 secs
-Help	Device View		Aide
-Revert	Device View		Défaire
-Start Bluetooth ServicesxE2x80xA6	Device View		Démarrer les serrvices bluetoothxE2x80xA6
-61 secs	Device View		61 secs
-Default Inquiry time:	Device View		Temps de recherche par défaut :
-Connections & Channels listxE2x80xA6	Device View		Liste des canaux et connexionsxE2x80xA6
- seconds	Device View		 secondes
-Policy...	Device View		Attitude...
-Show Name	Device View		Montrer le nom
-Laptop	Device View		Portable
-AboutxE2x80xA6	Device View		À proposxE2x80xA6
+1	french	x-vnd.Haiku-BluetoothPrefs	3058329015
+Handheld	Settings view		Appareil de poche
+Only from Trusted devices	Settings view		Seulement les appareils de confiance
+Refresh LocalDevicesxE2x80xA6	Window		Rafraîchir LocalDevicexE2x80xA6
+Add device to list	Inquiry panel		Ajouter l'appareil à la liste
+Starting scan...	Inquiry panel		Démarrage de la recherche...
+Smart Phone	Settings view		Téléphone
+ seconds	Inquiry panel		 secondes
+Remote Devices	Window		Appareils distants
+Server	Settings view		Serveur
+Default Inquiry time:	Settings view		Temps de requête par défaut:
+Identify host as:	Settings view		Identifier l'hôte comme :
+View	Window		Vue
+Show Bluetooth consolexE2x80xA6	Window		Montrer le terminal bluetoothxE2x80xA6
+Incoming connections policy:	Settings view		Attitude envers les connexions entrantes :
+From all devices	Settings view		Tous les appareils
+RefreshxE2x80xA6	Remote devices		RafraîchirxE2x80xA6
+Connections & Channels listxE2x80xA6	Window		Liste des connexions et canauxxE2x80xA6
+Server	Window		Serveur
+Scanning completed.	Inquiry panel		Recherche complète.
+Start Bluetooth ServicesxE2x80xA6	Window		Démarrer les services bluetoothxE2x80xA6
+Remove	Remote devices		Enlever
+15 secs	Settings view		15 secs
+Policy...	Settings view		Attitude...
+61 secs	Settings view		61 secs
+AddxE2x80xA6	Remote devices		AjouterxE2x80xA6
+Identify us as...	Settings view		S'identifier comme...
+Remaining 	Inquiry panel		Restant 
+Pick LocalDevice...	Settings view		Choisir LocalDevice...
+Defaults	Window		Défauts
+Inquiry	Inquiry panel		Requête
+Desktop	Settings view		Bureau
+Revert	Window		Défaire
+AboutxE2x80xA6	Window		À proposxE2x80xA6
+Remote Devices ListxE2x80xA6	Window		Liste d'appareils distantsxE2x80xA6
+Laptop	Settings view		Portable
+Retrieving name of 	Inquiry panel		Récupérer le nom de 
+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
+As Blocked	Remote devices		Comme bloqué
 Service Classes: 	Device View		Classes de services: 
-Remaining 	Device View		Restant 
-Pick LocalDevice...	Device View		Sélectionner LocalDevice...
-Remote Devices ListxE2x80xA6	Device View		Liste des appareils distantsxE2x80xA6
-RefreshxE2x80xA6	Device View		RafraîchirxE2x80xA6
-AddxE2x80xA6	Device View		AjouterxE2x80xA6
-View	Device View		Vue
-Desktop	Device View		Bureau
-Retrieving names...	Device View		Récupération des noms...
-Starting scan...	Device View		Début du balayage...
-From all devices	Device View		Depuis tous les appareils
+Stop Bluetooth ServicesxE2x80xA6	Window		Arrêter les services bluetoothxE2x80xA6
+Settings	Window		Paramètres
+Check that the bluetooth capabilities of your remote device are activated. Press Inquiry to start scanning. The needed time for the retrieval of the names is unknown, although should not take more than 3 seconds per device. Afterwards you will be able to add them to your main list, where you will be able to pair with them	Inquiry panel		Vérifiez que les fonctionnalités bluetooth de votre appareil distant sont activées. Appuyez sur "Requête" pour lancer la recherche. Le temps nécessaire pour récupérer les noms n'est pas connu, mais ça ne devrait pas prendre plus de 3 secondes par appareil. Ensuite vous pourrez les ajouter à la liste principale, où vous pourrez vous associer avec eux.
+Scanning progress	Inquiry panel		Avancée de la recherche
+Always ask	Settings view		Toujours demander
+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- Jörg 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 l'aide de :\n\t- Mika Lindqvist\n\t- Maksym Yevmenkin\n\nMerci à tous ceux qui ont aidé...\n\nEnvoi.don 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\nÉconomiquement:\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\nAvec des patches:\n\t- Michael Weirauch\n\t- Fredrik Ekdahl\n\t- Raynald Lesieur\n\t- Andreas Färber\n\t- Jörg Meyer\nTesting:\n\t- Petter H. Juliussen\n\t- Adrien Destugues\n\nQui m'ont tout appris:\n\t- l'équipe yellowTAB
+Retrieving names...	Inquiry panel		Récupération des noms...
+Help	Window		Aide
+Ok	main		Ok
+There has not been found any bluetooth LocalDevice device registered on the system	Inquiry panel		Aucun matériel bluetooth trouvé sur le système
+Show Name	Extended local device view		Montrer le nom




More information about the Haiku-commits mailing list