beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

build: cleanup and remove translations

Browse source
This commit is contained in:
Hylke Bons 2012-07-26 16:48:23 +02:00
parent 0e4252d2b3
commit 5290414866
13 changed files with 95 additions and 119 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.tx/config
View file

@ -1,7 +0,0 @@
[main]
host = https://www.transifex.net
[sparkleshare.UI]
file_filter = SparkleShare/Common/Translations/<lang>.po
source_file = SparkleShare/Common/Translations/sparkleshare.pot
source_lang = en

8
SparkleLib/Defines.cs.in
View file

@ -14,11 +14,15 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>. // along with this program. If not, see <http://www.gnu.org/licenses/>.
using System; using System;
using System.Reflection; using System.Reflection;
[assembly: AssemblyTitle("SparkleLib")] [assembly:AssemblyTitle ("SparkleLib")]
[assembly: AssemblyVersion("0.9.0.0")] [assembly:AssemblyVersion ("@VERSION@")]
[assembly:AssemblyCopyright ("Copyright (c) 2010 Hylke Bons and others")]
[assembly:AssemblyTrademark ("SparkleShare is a trademark of SparkleShare Ltd.")]
namespace SparkleLib { namespace SparkleLib {
public class Defines { public class Defines {

4
SparkleLib/Git/SparkleLib.Git.csproj
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@ -12,6 +12,7 @@
<AssemblyName>SparkleLib.Git</AssemblyName> <AssemblyName>SparkleLib.Git</AssemblyName>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<ReleaseVersion /> <ReleaseVersion />
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
@ -53,7 +54,6 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Xml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Folder Include="Properties\" /> <Folder Include="Properties\" />

3
SparkleLib/SparkleBackend.cs
View file

@ -25,7 +25,8 @@ namespace SparkleLib {
public static string Version { public static string Version {
get { get {
return Assembly.GetExecutingAssembly ().GetName ().Version.ToString (); string version = "" + Assembly.GetExecutingAssembly ().GetName ().Version;
return version.Substring (0, version.Length - 2);
} }
} }

3
SparkleLib/SparkleLib.csproj
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@ -32,7 +32,6 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="Mono.Posix" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

9
SparkleShare/Linux/SparkleAbout.cs
View file

@ -29,13 +29,6 @@ namespace SparkleShare {
private Label updates; private Label updates;
// Short alias for the translations
public static string _ (string s)
{
return Catalog.GetString (s);
}
public SparkleAbout () : base ("") public SparkleAbout () : base ("")
{ {
DeleteEvent += delegate (object o, DeleteEventArgs args) { DeleteEvent += delegate (object o, DeleteEventArgs args) {
@ -48,7 +41,7 @@ namespace SparkleShare {
BorderWidth = 0; BorderWidth = 0;
IconName = "folder-sparkleshare"; IconName = "folder-sparkleshare";
WindowPosition = WindowPosition.Center; WindowPosition = WindowPosition.Center;
Title = _("About SparkleShare"); Title = "About SparkleShare";
AppPaintable = true; AppPaintable = true;
string image_path = new string [] { SparkleUI.AssetsPath, "pixmaps", "about.png" }.Combine (); string image_path = new string [] { SparkleUI.AssetsPath, "pixmaps", "about.png" }.Combine ();

11
SparkleShare/Linux/SparkleEventLog.cs
View file

@ -42,13 +42,6 @@ namespace SparkleShare {
private SparkleSpinner spinner; private SparkleSpinner spinner;
// Short alias for the translations
public static string _ (string s)
{
return Catalog.GetString (s);
}
public SparkleEventLog () : base ("") public SparkleEventLog () : base ("")
{ {
SetSizeRequest (480, (int) (Gdk.Screen.Default.Height * 0.8)); SetSizeRequest (480, (int) (Gdk.Screen.Default.Height * 0.8));
@ -61,7 +54,7 @@ namespace SparkleShare {
Resizable = true; Resizable = true;
BorderWidth = 0; BorderWidth = 0;
Title = _("Recent Changes"); Title = "Recent Changes";
IconName = "folder-sparkleshare"; IconName = "folder-sparkleshare";
DeleteEvent += delegate (object o, DeleteEventArgs args) { DeleteEvent += delegate (object o, DeleteEventArgs args) {
@ -202,7 +195,7 @@ namespace SparkleShare {
ListStore store = new ListStore (typeof (string)); ListStore store = new ListStore (typeof (string));
store.AppendValues (_("Summary")); store.AppendValues ("Summary");
store.AppendValues ("---"); store.AppendValues ("---");
this.combo_box.Model = store; this.combo_box.Model = store;

102
SparkleShare/Linux/SparkleSetup.cs
View file

@ -32,13 +32,6 @@ namespace SparkleShare {
public SparkleSetupController Controller = new SparkleSetupController (); public SparkleSetupController Controller = new SparkleSetupController ();
private ProgressBar progress_bar = new ProgressBar (); private ProgressBar progress_bar = new ProgressBar ();
// Short alias for the translations
public static string _ (string s)
{
return Catalog.GetString (s);
}
public SparkleSetup () : base () public SparkleSetup () : base ()
@ -63,15 +56,15 @@ namespace SparkleShare {
switch (type) { switch (type) {
case PageType.Setup: { case PageType.Setup: {
Header = _("Welcome to SparkleShare!"); Header = "Welcome to SparkleShare!";
Description = "First off, what's your name and email?\nThis information is only visible to team members."; Description = "First off, what's your name and email?\nThis information is only visible to team members.";
Table table = new Table (2, 3, true) { Table table = new Table (2, 3, true) {
RowSpacing = 6, RowSpacing = 6,
ColumnSpacing = 6 ColumnSpacing = 6
}; };
Label name_label = new Label ("<b>" + _("Full Name:") + "</b>") { Label name_label = new Label ("<b>" + "Full Name:" + "</b>") {
UseMarkup = true, UseMarkup = true,
Xalign = 1 Xalign = 1
}; };
@ -94,7 +87,7 @@ namespace SparkleShare {
Controller.CheckSetupPage (name_entry.Text, email_entry.Text); Controller.CheckSetupPage (name_entry.Text, email_entry.Text);
}; };
Label email_label = new Label ("<b>" + _("Email:") + "</b>") { Label email_label = new Label ("<b>" + "Email:" + "</b>") {
UseMarkup = true, UseMarkup = true,
Xalign = 1 Xalign = 1
}; };
@ -107,13 +100,13 @@ namespace SparkleShare {
VBox wrapper = new VBox (false, 9); VBox wrapper = new VBox (false, 9);
wrapper.PackStart (table, true, false, 0); wrapper.PackStart (table, true, false, 0);
Button cancel_button = new Button (_("Cancel")); Button cancel_button = new Button ("Cancel");
cancel_button.Clicked += delegate { cancel_button.Clicked += delegate {
Controller.SetupPageCancelled (); Controller.SetupPageCancelled ();
}; };
Button continue_button = new Button (_("Continue")) { Button continue_button = new Button ("Continue") {
Sensitive = false Sensitive = false
}; };
@ -142,7 +135,7 @@ namespace SparkleShare {
case PageType.Add: { case PageType.Add: {
Header = _("Where's your project hosted?"); Header = "Where's your project hosted?";
VBox layout_vertical = new VBox (false, 12); VBox layout_vertical = new VBox (false, 12);
HBox layout_fields = new HBox (true, 12); HBox layout_fields = new HBox (true, 12);
@ -280,7 +273,7 @@ namespace SparkleShare {
}; };
layout_address.PackStart (new Label () { layout_address.PackStart (new Label () {
Markup = "<b>" + _("Address:") + "</b>", Markup = "<b>" + "Address:" + "</b>",
Xalign = 0 Xalign = 0
}, true, true, 0); }, true, true, 0);
@ -292,7 +285,7 @@ namespace SparkleShare {
}; };
layout_path.PackStart (new Label () { layout_path.PackStart (new Label () {
Markup = "<b>" + _("Remote Path:") + "</b>", Markup = "<b>" + "Remote Path:" + "</b>",
Xalign = 0 Xalign = 0
}, true, true, 0); }, true, true, 0);
@ -309,13 +302,13 @@ namespace SparkleShare {
Add (layout_vertical); Add (layout_vertical);
// Cancel button // Cancel button
Button cancel_button = new Button (_("Cancel")); Button cancel_button = new Button ("Cancel");
cancel_button.Clicked += delegate { cancel_button.Clicked += delegate {
Controller.PageCancelled (); Controller.PageCancelled ();
}; };
Button add_button = new Button (_("Add")) { Button add_button = new Button ("Add") {
Sensitive = false Sensitive = false
}; };
@ -352,8 +345,8 @@ namespace SparkleShare {
case PageType.Invite: { case PageType.Invite: {
Header = _("You've received an invite!"); Header = "You've received an invite!";
Description = _("Do you want to add this project to SparkleShare?"); Description = "Do you want to add this project to SparkleShare?";
Table table = new Table (2, 3, true) { Table table = new Table (2, 3, true) {
@ -361,11 +354,11 @@ namespace SparkleShare {
ColumnSpacing = 6 ColumnSpacing = 6
}; };
Label address_label = new Label (_("Address:")) { Label address_label = new Label ("Address:") {
Xalign = 1 Xalign = 1
}; };
Label path_label = new Label (_("Remote Path:")) { Label path_label = new Label ("Remote Path:") {
Xalign = 1 Xalign = 1
}; };
@ -387,13 +380,13 @@ namespace SparkleShare {
VBox wrapper = new VBox (false, 9); VBox wrapper = new VBox (false, 9);
wrapper.PackStart (table, true, false, 0); wrapper.PackStart (table, true, false, 0);
Button cancel_button = new Button (_("Cancel")); Button cancel_button = new Button ("Cancel");
cancel_button.Clicked += delegate { cancel_button.Clicked += delegate {
Controller.PageCancelled (); Controller.PageCancelled ();
}; };
Button add_button = new Button (_("Add")); Button add_button = new Button ("Add");
add_button.Clicked += delegate { add_button.Clicked += delegate {
Controller.InvitePageCompleted (); Controller.InvitePageCompleted ();
@ -408,18 +401,18 @@ namespace SparkleShare {
case PageType.Syncing: { case PageType.Syncing: {
Header = String.Format (_("Adding project ‘{0}’…"), Controller.SyncingFolder); Header = String.Format ("Adding project ‘{0}’…", Controller.SyncingFolder);
Description = _("This may either take a short or a long time depending on the project's size."); Description = "This may either take a short or a long time depending on the project's size.";
this.progress_bar.Fraction = Controller.ProgressBarPercentage / 100; this.progress_bar.Fraction = Controller.ProgressBarPercentage / 100;
Button finish_button = new Button () { Button finish_button = new Button () {
Sensitive = false, Sensitive = false,
Label = _("Finish") Label = "Finish"
}; };
Button cancel_button = new Button () { Button cancel_button = new Button () {
Label = _("Cancel") Label = "Cancel"
}; };
cancel_button.Clicked += delegate { cancel_button.Clicked += delegate {
@ -448,7 +441,7 @@ namespace SparkleShare {
case PageType.Error: { case PageType.Error: {
Header = _("Oops! Something went wrong") + "…"; Header = "Oops! Something went wrong" + "…";
VBox points = new VBox (false, 0); VBox points = new VBox (false, 0);
Image list_point_one = new Image (SparkleUIHelpers.GetIcon ("go-next", 16)); Image list_point_one = new Image (SparkleUIHelpers.GetIcon ("go-next", 16));
@ -500,13 +493,13 @@ namespace SparkleShare {
points.PackStart (new Label (""), true, true, 0); points.PackStart (new Label (""), true, true, 0);
Button cancel_button = new Button (_("Cancel")); Button cancel_button = new Button ("Cancel");
cancel_button.Clicked += delegate { cancel_button.Clicked += delegate {
Controller.PageCancelled (); Controller.PageCancelled ();
}; };
Button try_again_button = new Button (_("Try Again…")) { Button try_again_button = new Button ("Try Again…") {
Sensitive = true Sensitive = true
}; };
@ -526,7 +519,7 @@ namespace SparkleShare {
Header = "Set up file encryption"; Header = "Set up file encryption";
Description = "This project is supposed to be encrypted, but it doesn't yet have a password set. Please provide one below."; Description = "This project is supposed to be encrypted, but it doesn't yet have a password set. Please provide one below.";
Label password_label = new Label ("<b>" + _("Password:") + "</b>") { Label password_label = new Label ("<b>" + "Password:" + "</b>") {
UseMarkup = true, UseMarkup = true,
Xalign = 1 Xalign = 1
}; };
@ -622,7 +615,7 @@ namespace SparkleShare {
Header = "This project contains encrypted files"; Header = "This project contains encrypted files";
Description = "Please enter the password to see their contents."; Description = "Please enter the password to see their contents.";
Label password_label = new Label ("<b>" + _("Password:") + "</b>") { Label password_label = new Label ("<b>" + "Password:" + "</b>") {
UseMarkup = true, UseMarkup = true,
Xalign = 1 Xalign = 1
}; };
@ -693,23 +686,24 @@ namespace SparkleShare {
UrgencyHint = true; UrgencyHint = true;
if (!HasToplevelFocus) { if (!HasToplevelFocus) {
string title = _("Your shared project is ready!"); string title = "Your shared project is ready!";
string subtext = _("You can find the files in your SparkleShare folder."); string subtext = "You can find the files in your SparkleShare folder.");
SparkleUI.Bubbles.Controller.ShowBubble (title, subtext, null); SparkleUI.Bubbles.Controller.ShowBubble (title, subtext, null);
} }
Header = _("Your shared project is ready!"); Header = "Your shared project is ready!";
Description = _("You can find it in your SparkleShare folder"); Description = "You can find it in your SparkleShare folder";
// A button that opens the synced folder // A button that opens the synced folder
Button open_folder_button = new Button (string.Format ("Open {0}", System.IO.Path.GetFileName (Controller.PreviousPath))); Button open_folder_button = new Button (string.Format ("Open {0}",
System.IO.Path.GetFileName (Controller.PreviousPath)));
open_folder_button.Clicked += delegate { open_folder_button.Clicked += delegate {
Controller.OpenFolderClicked (); Controller.OpenFolderClicked ();
}; };
Button finish_button = new Button (_("Finish")); Button finish_button = new Button ("Finish");
finish_button.Clicked += delegate { finish_button.Clicked += delegate {
Controller.FinishPageCompleted (); Controller.FinishPageCompleted ();
@ -751,16 +745,16 @@ namespace SparkleShare {
switch (Controller.TutorialPageNumber) { switch (Controller.TutorialPageNumber) {
case 1: { case 1: {
Header = _("What's happening next?"); Header = "What's happening next?";
Description = "SparkleShare creates a special folder on your computer " + Description = "SparkleShare creates a special folder on your computer " +
"that will keep track of your projects."; "that will keep track of your projects.";
Button skip_tutorial_button = new Button (_("Skip Tutorial")); Button skip_tutorial_button = new Button ("Skip Tutorial");
skip_tutorial_button.Clicked += delegate { skip_tutorial_button.Clicked += delegate {
Controller.TutorialSkipped (); Controller.TutorialSkipped ();
}; };
Button continue_button = new Button (_("Continue")); Button continue_button = new Button ("Continue");
continue_button.Clicked += delegate { continue_button.Clicked += delegate {
Controller.TutorialPageCompleted (); Controller.TutorialPageCompleted ();
}; };
@ -776,11 +770,11 @@ namespace SparkleShare {
} }
case 2: { case 2: {
Header = _("Sharing files with others"); Header = "Sharing files with others";
Description = _("All files added to your project folders are synced automatically with " + Description = "All files added to your project folders are synced automatically with " +
"the host and your team members."); "the host and your team members.";
Button continue_button = new Button (_("Continue")); Button continue_button = new Button ("Continue");
continue_button.Clicked += delegate { continue_button.Clicked += delegate {
Controller.TutorialPageCompleted (); Controller.TutorialPageCompleted ();
}; };
@ -794,11 +788,11 @@ namespace SparkleShare {
} }
case 3: { case 3: {
Header = _("The status icon is here to help"); Header = "The status icon is here to help";
Description = _("It shows the syncing progress, provides easy access to " + Description = "It shows the syncing progress, provides easy access to " +
"your projects and let's you view recent changes."); "your projects and let's you view recent changes.";
Button continue_button = new Button (_("Continue")); Button continue_button = new Button ("Continue");
continue_button.Clicked += delegate { continue_button.Clicked += delegate {
Controller.TutorialPageCompleted (); Controller.TutorialPageCompleted ();
}; };
@ -812,13 +806,13 @@ namespace SparkleShare {
} }
case 4: { case 4: {
Header = _("Adding projects to SparkleShare"); Header = "Adding projects to SparkleShare";
Description = _("You can do this through the status icon menu, or by clicking " + Description = "You can do this through the status icon menu, or by clicking " +
"magic buttons on webpages that look like this:"); "magic buttons on webpages that look like this:";
Image slide = SparkleUIHelpers.GetImage ("tutorial-slide-4.png"); Image slide = SparkleUIHelpers.GetImage ("tutorial-slide-4.png");
Button finish_button = new Button (_("Finish")); Button finish_button = new Button ("Finish");
finish_button.Clicked += delegate { finish_button.Clicked += delegate {
Controller.TutorialPageCompleted (); Controller.TutorialPageCompleted ();
}; };

23
SparkleShare/Linux/SparkleShare.csproj
View file

@ -57,26 +57,25 @@
</ProjectExtensions> </ProjectExtensions>
<ItemGroup> <ItemGroup>
<Compile Include="SparkleBubbles.cs" /> <Compile Include="SparkleBubbles.cs" />
<Compile Include="SparkleBubblesController.cs" />
<Compile Include="SparkleController.cs" /> <Compile Include="SparkleController.cs" />
<Compile Include="SparkleEntry.cs" />
<Compile Include="SparkleSetup.cs" /> <Compile Include="SparkleSetup.cs" />
<Compile Include="SparkleSetupController.cs" />
<Compile Include="SparkleSetupWindow.cs" /> <Compile Include="SparkleSetupWindow.cs" />
<Compile Include="Program.cs" />
<Compile Include="SparkleSpinner.cs" /> <Compile Include="SparkleSpinner.cs" />
<Compile Include="SparkleStatusIcon.cs" /> <Compile Include="SparkleStatusIcon.cs" />
<Compile Include="SparkleStatusIconController.cs" />
<Compile Include="SparkleUI.cs" /> <Compile Include="SparkleUI.cs" />
<Compile Include="SparkleUIHelpers.cs" /> <Compile Include="SparkleUIHelpers.cs" />
<Compile Include="SparkleEventLogController.cs" />
<Compile Include="SparkleEventLog.cs" /> <Compile Include="SparkleEventLog.cs" />
<Compile Include="SparkleAboutController.cs" />
<Compile Include="SparkleAbout.cs" /> <Compile Include="SparkleAbout.cs" />
<Compile Include="SparkleExtensions.cs" /> <Compile Include="..\Program.cs" />
<Compile Include="SparkleControllerBase.cs" /> <Compile Include="..\SparkleAboutController.cs" />
<Compile Include="SparklePlugin.cs" /> <Compile Include="..\SparkleBubblesController.cs" />
<Compile Include="SparkleOptions.cs" /> <Compile Include="..\SparkleControllerBase.cs" />
<Compile Include="SparkleInvite.cs" /> <Compile Include="..\SparkleEventLogController.cs" />
<Compile Include="..\SparkleExtensions.cs" />
<Compile Include="..\SparkleInvite.cs" />
<Compile Include="..\SparkleKeys.cs" />
<Compile Include="..\SparklePlugin.cs" />
<Compile Include="..\SparkleSetupController.cs" />
<Compile Include="..\SparkleStatusIconController.cs" />
</ItemGroup> </ItemGroup>
</Project> </Project>

12
SparkleShare/Linux/SparkleShare.sln
View file

@ -3,12 +3,24 @@ Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008 # Visual Studio 2008
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleShare", "SparkleShare.csproj", "{728483AA-E34B-4441-BF2C-C8BC2901E4E0}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleShare", "SparkleShare.csproj", "{728483AA-E34B-4441-BF2C-C8BC2901E4E0}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleLib", "..\..\SparkleLib\SparkleLib.csproj", "{2C914413-B31C-4362-93C7-1AE34F09112A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleLib.Git", "..\..\SparkleLib\Git\SparkleLib.Git.csproj", "{009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU Release|Any CPU = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}.Release|Any CPU.Build.0 = Release|Any CPU
{2C914413-B31C-4362-93C7-1AE34F09112A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2C914413-B31C-4362-93C7-1AE34F09112A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2C914413-B31C-4362-93C7-1AE34F09112A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2C914413-B31C-4362-93C7-1AE34F09112A}.Release|Any CPU.Build.0 = Release|Any CPU
{728483AA-E34B-4441-BF2C-C8BC2901E4E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {728483AA-E34B-4441-BF2C-C8BC2901E4E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{728483AA-E34B-4441-BF2C-C8BC2901E4E0}.Debug|Any CPU.Build.0 = Debug|Any CPU {728483AA-E34B-4441-BF2C-C8BC2901E4E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{728483AA-E34B-4441-BF2C-C8BC2901E4E0}.Release|Any CPU.ActiveCfg = Release|Any CPU {728483AA-E34B-4441-BF2C-C8BC2901E4E0}.Release|Any CPU.ActiveCfg = Release|Any CPU

23
SparkleShare/Linux/SparkleStatusIcon.cs
View file

@ -41,13 +41,6 @@ namespace SparkleShare {
#else #else
private StatusIcon status_icon; private StatusIcon status_icon;
#endif #endif
// Short alias for the translations
public static string _ (string s)
{
return Catalog.GetString (s);
}
public SparkleStatusIcon () public SparkleStatusIcon ()
@ -207,7 +200,7 @@ namespace SparkleShare {
this.menu.Add (new SeparatorMenuItem ()); this.menu.Add (new SeparatorMenuItem ());
MenuItem sync_item = new MenuItem (_("Add Hosted Project…")); MenuItem sync_item = new MenuItem ("Add Hosted Project…");
sync_item.Activated += delegate { sync_item.Activated += delegate {
Controller.AddHostedProjectClicked (); Controller.AddHostedProjectClicked ();
@ -215,7 +208,7 @@ namespace SparkleShare {
this.menu.Add (sync_item); this.menu.Add (sync_item);
this.recent_events_item = new MenuItem (_("Recent Changes…")); this.recent_events_item = new MenuItem ("Recent Changes…");
this.recent_events_item.Sensitive = Controller.OpenRecentEventsItemEnabled; this.recent_events_item.Sensitive = Controller.OpenRecentEventsItemEnabled;
@ -230,18 +223,18 @@ namespace SparkleShare {
MenuItem notify_item; MenuItem notify_item;
if (Program.Controller.NotificationsEnabled) if (Program.Controller.NotificationsEnabled)
notify_item = new MenuItem (_("Turn Notifications Off")); notify_item = new MenuItem ("Turn Notifications Off");
else else
notify_item = new MenuItem (_("Turn Notifications On")); notify_item = new MenuItem ("Turn Notifications On");
notify_item.Activated += delegate { notify_item.Activated += delegate {
Application.Invoke (delegate { Application.Invoke (delegate {
Program.Controller.ToggleNotifications (); Program.Controller.ToggleNotifications ();
if (Program.Controller.NotificationsEnabled) if (Program.Controller.NotificationsEnabled)
(notify_item.Child as Label).Text = _("Turn Notifications Off"); (notify_item.Child as Label).Text = "Turn Notifications Off";
else else
(notify_item.Child as Label).Text = _("Turn Notifications On"); (notify_item.Child as Label).Text = "Turn Notifications On";
}); });
}; };
@ -249,7 +242,7 @@ namespace SparkleShare {
this.menu.Add (new SeparatorMenuItem ()); this.menu.Add (new SeparatorMenuItem ());
MenuItem about_item = new MenuItem (_("About SparkleShare")); MenuItem about_item = new MenuItem ("About SparkleShare");
about_item.Activated += delegate { about_item.Activated += delegate {
Controller.AboutClicked (); Controller.AboutClicked ();
@ -259,7 +252,7 @@ namespace SparkleShare {
this.menu.Add (new SeparatorMenuItem ()); this.menu.Add (new SeparatorMenuItem ());
this.quit_item = new MenuItem (_("Quit")) { this.quit_item = new MenuItem ("Quit") {
Sensitive = Controller.QuitItemEnabled Sensitive = Controller.QuitItemEnabled
}; };

1
SparkleShare/Mac/SparkleShare.csproj
View file

@ -32,7 +32,6 @@
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="MonoMac" /> <Reference Include="MonoMac" />
<Reference Include="System.Net" /> <Reference Include="System.Net" />

8
configure.ac
View file

@ -1,9 +1,5 @@
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
m4_define([sparkleshare_version], m4_define([sparkleshare_version], [0.9.1])
[0.9.0])
m4_define([sparkleshare_asm_version],
[0.9.0])
AC_PREREQ([2.54]) AC_PREREQ([2.54])
AC_INIT([SparkleShare], sparkleshare_version) AC_INIT([SparkleShare], sparkleshare_version)
@ -11,7 +7,7 @@ AM_INIT_AUTOMAKE([1.11 dist-bzip2 dist-zip foreign tar-pax])
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
dnl Export Version Info dnl Export Version Info
AC_SUBST([ASM_VERSION], [sparkleshare_asm_version]) AC_SUBST([ASM_VERSION], [sparkleshare_version])
dnl pkg-config dnl pkg-config
AC_PATH_PROG(PKG_CONFIG, pkg-config, no) AC_PATH_PROG(PKG_CONFIG, pkg-config, no)