diff --git a/.tx/config b/.tx/config deleted file mode 100644 index 9e2054fb..00000000 --- a/.tx/config +++ /dev/null @@ -1,7 +0,0 @@ -[main] -host = https://www.transifex.net - -[sparkleshare.UI] -file_filter = SparkleShare/Common/Translations/.po -source_file = SparkleShare/Common/Translations/sparkleshare.pot -source_lang = en diff --git a/SparkleLib/Defines.cs.in b/SparkleLib/Defines.cs.in index 99059352..fcc1ee99 100755 --- a/SparkleLib/Defines.cs.in +++ b/SparkleLib/Defines.cs.in @@ -14,11 +14,15 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . + using System; using System.Reflection; -[assembly: AssemblyTitle("SparkleLib")] -[assembly: AssemblyVersion("0.9.0.0")] +[assembly:AssemblyTitle ("SparkleLib")] +[assembly:AssemblyVersion ("@VERSION@")] +[assembly:AssemblyCopyright ("Copyright (c) 2010 Hylke Bons and others")] +[assembly:AssemblyTrademark ("SparkleShare is a trademark of SparkleShare Ltd.")] + namespace SparkleLib { public class Defines { diff --git a/SparkleLib/Git/SparkleLib.Git.csproj b/SparkleLib/Git/SparkleLib.Git.csproj index ab22caa7..5559e117 100644 --- a/SparkleLib/Git/SparkleLib.Git.csproj +++ b/SparkleLib/Git/SparkleLib.Git.csproj @@ -1,5 +1,5 @@ - + Debug AnyCPU @@ -12,6 +12,7 @@ SparkleLib.Git 512 + v4.0 true @@ -53,7 +54,6 @@ - diff --git a/SparkleLib/SparkleBackend.cs b/SparkleLib/SparkleBackend.cs index 8c896f4e..dfaf74aa 100755 --- a/SparkleLib/SparkleBackend.cs +++ b/SparkleLib/SparkleBackend.cs @@ -25,7 +25,8 @@ namespace SparkleLib { public static string Version { get { - return Assembly.GetExecutingAssembly ().GetName ().Version.ToString (); + string version = "" + Assembly.GetExecutingAssembly ().GetName ().Version; + return version.Substring (0, version.Length - 2); } } diff --git a/SparkleLib/SparkleLib.csproj b/SparkleLib/SparkleLib.csproj index 59b83d4a..b092e6b2 100644 --- a/SparkleLib/SparkleLib.csproj +++ b/SparkleLib/SparkleLib.csproj @@ -1,5 +1,5 @@ - + Debug AnyCPU @@ -32,7 +32,6 @@ - diff --git a/SparkleShare/Linux/SparkleAbout.cs b/SparkleShare/Linux/SparkleAbout.cs index 485cb8f4..81a0fae2 100755 --- a/SparkleShare/Linux/SparkleAbout.cs +++ b/SparkleShare/Linux/SparkleAbout.cs @@ -29,13 +29,6 @@ namespace SparkleShare { private Label updates; - // Short alias for the translations - public static string _ (string s) - { - return Catalog.GetString (s); - } - - public SparkleAbout () : base ("") { DeleteEvent += delegate (object o, DeleteEventArgs args) { @@ -48,7 +41,7 @@ namespace SparkleShare { BorderWidth = 0; IconName = "folder-sparkleshare"; WindowPosition = WindowPosition.Center; - Title = _("About SparkleShare"); + Title = "About SparkleShare"; AppPaintable = true; string image_path = new string [] { SparkleUI.AssetsPath, "pixmaps", "about.png" }.Combine (); diff --git a/SparkleShare/Linux/SparkleEventLog.cs b/SparkleShare/Linux/SparkleEventLog.cs index f8b83e11..584c73a5 100755 --- a/SparkleShare/Linux/SparkleEventLog.cs +++ b/SparkleShare/Linux/SparkleEventLog.cs @@ -42,13 +42,6 @@ namespace SparkleShare { private SparkleSpinner spinner; - // Short alias for the translations - public static string _ (string s) - { - return Catalog.GetString (s); - } - - public SparkleEventLog () : base ("") { SetSizeRequest (480, (int) (Gdk.Screen.Default.Height * 0.8)); @@ -61,7 +54,7 @@ namespace SparkleShare { Resizable = true; BorderWidth = 0; - Title = _("Recent Changes"); + Title = "Recent Changes"; IconName = "folder-sparkleshare"; DeleteEvent += delegate (object o, DeleteEventArgs args) { @@ -202,7 +195,7 @@ namespace SparkleShare { ListStore store = new ListStore (typeof (string)); - store.AppendValues (_("Summary")); + store.AppendValues ("Summary"); store.AppendValues ("---"); this.combo_box.Model = store; diff --git a/SparkleShare/Linux/SparkleSetup.cs b/SparkleShare/Linux/SparkleSetup.cs index 695e8a39..11d761a8 100755 --- a/SparkleShare/Linux/SparkleSetup.cs +++ b/SparkleShare/Linux/SparkleSetup.cs @@ -32,13 +32,6 @@ namespace SparkleShare { public SparkleSetupController Controller = new SparkleSetupController (); private ProgressBar progress_bar = new ProgressBar (); - - - // Short alias for the translations - public static string _ (string s) - { - return Catalog.GetString (s); - } public SparkleSetup () : base () @@ -63,15 +56,15 @@ namespace SparkleShare { switch (type) { case PageType.Setup: { - Header = _("Welcome to SparkleShare!"); - Description = "First off, what's your name and email?\nThis information is only visible to team members."; + Header = "Welcome to SparkleShare!"; + Description = "First off, what's your name and email?\nThis information is only visible to team members."; Table table = new Table (2, 3, true) { RowSpacing = 6, ColumnSpacing = 6 }; - Label name_label = new Label ("" + _("Full Name:") + "") { + Label name_label = new Label ("" + "Full Name:" + "") { UseMarkup = true, Xalign = 1 }; @@ -94,7 +87,7 @@ namespace SparkleShare { Controller.CheckSetupPage (name_entry.Text, email_entry.Text); }; - Label email_label = new Label ("" + _("Email:") + "") { + Label email_label = new Label ("" + "Email:" + "") { UseMarkup = true, Xalign = 1 }; @@ -107,13 +100,13 @@ namespace SparkleShare { VBox wrapper = new VBox (false, 9); wrapper.PackStart (table, true, false, 0); - Button cancel_button = new Button (_("Cancel")); + Button cancel_button = new Button ("Cancel"); cancel_button.Clicked += delegate { Controller.SetupPageCancelled (); }; - Button continue_button = new Button (_("Continue")) { + Button continue_button = new Button ("Continue") { Sensitive = false }; @@ -142,7 +135,7 @@ namespace SparkleShare { case PageType.Add: { - Header = _("Where's your project hosted?"); + Header = "Where's your project hosted?"; VBox layout_vertical = new VBox (false, 12); HBox layout_fields = new HBox (true, 12); @@ -280,7 +273,7 @@ namespace SparkleShare { }; layout_address.PackStart (new Label () { - Markup = "" + _("Address:") + "", + Markup = "" + "Address:" + "", Xalign = 0 }, true, true, 0); @@ -292,7 +285,7 @@ namespace SparkleShare { }; layout_path.PackStart (new Label () { - Markup = "" + _("Remote Path:") + "", + Markup = "" + "Remote Path:" + "", Xalign = 0 }, true, true, 0); @@ -309,13 +302,13 @@ namespace SparkleShare { Add (layout_vertical); // Cancel button - Button cancel_button = new Button (_("Cancel")); + Button cancel_button = new Button ("Cancel"); cancel_button.Clicked += delegate { Controller.PageCancelled (); }; - Button add_button = new Button (_("Add")) { + Button add_button = new Button ("Add") { Sensitive = false }; @@ -352,8 +345,8 @@ namespace SparkleShare { case PageType.Invite: { - Header = _("You've received an invite!"); - Description = _("Do you want to add this project to SparkleShare?"); + Header = "You've received an invite!"; + Description = "Do you want to add this project to SparkleShare?"; Table table = new Table (2, 3, true) { @@ -361,11 +354,11 @@ namespace SparkleShare { ColumnSpacing = 6 }; - Label address_label = new Label (_("Address:")) { + Label address_label = new Label ("Address:") { Xalign = 1 }; - Label path_label = new Label (_("Remote Path:")) { + Label path_label = new Label ("Remote Path:") { Xalign = 1 }; @@ -387,13 +380,13 @@ namespace SparkleShare { VBox wrapper = new VBox (false, 9); wrapper.PackStart (table, true, false, 0); - Button cancel_button = new Button (_("Cancel")); + Button cancel_button = new Button ("Cancel"); cancel_button.Clicked += delegate { Controller.PageCancelled (); }; - Button add_button = new Button (_("Add")); + Button add_button = new Button ("Add"); add_button.Clicked += delegate { Controller.InvitePageCompleted (); @@ -408,18 +401,18 @@ namespace SparkleShare { case PageType.Syncing: { - 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."); + 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."; this.progress_bar.Fraction = Controller.ProgressBarPercentage / 100; Button finish_button = new Button () { Sensitive = false, - Label = _("Finish") + Label = "Finish" }; Button cancel_button = new Button () { - Label = _("Cancel") + Label = "Cancel" }; cancel_button.Clicked += delegate { @@ -448,7 +441,7 @@ namespace SparkleShare { case PageType.Error: { - Header = _("Oops! Something went wrong") + "…"; + Header = "Oops! Something went wrong" + "…"; VBox points = new VBox (false, 0); Image list_point_one = new Image (SparkleUIHelpers.GetIcon ("go-next", 16)); @@ -500,13 +493,13 @@ namespace SparkleShare { points.PackStart (new Label (""), true, true, 0); - Button cancel_button = new Button (_("Cancel")); + Button cancel_button = new Button ("Cancel"); cancel_button.Clicked += delegate { Controller.PageCancelled (); }; - Button try_again_button = new Button (_("Try Again…")) { + Button try_again_button = new Button ("Try Again…") { Sensitive = true }; @@ -526,7 +519,7 @@ namespace SparkleShare { 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."; - Label password_label = new Label ("" + _("Password:") + "") { + Label password_label = new Label ("" + "Password:" + "") { UseMarkup = true, Xalign = 1 }; @@ -622,7 +615,7 @@ namespace SparkleShare { Header = "This project contains encrypted files"; Description = "Please enter the password to see their contents."; - Label password_label = new Label ("" + _("Password:") + "") { + Label password_label = new Label ("" + "Password:" + "") { UseMarkup = true, Xalign = 1 }; @@ -693,23 +686,24 @@ namespace SparkleShare { UrgencyHint = true; if (!HasToplevelFocus) { - string title = _("Your shared project is ready!"); - string subtext = _("You can find the files in your SparkleShare folder."); + string title = "Your shared project is ready!"; + string subtext = "You can find the files in your SparkleShare folder."); SparkleUI.Bubbles.Controller.ShowBubble (title, subtext, null); } - Header = _("Your shared project is ready!"); - Description = _("You can find it in your SparkleShare folder"); + Header = "Your shared project is ready!"; + Description = "You can find it in your SparkleShare 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 { Controller.OpenFolderClicked (); }; - Button finish_button = new Button (_("Finish")); + Button finish_button = new Button ("Finish"); finish_button.Clicked += delegate { Controller.FinishPageCompleted (); @@ -751,16 +745,16 @@ namespace SparkleShare { switch (Controller.TutorialPageNumber) { case 1: { - Header = _("What's happening next?"); + Header = "What's happening next?"; Description = "SparkleShare creates a special folder on your computer " + "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 { Controller.TutorialSkipped (); }; - Button continue_button = new Button (_("Continue")); + Button continue_button = new Button ("Continue"); continue_button.Clicked += delegate { Controller.TutorialPageCompleted (); }; @@ -776,11 +770,11 @@ namespace SparkleShare { } case 2: { - Header = _("Sharing files with others"); - Description = _("All files added to your project folders are synced automatically with " + - "the host and your team members."); + Header = "Sharing files with others"; + Description = "All files added to your project folders are synced automatically with " + + "the host and your team members."; - Button continue_button = new Button (_("Continue")); + Button continue_button = new Button ("Continue"); continue_button.Clicked += delegate { Controller.TutorialPageCompleted (); }; @@ -794,11 +788,11 @@ namespace SparkleShare { } case 3: { - Header = _("The status icon is here to help"); - Description = _("It shows the syncing progress, provides easy access to " + - "your projects and let's you view recent changes."); + Header = "The status icon is here to help"; + Description = "It shows the syncing progress, provides easy access to " + + "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 { Controller.TutorialPageCompleted (); }; @@ -812,13 +806,13 @@ namespace SparkleShare { } case 4: { - Header = _("Adding projects to SparkleShare"); - Description = _("You can do this through the status icon menu, or by clicking " + - "magic buttons on webpages that look like this:"); + Header = "Adding projects to SparkleShare"; + Description = "You can do this through the status icon menu, or by clicking " + + "magic buttons on webpages that look like this:"; Image slide = SparkleUIHelpers.GetImage ("tutorial-slide-4.png"); - Button finish_button = new Button (_("Finish")); + Button finish_button = new Button ("Finish"); finish_button.Clicked += delegate { Controller.TutorialPageCompleted (); }; diff --git a/SparkleShare/Linux/SparkleShare.csproj b/SparkleShare/Linux/SparkleShare.csproj index 86ea9285..a0f5513f 100644 --- a/SparkleShare/Linux/SparkleShare.csproj +++ b/SparkleShare/Linux/SparkleShare.csproj @@ -57,26 +57,25 @@ - - - - - - - - - - - - + + + + + + + + + + + diff --git a/SparkleShare/Linux/SparkleShare.sln b/SparkleShare/Linux/SparkleShare.sln index 9716fc21..241c51e8 100644 --- a/SparkleShare/Linux/SparkleShare.sln +++ b/SparkleShare/Linux/SparkleShare.sln @@ -3,12 +3,24 @@ Microsoft Visual Studio Solution File, Format Version 10.00 # Visual Studio 2008 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleShare", "SparkleShare.csproj", "{728483AA-E34B-4441-BF2C-C8BC2901E4E0}" 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 GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection 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.Build.0 = Debug|Any CPU {728483AA-E34B-4441-BF2C-C8BC2901E4E0}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/SparkleShare/Linux/SparkleStatusIcon.cs b/SparkleShare/Linux/SparkleStatusIcon.cs index 6f02fd12..d523ad4d 100644 --- a/SparkleShare/Linux/SparkleStatusIcon.cs +++ b/SparkleShare/Linux/SparkleStatusIcon.cs @@ -41,13 +41,6 @@ namespace SparkleShare { #else private StatusIcon status_icon; #endif - - - // Short alias for the translations - public static string _ (string s) - { - return Catalog.GetString (s); - } public SparkleStatusIcon () @@ -207,7 +200,7 @@ namespace SparkleShare { 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 { Controller.AddHostedProjectClicked (); @@ -215,7 +208,7 @@ namespace SparkleShare { 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; @@ -230,18 +223,18 @@ namespace SparkleShare { MenuItem notify_item; if (Program.Controller.NotificationsEnabled) - notify_item = new MenuItem (_("Turn Notifications Off")); + notify_item = new MenuItem ("Turn Notifications Off"); else - notify_item = new MenuItem (_("Turn Notifications On")); + notify_item = new MenuItem ("Turn Notifications On"); notify_item.Activated += delegate { Application.Invoke (delegate { Program.Controller.ToggleNotifications (); if (Program.Controller.NotificationsEnabled) - (notify_item.Child as Label).Text = _("Turn Notifications Off"); + (notify_item.Child as Label).Text = "Turn Notifications Off"; 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 ()); - MenuItem about_item = new MenuItem (_("About SparkleShare")); + MenuItem about_item = new MenuItem ("About SparkleShare"); about_item.Activated += delegate { Controller.AboutClicked (); @@ -259,7 +252,7 @@ namespace SparkleShare { this.menu.Add (new SeparatorMenuItem ()); - this.quit_item = new MenuItem (_("Quit")) { + this.quit_item = new MenuItem ("Quit") { Sensitive = Controller.QuitItemEnabled }; diff --git a/SparkleShare/Mac/SparkleShare.csproj b/SparkleShare/Mac/SparkleShare.csproj index 43eb28cc..9b551229 100644 --- a/SparkleShare/Mac/SparkleShare.csproj +++ b/SparkleShare/Mac/SparkleShare.csproj @@ -32,7 +32,6 @@ - diff --git a/configure.ac b/configure.ac index 12dbaea7..51620e05 100755 --- a/configure.ac +++ b/configure.ac @@ -1,9 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -m4_define([sparkleshare_version], - [0.9.0]) - -m4_define([sparkleshare_asm_version], - [0.9.0]) +m4_define([sparkleshare_version], [0.9.1]) AC_PREREQ([2.54]) AC_INIT([SparkleShare], sparkleshare_version) @@ -11,7 +7,7 @@ AM_INIT_AUTOMAKE([1.11 dist-bzip2 dist-zip foreign tar-pax]) AM_MAINTAINER_MODE dnl Export Version Info -AC_SUBST([ASM_VERSION], [sparkleshare_asm_version]) +AC_SUBST([ASM_VERSION], [sparkleshare_version]) dnl pkg-config AC_PATH_PROG(PKG_CONFIG, pkg-config, no)