Author: jerome
Date: 2009-02-11 23:06:26 +0100 (Wed, 11 Feb 2009)
New Revision: 3609
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/Languages.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/messages_en_US.properties
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/messages_es_ES.properties
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/messages_fr_FR.properties
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/messages_it_IT.properties
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/messages_nl_NL.properties
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/Messages.java
Log:
* Cleanup.
* Removed unused messages.
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/Languages.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/Languages.java
2009-02-11 18:39:36 UTC (rev 3608)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/Languages.java
2009-02-11 22:06:26 UTC (rev 3609)
@@ -63,7 +63,7 @@
}
- public String get(String value, String defaultv)
+ private String get(String value, String defaultv)
{
try
{
@@ -87,19 +87,7 @@
*/
public String get(String value)
{
- try
- {
- if(captions != null)
- {
- return captions.getString(value);
- }
- }
- catch(Exception e)
- {
- e.printStackTrace();
- CcCommons.logger.appendError(e.getStackTrace());
- }
- return value;
+ return this.get(value, value);
}
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/messages_en_US.properties
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/messages_en_US.properties
2009-02-11 18:39:36 UTC (rev 3608)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/messages_en_US.properties
2009-02-11 22:06:26 UTC (rev 3609)
@@ -1,14 +1,10 @@
changedLanguageMessage=Please restart the Control Center for the changes to
take effect.
messagesPanesTitle=Control Center notification.
-getFileErrorMessage=Error trying to get this file.
attitunesReadError=An error occured. This attitune cannot be played.
radioNotConnected=Radio connecttion is not detected.\nPlease switch on your
Tux.
dongleNotConnected=The fish dongle is not detected.\nPlease make sure the
dongle is connected.
serverConnectionError=Cannot connect to the Tux Droid software server.\nPlease
make sure it is running and try again.
attituneIndexError=This attitune cannot be found in the index
urlFileError=This gadget or attitune is already installed in the Library.
-urlFromWarning=Warning: this file doesn't come from the 'live with a penguin'
website.
unexcpectedFileFormat=Error: this file is not a gadget or attitune.
-frmeworkNotifictionError= has reported an error.
softwareUpdate=Several gadgets, attitunes or tools have been updated.\nPlease
wait. The Control Center is implementing the new updates.
-corruptedSettings=Your settings.xml file is corrupted and cannot be
removed.\nPlease locate it at \n%s\nand delete the file manually
\ No newline at end of file
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/messages_es_ES.properties
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/messages_es_ES.properties
2009-02-11 18:39:36 UTC (rev 3608)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/messages_es_ES.properties
2009-02-11 22:06:26 UTC (rev 3609)
@@ -1,14 +1,10 @@
changedLanguageMessage=Renicie el Control Center para que los cambios tengan
efecto.
messagesPanesTitle=Notificaciones del Control Center.
-getFileErrorMessage=Error intentando obtener el fichero.
attitunesReadError=Ha ocurrido un error. Este attitune no puede ser
reproducido.
radioNotConnected=No se ha detectado la conexion de radio.\nPor favor encienda
su TUX.
dongleNotConnected=El pez dongle no se ha detectado.\nAsegurese que el dongle
este conectado.
serverConnectionError=No es posible la conexion al software servidor del TUX
Droid.\nSegurese de que este ejecutandose e intentenlo de nuevo.
attituneIndexError=Este attitune no se encuentra en el indice
urlFileError=URL no puede ser abierta. Asegurese que la direccion es correcta\
o que no tiene a instalado este attitune.
-urlFromWarning=Advertencia: este fichero no proviene del sitio web 'live with
a penguin'.
unexcpectedFileFormat=Error: este fichero no es un gadget o un attitune.
-frmeworkNotifictionError= a notificado un error.
softwareUpdate=Some gadget, attitunes or tools have been updated.\nPlease wait
until Control center get new softwares.
-corruptedSettings=Your settings.xml file is corrupted and cannot be
removed.\nPlease locate it at \n%s\nand delete the file manually
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/messages_fr_FR.properties
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/messages_fr_FR.properties
2009-02-11 18:39:36 UTC (rev 3608)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/messages_fr_FR.properties
2009-02-11 22:06:26 UTC (rev 3609)
@@ -1,14 +1,10 @@
changedLanguageMessage=Red�marrez le Centre de Controle pour prendre en compte
ces changements.
messagesPanesTitle=Notification du Centre de contr�le.
-getFileErrorMessage=Impossible de d�placer ce fichier.
attitunesReadError=Une erreur est survenue, impossible de lire cette attitune.
radioNotConnected=Aucune connexion radio trouv�e.
dongleNotConnected=Le dongle ne semble pas �tre connect�.
serverConnectionError=Impossible de se connecter au serveur TuxDroid. Assurez
vous qu'il soit d�marr�
attituneIndexError=Impossible de trouver une attitune � cet index.
urlFileError=Ce gadget/attitune est d�j� install� dans la librairie.
-urlFromWarning=Attention, ce fichier ne provient pas de 'live with a penguin'.
unexcpectedFileFormat=Erreur, ce fichier n'est ni un gadget, ni une attitune.
-frmeworkNotifictionError= � report� une erreur
softwareUpdate=Quelques gadgets, attitunes ou tools ont �t� mis � jour.\n S'il
vous plait, attendez que le Centre de Controle les r�cup�re.
-corruptedSettings=Votre fichier settings.xml est corrompu et ne peut �tre
supprim�.\nS'il vous plait trouvez le � \n%s\net supprimez ce fichier
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/messages_it_IT.properties
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/messages_it_IT.properties
2009-02-11 18:39:36 UTC (rev 3608)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/messages_it_IT.properties
2009-02-11 22:06:26 UTC (rev 3609)
@@ -1,14 +1,10 @@
changedLanguageMessage=Please restart the Control Center for the changes to
take effect.
messagesPanesTitle=Control Center notification.
-getFileErrorMessage=Error trying to get this file.
attitunesReadError=An error occured. This attitune cannot be played.
radioNotConnected=Radio connecttion is not detected.\nPlease switch on your
Tux.
dongleNotConnected=The fish dongle is not detected.\nPlease make sure the
dongle is connected.
serverConnectionError=Cannot connect to the Tux Droid software server.\nPlease
make sure it is running and try again.
attituneIndexError=This attitune cannot be found in the index
urlFileError=This gadget or attitune is already installed in the Library.
-urlFromWarning=Warning: this file doesn't come from the 'live with a penguin'
website.
unexcpectedFileFormat=Error: this file is not a gadget or attitune.
-frmeworkNotifictionError= has reported an error.
softwareUpdate=Several gadgets, attitunes or tools have been updated.\nPlease
wait. The Control Center is implementing the new updates.
-corruptedSettings=Your settings.xml file is corrupted and cannot be
removed.\nPlease locate it at \n%s\nand delete the file manually
\ No newline at end of file
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/messages_nl_NL.properties
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/messages_nl_NL.properties
2009-02-11 18:39:36 UTC (rev 3608)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/messages_nl_NL.properties
2009-02-11 22:06:26 UTC (rev 3609)
@@ -1,14 +1,10 @@
changedLanguageMessage=De aanpassing wordt pas van kracht eens de Control
Center herstart is.
messagesPanesTitle=Control Center notificatie.
-getFileErrorMessage=Fout bij het ophalen van het bestand.
attitunesReadError=Fout bij het afspelen van de Attitune.
radioNotConnected=Geen radioconnectie gedetecteerd.\nControleer of Tux
aanstaat.
dongleNotConnected=De vis dongle is niet gedetecteerd.\nControleer of de
dongle goed is aangesloten.
serverConnectionError=Kan de Tux Droid software server niet
vinden.\nControleer of de server is gestart en probeer opnieuw.
attituneIndexError=Attitune kan niet gevonden worden in de index.
urlFileError=Deze Gadget of Attitune is al ge�nstalleeerd in de Library.
-urlFromWarning=Waarschuwing! Dit bestand komt niet van de 'live with a
penguin' website.
unexcpectedFileFormat=Foutmelding: Dit bestand is geen gadget of attitune.
-frmeworkNotifictionError= heeft een probleem gemeld.
softwareUpdate=Enkele gadgets, attitunes of tools werden geupdate.\n De
Control Center is deze nu aan het implementeren. Dit kan even duren...
-corruptedSettings=Je settings.xml bestand is corrupt en kan niet worden
verwijderd.\nGelieve het bestand op de volgende locatie handmatig te
verwijderen : \n%s
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/Messages.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/Messages.java
2009-02-11 18:39:36 UTC (rev 3608)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/Messages.java
2009-02-11 22:06:26 UTC (rev 3609)
@@ -34,7 +34,6 @@
//Default values.
private final String changedLanguageEn = "You must restart the Control
Center to let changes take effect";
private final String messageBoxDefaultTitle = "Control Center
notification.";
- private final String fileErrorMessageDefault = "Error trying to get
this file";
private final String attituneReadErrorDefault = "An error occured.
Cannot play this attitunes";
private final String radioErrorMsgDefault = "Radio doesn't seem to be
connected";
private final String dongleErrorMsgDefault = "The fish doesn't seem to
be connected";
@@ -42,9 +41,7 @@
"Cannot connect to the TuxDroid server. Please, make
sure it is started and try again";
private final String indexErrorMsg = "Cannot found attitune at index";
private final String URLError = "Cannot get this URL, please make sure
that the linl is not dead.";
- private final String hostWarning = "Warning, this file don't comes from
tuxisalive website.";
private final String fileTypeError = "Error, this file is not a gadget
or attitune.";
- private final String frameworkError="has reported an error that is,";
public Messages(Locale locale){
String bundle =
"com/tuxdroid/cc/settings/LanguagesSet/messages";
@@ -75,10 +72,6 @@
return this.get("messagesPanesTitle",
this.messageBoxDefaultTitle);
}
- public String getFileErrorMessage(){
- return this.get("getFileErrorMessage",
this.fileErrorMessageDefault);
- }
-
public String getAttituneReadErrorMessage(){
return this.get("attitunesReadError",
this.attituneReadErrorDefault);
}
@@ -103,27 +96,13 @@
return this.get("urlFileError", this.URLError);
}
- public String getHostWarningMessage(){
- return this.get("urlFromWarning", this.hostWarning);
- }
-
public String getErrorFileTypeMessage(){
return this.get("unexcpectedFileFormat", this.fileTypeError);
- }
-
- public String getFrameworkNotificationError(){
- return this.get("frmeworkNotifictionError",
this.frameworkError);
}
public String getSoftwareUpdateMessage()
{
return this.get("softwareUpdate", "Update in progress.");
- }
-
-
- public String getCorruptedSettingsMessage()
- {
- return this.get("corruptedSettings", "Settings file was
corrupted");
}
}
------------------------------------------------------------------------------
Create and Deploy Rich Internet Apps outside the browser with Adobe(R)AIR(TM)
software. With Adobe AIR, Ajax developers can use existing skills and code to
build responsive, highly engaging applications that combine the power of local
resources and data with the reach of the web. Download the Adobe AIR SDK and
Ajax docs to start building applications today-http://p.sf.net/sfu/adobe-com
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
