Author: jerome
Date: 2009-02-11 19:39:36 +0100 (Wed, 11 Feb 2009)
New Revision: 3608
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/cc_main.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcInterface.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/PseudoFileBrowser/FileBrowser.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxAttitunesListView.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxAttitunesThumbnailView.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxGadgetsListView.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/IUUIDChecker.java
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/languages_en_US.properties
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/languages_es_ES.properties
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/languages_fr_FR.properties
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/languages_it_IT.properties
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/languages_nl_NL.properties
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/swing/About.java
Log:
* Cleanup.
* Removed some unused strings
* Fixed a translation bug.
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/cc_main.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/cc_main.java
2009-02-11 15:22:12 UTC (rev 3607)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/cc_main.java
2009-02-11 18:39:36 UTC (rev 3608)
@@ -141,7 +141,7 @@
CcCommons.menuTray = new JPopupMenu("A Menu");
final JMenuItem item1 = new
JMenuItem(CcCommons.language.getTrayHideCaption());
- final JMenuItem item2 = new
JMenuItem(CcCommons.language.getTrayExitCaption());
+ final JMenuItem item2 = new
JMenuItem(CcCommons.language.get("exit"));
item2.setIcon(new
ImageIcon(CcCommons.targetClass.getResource("images/close-exit.png")));
item1.setIcon(CcCommons.tray_hide);
@@ -269,8 +269,7 @@
{
JOptionPane.showMessageDialog(null,
CcCommons.language.messages.getServerErrorMessage(),
-
CcCommons.language.getTitle(),
-
JOptionPane.ERROR_MESSAGE);
+
"Tux Droid Control Center", JOptionPane.ERROR_MESSAGE);
CcCommons.logger.append("Cannot get connected to the
Tuxdroid Server", true);
System.exit(0);
}
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcInterface.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcInterface.java
2009-02-11 15:22:12 UTC (rev 3607)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcInterface.java
2009-02-11 18:39:36 UTC (rev 3608)
@@ -259,7 +259,7 @@
jFrame.setSize(764, 497);
jFrame.setPreferredSize(jFrame.getSize());
- jFrame.setTitle(CcCommons.language.getTitle());
+ jFrame.setTitle("Tux Droid Control Center");
jFrame.setIconImage((new
ImageIcon(CcCommons.targetClass.getResource("images/cc.png"))).getImage());
jFrame.setLayout(null);
@@ -707,7 +707,7 @@
popupFileMenu.addSeparator();
final String path =
CcCommons.language.getMenuSubDirectory();
//Add exit menu item that allow to exit application.
- exit = new
JMenuItem(CcCommons.language.getMenuFileExit());
+ exit = new JMenuItem(CcCommons.language.get("exit"));
exit.addMouseListener(new ExitControlListener(this,
fileBrowser, fileMenu,
"doneWhenExit", path + "file.png"));
popupFileMenu.add(exit);
@@ -796,7 +796,7 @@
helpMenu.addMouseMotionListener(new
HandCursorChanger(jContentPane));
//Adding help menus to an "online" menu.
- JMenu online = new
JMenu(CcCommons.language.getOnlineMenuCaption());
+ JMenu online = new
JMenu(CcCommons.language.get("online"));
online.add(onlineFaq);
online.add(reportBug);
online.add(help);
@@ -897,21 +897,21 @@
if(!reachable)
{
JOptionPane.showConfirmDialog(jFrame,
String.format(CcCommons.language.getUnreachableHostMsg(), SelectedIP),
-
CcCommons.language.getTitle(),
JOptionPane.CLOSED_OPTION);
+
"Tux Droid Control Center",
JOptionPane.CLOSED_OPTION);
return;
}
}
catch
(UnknownHostException e)
{
JOptionPane.showConfirmDialog(jFrame,
String.format(CcCommons.language.getUnknownHostMsg(), SelectedIP),
-
CcCommons.language.getTitle(), JOptionPane.CLOSED_OPTION);
+
"Tux Droid Control Center", JOptionPane.CLOSED_OPTION);
return;
}
catch (IOException e)
{
JOptionPane.showConfirmDialog(jFrame,
String.format(CcCommons.language.getUnknownHostMsg(), SelectedIP),
-
CcCommons.language.getTitle(), JOptionPane.CLOSED_OPTION);
+ "Tux Droid
Control Center", JOptionPane.CLOSED_OPTION);
return;
}
@@ -922,7 +922,7 @@
else
{
-
JOptionPane.showConfirmDialog(jFrame, CcCommons.language.getIPBadFormat(),
CcCommons.language.getTitle(),
+
JOptionPane.showConfirmDialog(jFrame, CcCommons.language.getIPBadFormat(), "Tux
Droid Control Center",
JOptionPane.CLOSED_OPTION);
}
}
@@ -1266,7 +1266,7 @@
*/
private JPanel getMenuPanel() {
if (menuPanel == null) {
- titleLabel = new JLabel(CcCommons.language.getTitle());
+ titleLabel = new JLabel("Tux Droid Control Center");
titleLabel.setBounds(new Rectangle(330, 5, 186, 16));
titleLabel.setFont(new Font(CcCommons.fontName,
Font.BOLD, 11));
menuPanel = new JPanel();
@@ -1302,7 +1302,7 @@
jLabelOnline.setBounds(new Rectangle(6, 62, 134, 16));
jLabelOnline.setForeground(Color.white);
jLabelOnline.setIcon(new
ImageIcon(CcCommons.targetClass.getResource("images/arrow_down.png")));
-
jLabelOnline.setText(CcCommons.language.getOnlineTitle());
+ jLabelOnline.setText(CcCommons.language.get("online"));
jLabelOnline.setFont(new Font(CcCommons.fontName,
Font.BOLD, 11));
jLabelLibrary = new JLabel();
@@ -1952,7 +1952,8 @@
}
}
//A gadget selection changed event has been reveived.
- else
if(arg0.getPropertyName().equalsIgnoreCase("Gadget-Selection-Changed")){
+ else
if(arg0.getPropertyName().equalsIgnoreCase("Gadget-Selection-Changed")){
+ System.out.println("value changed");
Vector<Object> readOnly = (Vector<Object>)
arg0.getNewValue();
TuxDegradeeScrollPane paneHelp =
(TuxDegradeeScrollPane)readOnly.get(1);
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/PseudoFileBrowser/FileBrowser.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/PseudoFileBrowser/FileBrowser.java
2009-02-11 15:22:12 UTC (rev 3607)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/PseudoFileBrowser/FileBrowser.java
2009-02-11 18:39:36 UTC (rev 3608)
@@ -393,9 +393,9 @@
private JScrollPane createListView(){
- String[] column_headers =
{CcCommons.language.getGdgAttNameHeader(),
+ String[] column_headers =
{CcCommons.language.get("name"),
CcCommons.language.getGdgAttDescriptionHeader(),
-
CcCommons.language.getAttAuthorHeader()};
+ CcCommons.language.get("author")};
gadgetsListView = new
TuxGadgetsListView(GadgetsDatasToDisplay, GadgetsDatas, column_headers);
return gadgetsListView.getTable();
}
@@ -425,12 +425,12 @@
private JScrollPane createAttitunesView(){
- String[] column_headers =
{CcCommons.language.getGdgAttNameHeader(),
+ String[] column_headers =
{CcCommons.language.get("name"),
CcCommons.language.getAttituneCategoryCaption(),
CcCommons.language.getAttDurationHeader(),
CcCommons.language.getGdgAttDescriptionHeader(),
CcCommons.language.attituneLanguageCaption(),
- CcCommons.language.getAttAuthorHeader()
+ CcCommons.language.get("author")
};
attitunesListView = new
TuxAttitunesListView(column_headers);
JScrollPane scroll = attitunesListView.getTable();
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxAttitunesListView.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxAttitunesListView.java
2009-02-11 15:22:12 UTC (rev 3607)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxAttitunesListView.java
2009-02-11 18:39:36 UTC (rev 3608)
@@ -450,9 +450,10 @@
}
- private String getSelectedDisplayInfos(){
+ private String getSelectedDisplayInfos()
+ {
int index = this.getSelectedIndex();
- String author = CcCommons.language.getAttAuthorHeader() + " : "
+ values[index][5].toString();
+ String author = CcCommons.language.get("author") + " : " +
values[index][5].toString();
String version = CcCommons.language.getAttituneVersionCaption()
+ " : " + values[index][6].toString();
return new String(" " + version + " , " + author);
}
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxAttitunesThumbnailView.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxAttitunesThumbnailView.java
2009-02-11 15:22:12 UTC (rev 3607)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxAttitunesThumbnailView.java
2009-02-11 18:39:36 UTC (rev 3608)
@@ -204,7 +204,7 @@
private String getSelectedDisplayInfos(){
int index = this.getSelectedModelIndex().intValue();
- String author = CcCommons.language.getAttAuthorHeader() + " : "
+ modele.values[index][5].toString();
+ String author = CcCommons.language.get("author") + " : " +
modele.values[index][5].toString();
String version = CcCommons.language.getAttituneVersionCaption()
+ " : " + modele.values[index][6].toString();
return new String(" " + version + " , " + author);
}
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxGadgetsListView.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxGadgetsListView.java
2009-02-11 15:22:12 UTC (rev 3607)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxGadgetsListView.java
2009-02-11 18:39:36 UTC (rev 3608)
@@ -66,6 +66,7 @@
import net.karmaLab.tools.SystemInformation;
+import com.tuxdroid.cc.CcCommons;
import com.tuxdroid.cc.Listener.ColumnHeaderListener;
import com.tuxdroid.cc.Models.FiltreTriModel;
import com.tuxdroid.cc.Models.GadgetsTableModel;
@@ -406,7 +407,7 @@
Object[] vals = this.privatesValues[privatesDatasIndex];
String description = vals[1].toString() +": " + vals[3].toString();
- String about = " Version : " + vals[5].toString() + " Author: " +
+ String about = " "+ CcCommons.language.getAttituneVersionCaption() + "
: " + vals[5].toString() + " "+ CcCommons.language.get("author") + ": " +
vals[2].toString();
JLabel gdgdescription = new JLabel(description);
gdgdescription.setSize(200, 200);
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/IUUIDChecker.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/IUUIDChecker.java
2009-02-11 15:22:12 UTC (rev 3607)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/IUUIDChecker.java
2009-02-11 18:39:36 UTC (rev 3608)
@@ -226,7 +226,7 @@
{
//IUUID has never been registered so create it, and
update gadgets, attitunes, and tools.
JOptionPane.showMessageDialog(null,
CcCommons.language.messages.getSoftwareUpdateMessage(),
-
CcCommons.language.getTitle(), JOptionPane.WARNING_MESSAGE);
+
"Tux Droid Control Center", JOptionPane.WARNING_MESSAGE);
if(this.updateAttitunes)
this.updateAttitunes();
if(this.updateGadgets)
@@ -246,7 +246,7 @@
{
//then IUUID has changed, so update
needed.
JOptionPane.showMessageDialog(null,
CcCommons.language.messages.getSoftwareUpdateMessage(),
-
CcCommons.language.getTitle(), JOptionPane.WARNING_MESSAGE);
+ "Tux Droid Control
Center", JOptionPane.WARNING_MESSAGE);
if(this.updateAttitunes)
this.updateAttitunes();
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 15:22:12 UTC (rev 3607)
+++
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)
@@ -37,7 +37,8 @@
//Messages object.
public Messages messages;
- public Languages(Locale locale){
+ public Languages(Locale locale)
+ {
this.locale = locale;
String bundle =
"com/tuxdroid/cc/settings/LanguagesSet/languages";
try
@@ -62,7 +63,8 @@
}
- private String get(String value, String defaultv){
+ public String get(String value, String defaultv)
+ {
try
{
if(captions != null)
@@ -72,330 +74,320 @@
}
catch(Exception e)
{
+ e.printStackTrace();
CcCommons.logger.appendError(e.getStackTrace());
}
return defaultv;
+ }
+
+ /**
+ * Get specified string value from bundle
+ * @param value : is the wanted string.
+ * @return translated string.
+ */
+ 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;
}
- public String getTitle(){
- return this.get("ccTitle", "TuxDroid Control Center");
- }
-
-
- public String getWelcomeMessage(){
+ public String getWelcomeMessage()
+ {
return this.get("welcomeMessage", "Welcomme to TuxDroid control
center");
}
- public String getMaleSpeaker(){
- return this.get("speaker_male", "Ryan");
- }
-
-
- public String getFemeleSpeaker(){
- return this.get("speaker_female", "Heather");
- }
-
-
- public String getMenuFileAdd(){
- return this.get("menuFileAdd", "Add file to library");
- }
-
-
- public String getMenuFileRemove(){
- return this.get("menuFileRemove", "Remove file from library");
- }
-
-
- public String getMenuFileEdit(){
- return this.get("menuFileEdit", "Edit Attitune playlist");
- }
-
-
- public String getMenuFileCreate(){
- return this.get("menuFileCreate", "Create Attitune playlist");
- }
-
-
- public String getMenuFileExit(){
- return this.get("menuFileExit", "Exit");
- }
-
-
- public String getMenuHelpOnlineHelp(){
+ public String getMenuHelpOnlineHelp()
+ {
return this.get("menuHelpOnlineHelp", "Online help");
}
- public String getMenuHelpOnlineFAQ(){
+ public String getMenuHelpOnlineFAQ()
+ {
return this.get("menuHelpOnlineFaq", "Online FAQ");
}
- public String getMenuHelpReportBug(){
+ public String getMenuHelpReportBug()
+ {
return this.get("menuHelpReportBug", "Report a bug");
}
+
- public String getMenuHelpAbout(){
- return this.get("menuHelpAbout", "About...");
+ public String getMenuHelpAbout()
+ {
+ return this.get("menuHelpAbout", "About");
}
- public String getMenuViewLanguage(){
+ public String getMenuViewLanguage()
+ {
return this.get("menuViewLanguage", "Set language");
}
- public String getMenuViewSpeaker(){
+ public String getMenuViewSpeaker()
+ {
return this.get("menuViewSpeaker", "Set speaker");
}
- public String getMenuViewListView(){
+ public String getMenuViewListView()
+ {
return this.get("menuViewListView", "Show List view");
}
- public String getMenuViewThumbnailView(){
+ public String getMenuViewThumbnailView()
+ {
return this.get("menuViewThumbnailView", "Show thumbnail view");
}
+
- public String getMenuViewShowProperties(){
- return this.get("menuViewShowHide", "Show-Hide properties
panel");
- }
-
- public String getPlaylistsTitle(){
+ public String getPlaylistsTitle()
+ {
return this.get("playlistsTitle", "Playlists");
}
- public String getOnlineTitle(){
- return this.get("onlineTitle", "Online");
- }
- public String getLibraryTitle(){
+ public String getLibraryTitle()
+ {
return this.get("libraryTitle", "Library");
}
- public String getPlaylistsOptNotification(){
- return this.get("playlistsOptNotification", "Notification");
+ public String getPlaylistsOptNotification()
+ {
+ return this.get("playlistsOptNotification", "My Alerts");
}
- public String getPlaylistsOptRemote(){
- return this.get("playlistsOptRemote", "Remote");
+ public String getPlaylistsOptRemote()
+ {
+ return this.get("playlistsOptRemote", "My Favorites");
}
- public String getPanelDescription(){
+ public String getPanelDescription()
+ {
return this.get("panelDescription", "Description");
}
- public String getPanelSummary(){
+ public String getPanelSummary()
+ {
return this.get("panelSummary", "Summary");
}
- public String getPanelConfiguration(){
+ public String getPanelConfiguration()
+ {
return this.get("panelConfiguration", "Configuration");
}
- public String getPanelGadgetConfiguration(){
+ public String getPanelGadgetConfiguration()
+ {
return this.get("panelGadgetConfiguration", "Gadget
Configuration");
}
- public String getPanelHelp(){
+ public String getPanelHelp()
+ {
return this.get("panelHelp", "Help");
}
- public String getPanelAlarm(){
+ public String getPanelAlarm()
+ {
return this.get("panelAttitune", "Attitunes");
}
- public String getGdgAttNameHeader(){
- return this.get("gdgAttNameHeader", "Name");
- }
- public String getGdgAttDescriptionHeader(){
+ public String getGdgAttDescriptionHeader()
+ {
return this.get("gdgAttDescriptionHeader", "Description");
}
- public String getGdgInPlaylistHeader(){
- return this.get("gdgInPlaylistHeader", "In playlist");
- }
- public String getGdgTypeHeader(){
- return this.get("gdgTypeHeader", "Gadget type");
- }
-
- public String getAttAuthorHeader(){
- return this.get("attAuthorHeader", "Author");
- }
-
- public String getAttDurationHeader(){
+ public String getAttDurationHeader()
+ {
return this.get("attDurationHeader", "Duration");
}
- public String getMenuSubDirectory(){
+ public String getMenuSubDirectory()
+ {
return this.get("menuIconDirectory", "/images/en");
}
- public Point getMenuFileLocation(){
+ public Point getMenuFileLocation()
+ {
String x = this.get("menuFilePosX", "0");
int X = Integer.valueOf(x).intValue();
return new Point(X, 0);
}
- public Point getMenuToolLocation(){
+ public Point getMenuToolLocation()
+ {
String x = this.get("menuToolPosX", "0");
int X = Integer.valueOf(x).intValue();
return new Point(X, 0);
}
- public Point getMenuViewLocation(){
+ public Point getMenuViewLocation()
+ {
String x = this.get("menuViewPosX", "0");
int X = Integer.valueOf(x).intValue();
return new Point(X, 0);
}
- public Point getMenuHelpLocation(){
+ public Point getMenuHelpLocation()
+ {
String x = this.get("menuHelpPosX", "0");
int X = Integer.valueOf(x).intValue();
return new Point(X, 0);
}
- public String getIpSelectionCaption(){
+ public String getIpSelectionCaption()
+ {
return this.get("ipSelection", "Select ip");
}
- public String getIpSelectionMessage(){
+ public String getIpSelectionMessage()
+ {
return this.get("ipSelectionEnter", "Enter an ip adress that
wil be used.");
}
- public String showDebuggerCaption(){
+ public String showDebuggerCaption()
+ {
return this.get("showDebugger", "Show Debugger");
}
-
- public String getServiceExecutionCaption(){
- return this.get("executionModelService", "service");
- }
-
- public String getCommandExecutionCaption(){
- return this.get("executionModelCommand", "remote");
- }
-
- public String getUIExecutionModeCaption(){
- return this.get("executionModelUI", "visual");
- }
- public String getChooseActionCaption(){
- return this.get("chooseAnAction", "Choose an action");
- }
- public String[] getRemoteListHeaders(){
+ public String[] getRemoteListHeaders()
+ {
return new String[]{
- this.get("remoteListHeaderName", "Name"),
+ this.get("name"),
this.get("remoteListHeaderType", "Type"),
- this.get("remoteListHeaderAuthor", "Author")
+ this.get("author")
};
}
- public String getTrayHideCaption(){
+ public String getTrayHideCaption()
+ {
return this.get("trayHide", "Hide");
}
- public String getTrayShowCaption(){
+ public String getTrayShowCaption()
+ {
return this.get("trayShow", "Show");
}
- public String getTrayExitCaption(){
- return this.get("trayExit", "Exit");
- }
- public String getCcVersion(){
+ public String getCcVersion()
+ {
return this.get("ccVersion", "Unversionned");
}
- public String getAboutDevelopperCaption(){
+ public String getAboutDevelopperCaption()
+ {
return this.get("aboutDevelopper", "Developper: Jerome Conan");
}
- public String getAboutDevelopperMail(){
- return this.get("aboutDevelopperMail",
"[email protected]");
+ public String getContributors()
+ {
+ return this.get("aboutContributors", "Contributors: ");
}
- public String getContributors(){
- return this.get("aboutContributors", "");
- }
-
- public String getPitchCaptionPlus(){
+ public String getPitchCaptionPlus()
+ {
return this.get("pitchMenuCaptionPlus", "Current: %d up to 10");
}
- public String getPitchCaptionMinder(){
+ public String getPitchCaptionMinder()
+ {
return this.get("pitchMenuCaptionMinder", "Current: %d down to
10");
}
- public String getPitchMenuCaption(){
+ public String getPitchMenuCaption()
+ {
return this.get("pitchMenuCaption", "Pitch setting");
}
- public String getPanelAlertConfTitle(){
+ public String getPanelAlertConfTitle()
+ {
return this.get("alertConfTitle", "Time");
}
- public String getPanelAlertSchedulConfTitle(){
+ public String getPanelAlertSchedulConfTitle()
+ {
return this.get("alertShedulConfTitle", "Alert");
}
- public String getPanelAlertConfMins(){
+ public String getPanelAlertConfMins()
+ {
return this.get("alertConfMins", "minutes");
}
- public String getPanelAlertConfEvery(){
+ public String getPanelAlertConfEvery()
+ {
return this.get("alertConfEvery", "Start every");
}
- public String getPanelAlertConfStartAt(){
+ public String getPanelAlertConfStartAt()
+ {
return this.get("alertConfStartAtTime", "Start at time");
}
- public String getPanelAlertSchedulConfTTS(){
+ public String getPanelAlertSchedulConfTTS()
+ {
return this.get("alertPanelSchedulConfTTS", "TTS Message");
}
- public String getPanelAlertSchedulConfTTSMessages(){
+ public String getPanelAlertSchedulConfTTSMessages()
+ {
return this.get("alertPanelSchedulConTTSMessage", "Something
changed");
}
- public String getPanelAlertSchedulConfStartGdg(){
+ public String getPanelAlertSchedulConfStartGdg()
+ {
return this.get("alertPanelSchedulConStartGdg", "Start Gadget");
}
- public String getToolMenuAdvanced(){
+ public String getToolMenuAdvanced()
+ {
return this.get("menuToolsAdvancedItem", "Advanced");
}
- public String getAttituneCategoryCaption(){
+ public String getAttituneCategoryCaption()
+ {
return this.get("tableCategory", "Category");
}
- public String getAttituneVersionCaption(){
+ public String getAttituneVersionCaption()
+ {
return this.get("attituneVersion", "Version");
}
- public String getEnabledAlert(){
+ public String getEnabledAlert()
+ {
return this.get("alertDisabled", "Disable");
}
- public String attituneLanguageCaption(){
+ public String attituneLanguageCaption()
+ {
return this.get("attituneLanguageCaption", "Language");
}
- public String attituneinvalidTTS(){
+ public String attituneinvalidTTS()
+ {
return this.get("attitunePlayNoTTS", "You do not have this tts
language installed");
}
- public String getOnlineMenuCaption(){
- return this.get("onlineMenuCaption", "Online");
- }
-
public String getUnknownHostMsg()
{
return this.get("unknownHost", "Unknown host %s");
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/languages_en_US.properties
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/languages_en_US.properties
2009-02-11 15:22:12 UTC (rev 3607)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/languages_en_US.properties
2009-02-11 18:39:36 UTC (rev 3608)
@@ -1,10 +1,8 @@
-ccTitle=Tux Droid Control Center
+exit=Exit
+name=Name
+author=Author
+online=Online
welcomeMessage=Welcome to tux control center
-menuFileAdd=Add file to library
-menuFileEdit=Edit Attitune playlist
-menuFileRemove=Remove file from library
-menuFileCreate=Create Attitune playlist
-menuFileExit=Exit
menuHelpOnlineHelp=Online help
menuHelpOnlineFaq=Online FAQ
menuHelpReportBug=Report a bug
@@ -13,9 +11,7 @@
menuViewSpeaker=Voice
menuViewListView=List view
menuViewThumbnailView=Thumbnail view
-menuViewShowHide=Show/Hide properties
playlistsTitle=Live with Tux
-onlineTitle=Online
libraryTitle=Library
playlistsOptNotification=My Alerts
playlistsOptRemote=My Favorites
@@ -25,11 +21,7 @@
panelGadgetConfiguration=Gadget configuration
panelHelp=Help
panelAttitune=Alert settings
-gdgAttNameHeader=Name
gdgAttDescriptionHeader=Description
-gdgInPlaylistHeader=In playlist
-gdgTypeHeader=Gadget type
-attAuthorHeader=Author
attDurationHeader=Duration(sec)
menuIconDirectory=images/en/
menuHelpPosX=130
@@ -39,19 +31,11 @@
ipSelection=Connect to a friend
ipSelectionEnter=Enter the IP address to connect to
showDebugger=Show debugger
-executionModelCommand=remote control
-executionModelUI=visual
-executionModelService=service
-chooseAnAction=Choose an action
-remoteListHeaderName=Name
-remoteListHeaderAuthor=Author
remoteListHeaderType=Type
trayShow=Show
trayHide=Hide
-trayExit=Exit
ccVersion=Control Center V0.2.5
aboutDevelopper=Developer : Conan J�r�me
[email protected]
aboutContributors=Contributors :
pitchMenuCaptionPlus=value + 10
pitchMenuCaptionMinder=value - 10
@@ -67,14 +51,9 @@
alertDisabled=Disable
menuToolsAdvancedItem=Advanced
tableCategory=Category
-onlineMenuCaption=Online
attituneVersion=Version
attituneLanguageCaption=Language
attitunePlayNoTTS=Required TTS language is not installed!
-file=File
-view=View
-tools=Tools
-help=Help
unknownHost="Unknown host %s"
unReachable="Unreachable host %s"
badIpFormat="IP adress must match the following format x.x.x.x"
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/languages_es_ES.properties
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/languages_es_ES.properties
2009-02-11 15:22:12 UTC (rev 3607)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/languages_es_ES.properties
2009-02-11 18:39:36 UTC (rev 3608)
@@ -1,10 +1,8 @@
-ccTitle=Tux Droid Control Center
+exit=Salir
+name=Nombre
+author=Autor
+online=Online
welcomeMessage=Bienvenido al centro de control de TUX
-menuFileAdd=Añadir fichero a la libreria
-menuFileEdit=Editar lista de reproduccion de Attitune
-menuFileRemove=Eliminar fichero de la libreria
-menuFileCreate=Crear lista de reproduccion de Attitune
-menuFileExit=Salir
menuHelpOnlineHelp=Ayuda online
menuHelpOnlineFaq=Online FAQ
menuHelpReportBug=informar un bug
@@ -13,9 +11,7 @@
menuViewSpeaker=Voz
menuViewListView=Vista en lista
menuViewThumbnailView=Vista por iconos
-menuViewShowHide=Mostar/ocultar propiedades
playlistsTitle=Live with Tux
-onlineTitle=Online
libraryTitle=Libreria
playlistsOptNotification=Mis Alertas
playlistsOptRemote=Mis Favoritos
@@ -25,11 +21,7 @@
panelGadgetConfiguration=Gadget configuracion
panelHelp=Ayuda
panelAttitune=Opciones de alertas
-gdgAttNameHeader=Nombre
gdgAttDescriptionHeader=Descricion
-gdgInPlaylistHeader=En lista de repro.
-gdgTypeHeader=Tipo de Gadget
-attAuthorHeader=Autor
attDurationHeader=Duracion(seg)
menuIconDirectory=images/es/
menuHelpPosX=134
@@ -39,19 +31,11 @@
ipSelection=Conectarse a un amigo
ipSelectionEnter=Introduzca la IP a la que quiere conectar
showDebugger=Mostar debugger
-executionModelCommand=control remoto
-executionModelUI=visual
-executionModelService=servicio
-chooseAnAction=Elija una accion
-remoteListHeaderName=Nombre
-remoteListHeaderAuthor=Autor
remoteListHeaderType=Tipo
trayShow=Mostrar
trayHide=Ocultar
-trayExit=Salir
ccVersion=Control Center V0.2.5
aboutDevelopper=Desarrolador : Conan Jerome.
[email protected]
aboutContributors=Colaboradores :
pitchMenuCaptionPlus=valor + 10
pitchMenuCaptionMinder=valor - 10
@@ -67,12 +51,7 @@
alertDisabled=Deshabilitar
menuToolsAdvancedItem=Advanzado
tableCategory=Categoria
-onlineMenuCaption=Online
attituneVersion=Version
attituneLanguageCaption=Idioma
attitunePlayNoTTS=El lenguaje TTS no esta instalado!
-file=Fichero
-view=Vista
-tools=Herramientas
-help=Ayuda
onlineHelpLink=http://www.kysoh.com/documentacion?set_language=es
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/languages_fr_FR.properties
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/languages_fr_FR.properties
2009-02-11 15:22:12 UTC (rev 3607)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/languages_fr_FR.properties
2009-02-11 18:39:36 UTC (rev 3608)
@@ -1,10 +1,8 @@
-ccTitle=Tux Droid Control Center
+exit=Quitter
+name=Nom
+author=Auteur
+online=En ligne
welcomeMessage=bienvenue dans le centre de contr�le.
-menuFileAdd=Ajouter � la librairie
-menuFileEdit=Editer une playliste Attitune
-menuFileRemove=Supprimer de le librairie
-menuFileCreate=Cr�er une playliste Attitune
-menuFileExit=Quitter
menuHelpOnlineHelp=Aide en ligne
menuHelpOnlineFaq=FAQ en ligne
menuHelpReportBug=Reporter un bug
@@ -13,10 +11,8 @@
menuViewSpeaker=Choix du locuteur
menuViewListView=Voir la vue par liste
menuViewThumbnailView=Voir la vue par ic�nes
-menuViewShowHide=Voir/Cacher les propri�t�s
playlistsTitle=Vivre avec Tux
-onlineTitle=En ligne
-libraryTitle=Librairies
+libraryTitle=Librairie
playlistsOptNotification=Mes Alertes
playlistsOptRemote=Mes Favoris
panelDescription=Description
@@ -25,11 +21,7 @@
panelGadgetConfiguration=Configuration du gadget
panelHelp=Aide
panelAttitune=Configuration de l'alarme
-gdgAttNameHeader=Nom
gdgAttDescriptionHeader=Description
-gdgInPlaylistHeader=Dans playliste
-gdgTypeHeader=Type du gadget
-attAuthorHeader=Auteur
attDurationHeader=Dur�e(sec)
menuIconDirectory=images/fr/
menuHelpPosX=164
@@ -39,19 +31,11 @@
ipSelection=Se connecter � un ami
ipSelectionEnter=Entrez l'ip � utiliser.
showDebugger=Debugger
-executionModelCommand=t�l�commande
-executionModelUI=visuel
-executionModelService=service
-chooseAnAction=Choisissez une action.
-remoteListHeaderName=Nom
-remoteListHeaderAuthor=Auteur
remoteListHeaderType=Type
trayShow=Afficher
trayHide=Masquer
-trayExit=Quitter
ccVersion=Centre de contr�le V0.2.5
aboutDevelopper=D�veloppeur : Conan J�r�me
[email protected]
aboutContributors=Contribution :
pitchMenuCaptionPlus=+ 10
pitchMenuCaptionMinder=- 10
@@ -70,11 +54,6 @@
attituneVersion=Version
attituneLanguageCaption=Language
attitunePlayNoTTS=Cette langue tts ne semble pas install�e
-onlineMenuCaption=En ligne
-file=Fichier
-view=Affichage
-tools=Outils
-help=Aide
unknownHost="H�te inconnu"
unReachable="H�te inaccessible"
badIpFormat="L'IP doit �tre dans le format suivant: x.x.x.x"
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/languages_it_IT.properties
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/languages_it_IT.properties
2009-02-11 15:22:12 UTC (rev 3607)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/languages_it_IT.properties
2009-02-11 18:39:36 UTC (rev 3608)
@@ -1,10 +1,8 @@
-ccTitle=Tux Droid Control Center
+exit=Exit
+name=Name
+author=Author
+online=Online
welcomeMessage=Welcome to tux control center
-menuFileAdd=Add file to library
-menuFileEdit=Edit Attitune playlist
-menuFileRemove=Remove file from library
-menuFileCreate=Create Attitune playlist
-menuFileExit=Exit
menuHelpOnlineHelp=Online help
menuHelpOnlineFaq=Online FAQ
menuHelpReportBug=Report a bug
@@ -13,9 +11,7 @@
menuViewSpeaker=Voice
menuViewListView=List view
menuViewThumbnailView=Thumbnail view
-menuViewShowHide=Show/Hide properties
playlistsTitle=Live with Tux
-onlineTitle=Online
libraryTitle=Library
playlistsOptNotification=My Alerts
playlistsOptRemote=My Favorites
@@ -25,11 +21,7 @@
panelGadgetConfiguration=Gadget configuration
panelHelp=Help
panelAttitune=Alert settings
-gdgAttNameHeader=Name
gdgAttDescriptionHeader=Description
-gdgInPlaylistHeader=In playlist
-gdgTypeHeader=Gadget type
-attAuthorHeader=Author
attDurationHeader=Duration(sec)
menuIconDirectory=images/en/
menuHelpPosX=130
@@ -39,19 +31,11 @@
ipSelection=Connect to a friend
ipSelectionEnter=Enter the IP address to connect to
showDebugger=Show debugger
-executionModelCommand=remote control
-executionModelUI=visual
-executionModelService=service
-chooseAnAction=Choose an action
-remoteListHeaderName=Name
-remoteListHeaderAuthor=Author
remoteListHeaderType=Type
trayShow=Show
trayHide=Hide
-trayExit=Exit
ccVersion=Control Center V0.2.5
aboutDevelopper=Developer : Conan J�r�me
[email protected]
aboutContributors=Contributors :
pitchMenuCaptionPlus=value + 10
pitchMenuCaptionMinder=value - 10
@@ -67,14 +51,9 @@
alertDisabled=Disable
menuToolsAdvancedItem=Advanced
tableCategory=Category
-onlineMenuCaption=Online
attituneVersion=Version
attituneLanguageCaption=Language
attitunePlayNoTTS=Required TTS language is not installed!
-file=File
-view=View
-tools=Tools
-help=Help
unknownHost="Unknown host %s"
unReachable="Unreachable host %s"
badIpFormat="IP adress must match the following format x.x.x.x"
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/languages_nl_NL.properties
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/languages_nl_NL.properties
2009-02-11 15:22:12 UTC (rev 3607)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/languages_nl_NL.properties
2009-02-11 18:39:36 UTC (rev 3608)
@@ -1,10 +1,8 @@
-ccTitle=Tux Droid Control Center
+exit=Sluiten
+name=Naam
+author=Auteur
+online=Online
welcomeMessage=Welkom bij Tuks Control Center
-menuFileAdd=Bestand toevoegen aan library
-menuFileEdit=Attitune playlist bewerken
-menuFileRemove=Bestand van library verwijderen
-menuFileCreate=Attitune playlist aanmaken
-menuFileExit=Sluiten
menuHelpOnlineHelp=Online help
menuHelpOnlineFaq=Online FAQ
menuHelpReportBug=Bugs melden
@@ -13,9 +11,7 @@
menuViewSpeaker=Stem
menuViewListView=Lijst weergave
menuViewThumbnailView=Thumbnail weergave
-menuViewShowHide=Eigenschappen tonen/verbergen
playlistsTitle=Leef met Tux
-onlineTitle=Online
libraryTitle=Library
playlistsOptNotification=Mijn Alarmen
playlistsOptRemote=Mijn Favorieten
@@ -25,11 +21,7 @@
panelGadgetConfiguration=Gadget configuratie
panelHelp=Help
panelAttitune=Alarm instellingen
-gdgAttNameHeader=Naam
gdgAttDescriptionHeader=Beschrijving
-gdgInPlaylistHeader=In playlist
-gdgTypeHeader=Gadget type
-attAuthorHeader=Auteur
attDurationHeader=Lengte(sec)
menuIconDirectory=images/nl/
menuHelpPosX=144
@@ -39,19 +31,11 @@
ipSelection=Verbinden met een vriend
ipSelectionEnter=Voer het IP adres in
showDebugger=Debugger tonen
-executionModelCommand=afstandsbediening
-executionModelUI=visueel
-executionModelService=service
-chooseAnAction=Kies een actie
-remoteListHeaderName=Naam
-remoteListHeaderAuthor=Auteur
remoteListHeaderType=Type
trayShow=Tonen
trayHide=Verbergen
-trayExit=Sluiten
ccVersion=Control Center V0.2.5
aboutDevelopper=Developer : Conan J�r�me.
[email protected]
aboutContributors=Medewerkers :
pitchMenuCaptionPlus=Huidige toonhoogte + 10
pitchMenuCaptionMinder=Huidige toonhoogte - 10
@@ -70,11 +54,6 @@
attituneVersion=Versie
attituneLanguageCaption=Taal
attitunePlayNoTTS=Vereiste TTS taal is niet ge�nstalleerd
-onlineMenuCaption=Online
-file=File
-view=View
-tools=Tools
-help=Help
unknownHost=Onbekende host
unReachable=Onbereikbare host
badIpFormat=IP adres moet in het volgende formaat zijn x.x.x.x
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/swing/About.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/swing/About.java
2009-02-11 15:22:12 UTC (rev 3607)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/swing/About.java
2009-02-11 18:39:36 UTC (rev 3608)
@@ -55,7 +55,7 @@
add(this.getjContentPane());
setIconImage(new
ImageIcon(CcInterface.class.getResource("images/cc.png")).getImage());
- setTitle(CcCommons.language.getTitle());
+ setTitle("Tux Droid Control Center");
setResizable(false);
setVisible(true);
pack();
@@ -68,7 +68,7 @@
private JButton getExitButton(){
if(this.exit == null){
- exit = new
JButton(CcCommons.language.getMenuFileExit());
+ exit = new JButton(CcCommons.language.get("exit"));
exit.setSize(73,25);
exit.setPreferredSize(exit.getSize());
exit.setLocation(210, 240);
@@ -102,7 +102,7 @@
ImageIcon image = new
ImageIcon(CcInterface.class.getResource("images/cc.png"));
//Developper label.
JLabel developper = new
JLabel(CcCommons.language.getAboutDevelopperCaption() );
- JLabel developperMail = new JLabel("
"+CcCommons.language.getAboutDevelopperMail()+" ");
+ JLabel developperMail = new JLabel("
[email protected] ");
developperMail.setForeground(Color.blue);
//Contributors.
------------------------------------------------------------------------------
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
