diff --git a/SparkleShare/SparkleAbout.cs b/SparkleShare/SparkleAbout.cs index 5e738371..7afe214a 100644 --- a/SparkleShare/SparkleAbout.cs +++ b/SparkleShare/SparkleAbout.cs @@ -21,7 +21,6 @@ using System.IO; using System.Net; using Gtk; -using Mono.Unix; namespace SparkleShare { @@ -33,7 +32,7 @@ namespace SparkleShare { // Short alias for the translations public static string _(string s) { - return Catalog.GetString (s); + return s; } diff --git a/SparkleShare/SparkleController.cs b/SparkleShare/SparkleController.cs index c0b229dd..8655e1f9 100644 --- a/SparkleShare/SparkleController.cs +++ b/SparkleShare/SparkleController.cs @@ -27,7 +27,6 @@ using System.Text.RegularExpressions; using System.Threading; using System.Xml; -using Mono.Unix; using SparkleLib; namespace SparkleShare { @@ -85,7 +84,7 @@ namespace SparkleShare { // Short alias for the translations public static string _ (string s) { - return Catalog.GetString (s); + return s; } @@ -650,7 +649,7 @@ namespace SparkleShare { change_set.MovedFrom.Count) - 1; if (changes_count > 0) { - string msg = Catalog.GetPluralString ("and {0} more", "and {0} more", changes_count); + string msg = "and {0} more"; message += " " + String.Format (msg, changes_count); } else if (changes_count < 0) { diff --git a/SparkleShare/SparkleIntro.cs b/SparkleShare/SparkleIntro.cs index 7a0478f1..fe92455e 100644 --- a/SparkleShare/SparkleIntro.cs +++ b/SparkleShare/SparkleIntro.cs @@ -22,7 +22,6 @@ using System.Text.RegularExpressions; using System.Timers; using Gtk; -using Mono.Unix; using Notifications; namespace SparkleShare { @@ -44,7 +43,7 @@ namespace SparkleShare { // Short alias for the translations public static string _ (string s) { - return Catalog.GetString (s); + return s; } diff --git a/SparkleShare/SparkleShare.cs b/SparkleShare/SparkleShare.cs index fed350a6..ae6de9c6 100644 --- a/SparkleShare/SparkleShare.cs +++ b/SparkleShare/SparkleShare.cs @@ -22,8 +22,6 @@ using System.IO; using System.Runtime.InteropServices; using System.Text; -using Mono.Unix; -using Mono.Unix.Native; using SparkleLib; using SparkleLib.Options; @@ -39,19 +37,21 @@ namespace SparkleShare { // Short alias for the translations public static string _ (string s) { - return Catalog.GetString (s); + return s; } public static void Main (string [] args) { // Use translations - Catalog.Init (Defines.GETTEXT_PACKAGE, Defines.LOCALE_DIR); + if ((SparkleBackend.Platform == PlatformID.Unix || + SparkleBackend.Platform == PlatformID.MacOSX)) + Mono.Unix.Catalog.Init (Defines.GETTEXT_PACKAGE, Defines.LOCALE_DIR); // Don't allow running as root on Linux or Mac if ((SparkleBackend.Platform == PlatformID.Unix || SparkleBackend.Platform == PlatformID.MacOSX) && - new UnixUserInfo (UnixEnvironment.UserName).UserId == 0) { + new Mono.Unix.UnixUserInfo (Mono.Unix.UnixEnvironment.UserName).UserId == 0) { Console.WriteLine (_("Sorry, you can't run SparkleShare with these permissions.")); Console.WriteLine (_("Things would go utterly wrong.")); diff --git a/SparkleShare/SparkleStatusIcon.cs b/SparkleShare/SparkleStatusIcon.cs index d93246f1..060bea2c 100644 --- a/SparkleShare/SparkleStatusIcon.cs +++ b/SparkleShare/SparkleStatusIcon.cs @@ -23,7 +23,6 @@ using System.Timers; using AppIndicator; #endif using Gtk; -using Mono.Unix; using SparkleLib; namespace SparkleShare { @@ -47,7 +46,7 @@ namespace SparkleShare { // Short alias for the translations public static string _ (string s) { - return Catalog.GetString (s); + return s; } diff --git a/SparkleShare/SparkleUI.cs b/SparkleShare/SparkleUI.cs index ed8a7015..e343aa21 100644 --- a/SparkleShare/SparkleUI.cs +++ b/SparkleShare/SparkleUI.cs @@ -24,8 +24,6 @@ using System.Text; using System.Threading; using Gtk; -using Mono.Unix; -using Mono.Unix.Native; using SparkleLib; namespace SparkleShare { @@ -40,7 +38,7 @@ namespace SparkleShare { // Short alias for the translations public static string _(string s) { - return Catalog.GetString (s); + return s; } diff --git a/SparkleShare/SparkleWindow.cs b/SparkleShare/SparkleWindow.cs index 9f510a20..c2392455 100644 --- a/SparkleShare/SparkleWindow.cs +++ b/SparkleShare/SparkleWindow.cs @@ -23,7 +23,6 @@ using System.Text.RegularExpressions; using System.Timers; using Gtk; -using Mono.Unix; using SparkleLib; namespace SparkleShare { @@ -38,7 +37,7 @@ namespace SparkleShare { public SparkleWindow () : base ("") { - Title = Catalog.GetString ("SparkleShare Setup"); + Title = "SparkleShare Setup"; BorderWidth = 0; IconName = "folder-sparkleshare"; Resizable = false; diff --git a/SparkleShare/Windows/SparkleEventLog.cs b/SparkleShare/Windows/SparkleEventLog.cs index 3334d4ed..d78e369e 100644 --- a/SparkleShare/Windows/SparkleEventLog.cs +++ b/SparkleShare/Windows/SparkleEventLog.cs @@ -22,7 +22,6 @@ using System.Text.RegularExpressions; using System.Threading; using Gtk; -using Mono.Unix; using SparkleLib; #if false using WebKit; @@ -50,7 +49,7 @@ namespace SparkleShare { // Short alias for the translations public static string _ (string s) { - return Catalog.GetString (s); + return s; } diff --git a/SparkleShare/Windows/SparkleWinController.cs b/SparkleShare/Windows/SparkleWinController.cs index e4771c7e..dafe65df 100644 --- a/SparkleShare/Windows/SparkleWinController.cs +++ b/SparkleShare/Windows/SparkleWinController.cs @@ -14,8 +14,6 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -using Mono.Unix; -using Mono.Unix.Native; using SparkleLib; using System; using System.Collections.Generic;