Skip to content

Commit

Permalink
Make the update message more clear. Fixes #59
Browse files Browse the repository at this point in the history
  • Loading branch information
Antoine Aflalo committed Jan 3, 2016
1 parent 8ca0eef commit 0887b1f
Show file tree
Hide file tree
Showing 3 changed files with 79 additions and 78 deletions.
2 changes: 1 addition & 1 deletion SoundSwitch/Properties/TrayIconStrings.fr.resx
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
<value>MàJ Disponible ({0})</value>
</data>
<data name="versionAvailable" xml:space="preserve">
<value>Version {0} est disponible</value>
<value>MàJ pour{0} ({1}) est disponible.</value>
</data>
<data name="howDownloadUpdate" xml:space="preserve">
<value>Cliquer ici pour mettre à jour.</value>
Expand Down
150 changes: 75 additions & 75 deletions SoundSwitch/Properties/TrayIconStrings.resx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
<!--
Microsoft ResX Schema
Version 2.0
Expand Down Expand Up @@ -59,107 +59,107 @@
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="NoUpdate" xml:space="preserve">
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="NoUpdate" xml:space="preserve">
<value>No Update</value>
</data>
<data name="NoDevSel" xml:space="preserve">
<data name="NoDevSel" xml:space="preserve">
<value>No devices selected</value>
</data>
<data name="playbackDev" xml:space="preserve">
<data name="playbackDev" xml:space="preserve">
<value>Playback Devices</value>
</data>
<data name="mixer" xml:space="preserve">
<data name="mixer" xml:space="preserve">
<value>Mixer</value>
</data>
<data name="settings" xml:space="preserve">
<data name="settings" xml:space="preserve">
<value>Settings</value>
</data>
<data name="about" xml:space="preserve">
<data name="about" xml:space="preserve">
<value>About</value>
</data>
<data name="exit" xml:space="preserve">
<data name="exit" xml:space="preserve">
<value>Exit</value>
</data>
<data name="updateAvailable" xml:space="preserve">
<data name="updateAvailable" xml:space="preserve">
<value>Update Available ({0})</value>
</data>
<data name="versionAvailable" xml:space="preserve">
<value>Version {0} is available</value>
<data name="versionAvailable" xml:space="preserve">
<value>Update for {0} ({1}) is available.</value>
</data>
<data name="howDownloadUpdate" xml:space="preserve">
<data name="howDownloadUpdate" xml:space="preserve">
<value>Click here to update.</value>
</data>
<data name="playbackChanged" xml:space="preserve">
<data name="playbackChanged" xml:space="preserve">
<value>{0}: Playback device switched to</value>
</data>
<data name="recordingChanged" xml:space="preserve">
<data name="recordingChanged" xml:space="preserve">
<value>{0}: Recording device switched to</value>
</data>
<data name="confNeeded" xml:space="preserve">
<data name="confNeeded" xml:space="preserve">
<value>{0}: Configuration needed</value>
</data>
<data name="confNeededExp" xml:space="preserve">
<data name="confNeededExp" xml:space="preserve">
<value>No devices available to switch to. Open configuration by right-clicking on the icon.</value>
</data>
<data name="error" xml:space="preserve">
<data name="error" xml:space="preserve">
<value>Error</value>
</data>
</root>
5 changes: 3 additions & 2 deletions SoundSwitch/Util/TrayIcon.cs
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,9 @@ private void NewReleaseAvailable(object sender, UpdateChecker.NewReleaseEvent ne
_updateMenuItem.Enabled = true;
NotifyIcon.BalloonTipClicked += OnUpdateClick;
NotifyIcon.ShowBalloonTip(3000,
string.Format(TrayIconStrings.versionAvailable, newReleaseEvent.Release.ReleaseVersion),
TrayIconStrings.howDownloadUpdate, ToolTipIcon.Info);
string.Format(TrayIconStrings.versionAvailable, Application.ProductName,
newReleaseEvent.Release.ReleaseVersion),
newReleaseEvent.Release.Name + '\n' + TrayIconStrings.howDownloadUpdate, ToolTipIcon.Info);
}


Expand Down

0 comments on commit 0887b1f

Please sign in to comment.