remove references to Mono.Unix.Catalog
This commit is contained in:
parent
509f969e9c
commit
84bf6e5fa9
|
@ -21,7 +21,6 @@ using System.IO;
|
||||||
using System.Net;
|
using System.Net;
|
||||||
|
|
||||||
using Gtk;
|
using Gtk;
|
||||||
using Mono.Unix;
|
|
||||||
|
|
||||||
namespace SparkleShare {
|
namespace SparkleShare {
|
||||||
|
|
||||||
|
@ -33,7 +32,7 @@ namespace SparkleShare {
|
||||||
// Short alias for the translations
|
// Short alias for the translations
|
||||||
public static string _(string s)
|
public static string _(string s)
|
||||||
{
|
{
|
||||||
return Catalog.GetString (s);
|
return s;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -27,7 +27,6 @@ using System.Text.RegularExpressions;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Xml;
|
using System.Xml;
|
||||||
|
|
||||||
using Mono.Unix;
|
|
||||||
using SparkleLib;
|
using SparkleLib;
|
||||||
|
|
||||||
namespace SparkleShare {
|
namespace SparkleShare {
|
||||||
|
@ -85,7 +84,7 @@ namespace SparkleShare {
|
||||||
// Short alias for the translations
|
// Short alias for the translations
|
||||||
public static string _ (string s)
|
public static string _ (string s)
|
||||||
{
|
{
|
||||||
return Catalog.GetString (s);
|
return s;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -650,7 +649,7 @@ namespace SparkleShare {
|
||||||
change_set.MovedFrom.Count) - 1;
|
change_set.MovedFrom.Count) - 1;
|
||||||
|
|
||||||
if (changes_count > 0) {
|
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);
|
message += " " + String.Format (msg, changes_count);
|
||||||
|
|
||||||
} else if (changes_count < 0) {
|
} else if (changes_count < 0) {
|
||||||
|
|
|
@ -22,7 +22,6 @@ using System.Text.RegularExpressions;
|
||||||
using System.Timers;
|
using System.Timers;
|
||||||
|
|
||||||
using Gtk;
|
using Gtk;
|
||||||
using Mono.Unix;
|
|
||||||
using Notifications;
|
using Notifications;
|
||||||
|
|
||||||
namespace SparkleShare {
|
namespace SparkleShare {
|
||||||
|
@ -44,7 +43,7 @@ namespace SparkleShare {
|
||||||
// Short alias for the translations
|
// Short alias for the translations
|
||||||
public static string _ (string s)
|
public static string _ (string s)
|
||||||
{
|
{
|
||||||
return Catalog.GetString (s);
|
return s;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -22,8 +22,6 @@ using System.IO;
|
||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
|
|
||||||
using Mono.Unix;
|
|
||||||
using Mono.Unix.Native;
|
|
||||||
using SparkleLib;
|
using SparkleLib;
|
||||||
using SparkleLib.Options;
|
using SparkleLib.Options;
|
||||||
|
|
||||||
|
@ -39,19 +37,21 @@ namespace SparkleShare {
|
||||||
// Short alias for the translations
|
// Short alias for the translations
|
||||||
public static string _ (string s)
|
public static string _ (string s)
|
||||||
{
|
{
|
||||||
return Catalog.GetString (s);
|
return s;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public static void Main (string [] args)
|
public static void Main (string [] args)
|
||||||
{
|
{
|
||||||
// Use translations
|
// 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
|
// Don't allow running as root on Linux or Mac
|
||||||
if ((SparkleBackend.Platform == PlatformID.Unix ||
|
if ((SparkleBackend.Platform == PlatformID.Unix ||
|
||||||
SparkleBackend.Platform == PlatformID.MacOSX) &&
|
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 (_("Sorry, you can't run SparkleShare with these permissions."));
|
||||||
Console.WriteLine (_("Things would go utterly wrong."));
|
Console.WriteLine (_("Things would go utterly wrong."));
|
||||||
|
|
|
@ -23,7 +23,6 @@ using System.Timers;
|
||||||
using AppIndicator;
|
using AppIndicator;
|
||||||
#endif
|
#endif
|
||||||
using Gtk;
|
using Gtk;
|
||||||
using Mono.Unix;
|
|
||||||
using SparkleLib;
|
using SparkleLib;
|
||||||
|
|
||||||
namespace SparkleShare {
|
namespace SparkleShare {
|
||||||
|
@ -47,7 +46,7 @@ namespace SparkleShare {
|
||||||
// Short alias for the translations
|
// Short alias for the translations
|
||||||
public static string _ (string s)
|
public static string _ (string s)
|
||||||
{
|
{
|
||||||
return Catalog.GetString (s);
|
return s;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -24,8 +24,6 @@ using System.Text;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
|
|
||||||
using Gtk;
|
using Gtk;
|
||||||
using Mono.Unix;
|
|
||||||
using Mono.Unix.Native;
|
|
||||||
using SparkleLib;
|
using SparkleLib;
|
||||||
|
|
||||||
namespace SparkleShare {
|
namespace SparkleShare {
|
||||||
|
@ -40,7 +38,7 @@ namespace SparkleShare {
|
||||||
// Short alias for the translations
|
// Short alias for the translations
|
||||||
public static string _(string s)
|
public static string _(string s)
|
||||||
{
|
{
|
||||||
return Catalog.GetString (s);
|
return s;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -23,7 +23,6 @@ using System.Text.RegularExpressions;
|
||||||
using System.Timers;
|
using System.Timers;
|
||||||
|
|
||||||
using Gtk;
|
using Gtk;
|
||||||
using Mono.Unix;
|
|
||||||
using SparkleLib;
|
using SparkleLib;
|
||||||
|
|
||||||
namespace SparkleShare {
|
namespace SparkleShare {
|
||||||
|
@ -38,7 +37,7 @@ namespace SparkleShare {
|
||||||
|
|
||||||
public SparkleWindow () : base ("")
|
public SparkleWindow () : base ("")
|
||||||
{
|
{
|
||||||
Title = Catalog.GetString ("SparkleShare Setup");
|
Title = "SparkleShare Setup";
|
||||||
BorderWidth = 0;
|
BorderWidth = 0;
|
||||||
IconName = "folder-sparkleshare";
|
IconName = "folder-sparkleshare";
|
||||||
Resizable = false;
|
Resizable = false;
|
||||||
|
|
|
@ -22,7 +22,6 @@ using System.Text.RegularExpressions;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
|
|
||||||
using Gtk;
|
using Gtk;
|
||||||
using Mono.Unix;
|
|
||||||
using SparkleLib;
|
using SparkleLib;
|
||||||
#if false
|
#if false
|
||||||
using WebKit;
|
using WebKit;
|
||||||
|
@ -50,7 +49,7 @@ namespace SparkleShare {
|
||||||
// Short alias for the translations
|
// Short alias for the translations
|
||||||
public static string _ (string s)
|
public static string _ (string s)
|
||||||
{
|
{
|
||||||
return Catalog.GetString (s);
|
return s;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -14,8 +14,6 @@
|
||||||
// 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 Mono.Unix;
|
|
||||||
using Mono.Unix.Native;
|
|
||||||
using SparkleLib;
|
using SparkleLib;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
|
Loading…
Reference in a new issue