Author: jerome
Date: 2008-08-20 09:09:13 +0200 (Wed, 20 Aug 2008)
New Revision: 1556
Added:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/TuxLanguagesMenu.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/images/close-exit.png
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/images/hide.png
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/images/show.png
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/Utils/languages/Languages.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/LanguagesSet/languages_en_US.properties
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/LanguagesSet/languages_fr_FR.properties
Log:
* Changed menus languages philosophy.
* Added tray icon sub-menus icons.
* Removed some glitches.
* Make displayed language independent of tux language.
* ...
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
2008-08-19 14:43:58 UTC (rev 1555)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcInterface.java
2008-08-20 07:09:13 UTC (rev 1556)
@@ -101,6 +101,7 @@
import com.tuxdroid.cc.Utils.SimpleAlertSettings;
import com.tuxdroid.cc.Utils.TaskDefiner;
import com.tuxdroid.cc.Utils.TuxDropTarget;
+import com.tuxdroid.cc.Utils.TuxLanguagesMenu;
import com.tuxdroid.cc.Utils.TuxToolsMenu;
import com.tuxdroid.cc.Utils.functions;
import com.tuxdroid.cc.Utils.languages.Languages;
@@ -247,7 +248,11 @@
public TrayIcon tray;
ImageIcon tray_online = new
ImageIcon(getClass().getResource("images/tray-online.png"));
ImageIcon tray_offline = new
ImageIcon(getClass().getResource("images/tray-offline.png"));
- public JPopupMenu menuTray;
+ ImageIcon tray_hide = new
ImageIcon(getClass().getResource("images/hide.png"));
+ ImageIcon tray_show = new
ImageIcon(getClass().getResource("images/show.png"));
+ public JPopupMenu menuTray;
+
+ TuxLanguagesMenu interfaceMenusLang;
/**
* CcInterface constructor.
@@ -291,7 +296,10 @@
//Create FileBrowser engine.
file_browser = new FileBrowser(this.language);
file_browser.addPropertyChangeListener(this);
- this.setTrayIcon();
+ this.setTrayIcon();
+
+ //TODO remove this test.
+ interfaceMenusLang = new TuxLanguagesMenu(tux, this.settings,
this.language);
}
@@ -306,10 +314,12 @@
if(item.getText().equals(language.getTrayHideCaption())){
item.setText(language.getTrayShowCaption());
jFrame.setVisible(false);
+ item.setIcon(tray_hide);
}
else if(item.getText().equals(language.getTrayShowCaption())){
item.setText(language.getTrayHideCaption());
jFrame.setVisible(true);
+ item.setIcon(tray_hide);
}
}
@@ -321,6 +331,9 @@
final JMenuItem item1 = new
JMenuItem(language.getTrayHideCaption());
final JMenuItem item2 = new
JMenuItem(language.getTrayExitCaption());
+ item2.setIcon(new
ImageIcon(getClass().getResource("images/close-exit.png")));
+ item1.setIcon(this.tray_hide);
+
item1.addMouseListener(new java.awt.event.MouseAdapter(){
public void mousePressed(java.awt.event.MouseEvent
event){
menuTrayChange(item1);
@@ -344,7 +357,7 @@
public void popupMenuWillBecomeVisible(PopupMenuEvent
arg0) {
menuTray.setLocation(new
Point(tray.getLocationOnScreen().x -3,
-
tray.getLocationOnScreen().y-50));
+
tray.getLocationOnScreen().y-60));
}
});
@@ -385,7 +398,12 @@
*/
public void onRadioConnected(String value, Double delay){
setOnlineStatus(true);
- tray.setIcon(this.tray_online);
+ tray.setIcon(this.tray_online);
+ if(this.interfaceMenusLang.areLocutorsInitialized()){
+ this.interfaceMenusLang.setTux(tux);
+ this.initializeLocutors();
+ this.interfaceMenusLang.setLocutorsInitialized(true);
+ }
}
/**
@@ -876,6 +894,19 @@
}
return toolsMenu;
+ }
+
+
+ public void initializeLocutors(){
+ if(this.interfaceMenusLang.haveLocutor()){
+ //Set speaker selection menu.
+ JMenu speaker = new
JMenu(language.getMenuViewSpeaker());
+
+ for(JMenuItem items :
this.interfaceMenusLang.getTuxLocutorsMenus()){
+ speaker.add(items);
+ }
+ popupmenu2.add(speaker);
+ }
}
/**
@@ -894,92 +925,26 @@
URL one = getClass().getResource(path+"view.png");
URL two = getClass().getResource(path+"view_over.png");
URL three = getClass().getResource(path+"view.png");
- //Adding language menu.
- JMenu languages = new
JMenu(language.getMenuViewLanguage());
+
//Create sub menus languages.
- String lang = settings.getLocale().getCountry();
- final JMenuItem subLanguageEn = new JMenuItem("English
US");
- final JMenuItem subLanguageFr = new JMenuItem("Francais
FR");
- final URL icon =
getClass().getResource("images/arrow_lang.png");
- if(lang == "US"){
- subLanguageEn.setIcon(new ImageIcon(icon));
+ if(this.interfaceMenusLang.haveLanguages()){
+ JMenu languages = new
JMenu(language.getMenuViewLanguage());
+ for(JMenuItem items :
this.interfaceMenusLang.getInterfaceLanguagesMenus()){
+ languages.add(items);
+ }
+ popupmenu2.add(languages);
}
-
- else if(lang == "FR"){
- subLanguageFr.setIcon(new ImageIcon(icon));
+
+ if(!this.interfaceMenusLang.areLocutorsInitialized()){
+ this.initializeLocutors();
+
this.interfaceMenusLang.setLocutorsInitialized(true);
}
-
- //Create listeners.
- subLanguageEn.addMouseListener(new
java.awt.event.MouseAdapter(){
-
- public void
mousePressed(java.awt.event.MouseEvent event){
- subLanguageEn.setIcon(new
ImageIcon(icon));
- subLanguageFr.setIcon(null);
- settings.saveLocale("en", "US");
- settings.saveSpeaker("Ryan");
- String msg =
language.messages.getChangedLangageMessage();
- String titleBox =
language.messages.getMessageBoxTitle();
-
JOptionPane.showMessageDialog(jContentPane, msg, titleBox,
-
JOptionPane.DEFAULT_OPTION);
- }
- });
-
- subLanguageFr.addMouseListener(new
java.awt.event.MouseAdapter(){
-
- public void
mousePressed(java.awt.event.MouseEvent event){
- subLanguageEn.setIcon(null);
- subLanguageFr.setIcon(new
ImageIcon(icon));
- settings.saveLocale("fr", "FR");
- settings.saveSpeaker("Bruno");
- String msg =
language.messages.getChangedLangageMessage();
- String titleBox =
language.messages.getMessageBoxTitle();
-
JOptionPane.showMessageDialog(jContentPane, msg, titleBox,
-
JOptionPane.DEFAULT_OPTION);
- }
- });
- languages.add(subLanguageEn);
- languages.add(subLanguageFr);
-
- //Set speaker selection menu.
- JMenu speaker = new
JMenu(language.getMenuViewSpeaker());
- //Create speaker sub menus.
- final JMenuItem male = new
JMenuItem(language.getMaleSpeaker());
- final JMenuItem female = new
JMenuItem(language.getFemeleSpeaker());
-
- String currentSpeaker = settings.getSpeaker();
-
if(currentSpeaker.equalsIgnoreCase(language.getMaleSpeaker())){
- male.setIcon(new ImageIcon(icon));
- }
- else
if(currentSpeaker.equalsIgnoreCase(language.getFemeleSpeaker())){
- female.setIcon(new ImageIcon(icon));
- }
-
- male.addMouseListener(new java.awt.event.MouseAdapter(){
- public void
mousePressed(java.awt.event.MouseEvent event){
- female.setIcon(null);
- male.setIcon(new ImageIcon(icon));
-
settings.saveSpeaker(language.getMaleSpeaker());
-
tux.tts.setLocutor(language.getMaleSpeaker());
- }
- });
-
- female.addMouseListener(new
java.awt.event.MouseAdapter(){
- public void
mousePressed(java.awt.event.MouseEvent event){
- male.setIcon(null);
- female.setIcon(new ImageIcon(icon));
-
settings.saveSpeaker(language.getFemeleSpeaker());
-
tux.tts.setLocutor(language.getFemeleSpeaker());
- }
- });
-
- speaker.add(male);
- speaker.add(female);
//Create pitch menu.
final int pitchValue = settings.getPitch();
- final JMenu pitch = new JMenu(String.format("Pitch
Setting"));
- final JMenuItem plus = new
JMenuItem(String.format("Current: %d up to 10", pitchValue));
- final JMenuItem minder = new
JMenuItem(String.format("Current: %d down to 10", pitchValue));
+ final JMenu pitch = new
JMenu(String.format(language.getPitchMenuCaption()));
+ final JMenuItem plus = new
JMenuItem(String.format(language.getPitchCaptionPlus(), pitchValue));
+ final JMenuItem minder = new
JMenuItem(String.format(language.getPitchCaptionMinder(), pitchValue));
pitch.add(plus);
pitch.add(minder);
@@ -988,9 +953,9 @@
public void
mousePressed(java.awt.event.MouseEvent event){
if(settings.getPitch() < 200){
settings.setPitch(settings.getPitch() + 10);
-
((JMenuItem)event.getSource()).setText(String.format("Current: %d up to 10",
+
((JMenuItem)event.getSource()).setText(String.format(language.getPitchCaptionPlus(),
settings.getPitch()));
-
minder.setText(String.format("Current: %d down to 10",
+
minder.setText(String.format(language.getPitchCaptionMinder(),
settings.getPitch()));
tux.tts.setPitch(settings.getPitch());
}
@@ -1001,9 +966,9 @@
public void
mousePressed(java.awt.event.MouseEvent event){
if(settings.getPitch() > 0){
settings.setPitch(settings.getPitch() - 10);
-
((JMenuItem)event.getSource()).setText(String.format("Current: %d down to -10",
+
((JMenuItem)event.getSource()).setText(String.format(language.getPitchCaptionMinder(),
settings.getPitch()));
-
plus.setText(String.format("Current: %d up to 10",
+
plus.setText(String.format(language.getPitchCaptionPlus(),
settings.getPitch()));
tux.tts.setPitch(settings.getPitch());
}
@@ -1033,12 +998,12 @@
}
});
- //Adding items.
+ //Adding items.
+ if(this.interfaceMenusLang.haveLocutor()){
+ popupmenu2.add(pitch);
+ }
popupmenu2.add(showlist);
popupmenu2.add(showthumb);
- popupmenu2.add(languages);
- popupmenu2.add(speaker);
- popupmenu2.add(pitch);
popupmenu2.add(showHideBottomFrame);
//Display menu.
@@ -1717,16 +1682,17 @@
* This procedure masks gadgets tabbedPane tabs.
*/
protected void maskGadgetsTabs(){
- this.maskAllTabs(); //remove all tabs
- JPanel desc = file_browser.getAttitunesDescriptionsPanel();
- jTabbedPane.addTab(language.getPanelDescription(), desc);
+ this.maskAllTabs(); //remove all tabs
+ //Add previous selected panel here for attitunes / alerts /
remote.
+ jTabbedPane.addTab("", new TuxDegradeePanel());
}
/**
* This procedure restore tabbedPane gadgets Tabs.
*/
protected void unMaskGadgetsTabs(){
- this.maskAllTabs();
+ this.maskAllTabs();
+ //Add previous selected panel here for gadgets.
jTabbedPane.addTab(language.getPanelSummary(), null,
getSummaryPanel(), null);
jTabbedPane.addTab(language.getPanelHelp(), null,
getHelpPanel(), null);
}
@@ -2328,6 +2294,9 @@
jFrame.repaint();
jFrame.pack();
+
+ currentGadget = gdg;
+ currentGadgetParameters = parameters;
}
}
else
if(arg0.getPropertyName().equalsIgnoreCase("scheduler-trigger-event")){
@@ -2471,16 +2440,15 @@
}
else
if(arg0.getPropertyName().equalsIgnoreCase("alert-double-click")){
- System.out.println("clicked from alert");
playButton.setIcon(new ImageIcon(
getClass().getResource("images/buttons/stop_down.png")));
if(alertPlaylist.haveDatas()){
if(alertPlaylist.getSelectedItemKind().equalsIgnoreCase("attitune")){
//then it's an attitune.
-
+ playflag = !playflag;
file_browser.playAttituneFromPath(alertPlaylist.getPath());
+
if(tux.radio.getConnected()){
- playflag = !playflag;
setPlayerControlsConsistants(false);
}else{
playButton.setIcon(new
ImageIcon(
@@ -2489,9 +2457,6 @@
}
else
if(alertPlaylist.getSelectedItemKind().equalsIgnoreCase("gadget")){
//then it's a gadget.
-
-
System.out.println(alertPlaylist.getSelectedItemKind());
-
System.out.println(alertPlaylist.getSelectedName());
String uid =
settings.getUID(alertPlaylist.getSelectedName());
String gdgPath =
settings.getGadgetPath(uid);
GadgetObject gdg =
file_browser.getGadgetInstanceByPath(gdgPath);
@@ -2507,13 +2472,13 @@
parameters = pr.getValues();
}
//Setting framework to don't talk and
let scheduler do what it want.
+ this.currentGadget = gdg;
gdgInstance.start(null, parameters);
}
}
else{
- playflag = !playflag;
playButton.setIcon(new ImageIcon(
getClass().getResource("images/buttons/play.png")));
}
@@ -2714,9 +2679,12 @@
else if(type == CcInterface.TYPE_ATTITUNES){
boolean played =
file_browser.playAttitune(view);
+ playflag = !playflag;
if(tux.radio.getConnected()){
- playflag = !playflag;
- if(played)
setPlayerControlsConsistants(false);
+ if(played){
+ playflag = !playflag;
+
setPlayerControlsConsistants(false);
+ }
}
else{
playButton.setIcon(new ImageIcon(
@@ -2724,8 +2692,9 @@
setPlayerControlsConsistants(true);
}
}
+
else if(type == CcInterface.TYPE_REMOTELIST){
- //Play gadget here.
+
if(remotePlaylist.haveDatas()){
if(remotePlaylist.getSelectedItemKind().equals("gadget")){
file_browser.playGadget(currentGadget,
@@ -2745,17 +2714,38 @@
}
}
+ else if(type == CcInterface.TYPE_ALERT){
+ if(alertPlaylist.haveDatas()){
+
if(alertPlaylist.getSelectedItemKind().equals("gadget")){
+
file_browser.playGadget(currentGadget,
+
currentGadgetParameters.getValues());
+
setPlayerControlsConsistants(false);
+ }
+ else{
+
file_browser.playAttituneFromPath(alertPlaylist.getPath());
+ }
+ }
+ }
+
} else {
playButton.setIcon(new ImageIcon(
getClass().getResource("images/buttons/play.png")));
if(type != CcInterface.TYPE_REMOTELIST){
+ if(type == CcInterface.TYPE_ALERT){
+
if(alertPlaylist.getSelectedItemKind().equals("attitune")){
+
file_browser.stopPlaying(TYPE_ATTITUNES, TYPE_REMOTELIST);
+ }
+ else{
+
currentGadget.getGadget().stop();
+ }
+ }
file_browser.stopPlaying(type, view);
}
else{
//Then stopping something from remoted list.
if(remotePlaylist.getSelectedItemKind().equals("attitune")){
-
file_browser.stopPlaying(CcInterface.TYPE_ATTITUNES,
CcInterface.TYPE_REMOTELIST);
+
file_browser.stopPlaying(TYPE_ATTITUNES, TYPE_REMOTELIST);
}
else{
currentGadget.getGadget().stop();
Added:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/TuxLanguagesMenu.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/TuxLanguagesMenu.java
(rev 0)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/TuxLanguagesMenu.java
2008-08-20 07:09:13 UTC (rev 1556)
@@ -0,0 +1,168 @@
+/* This file is part of "TuxDroid control center".
+ * Copyright 2008, kysoh
+ * Author : Conan Jerome
+ * eMail : [EMAIL PROTECTED]
+ * Site : http://www.kysoh.com/
+ *
+ * "TuxDroid control center" is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * "TuxDroid control center" is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with "TuxDroid Control Center"; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package com.tuxdroid.cc.Utils;
+
+import java.io.File;
+import java.net.URL;
+import java.util.Vector;
+
+import javax.swing.ImageIcon;
+import javax.swing.JMenuItem;
+import javax.swing.JOptionPane;
+
+import com.tuxdroid.cc.Utils.languages.Languages;
+import com.tuxisalive.api.TuxAPI;
+
+public class TuxLanguagesMenu {
+
+ private TuxAPI tux;
+ private Settings settings;
+ private Languages language;
+
+ //Menus
+ private Vector<JMenuItem> locutorsMenus = new Vector<JMenuItem>();
+ private Vector<JMenuItem> interfaceLangMenus = new Vector<JMenuItem>();
+
+ //availables.
+ private Vector<String> interfaceLanguages = new Vector<String>();
+
+ //menu icon.
+ static final URL icon =
com.tuxdroid.cc.CcInterface.class.getResource("images/arrow_lang.png");
+ private boolean initialized = false;
+
+ //constructor.
+ public TuxLanguagesMenu(TuxAPI tux, Settings settings, Languages
language){
+ this.tux = tux;
+ this.settings = settings;
+ this.language = language;
+ this.getAvailablesLang();
+ this.getInterfaceMenu();
+ this.getLocutorsMenus();
+ }
+
+ /** Gets languages **/
+ private void getAvailablesLang(){
+ File directory = new
File(com.tuxdroid.cc.Utils.languages.Languages.class.getResource("LanguagesSet").getPath());
+ for(String f : directory.list()){
+ if(f.contains("languages")){
+ interfaceLanguages.add(f);
+ }
+ }
+ }
+
+
+ public boolean areLocutorsInitialized(){
+ return this.initialized;
+ }
+
+ public void setLocutorsInitialized(boolean arg0){
+ this.initialized = arg0;
+ }
+
+
+ /** get availables languages menus. **/
+ private boolean getLocutorsMenus(){
+ if(tux.tts.getVoices().size() <= 0) return false;
+
+ String currentSpeaker = settings.getSpeaker();
+ for(String menuName : tux.tts.getVoices()){
+ JMenuItem menu = new JMenuItem(menuName);
+ if(menuName.equalsIgnoreCase(currentSpeaker)){
+ //the set the 'slected' icon.
+ menu.setIcon(new
ImageIcon(TuxLanguagesMenu.icon));
+ }
+ menu.addMouseListener(new java.awt.event.MouseAdapter(){
+ public void
mousePressed(java.awt.event.MouseEvent event){
+ removeMenuIcons(locutorsMenus);
+ ((JMenuItem)
event.getComponent()).setIcon(new ImageIcon(TuxLanguagesMenu.icon));
+
settings.saveSpeaker(((JMenuItem)event.getComponent()).getText());
+
tux.tts.setLocutor(((JMenuItem)event.getComponent()).getText());
+ }
+ });
+ this.locutorsMenus.add(menu);
+ }
+ return true;
+ }
+
+
+ public void setTux(TuxAPI tux){
+ this.tux = tux;
+ }
+
+
+ private boolean getInterfaceMenu(){
+ if(this.interfaceLanguages.size() <= 0) return false;
+ for(String str : this.interfaceLanguages){
+ JMenuItem item = new
JMenuItem(str.replace("languages_", "").replace("_", " ").substring(0, 2));
+
if(item.getText().equalsIgnoreCase(settings.getLanguage())){
+ item.setIcon(new
ImageIcon(TuxLanguagesMenu.icon));
+ }
+ item.addMouseListener(new java.awt.event.MouseAdapter(){
+ public void
mousePressed(java.awt.event.MouseEvent event){
+ removeMenuIcons(interfaceLangMenus);
+ setLanguageMenuIcon((JMenuItem)
event.getComponent());
+ //Register new language.
+ String lang =
((JMenuItem)event.getComponent()).getText();
+ String country = lang.toUpperCase();
+ if(lang.equalsIgnoreCase("en")) country
= "US";
+ settings.saveLocale(lang, country);
+ settings.saveSpeaker("Ryan");
+ String msg =
language.messages.getChangedLangageMessage();
+ String titleBox =
language.messages.getMessageBoxTitle();
+ JOptionPane.showMessageDialog(null,
msg, titleBox,
+
JOptionPane.DEFAULT_OPTION);
+
+ }
+ });
+ this.interfaceLangMenus.add(item);
+ }
+ return true;
+ }
+
+
+ private void removeMenuIcons(Vector<JMenuItem> items){
+ for(JMenuItem item : items) item.setIcon(null);
+ }
+
+
+ private void setLanguageMenuIcon(JMenuItem item){
+ item.setIcon(new ImageIcon(TuxLanguagesMenu.icon));
+ }
+
+ /** return true if they have installed languages. **/
+ public boolean haveLanguages(){
+ return this.interfaceLanguages.size() > 0;
+ }
+
+ public boolean haveLocutor(){
+ return tux.tts.getVoices().size() > 0;
+ }
+
+ public Vector<JMenuItem> getInterfaceLanguagesMenus(){
+ return this.interfaceLangMenus;
+ }
+
+ public Vector<JMenuItem> getTuxLocutorsMenus(){
+ return this.locutorsMenus;
+ }
+}
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/Languages.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/Languages.java
2008-08-19 14:43:58 UTC (rev 1555)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/Languages.java
2008-08-20 07:09:13 UTC (rev 1556)
@@ -289,5 +289,18 @@
public String getContributorsNames(){
return this.get("aboutContributorsNames", "No contributors");
+ }
+
+ public String getPitchCaptionPlus(){
+ return this.get("pitchMenuCaptionPlus", "Current: %d up to 10");
+ }
+
+ public String getPitchCaptionMinder(){
+ return this.get("pitchMenuCaptionMinder", "Current: %d down to
10");
+ }
+
+
+ public String getPitchMenuCaption(){
+ return this.get("pitchMenuCaption", "Pitch setting");
}
}
\ No newline at end of file
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/LanguagesSet/languages_en_US.properties
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/LanguagesSet/languages_en_US.properties
2008-08-19 14:43:58 UTC (rev 1555)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/LanguagesSet/languages_en_US.properties
2008-08-20 07:09:13 UTC (rev 1556)
@@ -1,7 +1,5 @@
ccTitle=TuxDroid Control Center
welcomeMessage=Welcome to tux control center
-speaker_female=Heather
-speaker_male=Ryan
menuFileAdd=Add file to library
menuFileEdit=Edit Attitune playlist
menuFileRemove=Remove file from library
@@ -11,11 +9,11 @@
menuHelpOnlineFaq=Online FAQ
menuHelpReportBug=Report a bug
menuHelpAbout=About...
-menuViewLanguage=Set language
-menuViewSpeaker=Set speaker
-menuViewListView=Show list view
-menuViewThumbnailView=Show thumbnail view
-menuViewShowHide=Show/Hide bottom panel
+menuViewLanguage=Interface language
+menuViewSpeaker=Speak locutor
+menuViewListView=List view
+menuViewThumbnailView=Thumbnail view
+menuViewShowHide=Show/Hide properties
playlistsTitle=Live with Tux
onlineTitle=Online
libraryTitle=Library
@@ -54,4 +52,7 @@
aboutDevelopper=Developper : Conan J�r�me.
[EMAIL PROTECTED]
aboutContributorsNames =Thierry Nancy, Sebastiaan Vanpoucke.
-aboutContributors=Contributors:
\ No newline at end of file
+aboutContributors=Contributors:
+pitchMenuCaptionPlus=Current: %d up to 10
+pitchMenuCaptionMinder=Current: %d down to 10
+pitchMenuCaption=Pitch setting
\ No newline at end of file
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/LanguagesSet/languages_fr_FR.properties
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/LanguagesSet/languages_fr_FR.properties
2008-08-19 14:43:58 UTC (rev 1555)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/LanguagesSet/languages_fr_FR.properties
2008-08-20 07:09:13 UTC (rev 1556)
@@ -1,7 +1,5 @@
ccTitle=TuxDroid Centre de contr�le
welcomeMessage=bienvenue dans le centre de contr�le.
-speaker_female=Julie
-speaker_male=Bruno
menuFileAdd=Ajouter � la librairie
menuFileEdit=Editer une playliste Attitune
menuFileRemove=Supprimer de le librairie
@@ -11,11 +9,11 @@
menuHelpOnlineFaq=FAQ en ligne
menuHelpReportBug=Reporter un bug
menuHelpAbout=A propos...
-menuViewLanguage=Choisir la langue
-menuViewSpeaker=Choisir le locuteur
+menuViewLanguage=Langue du logiciel
+menuViewSpeaker=Choix du locuteur
menuViewListView=Voir la vue par liste
menuViewThumbnailView=Voir la vue par thumbnail
-menuViewShowHide=Montrer/Masquer les propri�t�s.
+menuViewShowHide=Voir/Cacher les propri�t�s.
playlistsTitle=Vivre avec Tux
onlineTitle=En ligne
libraryTitle=Librairies
@@ -54,4 +52,7 @@
aboutDevelopper=D�veloppeur : Conan J�r�me.
[EMAIL PROTECTED]
aboutContributorsNames =Thierry Nancy, Sebastiaan Vanpoucke.
-aboutContributors=Contribution:
\ No newline at end of file
+aboutContributors=Contribution:
+pitchMenuCaptionPlus=Actuel: %d : ajouter 10
+pitchMenuCaptionMinder=Actuel: %d : enlever 10
+pitchMenuCaption=Valeur du pitch
\ No newline at end of file
Added:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/images/close-exit.png
===================================================================
(Binary files differ)
Property changes on:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/images/close-exit.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/images/hide.png
===================================================================
(Binary files differ)
Property changes on:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/images/hide.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/images/show.png
===================================================================
(Binary files differ)
Property changes on:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/images/show.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
