diff --git a/.gitignore b/.gitignore index b64e5d69..ad095000 100644 --- a/.gitignore +++ b/.gitignore @@ -44,5 +44,5 @@ SparkleShare/sparkleshare po/sparkleshare.pot SparkleShare/Nautilus/sparkleshare-nautilus-extension.py gnome-doc-utils.make -sparkleshare-* +/sparkleshare-* desktop.ini diff --git a/AUTHORS b/AUTHORS index 96ff1c5a..f2aa8b0a 100644 --- a/AUTHORS +++ b/AUTHORS @@ -24,6 +24,7 @@ Contributors: Jakub Steiner Kristi Tsukida Lapo Calamandrei + Lars Falk-Petersen Luis Cordova Łukasz Jernaś Michael Monreal @@ -35,6 +36,7 @@ Contributors: Sandy Armstrong Simon Pither Steven Harms + Sven Mueller Vincent Untz Will Thompson diff --git a/Makefile.am b/Makefile.am index 77c913f1..1ca9d1da 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,11 +1,7 @@ -SUBDIRS = \ - build \ - help \ - SmartIrc4net \ - SparkleLib \ - SparkleShare \ - data \ - po +basedirs = build help SmartIrc4net SparkleLib data po + +SUBDIRS = $(basedirs) $(GUISUBDIRS) +DIST_SUBDIRS = $(basedirs) SparkleShare EXTRA_DIST = \ gnome-doc-utils.make \ diff --git a/NEWS b/NEWS index 7b1bf0e3..df789ab0 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,17 @@ +0.2.4 for Linux and Mac (Wed Jun 29, 2011): + + Hylke: Fix crash when setting up with an empty Git repository. + + +0.2.3 for Linux and Mac (Tue Jun 28, 2011): + + Hylke: Add the ability to add notes in the event logs. Fix some quirks + in the webkit view on Linux. Redid gravatar fetching parts to be more + efficient. Remove headless feature. Fix some small bugs and crashes. + SparkleShare will now also try to use your existing SSH keypair. Required + Git version is now 1.7.1 or later. + + 0.2.2 for Linux and Mac (Tue Jun 14, 2011): Hylke: Fix crash on first run when ~/.ssh doesn't exist. Sync algorithm diff --git a/README b/README index a4f19ca1..065e718b 100644 --- a/README +++ b/README @@ -28,7 +28,7 @@ Run on Linux: SparkleShare currently requires: - - git >= 1.7 + - git >= 1.7.1 - gtk-sharp2 >= 2.12.7 - mono-core >= 2.2 - ndesk-dbus >= 0.6 diff --git a/SparkleLib/Git/SparkleFetcherGit.cs b/SparkleLib/Git/SparkleFetcherGit.cs index 49ada7af..390053c1 100644 --- a/SparkleLib/Git/SparkleFetcherGit.cs +++ b/SparkleLib/Git/SparkleFetcherGit.cs @@ -30,6 +30,12 @@ namespace SparkleLib { { remote_folder = remote_folder.Trim ("/".ToCharArray ()); + if (server.StartsWith("http")) { + base.target_folder = target_folder; + base.remote_url = server; + return; + } + // Gitorious formatting if (server.Contains ("gitorious.org")) { server = "ssh://git@gitorious.org"; @@ -102,6 +108,9 @@ namespace SparkleLib { // Ignore permission changes config = config.Replace ("filemode = true", "filemode = false"); + config = config.Replace ("fetch = +refs/heads/*:refs/remotes/origin/*", + "fetch = +refs/heads/*:refs/remotes/origin/*" + Environment.NewLine + + "\tfetch = +refs/notes/*:refs/notes/*"); // Add user info string n = Environment.NewLine; diff --git a/SparkleLib/Git/SparkleRepoGit.cs b/SparkleLib/Git/SparkleRepoGit.cs index 434e0ae7..474e189c 100644 --- a/SparkleLib/Git/SparkleRepoGit.cs +++ b/SparkleLib/Git/SparkleRepoGit.cs @@ -20,6 +20,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; using System.Text.RegularExpressions; +using System.Xml; namespace SparkleLib { @@ -49,6 +50,34 @@ namespace SparkleLib { } + public override string [] UnsyncedFilePaths { + get { + List file_paths = new List (); + + SparkleGit git = new SparkleGit (LocalPath, "status --porcelain"); + git.Start (); + + // Reading the standard output HAS to go before + // WaitForExit, or it will hang forever on output > 4096 bytes + string output = git.StandardOutput.ReadToEnd ().TrimEnd (); + git.WaitForExit (); + + string [] lines = output.Split ("\n".ToCharArray ()); + foreach (string line in lines) { + if (line [1].ToString ().Equals ("M") || + line [1].ToString ().Equals ("?") || + line [1].ToString ().Equals ("A")) { + + string path = line.Substring (3); + path = path.Trim ("\"".ToCharArray ()); + file_paths.Add (path); + } + } + + return file_paths.ToArray (); + } + } + public override string CurrentRevision { get { @@ -63,8 +92,9 @@ namespace SparkleLib { git.WaitForExit (); if (git.ExitCode == 0) { - string output = git.StandardOutput.ReadToEnd (); + string output = git.StandardOutput.ReadToEnd (); return output.TrimEnd (); + } else { return null; } @@ -88,6 +118,7 @@ namespace SparkleLib { if (!remote_revision.StartsWith (CurrentRevision)) { SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Remote changes found. (" + remote_revision + ")"); return true; + } else { return false; } @@ -102,7 +133,6 @@ namespace SparkleLib { Commit (message); SparkleGit git = new SparkleGit (LocalPath, "push origin master"); - git.Start (); git.WaitForExit (); @@ -115,14 +145,14 @@ namespace SparkleLib { public override bool SyncDown () { - SparkleGit git = new SparkleGit (LocalPath, "fetch -v origin master"); - + SparkleGit git = new SparkleGit (LocalPath, "fetch -v"); git.Start (); git.WaitForExit (); if (git.ExitCode == 0) { Rebase (); return true; + } else { return false; } @@ -133,9 +163,12 @@ namespace SparkleLib { get { SparkleGit git = new SparkleGit (LocalPath, "status --porcelain"); git.Start (); + + // Reading the standard output HAS to go before + // WaitForExit, or it will hang forever on output > 4096 bytes + string output = git.StandardOutput.ReadToEnd ().TrimEnd (); git.WaitForExit (); - string output = git.StandardOutput.ReadToEnd ().TrimEnd (); string [] lines = output.Split ("\n".ToCharArray ()); foreach (string line in lines) { @@ -265,9 +298,12 @@ namespace SparkleLib { SparkleGit git_status = new SparkleGit (LocalPath, "status --porcelain"); git_status.Start (); + + // Reading the standard output HAS to go before + // WaitForExit, or it will hang forever on output > 4096 bytes + string output = git_status.StandardOutput.ReadToEnd ().TrimEnd (); git_status.WaitForExit (); - string output = git_status.StandardOutput.ReadToEnd ().TrimEnd (); string [] lines = output.Split ("\n".ToCharArray ()); foreach (string line in lines) { @@ -339,7 +375,6 @@ namespace SparkleLib { // Returns a list of the latest change sets - // TODO: Method needs to be made a lot faster public override List GetChangeSets (int count) { if (count < 1) @@ -393,7 +428,6 @@ namespace SparkleLib { "([0-9]{2}):([0-9]{2}):([0-9]{2}) (.[0-9]{4})\n" + "*", RegexOptions.Compiled); - // TODO: Need to optimise for speed foreach (string log_entry in entries) { Regex regex; bool is_merge_commit = false; @@ -410,11 +444,11 @@ namespace SparkleLib { if (match.Success) { SparkleChangeSet change_set = new SparkleChangeSet (); - change_set.Folder = Name; - change_set.Revision = match.Groups [1].Value; - change_set.UserName = match.Groups [2].Value; - change_set.UserEmail = match.Groups [3].Value; - change_set.IsMerge = is_merge_commit; + change_set.Folder = Name; + change_set.Revision = match.Groups [1].Value; + change_set.UserName = match.Groups [2].Value; + change_set.UserEmail = match.Groups [3].Value; + change_set.IsMerge = is_merge_commit; change_set.Timestamp = new DateTime (int.Parse (match.Groups [4].Value), int.Parse (match.Groups [5].Value), int.Parse (match.Groups [6].Value), @@ -437,7 +471,7 @@ namespace SparkleLib { string file_path = entry_line.Substring (39); string to_file_path; - if (change_type.Equals ("A")) { + if (change_type.Equals ("A") && !file_path.Contains (".notes")) { change_set.Added.Add (file_path); } else if (change_type.Equals ("M")) { @@ -457,7 +491,13 @@ namespace SparkleLib { } } - change_sets.Add (change_set); + if ((change_set.Added.Count + + change_set.Edited.Count + + change_set.Deleted.Count) > 0) { + + change_set.Notes.AddRange (GetNotes (change_set.Revision)); + change_sets.Add (change_set); + } } } @@ -533,16 +573,6 @@ namespace SparkleLib { } - public override void CreateInitialChangeSet () - { - base.CreateInitialChangeSet (); - Add (); - - string message = FormatCommitMessage (); - Commit (message); - } - - public override bool UsesNotificationCenter { get { @@ -550,5 +580,12 @@ namespace SparkleLib { return !File.Exists (file_path); } } + + + public override void CreateInitialChangeSet () + { + base.CreateInitialChangeSet (); + SyncUp (); + } } } diff --git a/SparkleLib/Hg/SparkleRepoHg.cs b/SparkleLib/Hg/SparkleRepoHg.cs index 149c9f88..d59c3915 100644 --- a/SparkleLib/Hg/SparkleRepoHg.cs +++ b/SparkleLib/Hg/SparkleRepoHg.cs @@ -185,7 +185,6 @@ namespace SparkleLib { // Returns a list of the latest change sets - // TODO: Method needs to be made a lot faster public override List GetChangeSets (int count) { if (count < 1) @@ -224,7 +223,6 @@ namespace SparkleLib { Regex regex = new Regex (@"([0-9]{4})-([0-9]{2})-([0-9]{2}).*([0-9]{2}):([0-9]{2}).*.([0-9]{4})" + "(.+)<(.+)>.*.([a-z0-9]{12})", RegexOptions.Compiled); - // TODO: Need to optimise for speed foreach (string log_entry in entries) { bool is_merge_commit = false; diff --git a/SparkleLib/Makefile.am b/SparkleLib/Makefile.am index 0c928dc4..e5fdcd51 100644 --- a/SparkleLib/Makefile.am +++ b/SparkleLib/Makefile.am @@ -22,7 +22,7 @@ SOURCES = \ SparkleHelpers.cs \ SparkleListenerBase.cs \ SparkleListenerIrc.cs \ - SparkleListenerTcp.cs \ + SparkleListenerTcp.cs \ SparkleOptions.cs \ SparklePaths.cs \ SparkleRepoBase.cs \ diff --git a/SparkleLib/SparkleChangeSet.cs b/SparkleLib/SparkleChangeSet.cs index 9bcd66b9..5adfa4dd 100644 --- a/SparkleLib/SparkleChangeSet.cs +++ b/SparkleLib/SparkleChangeSet.cs @@ -24,15 +24,61 @@ namespace SparkleLib { public string UserName; public string UserEmail; + public string Folder; public string Revision; public DateTime Timestamp; - public bool IsMerge = false; + public bool IsMerge = false; + public List Added = new List (); public List Deleted = new List (); public List Edited = new List (); public List MovedFrom = new List (); public List MovedTo = new List (); + public List Notes = new List (); + + public string RelativeTimestamp { + get { + TimeSpan time_span = DateTime.Now - Timestamp; + + if (time_span <= TimeSpan.FromSeconds (60)) + return "just now"; + + if (time_span <= TimeSpan.FromMinutes (60)) + return time_span.Minutes > 1 + ? time_span.Minutes + " minutes ago" + : "a minute ago"; + + if (time_span <= TimeSpan.FromHours (24)) + return time_span.Hours > 1 + ? time_span.Hours + " hours ago" + : "an hour ago"; + + if (time_span <= TimeSpan.FromDays (30)) + return time_span.Days > 1 + ? time_span.Days + " days ago" + : "a day ago"; + + if (time_span <= TimeSpan.FromDays (365)) + return time_span.Days > 30 + ? (time_span.Days / 30) + " months ago" + : "a month ago"; + + return time_span.Days > 365 + ? (time_span.Days / 365) + " years ago" + : "a year ago"; + } + } + } + + + public class SparkleNote { + + public string UserName; + public string UserEmail; + + public DateTime Timestamp; + public string Body; } } diff --git a/SparkleLib/SparkleConfig.cs b/SparkleLib/SparkleConfig.cs index 88f99835..cb69040a 100644 --- a/SparkleLib/SparkleConfig.cs +++ b/SparkleLib/SparkleConfig.cs @@ -154,6 +154,21 @@ namespace SparkleLib { Save (); } + public bool SetFolderOptionalAttribute (string name, string key, string value) + { + XmlNode folder = this.GetFolder(name); + if (folder == null) return false; + + if (folder[key] != null) { + folder[key].InnerText = value; + } else { + XmlNode new_node = CreateElement(key); + new_node.InnerText = value; + folder.AppendChild(new_node); + } + return true; + } + public void RemoveFolder (string name) { @@ -168,51 +183,53 @@ namespace SparkleLib { public bool FolderExists (string name) { - foreach (XmlNode node_folder in SelectNodes ("/sparkleshare/folder")) { - if (node_folder ["name"].InnerText.Equals (name)) - return true; - } - - return false; + XmlNode folder = this.GetFolder(name); + return folder != null; } public string GetBackendForFolder (string name) { - foreach (XmlNode node_folder in SelectNodes ("/sparkleshare/folder")) { - if (node_folder ["name"].InnerText.Equals (name)) - return node_folder ["backend"].InnerText; - } - - return null; + return this.GetFolderValue(name, "backend"); } public string GetUrlForFolder (string name) { - foreach (XmlNode node_folder in SelectNodes ("/sparkleshare/folder")) { - if (node_folder ["name"].InnerText.Equals (name)) - return node_folder ["url"].InnerText; - } + return this.GetFolderValue(name, "url"); + } + - return null; + public List Hosts { + get { + List hosts = new List (); + + foreach (XmlNode node_folder in SelectNodes ("/sparkleshare/folder")) { + Uri uri = new Uri (node_folder ["url"].InnerText); + if (!hosts.Contains (uri.Host)) + hosts.Add (uri.Host); + } + + return hosts; + } } public string GetAnnouncementsForFolder (string name) { - foreach (XmlNode node_folder in SelectNodes ("/sparkleshare/folder")) { - if (node_folder ["name"].InnerText.Equals (name) && - node_folder ["announcements"] != null) { - - return node_folder ["announcements"].InnerText; - } - } - - return null; + return this.GetFolderValue(name, "announcements"); } + public string GetAnnouncementUrlForFolder (string name) + { + // examples? + // tcp://localhost:9999/ + // xmpp:someuser@somexmppserver?canhavefunnybits + // irc://hbons/#somechatroom + return this.GetFolderValue(name, "announcements_url"); + } + public string GetConfigOption (string name) { XmlNode node = SelectSingleNode ("/sparkleshare/" + name); @@ -252,6 +269,23 @@ namespace SparkleLib { Save (Path); SparkleHelpers.DebugInfo ("Config", "Updated \"" + Path + "\""); } + + + private XmlNode GetFolder (string name) + { + return SelectSingleNode(String.Format("/sparkleshare/folder[name='{0}']", name)); + } + + + private string GetFolderValue (string name, string key) + { + XmlNode folder = this.GetFolder(name); + + if ((folder != null) && (folder[key] != null)) { + return folder[key].InnerText; + } + return null; + } } diff --git a/SparkleLib/SparkleListenerBase.cs b/SparkleLib/SparkleListenerBase.cs index bcf12c93..e35e036f 100644 --- a/SparkleLib/SparkleListenerBase.cs +++ b/SparkleLib/SparkleListenerBase.cs @@ -37,34 +37,43 @@ namespace SparkleLib { public static class SparkleListenerFactory { - private static List listeners; + private static List listeners = new List (); - public static SparkleListenerIrc CreateIrcListener (string server, string folder_identifier, - string announcements) + public static SparkleListenerBase CreateListener (string folder_name, string folder_identifier) { - if (listeners == null) - listeners = new List (); + string announce_uri = SparkleConfig.DefaultConfig.GetAnnouncementUrlForFolder (folder_name); - // This is SparkleShare's centralized notification service. - // Don't worry, we only use this server as a backup if you - // don't have your own. All data needed to connect is hashed and - // we don't store any personal information ever - if (announcements == null) - server = "204.62.14.135"; - else - server = announcements; + if (announce_uri == null) { + // This is SparkleShare's centralized notification service. + // Don't worry, we only use this server as a backup if you + // don't have your own. All data needed to connect is hashed and + // we don't store any personal information ever + + announce_uri = "irc://204.62.14.135/"; + } foreach (SparkleListenerBase listener in listeners) { - if (listener.Server.Equals (server)) { - SparkleHelpers.DebugInfo ("ListenerFactory", "Refered to existing listener for " + server); + if (listener.Server.Equals (announce_uri)) { + SparkleHelpers.DebugInfo ("ListenerFactory", "Refered to existing listener for " + announce_uri); listener.AlsoListenTo (folder_identifier); - return (SparkleListenerIrc) listener; + return (SparkleListenerBase) listener; } } - SparkleHelpers.DebugInfo ("ListenerFactory", "Issued new listener for " + server); - listeners.Add (new SparkleListenerIrc (server, folder_identifier, announcements)); - return (SparkleListenerIrc) listeners [listeners.Count - 1]; + Uri listen_on = new Uri (announce_uri); + + switch (listen_on.Scheme) { + case "tcp": + listeners.Add (new SparkleListenerTcp (listen_on, folder_identifier)); + break; + case "irc": + default: + listeners.Add (new SparkleListenerIrc (listen_on, folder_identifier)); + break; + } + + SparkleHelpers.DebugInfo ("ListenerFactory", "Issued new listener for " + announce_uri); + return (SparkleListenerBase) listeners [listeners.Count - 1]; } } @@ -97,16 +106,17 @@ namespace SparkleLib { protected List queue_up = new List (); protected List queue_down = new List (); protected bool is_connecting; - protected string server; + protected Uri server; protected Timer reconnect_timer = new Timer { Interval = 60 * 1000, Enabled = true }; - public SparkleListenerBase (string server, string folder_identifier, string announcements) { - this.reconnect_timer.Elapsed += delegate { + public SparkleListenerBase (Uri server, string folder_identifier) { + this.reconnect_timer.Elapsed += delegate { if (!IsConnected && !this.is_connecting) Reconnect (); - }; + }; - this.reconnect_timer.Start (); + this.server = server; + this.reconnect_timer.Start (); } @@ -185,7 +195,7 @@ namespace SparkleLib { } - public string Server { + public Uri Server { get { return this.server; } diff --git a/SparkleLib/SparkleListenerIrc.cs b/SparkleLib/SparkleListenerIrc.cs index 8ab5f5bb..1932ef3e 100644 --- a/SparkleLib/SparkleListenerIrc.cs +++ b/SparkleLib/SparkleListenerIrc.cs @@ -31,11 +31,9 @@ namespace SparkleLib { private string nick; - public SparkleListenerIrc (string server, string folder_identifier, string announcements) : - base (server, folder_identifier, announcements) + public SparkleListenerIrc (Uri server, string folder_identifier) : + base (server, folder_identifier) { - base.server = server; - // Try to get a uniqueish nickname this.nick = SHA1 (DateTime.Now.ToString ("ffffff") + "sparkles"); @@ -90,9 +88,10 @@ namespace SparkleLib { this.thread = new Thread ( new ThreadStart (delegate { try { - // Connect, login, and join the channel - this.client.Connect (new string [] {base.server}, 6667); + int port = base.server.Port; + if (port < 0) port = 6667; + this.client.Connect (base.server.Host, port); this.client.Login (this.nick, this.nick); foreach (string channel in base.channels) { diff --git a/SparkleLib/SparkleListenerTcp.cs b/SparkleLib/SparkleListenerTcp.cs index 027d0ed1..ad7e71ae 100644 --- a/SparkleLib/SparkleListenerTcp.cs +++ b/SparkleLib/SparkleListenerTcp.cs @@ -16,52 +16,42 @@ using System; +using System.IO; using System.Text; using System.Threading; using System.Net.Sockets; using System.Security.Cryptography; +using System.Collections.Generic; +using System.Xml.Serialization; namespace SparkleLib { public class SparkleListenerTcp : SparkleListenerBase { private Thread thread; + + // these are shared + private readonly Object mutex = new Object(); private Socket socket; + private bool connected; - public SparkleListenerTcp (string server, string folder_identifier, string announcements) : - base (server, folder_identifier, announcements) + public SparkleListenerTcp (Uri server, string folder_identifier) : + base (server, folder_identifier) { - base.server = server; base.channels.Add (folder_identifier); this.socket = new Socket (AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); -/* - this.client.OnConnected += delegate { - base.is_connecting = false; - OnConnected (); - }; - - this.client.OnDisconnected += delegate { - base.is_connecting = false; - OnDisconnected (); - }; - - this.client.OnError += delegate { - base.is_connecting = false; - OnDisconnected (); - }; - - this..OnChannelMessage += delegate (object o, IrcEventArgs args) { - string message = args.Data.Message.Trim (); - string folder_id = args.Data.Channel.Substring (1); // remove the starting hash - OnAnnouncement (new SparkleAnnouncement (folder_id, message)); - };*/ + this.connected = false; } public override bool IsConnected { get { - //return this.client.IsConnected; - return true; + //return this.client.IsConnected; + bool result = false; + lock (this.mutex) { + result = this.connected; + } + return result; } } @@ -69,43 +59,51 @@ namespace SparkleLib { // Starts a new thread and listens to the channel public override void Connect () { - SparkleHelpers.DebugInfo ("ListenerTcp", "Connecting to " + Server); + SparkleHelpers.DebugInfo ("ListenerTcp", "Connecting to " + Server.Host); base.is_connecting = true; this.thread = new Thread ( new ThreadStart (delegate { try { - // Connect and subscribe to the channel - this.socket.Connect (Server, 9999); - base.is_connecting = false; + int port = Server.Port; + if (port < 0) port = 9999; + this.socket.Connect (Server.Host, port); + lock (this.mutex) { + base.is_connecting = false; + this.connected = true; - foreach (string channel in base.channels) { - SparkleHelpers.DebugInfo ("ListenerTcp", "Subscribing to channel " + channel); - - byte [] message = Encoding.UTF8.GetBytes ( - "{\"folder\": \"" + channel + "\", \"command\": \"subscribe\"}"); - this.socket.Send (message); + foreach (string channel in base.channels) { + SparkleHelpers.DebugInfo ("ListenerTcp", "Subscribing to channel " + channel); + this.socket.Send (Encoding.UTF8.GetBytes ("subscribe " + channel + "\n")); + } } + byte [] bytes = new byte [4096]; // List to the channels, this blocks the thread while (this.socket.Connected) { - this.socket.Receive (bytes); - if (bytes != null && bytes.Length > 0) { - Console.WriteLine (Encoding.UTF8.GetString (bytes)); + int bytes_read = this.socket.Receive (bytes); + if (bytes_read > 0) { + string received = Encoding.UTF8.GetString (bytes); + string folder_identifier = received.Substring (0, received.IndexOf ("!")); + string message = received.Substring (received.IndexOf ("!") + 1); - string received_message = bytes.ToString ().Trim (); - string folder_id = ""; // TODO: parse message, use XML - OnAnnouncement (new SparkleAnnouncement (folder_id, received_message)); + OnAnnouncement (new SparkleAnnouncement (folder_identifier, message)); + } else { + SparkleHelpers.DebugInfo ("ListenerTcp", "Error on socket"); + lock (this.mutex) { + this.socket.Close(); + this.connected = false; + } } } - - // Disconnect when we time out - this.socket.Close (); - + + SparkleHelpers.DebugInfo ("ListenerTcp", "Disconnected from " + Server.Host); + + // TODO: attempt to reconnect..? } catch (SocketException e) { SparkleHelpers.DebugInfo ("ListenerTcp", "Could not connect to " + Server + ": " + e.Message); } @@ -125,9 +123,11 @@ namespace SparkleLib { if (IsConnected) { SparkleHelpers.DebugInfo ("ListenerTcp", "Subscribing to channel " + channel); - byte [] message = Encoding.UTF8.GetBytes ( - "{\"folder\": \"" + channel + "\", \"command\": \"subscribe\"}"); - this.socket.Send (message); + string to_send = "subscribe " + folder_identifier + "\n"; + + lock (this.mutex) { + this.socket.Send (Encoding.UTF8.GetBytes (to_send)); + } } } } @@ -135,13 +135,12 @@ namespace SparkleLib { public override void Announce (SparkleAnnouncement announcement) { - string channel = announcement.FolderIdentifier; - byte [] message = Encoding.UTF8.GetBytes ( - "{\"folder\": \"" + channel + "\", \"command\": \"publish\"}"); - this.socket.Send (message); + string to_send = "announce " + announcement.FolderIdentifier + + " " + announcement.Message + "\n"; - // Also announce to ourselves for debugging purposes - // base.OnAnnouncement (announcement); + lock (this.mutex) { + this.socket.Send (Encoding.UTF8.GetBytes (to_send)); + } } diff --git a/SparkleLib/SparkleRepoBase.cs b/SparkleLib/SparkleRepoBase.cs index abceb727..e313faa2 100644 --- a/SparkleLib/SparkleRepoBase.cs +++ b/SparkleLib/SparkleRepoBase.cs @@ -18,6 +18,8 @@ using System; using System.Collections.Generic; using System.IO; +using System.Security.Cryptography; +using System.Text; using System.Text.RegularExpressions; using System.Timers; using System.Xml; @@ -38,7 +40,6 @@ namespace SparkleLib { private TimeSpan long_interval = new TimeSpan (0, 0, 10, 0); private SparkleWatcher watcher; - private SparkleListenerBase listener; private TimeSpan poll_interval; private Timer local_timer = new Timer () { Interval = 0.25 * 1000 }; private Timer remote_timer = new Timer () { Interval = 10 * 1000 }; @@ -47,6 +48,7 @@ namespace SparkleLib { private bool has_changed = false; private Object change_lock = new Object (); + protected SparkleListenerBase listener; protected SyncStatus status; protected bool is_buffering = false; protected bool server_online = true; @@ -86,10 +88,8 @@ namespace SparkleLib { this.status = status; }; - if (CurrentRevision == null) { + if (CurrentRevision == null) CreateInitialChangeSet (); - HasUnsyncedChanges = true; - } CreateWatcher (); CreateListener (); @@ -115,9 +115,6 @@ namespace SparkleLib { SyncUpBase (); }; - this.remote_timer.Start (); - this.local_timer.Start (); - // Sync up everything that changed // since we've been offline if (AnyDifferences) { @@ -128,6 +125,9 @@ namespace SparkleLib { SyncUpBase (); EnableWatching (); } + + this.remote_timer.Start (); + this.local_timer.Start (); } @@ -145,6 +145,13 @@ namespace SparkleLib { } + public virtual string [] UnsyncedFilePaths { + get { + return new string [0]; + } + } + + public string Domain { get { Regex regex = new Regex (@"(@|://)([a-z0-9\.-]+)(/|:)"); @@ -218,10 +225,9 @@ namespace SparkleLib { } - private void CreateListener () + public void CreateListener () { - this.listener = SparkleListenerFactory.CreateIrcListener (Domain, Identifier, - SparkleConfig.DefaultConfig.GetAnnouncementsForFolder (Name)); + this.listener = SparkleListenerFactory.CreateListener (Name, Identifier); // Stop polling when the connection to the irc channel is succesful this.listener.Connected += delegate { @@ -302,7 +308,8 @@ namespace SparkleLib { if (!this.watcher.EnableRaisingEvents) return; - if (args.FullPath.Contains (Path.DirectorySeparatorChar + ".")) + if (args.FullPath.Contains (Path.DirectorySeparatorChar + ".") && + !args.FullPath.Contains (Path.DirectorySeparatorChar + ".notes")) return; WatcherChangeTypes wct = args.ChangeType; @@ -329,6 +336,42 @@ namespace SparkleLib { } + public List GetNotes (string revision) { + List notes = new List (); + + string notes_path = Path.Combine (LocalPath, ".notes"); + + if (!Directory.Exists (notes_path)) + Directory.CreateDirectory (notes_path); + + Regex regex_notes = new Regex (@"(.+).*" + + "(.+).*" + + "([0-9]+).*" + + "(.+)", RegexOptions.Compiled); + + foreach (string file_path in Directory.GetFiles (notes_path)) { + if (Path.GetFileName (file_path).StartsWith (revision)) { + string note_xml = String.Join ("", File.ReadAllLines (file_path)); + + Match match_notes = regex_notes.Match (note_xml); + + if (match_notes.Success) { + SparkleNote note = new SparkleNote () { + UserName = match_notes.Groups [1].Value, + UserEmail = match_notes.Groups [2].Value, + Timestamp = new DateTime (1970, 1, 1).AddSeconds (int.Parse (match_notes.Groups [3].Value)), + Body = match_notes.Groups [4].Value + }; + + notes.Add (note); + } + } + } + + return notes; + } + + private void SyncUpBase () { try { @@ -393,8 +436,9 @@ namespace SparkleLib { if (SyncStatusChanged != null) SyncStatusChanged (SyncStatus.Idle); - if (NewChangeSet != null) - NewChangeSet (GetChangeSets (1) [0], LocalPath); + SparkleChangeSet change_set = GetChangeSets (1) [0]; + if (NewChangeSet != null && change_set.Revision != CurrentRevision) + NewChangeSet (change_set, LocalPath); // There could be changes from a // resolved conflict. Tries only once, @@ -443,6 +487,44 @@ namespace SparkleLib { } + public void AddNote (string revision, string note) + { + string notes_path = Path.Combine (LocalPath, ".notes"); + + if (!Directory.Exists (notes_path)) + Directory.CreateDirectory (notes_path); + + // Add a timestamp in seconds since unix epoch + int timestamp = (int) (DateTime.UtcNow - new DateTime (1970, 1, 1)).TotalSeconds; + + string n = Environment.NewLine; + note = "" + n + + " " + n + + " " + SparkleConfig.DefaultConfig.UserName + "" + n + + " " + SparkleConfig.DefaultConfig.UserEmail + "" + n + + " " + n + + " " + timestamp + "" + n + + " " + note + "" + n + + "" + n; + + string note_name = revision + SHA1 (timestamp.ToString () + note); + string note_path = Path.Combine (notes_path, note_name); + + StreamWriter writer = new StreamWriter (note_path); + writer.Write (note); + writer.Close (); + + + // The watcher doesn't like .*/ so we need to trigger + // a change manually + FileSystemEventArgs args = new FileSystemEventArgs (WatcherChangeTypes.Changed, + notes_path, note_name); + + OnFileActivity (args); + SparkleHelpers.DebugInfo ("Note", "Added note to " + revision); + } + + // Recursively gets a folder's size in bytes private double CalculateFolderSize (DirectoryInfo parent) { @@ -456,7 +538,7 @@ namespace SparkleLib { if (parent.Name.Equals ("rebase-apply")) return 0; - foreach (FileInfo file in parent.GetFiles()) { + foreach (FileInfo file in parent.GetFiles ()) { if (!file.Exists) return 0; @@ -468,5 +550,15 @@ namespace SparkleLib { return size; } + + + // Creates a SHA-1 hash of input + private string SHA1 (string s) + { + SHA1 sha1 = new SHA1CryptoServiceProvider (); + Byte[] bytes = ASCIIEncoding.Default.GetBytes (s); + Byte[] encoded_bytes = sha1.ComputeHash (bytes); + return BitConverter.ToString (encoded_bytes).ToLower ().Replace ("-", ""); + } } } diff --git a/SparkleLib/windows/SparkleLib.csproj b/SparkleLib/windows/SparkleLib.csproj index 57c0577f..e1f1e575 100644 --- a/SparkleLib/windows/SparkleLib.csproj +++ b/SparkleLib/windows/SparkleLib.csproj @@ -108,6 +108,7 @@ + True @@ -165,4 +166,4 @@ $(ProjectDir)transform_tt.cmd - \ No newline at end of file + diff --git a/SparkleShare/Mac/Growl.plist b/SparkleShare/Mac/Growl.plist index cb8e7130..af7016e0 100644 --- a/SparkleShare/Mac/Growl.plist +++ b/SparkleShare/Mac/Growl.plist @@ -2,19 +2,15 @@ - TicketVersion - 1 - AllNotifications - - Start - Stop - Info - - DefaultNotifications - - Start - Stop - Info - + TicketVersion + 1 + AllNotifications + + Event + + DefaultNotifications + + Event + diff --git a/SparkleShare/Mac/SparkleAbout.cs b/SparkleShare/Mac/SparkleAbout.cs index 8177789e..e145b120 100644 --- a/SparkleShare/Mac/SparkleAbout.cs +++ b/SparkleShare/Mac/SparkleAbout.cs @@ -24,14 +24,15 @@ using MonoMac.AppKit; using MonoMac.ObjCRuntime; using MonoMac.WebKit; + namespace SparkleShare { public class SparkleAbout : NSWindow { - private NSButton WebsiteButton; - private NSButton CreditsButton; - private NSBox Box; - private NSTextField HeaderTextField; + public SparkleAboutController Controller = new SparkleAboutController (); + + private NSImage AboutImage; + private NSImageView AboutImageView; private NSTextField VersionTextField; private NSTextField UpdatesTextField; private NSTextField CreditsTextField; @@ -41,21 +42,22 @@ namespace SparkleShare { public SparkleAbout () : base () { - SetFrame (new RectangleF (0, 0, 360, 288), true); + SetFrame (new RectangleF (0, 0, 640, 281), true); Center (); Delegate = new SparkleAboutDelegate (); StyleMask = (NSWindowStyle.Closable | NSWindowStyle.Titled); Title = "About SparkleShare"; - MaxSize = new SizeF (360, 288); - MinSize = new SizeF (360, 288); + MaxSize = new SizeF (640, 281); + MinSize = new SizeF (640, 281); HasShadow = true; BackingType = NSBackingStore.Buffered; CreateAbout (); + OrderFrontRegardless (); MakeKeyAndOrderFront (this); - SparkleShare.Controller.NewVersionAvailable += delegate (string new_version) { + Controller.NewVersionEvent += delegate (string new_version) { InvokeOnMainThread (delegate { UpdatesTextField.StringValue = "A newer version (" + new_version + ") is available!"; UpdatesTextField.TextColor = @@ -63,7 +65,7 @@ namespace SparkleShare { }); }; - SparkleShare.Controller.VersionUpToDate += delegate { + Controller.VersionUpToDateEvent += delegate { InvokeOnMainThread (delegate { UpdatesTextField.StringValue = "You are running the latest version."; UpdatesTextField.TextColor = @@ -71,103 +73,83 @@ namespace SparkleShare { }); }; - CheckForNewVersion (); - } - - - public void CheckForNewVersion () - { - SparkleShare.Controller.CheckForNewVersion (); + Controller.CheckingForNewVersionEvent += delegate { + InvokeOnMainThread (delegate { + UpdatesTextField.StringValue = "Checking for updates..."; + UpdatesTextField.TextColor = NSColor.DisabledControlText; + }); + }; } private void CreateAbout () { - Box = new NSBox () { - FillColor = NSColor.White, - Frame = new RectangleF (-1, Frame.Height - 105, Frame.Width + 2, 105), - BoxType = NSBoxType.NSBoxCustom + string about_image_path = Path.Combine (NSBundle.MainBundle.ResourcePath, + "Pixmaps", "about.png"); + + AboutImage = new NSImage (about_image_path) { + Size = new SizeF (640, 260) }; - HeaderTextField = new NSTextField () { - StringValue = "SparkleShare", - Frame = new RectangleF (22, Frame.Height - 89, 318, 48), - BackgroundColor = NSColor.White, - Bordered = false, - Editable = false, - Font = NSFontManager.SharedFontManager.FontWithFamily - ("Lucida Grande", NSFontTraitMask.Condensed, 0, 24) + AboutImageView = new NSImageView () { + Image = AboutImage, + Frame = new RectangleF (0, 0, 640, 260) }; + VersionTextField = new NSTextField () { - StringValue = SparkleShare.Controller.Version, - Frame = new RectangleF (22, Frame.Height - 94, 318, 22), + StringValue = "version " + Controller.RunningVersion, + Frame = new RectangleF (295, 140, 318, 22), BackgroundColor = NSColor.White, Bordered = false, Editable = false, + DrawsBackground = false, + TextColor = NSColor.White, Font = NSFontManager.SharedFontManager.FontWithFamily - ("Lucida Grande", NSFontTraitMask.Unbold, 0, 11), - TextColor = NSColor.DisabledControlText + ("Lucida Grande", NSFontTraitMask.Unbold, 0, 11) }; UpdatesTextField = new NSTextField () { StringValue = "Checking for updates...", - Frame = new RectangleF (22, Frame.Height - 222, 318, 98), - BackgroundColor = NSColor.WindowBackground, + Frame = new RectangleF (295, Frame.Height - 232, 318, 98), Bordered = false, Editable = false, + DrawsBackground = false, Font = NSFontManager.SharedFontManager.FontWithFamily ("Lucida Grande", NSFontTraitMask.Unbold, 0, 11), TextColor = NSColor.DisabledControlText }; CreditsTextField = new NSTextField () { - StringValue = @"Copyright © 2010–" + DateTime.Now.Year + " Hylke Bons and others" + + StringValue = @"Copyright © 2010–" + DateTime.Now.Year + " Hylke Bons and others." + "\n" + "\n" + "SparkleShare is Free and Open Source Software. You are free to use, modify, and redistribute it " + "under the GNU General Public License version 3 or later.", - Frame = new RectangleF (22, Frame.Height - 250, 318, 98), - BackgroundColor = NSColor.WindowBackground, + Frame = new RectangleF (295, Frame.Height - 260, 318, 98), + TextColor = NSColor.White, + DrawsBackground = false, Bordered = false, Editable = false, Font = NSFontManager.SharedFontManager.FontWithFamily ("Lucida Grande", NSFontTraitMask.Unbold, 0, 11), }; - WebsiteButton = new NSButton () { - Frame = new RectangleF (12, 12, 120, 32), - Title = "Visit Website", - BezelStyle = NSBezelStyle.Rounded, - Font = SparkleUI.Font - }; +// WebsiteButton.Activated += delegate { +// NSUrl url = new NSUrl ("http://www.sparkleshare.org/"); +// NSWorkspace.SharedWorkspace.OpenUrl (url); +// }; - WebsiteButton.Activated += delegate { - NSUrl url = new NSUrl ("http://www.sparkleshare.org/"); - NSWorkspace.SharedWorkspace.OpenUrl (url); - }; +// CreditsButton.Activated += delegate { +// NSUrl url = new NSUrl ("http://www.sparkleshare.org/credits/"); +// NSWorkspace.SharedWorkspace.OpenUrl (url); +// }; - CreditsButton = new NSButton () { - Frame = new RectangleF (Frame.Width - 12 - 120, 12, 120, 32), - Title = "Show Credits", - BezelStyle = NSBezelStyle.Rounded, - Font = SparkleUI.Font - }; + ContentView.AddSubview (AboutImageView); - CreditsButton.Activated += delegate { - - NSUrl url = new NSUrl ("http://www.sparkleshare.org/credits/"); - NSWorkspace.SharedWorkspace.OpenUrl (url); - - }; - - ContentView.AddSubview (Box); - ContentView.AddSubview (HeaderTextField); ContentView.AddSubview (VersionTextField); ContentView.AddSubview (UpdatesTextField); ContentView.AddSubview (CreditsTextField); - ContentView.AddSubview (CreditsButton); - ContentView.AddSubview (WebsiteButton); } } diff --git a/SparkleShare/Mac/SparkleBadger.cs b/SparkleShare/Mac/SparkleBadger.cs new file mode 100644 index 00000000..f59c3d8f --- /dev/null +++ b/SparkleShare/Mac/SparkleBadger.cs @@ -0,0 +1,91 @@ +// SparkleShare, a collaboration and sharing tool. +// Copyright (C) 2010 Hylke Bons +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + + +using System; +using System.Drawing; +using System.IO; +using System.Collections.Generic; + +using MonoMac.AppKit; +using MonoMac.Foundation; +using MonoMac.Growl; + +namespace SparkleShare { + + public class SparkleBadger { + + private Dictionary icons = new Dictionary (); + private int [] sizes = new int [] {16, 32, 48, 128, 256, 512}; + private string [] paths; + + + public SparkleBadger (string [] paths) + { + this.paths = paths; + } + + + public void Badge () + { + using (NSAutoreleasePool a = new NSAutoreleasePool ()) { + foreach (string path in this.paths) { + string extension = Path.GetExtension (path.ToLower ()); + NSImage new_icon = new NSImage (); + + if (!this.icons.ContainsKey (extension)) { + foreach (int size in this.sizes) { + NSImage file_icon = NSWorkspace.SharedWorkspace.IconForFileType (extension); + file_icon.Size = new SizeF (size, size); + + // TODO: replace this with the sync icon + NSImage overlay_icon = NSWorkspace.SharedWorkspace.IconForFileType ("sln"); + overlay_icon.Size = new SizeF (size / 2, size / 2); + + file_icon.LockFocus (); + NSGraphicsContext.CurrentContext.ImageInterpolation = NSImageInterpolation.High; + overlay_icon.Draw ( + new RectangleF (0, 0, file_icon.Size.Width / 3, file_icon.Size.Width / 3), + new RectangleF (), NSCompositingOperation.SourceOver, 1.0f); + file_icon.UnlockFocus (); + + new_icon.AddRepresentation (file_icon.Representations () [0]); + } + + + this.icons.Add (extension, new_icon); + + } else { + new_icon = this.icons [extension]; + } + + NSWorkspace.SharedWorkspace.SetIconforFile (new_icon, path, 0); + } + } + } + + + public void Clear () + { + foreach (string path in this.paths) { + string extension = Path.GetExtension (path.ToLower ()); + + NSImage original_icon = NSWorkspace.SharedWorkspace.IconForFileType (extension); + NSWorkspace.SharedWorkspace.SetIconforFile (original_icon, path, 0); + } + } + } +} diff --git a/SparkleShare/Mac/SparkleBubble.cs b/SparkleShare/Mac/SparkleBubble.cs deleted file mode 100644 index 05523f1f..00000000 --- a/SparkleShare/Mac/SparkleBubble.cs +++ /dev/null @@ -1,58 +0,0 @@ -// SparkleShare, a collaboration and sharing tool. -// Copyright (C) 2010 Hylke Bons -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . - - -using System; -using System.IO; - -using MonoMac.AppKit; -using MonoMac.Foundation; -using MonoMac.Growl; - -namespace SparkleShare { - - public class SparkleBubble : NSObject { - - public string ImagePath; - - private string title; - private string subtext; - - - public SparkleBubble (string title, string subtext) - { - this.title = title; - this.subtext = subtext; - } - - - public void Show () - { - InvokeOnMainThread (delegate { - if (ImagePath != null && File.Exists (ImagePath)) { - NSData image_data = NSData.FromFile (ImagePath); - - GrowlApplicationBridge.Notify (this.title, this.subtext, - "Start", image_data, 0, false, null); - - } else { - GrowlApplicationBridge.Notify (this.title, this.subtext, - "Start", null, 0, false, null); - } - }); - } - } -} diff --git a/SparkleShare/Mac/SparkleBubbles.cs b/SparkleShare/Mac/SparkleBubbles.cs new file mode 100644 index 00000000..95487186 --- /dev/null +++ b/SparkleShare/Mac/SparkleBubbles.cs @@ -0,0 +1,64 @@ +// SparkleShare, a collaboration and sharing tool. +// Copyright (C) 2010 Hylke Bons +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + + +using System; +using System.IO; + +using MonoMac.AppKit; +using MonoMac.Foundation; +using MonoMac.Growl; + +namespace SparkleShare { + + public class SparkleBubbles : NSObject { + + private SparkleBubblesController controller = new SparkleBubblesController (); + + + public SparkleBubbles () + { + this.controller.ShowBubbleEvent += delegate (string title, string subtext, string image_path) { + InvokeOnMainThread (delegate { + if (!GrowlApplicationBridge.IsGrowlRunning ()) { + NSApplication.SharedApplication.RequestUserAttention ( + NSRequestUserAttentionType.InformationalRequest); + + return; + } + + if (NSApplication.SharedApplication.DockTile.BadgeLabel == null) { + NSApplication.SharedApplication.DockTile.BadgeLabel = "1"; + + } else { + int events = int.Parse (NSApplication.SharedApplication.DockTile.BadgeLabel); + NSApplication.SharedApplication.DockTile.BadgeLabel = (events + 1).ToString (); + } + + if (image_path != null && File.Exists (image_path)) { + NSData image_data = NSData.FromFile (image_path); + GrowlApplicationBridge.Notify (title, subtext, + "Event", image_data, 0, false, null); + + } else { + GrowlApplicationBridge.Notify (title, subtext, + "Event", null, 0, false, null); + } + }); + }; + } + } +} diff --git a/SparkleShare/Mac/SparkleEventLog.cs b/SparkleShare/Mac/SparkleEventLog.cs index 23f74c5d..88df1f37 100644 --- a/SparkleShare/Mac/SparkleEventLog.cs +++ b/SparkleShare/Mac/SparkleEventLog.cs @@ -16,33 +16,38 @@ using System; -using System.Collections.Generic; -using System.Diagnostics; using System.Drawing; using System.IO; +using System.Text.RegularExpressions; using System.Threading; using MonoMac.Foundation; using MonoMac.AppKit; using MonoMac.ObjCRuntime; using MonoMac.WebKit; -using SparkleLib; // Only used for SparkleChangeSet namespace SparkleShare { public class SparkleEventLog : NSWindow { - private WebView WebView; - private NSBox Separator; - private string HTML; + private SparkleEventLogController controller = new SparkleEventLogController (); + + private WebView web_view = new WebView (new RectangleF (0, 0, 480, 579), "", "") { + PolicyDelegate = new SparkleWebPolicyDelegate () + }; + + private NSBox Separator = new NSBox (new RectangleF (0, 579, 480, 1)) { + BorderColor = NSColor.LightGray, + BoxType = NSBoxType.NSBoxCustom + }; + private NSPopUpButton popup_button; - private NSProgressIndicator ProgressIndicator; - private List change_sets; - private string selected_log = null; + private NSProgressIndicator progress_indicator; public SparkleEventLog (IntPtr handle) : base (handle) { } + // TODO: Window needs to be made resizable public SparkleEventLog () : base () { Title = "Recent Events"; @@ -60,39 +65,52 @@ namespace SparkleShare { HasShadow = true; BackingType = NSBackingStore.Buffered; - CreateEvents (); - UpdateEvents (false); - UpdateChooser (); - - OrderFrontRegardless (); - } - - - private void CreateEvents () - { - Separator = new NSBox (new RectangleF (0, 579, 480, 1)) { - BorderColor = NSColor.LightGray, - BoxType = NSBoxType.NSBoxCustom - }; - ContentView.AddSubview (Separator); - WebView = new WebView (new RectangleF (0, 0, 480, 579), "", "") { - PolicyDelegate = new SparkleWebPolicyDelegate () - }; - ProgressIndicator = new NSProgressIndicator () { + this.progress_indicator = new NSProgressIndicator () { Style = NSProgressIndicatorStyle.Spinning, - Frame = new RectangleF (WebView.Frame.Width / 2 - 10, WebView.Frame.Height / 2 + 10, 20, 20) + Frame = new RectangleF (this.web_view.Frame.Width / 2 - 10, this.web_view.Frame.Height / 2 + 10, 20, 20) }; - ProgressIndicator.StartAnimation (this); - Update (); + this.progress_indicator.StartAnimation (this); + ContentView.AddSubview (this.progress_indicator); + + + UpdateContent (null); + UpdateChooser (null); + OrderFrontRegardless (); + + + // Hook up the controller events + this.controller.UpdateChooserEvent += delegate (string [] folders) { + InvokeOnMainThread (delegate { + UpdateChooser (folders); + }); + }; + + this.controller.UpdateContentEvent += delegate (string html) { + InvokeOnMainThread (delegate { + UpdateContent (html); + }); + }; + + this.controller.ContentLoadingEvent += delegate { + InvokeOnMainThread (delegate { + if (this.web_view.Superview == ContentView) + this.web_view.RemoveFromSuperview (); + + ContentView.AddSubview (this.progress_indicator); + }); + }; } - public void UpdateChooser () + public void UpdateChooser (string [] folders) { + if (folders == null) + folders = this.controller.Folders; + if (this.popup_button != null) this.popup_button.RemoveFromSuperview (); @@ -103,104 +121,61 @@ namespace SparkleShare { this.popup_button.Cell.ControlSize = NSControlSize.Small; this.popup_button.Font = NSFontManager.SharedFontManager.FontWithFamily - ("Lucida Grande", NSFontTraitMask.Condensed, 0, NSFont.SmallSystemFontSize); + ("Lucida Grande", NSFontTraitMask.Condensed, 0, NSFont.SmallSystemFontSize); this.popup_button.AddItem ("All Folders"); this.popup_button.Menu.AddItem (NSMenuItem.SeparatorItem); - this.popup_button.AddItems (SparkleShare.Controller.Folders.ToArray ()); - - if (this.selected_log != null && - !SparkleShare.Controller.Folders.Contains (this.selected_log)) { - - this.selected_log = null; - } + this.popup_button.AddItems (folders); this.popup_button.Activated += delegate { if (this.popup_button.IndexOfSelectedItem == 0) - this.selected_log = null; + this.controller.SelectedFolder = null; else - this.selected_log = this.popup_button.SelectedItem.Title; - - UpdateEvents (false); + this.controller.SelectedFolder = this.popup_button.SelectedItem.Title; }; ContentView.AddSubview (this.popup_button); } - public void UpdateEvents () + public void UpdateContent (string html) { - UpdateEvents (true); - } - - - public void UpdateEvents (bool silent) - { - if (!silent) { - InvokeOnMainThread (delegate { - if (WebView.Superview == ContentView) - WebView.RemoveFromSuperview (); + using (NSAutoreleasePool pool = new NSAutoreleasePool ()) { + Thread thread = new Thread (new ThreadStart (delegate { + if (html == null) + html = this.controller.HTML; - ContentView.AddSubview (ProgressIndicator); - }); + html = html.Replace ("", "Lucida Grande"); + html = html.Replace ("", "13.6px"); + html = html.Replace ("", "13.4px"); + html = html.Replace ("", "#bbb"); + html = html.Replace ("", "#ddd"); + html = html.Replace ("", "#f5f5f5"); + html = html.Replace ("", "#0085cf"); + html = html.Replace ("", "#009ff8"); + html = html.Replace ("", + "file://" + Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "avatar-default.png")); + html = html.Replace ("", + "file://" + Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "document-added-12.png")); + html = html.Replace ("", + "file://" + Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "document-deleted-12.png")); + html = html.Replace ("", + "file://" + Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "document-edited-12.png")); + html = html.Replace ("", + "file://" + Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "document-moved-12.png")); + + InvokeOnMainThread (delegate { + if (this.progress_indicator.Superview == ContentView) + this.progress_indicator.RemoveFromSuperview (); + + // TODO: still causes some flashes + this.web_view.MainFrame.LoadHtmlString (html, new NSUrl ("")); + ContentView.AddSubview (this.web_view); + }); + })); + + thread.Start (); } - - Thread thread = new Thread (new ThreadStart (delegate { - using (NSAutoreleasePool pool = new NSAutoreleasePool ()) { - Stopwatch watch = new Stopwatch (); - watch.Start (); - this.change_sets = SparkleShare.Controller.GetLog (this.selected_log); - GenerateHTML (); - watch.Stop (); - - // A short delay is less annoying than - // a flashing window - if (watch.ElapsedMilliseconds < 500 && !silent) - Thread.Sleep (500 - (int) watch.ElapsedMilliseconds); - - AddHTML (); - } - })); - - thread.Start (); - } - - - private void GenerateHTML () - { - HTML = SparkleShare.Controller.GetHTMLLog (this.change_sets); - - HTML = HTML.Replace ("", "Lucida Grande"); - HTML = HTML.Replace ("", "13.6px"); - HTML = HTML.Replace ("", "13.4px"); - HTML = HTML.Replace ("", "#bbb"); - HTML = HTML.Replace ("", "#ddd"); - HTML = HTML.Replace ("", "#f5f5f5"); - HTML = HTML.Replace ("", "#0085cf"); - HTML = HTML.Replace ("", "#009ff8"); - HTML = HTML.Replace ("", - "file://" + Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "avatar-default.png")); - HTML = HTML.Replace ("", - "file://" + Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "document-added-12.png")); - HTML = HTML.Replace ("", - "file://" + Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "document-deleted-12.png")); - HTML = HTML.Replace ("", - "file://" + Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "document-edited-12.png")); - HTML = HTML.Replace ("", - "file://" + Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "document-moved-12.png")); - } - - - private void AddHTML () - { - InvokeOnMainThread (delegate { - if (ProgressIndicator.Superview == ContentView) - ProgressIndicator.RemoveFromSuperview (); - - WebView.MainFrame.LoadHtmlString (HTML, new NSUrl ("")); - ContentView.AddSubview (WebView); - Update (); - }); } } @@ -220,10 +195,30 @@ namespace SparkleShare { public override void DecidePolicyForNavigation (WebView web_view, NSDictionary action_info, NSUrlRequest request, WebFrame frame, NSObject decision_token) { - string file_path = request.Url.ToString (); - file_path = file_path.Replace ("%20", " "); - - NSWorkspace.SharedWorkspace.OpenFile (file_path); + string url = request.Url.ToString (); + + if (url.StartsWith (Path.VolumeSeparatorChar.ToString ())) { + string file_path = request.Url.ToString (); + file_path = file_path.Replace ("%20", " "); + + NSWorkspace.SharedWorkspace.OpenFile (file_path); + + } else { + Regex regex = new Regex (@"(.+)~(.+)~(.+)"); + Match match = regex.Match (url); + + if (match.Success) { + string folder_name = match.Groups [1].Value; + string revision = match.Groups [2].Value; + string note = match.Groups [3].Value.Replace ("%20", " "); + + Thread thread = new Thread (new ThreadStart (delegate { + SparkleShare.Controller.AddNoteToFolder (folder_name, revision, note); + })); + + thread.Start (); + } + } } } } diff --git a/SparkleShare/Mac/SparkleIntro.cs b/SparkleShare/Mac/SparkleIntro.cs deleted file mode 100644 index 37d25c93..00000000 --- a/SparkleShare/Mac/SparkleIntro.cs +++ /dev/null @@ -1,445 +0,0 @@ -// SparkleShare, a collaboration and sharing tool. -// Copyright (C) 2010 Hylke Bons -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . - - -using System; -using System.Drawing; -using System.IO; -using System.Timers; - -using Mono.Unix; -using MonoMac.Foundation; -using MonoMac.AppKit; -using MonoMac.ObjCRuntime; -using MonoMac.WebKit; - -namespace SparkleShare { - - public class SparkleIntro : SparkleWindow { - - private NSButton ContinueButton; - private NSButton SyncButton; - private NSButton TryAgainButton; - private NSButton CancelButton; - private NSButton SkipButton; - private NSButton OpenFolderButton; - private NSButton FinishButton; - private NSForm UserInfoForm; - private NSProgressIndicator ProgressIndicator; - private NSTextField AddressTextField; - private NSTextField FolderNameTextField; - private NSTextField ServerTypeLabel; - private NSTextField AddressLabel; - private NSTextField FolderNameLabel; - private NSTextField FolderNameHelpLabel; - private NSButtonCell ButtonCellProto; - private NSMatrix Matrix; - private int ServerType; - private bool ServerFormOnly; - - - public SparkleIntro () : base () - { - ServerFormOnly = false; - } - - - public void ShowAccountForm () - { - Reset (); - - Header = "Welcome to SparkleShare!"; - Description = "Before we can create a SparkleShare folder on this " + - "computer, we need some information from you."; - - UserInfoForm = new NSForm (new RectangleF (250, 115, 350, 64)); - UserInfoForm.AddEntry ("Full Name:"); - UserInfoForm.AddEntry ("Email Address:"); - UserInfoForm.CellSize = new SizeF (280, 22); - UserInfoForm.IntercellSpacing = new SizeF (4, 4); - UserInfoForm.Cells [0].LineBreakMode = NSLineBreakMode.TruncatingTail; - UserInfoForm.Cells [1].LineBreakMode = NSLineBreakMode.TruncatingTail; - - UserInfoForm.Cells [0].StringValue = SparkleShare.Controller.UserName; - UserInfoForm.Cells [1].StringValue = SparkleShare.Controller.UserEmail; - - ContinueButton = new NSButton () { - Title = "Continue", - Enabled = false - }; - - ContinueButton.Activated += delegate { - SparkleShare.Controller.UserName = UserInfoForm.Cells [0].StringValue.Trim (); - SparkleShare.Controller.UserEmail = UserInfoForm.Cells [1].StringValue.Trim (); - SparkleShare.Controller.GenerateKeyPair (); - SparkleUI.StatusIcon.CreateMenu (); - - InvokeOnMainThread (delegate { - ShowServerForm (); - }); - }; - - // TODO: Ugly hack, do properly with events - Timer timer = new Timer () { - Interval = 50 - }; - - timer.Elapsed += delegate { - InvokeOnMainThread (delegate { - bool name_is_correct = - !UserInfoForm.Cells [0].StringValue.Trim ().Equals (""); - - bool email_is_correct = SparkleShare.Controller.IsValidEmail ( - UserInfoForm.Cells [1].StringValue.Trim ()); - - ContinueButton.Enabled = (name_is_correct && email_is_correct); - }); - }; - - timer.Start (); - - ContentView.AddSubview (UserInfoForm); - Buttons.Add (ContinueButton); - - ShowAll (); - } - - - public void ShowServerForm (bool server_form_only) - { - ServerFormOnly = server_form_only; - ShowServerForm (); - } - - - public void ShowServerForm () - { - Reset (); - - Header = "Where is your remote folder?"; - Description = ""; - - ServerTypeLabel = new NSTextField () { - Alignment = NSTextAlignment.Right, - BackgroundColor = NSColor.WindowBackground, - Bordered = false, - Editable = false, - Frame = new RectangleF (150, Frame.Height - 139 , 160, 17), - StringValue = "Server Type:", - Font = SparkleUI.Font - }; - - AddressLabel = new NSTextField () { - Alignment = NSTextAlignment.Right, - BackgroundColor = NSColor.WindowBackground, - Bordered = false, - Editable = false, - Frame = new RectangleF (150, Frame.Height - 237 , 160, 17), - StringValue = "Address:", - Font = SparkleUI.Font - }; - - FolderNameLabel = new NSTextField () { - Alignment = NSTextAlignment.Right, - BackgroundColor = NSColor.WindowBackground, - Bordered = false, - Editable = false, - Frame = new RectangleF (150, Frame.Height - 264 , 160, 17), - StringValue = "Folder Name:", - Font = SparkleUI.Font - }; - - - AddressTextField = new NSTextField () { - Frame = new RectangleF (320, Frame.Height - 240 , 256, 22), - Font = SparkleUI.Font - }; - - AddressTextField.Cell.LineBreakMode = NSLineBreakMode.TruncatingTail; - - FolderNameTextField = new NSTextField () { - Frame = new RectangleF (320, Frame.Height - (240 + 22 + 4) , 256, 22), - StringValue = "" - }; - - FolderNameTextField.Cell.LineBreakMode = NSLineBreakMode.TruncatingTail; - - FolderNameHelpLabel = new NSTextField () { - BackgroundColor = NSColor.WindowBackground, - Bordered = false, - TextColor = NSColor.DisabledControlText, - Editable = false, - Frame = new RectangleF (320, Frame.Height - 285 , 200, 17), - StringValue = "e.g. ‘rupert/website-design’" - }; - - - ServerType = 0; - - ButtonCellProto = new NSButtonCell (); - ButtonCellProto.SetButtonType (NSButtonType.Radio) ; - - Matrix = new NSMatrix (new RectangleF (315, 180, 256, 78), - NSMatrixMode.Radio, ButtonCellProto, 4, 1); - - Matrix.CellSize = new SizeF (256, 18); - - Matrix.Cells [0].Title = "My own server"; - Matrix.Cells [1].Title = "Github"; - Matrix.Cells [2].Title = "Gitorious"; - Matrix.Cells [3].Title = "The GNOME Project"; - - foreach (NSCell cell in Matrix.Cells) - cell.Font = SparkleUI.Font; - - // TODO: Ugly hack, do properly with events - Timer timer = new Timer () { - Interval = 50 - }; - - timer.Elapsed += delegate { - - InvokeOnMainThread (delegate { - - if (Matrix.SelectedRow != ServerType) { - ServerType = Matrix.SelectedRow; - - AddressTextField.Enabled = (ServerType == 0); - - switch (ServerType) { - case 0: - AddressTextField.StringValue = ""; - FolderNameHelpLabel.StringValue = "e.g. ‘rupert/website-design’"; - break; - case 1: - AddressTextField.StringValue = "ssh://git@github.com/"; - FolderNameHelpLabel.StringValue = "e.g. ‘rupert/website-design’"; - break; - case 2: - AddressTextField.StringValue = "ssh://git@gitorious.org/"; - FolderNameHelpLabel.StringValue = "e.g. ‘project/website-design’"; - break; - case 3: - AddressTextField.StringValue = "ssh://git@gnome.org/git/"; - FolderNameHelpLabel.StringValue = "e.g. ‘gnome-icon-theme’"; - break; - } - } - - - if (ServerType == 0 && !AddressTextField.StringValue.Trim ().Equals ("") - && !FolderNameTextField.StringValue.Trim ().Equals ("")) { - - SyncButton.Enabled = true; - - } else if (ServerType != 0 && - !FolderNameTextField.StringValue.Trim ().Equals ("")) { - - SyncButton.Enabled = true; - - } else { - SyncButton.Enabled = false; - } - }); - - }; - - timer.Start (); - - ContentView.AddSubview (ServerTypeLabel); - ContentView.AddSubview (Matrix); - - ContentView.AddSubview (AddressLabel); - ContentView.AddSubview (AddressTextField); - - ContentView.AddSubview (FolderNameLabel); - ContentView.AddSubview (FolderNameTextField); - ContentView.AddSubview (FolderNameHelpLabel); - - SyncButton = new NSButton () { - Title = "Sync", - Enabled = false - }; - - SyncButton.Activated += delegate { - string folder_name = FolderNameTextField.StringValue; - string server = AddressTextField.StringValue; - string canonical_name = Path.GetFileNameWithoutExtension (folder_name); - - ShowSyncingPage (canonical_name); - - SparkleShare.Controller.FolderFetched += delegate { - InvokeOnMainThread (delegate { - ShowSuccessPage (canonical_name); - }); - }; - - SparkleShare.Controller.FolderFetchError += delegate { - InvokeOnMainThread (delegate { - ShowErrorPage (); - }); - }; - - SparkleShare.Controller.FetchFolder (server, folder_name); - }; - - Buttons.Add (SyncButton); - - if (ServerFormOnly) { - CancelButton = new NSButton () { - Title = "Cancel" - }; - - CancelButton.Activated += delegate { - InvokeOnMainThread (delegate { - PerformClose (this); - }); - }; - - Buttons.Add (CancelButton); - } else { - SkipButton = new NSButton () { - Title = "Skip" - }; - - SkipButton.Activated += delegate { - InvokeOnMainThread (delegate { - ShowCompletedPage (); - }); - }; - - Buttons.Add (SkipButton); - } - - ShowAll (); - } - - - public void ShowErrorPage () - { - Reset (); - - Header = "Something went wrong…"; - Description = ""; - - TryAgainButton = new NSButton () { - Title = "Try again…" - }; - - TryAgainButton.Activated += delegate { - InvokeOnMainThread (delegate { - ShowServerForm (); - }); - }; - - Buttons.Add (TryAgainButton); - - ShowAll (); - } - - - private void ShowSyncingPage (string name) - { - Reset (); - - Header = "Syncing folder ‘" + name + "’…"; - Description = "This may take a while.\n" + - "Are you sure it’s not coffee o'clock?"; - - ProgressIndicator = new NSProgressIndicator () { - Frame = new RectangleF (190, Frame.Height - 200, 640 - 150 - 80, 20), - Style = NSProgressIndicatorStyle.Bar - }; - - ProgressIndicator.StartAnimation (this); - - ContentView.AddSubview (ProgressIndicator); - - FinishButton = new NSButton () { - Title = "Finish", - Enabled = false - }; - - Buttons.Add (FinishButton); - - ShowAll (); - } - - - public void ShowSuccessPage (string folder_name) - { - Reset (); - - Header = "Folder synced succesfully!"; - Description = "Now you can access the synced files from ‘" + folder_name + "’ in " + - "your SparkleShare folder."; - - FinishButton = new NSButton () { - Title = "Finish" - }; - - FinishButton.Activated += delegate { - InvokeOnMainThread (delegate { - SparkleUI.StatusIcon.CreateMenu (); - PerformClose (this); - }); - }; - - OpenFolderButton = new NSButton () { - Title = "Open Folder" - }; - - OpenFolderButton.Activated += delegate { - SparkleShare.Controller.OpenSparkleShareFolder (folder_name); - }; - - Buttons.Add (FinishButton); - Buttons.Add (OpenFolderButton); - - ShowAll (); - - NSApplication.SharedApplication.RequestUserAttention - (NSRequestUserAttentionType.CriticalRequest); - } - - - private void ShowCompletedPage () - { - Reset (); - - Header = "SparkleShare is ready to go!"; - Description = "Now you can start accepting invitations from others. " + - "Just click on invitations you get by email and " + - "we will take care of the rest."; - - FinishButton = new NSButton () { - Title = "Finish" - }; - - FinishButton.Activated += delegate { - InvokeOnMainThread (delegate { - SparkleUI.StatusIcon.CreateMenu (); - PerformClose (this); - }); - - }; - - Buttons.Add (FinishButton); - - ShowAll (); - } - } -} diff --git a/SparkleShare/Mac/SparkleMacController.cs b/SparkleShare/Mac/SparkleMacController.cs index c526174b..9e1a1080 100644 --- a/SparkleShare/Mac/SparkleMacController.cs +++ b/SparkleShare/Mac/SparkleMacController.cs @@ -138,8 +138,11 @@ namespace SparkleShare { StreamReader reader = new StreamReader (html_path); string html = reader.ReadToEnd (); reader.Close (); - - return html; + + html = html.Replace ("", "file://" + + Path.Combine (NSBundle.MainBundle.ResourcePath, "HTML", "jquery.js")); + + return html; } } @@ -177,6 +180,7 @@ namespace SparkleShare { new public void Quit () { this.watcher.Dispose (); + NSApplication.SharedApplication.Terminate (new NSObject ()); base.Quit (); } } diff --git a/SparkleShare/Mac/SparkleSetup.cs b/SparkleShare/Mac/SparkleSetup.cs new file mode 100644 index 00000000..126ce302 --- /dev/null +++ b/SparkleShare/Mac/SparkleSetup.cs @@ -0,0 +1,368 @@ +// SparkleShare, a collaboration and sharing tool. +// Copyright (C) 2010 Hylke Bons +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + + +using System; +using System.Drawing; +using System.IO; +using System.Timers; + +using Mono.Unix; +using MonoMac.Foundation; +using MonoMac.AppKit; +using MonoMac.ObjCRuntime; +using MonoMac.WebKit; + +namespace SparkleShare { + + public class SparkleSetup : SparkleSetupWindow { + + public SparkleSetupController Controller = new SparkleSetupController (); + + private NSButton ContinueButton; + private NSButton SyncButton; + private NSButton TryAgainButton; + private NSButton CancelButton; + private NSButton OpenFolderButton; + private NSButton FinishButton; + private NSForm UserInfoForm; + private NSProgressIndicator ProgressIndicator; + private NSTextField AddressTextField; + private NSTextField FolderNameTextField; + private NSTextField ServerTypeLabel; + private NSTextField AddressLabel; + private NSTextField FolderNameLabel; + private NSTextField FolderNameHelpLabel; + private NSButtonCell ButtonCellProto; + private NSMatrix Matrix; + private int ServerType; + private Timer timer; + + + public SparkleSetup () : base () + { + Controller.ChangePageEvent += delegate (PageType type) { + InvokeOnMainThread (delegate { + Reset (); + + switch (type) { + case PageType.Setup: + + Header = "Welcome to SparkleShare!"; + Description = "Before we can create a SparkleShare folder on this " + + "computer, we need some information from you."; + + UserInfoForm = new NSForm (new RectangleF (250, 115, 350, 64)); + + UserInfoForm.AddEntry ("Full Name:"); + UserInfoForm.AddEntry ("Email Address:"); + + UserInfoForm.CellSize = new SizeF (280, 22); + UserInfoForm.IntercellSpacing = new SizeF (4, 4); + UserInfoForm.Cells [0].LineBreakMode = NSLineBreakMode.TruncatingTail; + UserInfoForm.Cells [1].LineBreakMode = NSLineBreakMode.TruncatingTail; + + UserInfoForm.Cells [0].StringValue = SparkleShare.Controller.UserName; + UserInfoForm.Cells [1].StringValue = SparkleShare.Controller.UserEmail; + + // TODO: Ugly hack, do properly with events + timer = new Timer () { + Interval = 50 + }; + + ContinueButton = new NSButton () { + Title = "Continue", + Enabled = false + }; + + ContinueButton.Activated += delegate { + timer.Stop (); + timer = null; + + string full_name = UserInfoForm.Cells [0].StringValue.Trim (); + string email = UserInfoForm.Cells [1].StringValue.Trim (); + + Controller.SetupPageCompleted (full_name, email); + }; + + timer.Elapsed += delegate { + InvokeOnMainThread (delegate { + bool name_is_valid = !UserInfoForm.Cells [0].StringValue.Trim ().Equals (""); + + bool email_is_valid = SparkleShare.Controller.IsValidEmail ( + UserInfoForm.Cells [1].StringValue.Trim ()); + + ContinueButton.Enabled = (name_is_valid && email_is_valid); + }); + }; + + timer.Start (); + + ContentView.AddSubview (UserInfoForm); + Buttons.Add (ContinueButton); + + break; + + case PageType.Add: + + Header = "Where is your remote folder?"; + Description = ""; + + ServerTypeLabel = new NSTextField () { + Alignment = NSTextAlignment.Right, + BackgroundColor = NSColor.WindowBackground, + Bordered = false, + Editable = false, + Frame = new RectangleF (150, Frame.Height - 139 , 160, 17), + StringValue = "Server Type:", + Font = SparkleUI.Font + }; + + AddressLabel = new NSTextField () { + Alignment = NSTextAlignment.Right, + BackgroundColor = NSColor.WindowBackground, + Bordered = false, + Editable = false, + Frame = new RectangleF (150, Frame.Height - 237 , 160, 17), + StringValue = "Address:", + Font = SparkleUI.Font + }; + + FolderNameLabel = new NSTextField () { + Alignment = NSTextAlignment.Right, + BackgroundColor = NSColor.WindowBackground, + Bordered = false, + Editable = false, + Frame = new RectangleF (150, Frame.Height - 264 , 160, 17), + StringValue = "Folder Name:", + Font = SparkleUI.Font + }; + + + AddressTextField = new NSTextField () { + Frame = new RectangleF (320, Frame.Height - 240 , 256, 22), + Font = SparkleUI.Font, + StringValue = Controller.PreviousServer + }; + + AddressTextField.Cell.LineBreakMode = NSLineBreakMode.TruncatingTail; + + FolderNameTextField = new NSTextField () { + Frame = new RectangleF (320, Frame.Height - (240 + 22 + 4) , 256, 22), + StringValue = Controller.PreviousFolder + }; + + FolderNameTextField.Cell.LineBreakMode = NSLineBreakMode.TruncatingTail; + + FolderNameHelpLabel = new NSTextField () { + BackgroundColor = NSColor.WindowBackground, + Bordered = false, + TextColor = NSColor.DisabledControlText, + Editable = false, + Frame = new RectangleF (320, Frame.Height - 285 , 200, 17), + StringValue = "e.g. ‘rupert/website-design’" + }; + + ServerType = 0; + + ButtonCellProto = new NSButtonCell (); + ButtonCellProto.SetButtonType (NSButtonType.Radio) ; + + Matrix = new NSMatrix (new RectangleF (315, 180, 256, 78), + NSMatrixMode.Radio, ButtonCellProto, 4, 1); + + Matrix.CellSize = new SizeF (256, 18); + + Matrix.Cells [0].Title = "My own server"; + Matrix.Cells [1].Title = "Github"; + Matrix.Cells [2].Title = "Gitorious"; + Matrix.Cells [3].Title = "The GNOME Project"; + + foreach (NSCell cell in Matrix.Cells) + cell.Font = SparkleUI.Font; + + // TODO: Ugly hack, do properly with events + timer = new Timer () { + Interval = 50 + }; + + timer.Elapsed += delegate { + InvokeOnMainThread (delegate { + if (Matrix.SelectedRow != ServerType) { + ServerType = Matrix.SelectedRow; + + AddressTextField.Enabled = (ServerType == 0); + + switch (ServerType) { + case 0: + AddressTextField.StringValue = ""; + FolderNameHelpLabel.StringValue = "e.g. ‘rupert/website-design’"; + break; + case 1: + AddressTextField.StringValue = "ssh://git@github.com/"; + FolderNameHelpLabel.StringValue = "e.g. ‘rupert/website-design’"; + break; + case 2: + AddressTextField.StringValue = "ssh://git@gitorious.org/"; + FolderNameHelpLabel.StringValue = "e.g. ‘project/website-design’"; + break; + case 3: + AddressTextField.StringValue = "ssh://git@gnome.org/git/"; + FolderNameHelpLabel.StringValue = "e.g. ‘gnome-icon-theme’"; + break; + } + } + + + if (ServerType == 0 && !AddressTextField.StringValue.Trim ().Equals ("") + && !FolderNameTextField.StringValue.Trim ().Equals ("")) { + + SyncButton.Enabled = true; + + } else if (ServerType != 0 && + !FolderNameTextField.StringValue.Trim ().Equals ("")) { + + SyncButton.Enabled = true; + + } else { + SyncButton.Enabled = false; + } + }); + + }; + + timer.Start (); + + ContentView.AddSubview (ServerTypeLabel); + ContentView.AddSubview (Matrix); + + ContentView.AddSubview (AddressLabel); + ContentView.AddSubview (AddressTextField); + + ContentView.AddSubview (FolderNameLabel); + ContentView.AddSubview (FolderNameTextField); + ContentView.AddSubview (FolderNameHelpLabel); + + SyncButton = new NSButton () { + Title = "Sync", + Enabled = false + }; + + SyncButton.Activated += delegate { + timer.Stop (); + timer = null; + + string folder_name = FolderNameTextField.StringValue; + string server = AddressTextField.StringValue; + Controller.AddPageCompleted (server, folder_name); + }; + + Buttons.Add (SyncButton); + + CancelButton = new NSButton () { + Title = "Cancel" + }; + + CancelButton.Activated += delegate { + InvokeOnMainThread (delegate { + PerformClose (this); + }); + }; + + Buttons.Add (CancelButton); + + break; + + case PageType.Syncing: + + Header = "Syncing folder ‘" + Controller.SyncingFolder + "’…"; + Description = "This may take a while.\n" + + "Are you sure it’s not coffee o'clock?"; + + ProgressIndicator = new NSProgressIndicator () { + Frame = new RectangleF (190, Frame.Height - 200, 640 - 150 - 80, 20), + Style = NSProgressIndicatorStyle.Bar + }; + + ProgressIndicator.StartAnimation (this); + ContentView.AddSubview (ProgressIndicator); + + FinishButton = new NSButton () { + Title = "Finish", + Enabled = false + }; + + Buttons.Add (FinishButton); + + break; + + case PageType.Error: + + Header = "Something went wrong…"; + Description = ""; + + TryAgainButton = new NSButton () { + Title = "Try again…" + }; + + TryAgainButton.Activated += delegate { + Controller.ErrorPageCompleted (); + }; + + Buttons.Add (TryAgainButton); + + break; + + case PageType.Finished: + + Header = "Folder synced succesfully!"; + Description = "Now you can access the synced files from " + + "‘" + Controller.SyncingFolder + "’ in " + + "your SparkleShare folder."; + + FinishButton = new NSButton () { + Title = "Finish" + }; + + FinishButton.Activated += delegate { + InvokeOnMainThread (delegate { + PerformClose (this); + }); + }; + + OpenFolderButton = new NSButton () { + Title = "Open Folder" + }; + + OpenFolderButton.Activated += delegate { + SparkleShare.Controller.OpenSparkleShareFolder (Controller.SyncingFolder); + }; + + Buttons.Add (FinishButton); + Buttons.Add (OpenFolderButton); + + NSApplication.SharedApplication.RequestUserAttention + (NSRequestUserAttentionType.CriticalRequest); + + break; + } + + ShowAll (); + }); + }; + } + } +} diff --git a/SparkleShare/Mac/SparkleWindow.cs b/SparkleShare/Mac/SparkleSetupWindow.cs similarity index 98% rename from SparkleShare/Mac/SparkleWindow.cs rename to SparkleShare/Mac/SparkleSetupWindow.cs index 868203ff..08ef66ef 100644 --- a/SparkleShare/Mac/SparkleWindow.cs +++ b/SparkleShare/Mac/SparkleSetupWindow.cs @@ -28,7 +28,7 @@ using Mono.Unix; namespace SparkleShare { - public class SparkleWindow : NSWindow { + public class SparkleSetupWindow : NSWindow { public List Buttons; public string Header; @@ -40,7 +40,7 @@ namespace SparkleShare { private NSTextField DescriptionTextField; - public SparkleWindow () : base () + public SparkleSetupWindow () : base () { SetFrame (new RectangleF (0, 0, 640, 380), true); diff --git a/SparkleShare/Mac/SparkleShare.csproj b/SparkleShare/Mac/SparkleShare.csproj index 08c5bec8..e94e4bd5 100644 --- a/SparkleShare/Mac/SparkleShare.csproj +++ b/SparkleShare/Mac/SparkleShare.csproj @@ -62,7 +62,7 @@ False ..\..\bin\Meebey.SmartIrc4net.dll - + False ..\..\bin\SparkleLib.dll @@ -77,8 +77,6 @@ SparkleController.cs - - @@ -87,9 +85,27 @@ - + + + + + + SparkleBubblesController.cs + + + SparkleEventLogController.cs + + + SparkleSetupController.cs + + + SparkleStatusIconController.cs + + + SparkleAboutController.cs + @@ -170,9 +186,91 @@ Pixmaps\document-moved-12.png + + Translations\ar.po + + + Translations\bg.po + + + Translations\ca.po + + + Translations\cs_CZ.po + + + Translations\da.po + + + Translations\de.po + + + Translations\el.po + + + Translations\eo.po + + + Translations\es.po + + + Translations\fi.po + + + Translations\fr.po + + + Translations\he.po + + + Translations\hu.po + + + Translations\it.po + + + Translations\ja.po + + + Translations\nl.po + + + Translations\no_NO.po + + + Translations\pl.po + + + Translations\pt_BR.po + + + Translations\ru.po + + + Translations\sv.po + + + Translations\te.po + + + Translations\uk.po + + + Translations\zh_CN.po + + + Translations\zh_TW.po + + + Pixmaps\about.png + + + HTML\jquery.js + + diff --git a/SparkleShare/Mac/SparkleStatusIcon.cs b/SparkleShare/Mac/SparkleStatusIcon.cs index de1b32f1..e68c9de9 100644 --- a/SparkleShare/Mac/SparkleStatusIcon.cs +++ b/SparkleShare/Mac/SparkleStatusIcon.cs @@ -31,6 +31,8 @@ namespace SparkleShare { // user's notification area public class SparkleStatusIcon : NSObject { + public SparkleStatusIconController Controller = new SparkleStatusIconController (); + private Timer Animation; private int FrameNumber; private string StateText; @@ -58,51 +60,232 @@ namespace SparkleShare { public SparkleStatusIcon () : base () { - Animation = CreateAnimation (); + using (var a = new NSAutoreleasePool ()) { + Animation = CreateAnimation (); - StatusItem = NSStatusBar.SystemStatusBar.CreateStatusItem (28); - StatusItem.HighlightMode = true; - - SetNormalState (); - CreateMenu (); - - Menu.Delegate = new SparkleStatusIconMenuDelegate (); + StatusItem = NSStatusBar.SystemStatusBar.CreateStatusItem (28); + StatusItem.HighlightMode = true; + + StateText = _("Up to date") + " (" + Controller.FolderSize + ")"; + CreateMenu (); + + Menu.Delegate = new SparkleStatusIconMenuDelegate (); + } - SparkleShare.Controller.FolderSizeChanged += delegate { + Controller.UpdateMenuEvent += delegate (IconState state) { InvokeOnMainThread (delegate { - if (!Animation.Enabled) - SetNormalState (); - - UpdateMenu (); - }); - }; - - SparkleShare.Controller.FolderListChanged += delegate { - InvokeOnMainThread (delegate { - SetNormalState (); - CreateMenu (); + using (var a = new NSAutoreleasePool ()) { + switch (state) { + case IconState.Idle: + + Animation.Stop (); + + if (Controller.Folders.Length == 0) + StateText = _("Welcome to SparkleShare!"); + else + StateText = _("Up to date") + " (" + Controller.FolderSize + ")"; + + StateMenuItem.Title = StateText; + CreateMenu (); + + break; + + case IconState.Syncing: + + StateText = _("Syncing…"); + StateMenuItem.Title = StateText; + + if (!Animation.Enabled) + Animation.Start (); + + break; + + case IconState.Error: + + StateText = _("Not everything is synced"); + StateMenuItem.Title = StateText; + CreateMenu (); + + InvokeOnMainThread (delegate { + StatusItem.Image = new NSImage (NSBundle.MainBundle.ResourcePath + "/Pixmaps/error.png"); + StatusItem.AlternateImage = new NSImage (NSBundle.MainBundle.ResourcePath + "/Pixmaps/error-active.png"); + StatusItem.Image.Size = new SizeF (16, 16); + StatusItem.AlternateImage.Size = new SizeF (16, 16); + }); + break; + } + } }); }; - SparkleShare.Controller.OnIdle += delegate { - InvokeOnMainThread (delegate { - SetNormalState (); - CreateMenu (); - }); - }; - SparkleShare.Controller.OnSyncing += delegate { - InvokeOnMainThread (delegate { - SetAnimationState (); - UpdateMenu (); - }); - }; - SparkleShare.Controller.OnError += delegate { - InvokeOnMainThread (delegate { - SetNormalState (true); - CreateMenu (); - }); + } + + + public void CreateMenu () + { + using (NSAutoreleasePool a = new NSAutoreleasePool ()) { + StatusItem.Image = new NSImage (NSBundle.MainBundle.ResourcePath + "/Pixmaps/idle0.png"); + StatusItem.AlternateImage = new NSImage (NSBundle.MainBundle.ResourcePath + "/Pixmaps/idle0-active.png"); + StatusItem.Image.Size = new SizeF (16, 16); + StatusItem.AlternateImage.Size = new SizeF (16, 16); + + Menu = new NSMenu (); + + StateMenuItem = new NSMenuItem () { + Title = StateText + }; + + Menu.AddItem (StateMenuItem); + Menu.AddItem (NSMenuItem.SeparatorItem); + + FolderMenuItem = new NSMenuItem () { + Title = "SparkleShare" + }; + + FolderMenuItem.Activated += delegate { + SparkleShare.Controller.OpenSparkleShareFolder (); + }; + + FolderMenuItem.Image = NSImage.ImageNamed ("sparkleshare-mac"); + FolderMenuItem.Image.Size = new SizeF (16, 16); + + Menu.AddItem (FolderMenuItem); + + FolderMenuItems = new NSMenuItem [SparkleShare.Controller.Folders.Count]; + + if (Controller.Folders.Length > 0) { + Tasks = new EventHandler [SparkleShare.Controller.Folders.Count]; + + int i = 0; + foreach (string folder_name in SparkleShare.Controller.Folders) { + NSMenuItem item = new NSMenuItem (); + + item.Title = folder_name; + + if (SparkleShare.Controller.UnsyncedFolders.Contains (folder_name)) + item.Image = NSImage.ImageNamed ("NSCaution"); + else + item.Image = NSImage.ImageNamed ("NSFolder"); + + item.Image.Size = new SizeF (16, 16); + Tasks [i] = OpenFolderDelegate (folder_name); + + FolderMenuItems [i] = item; + FolderMenuItems [i].Activated += Tasks [i]; + + i++; + }; + + } else { + FolderMenuItems = new NSMenuItem [1]; + + FolderMenuItems [0] = new NSMenuItem () { + Title = "No Remote Folders Yet" + }; + } + + foreach (NSMenuItem item in FolderMenuItems) + Menu.AddItem (item); + + Menu.AddItem (NSMenuItem.SeparatorItem); + + SyncMenuItem = new NSMenuItem () { + Title = "Add Remote Folder…" + }; + + if (!SparkleShare.Controller.FirstRun) { + SyncMenuItem.Activated += delegate { + InvokeOnMainThread (delegate { + NSApplication.SharedApplication.ActivateIgnoringOtherApps (true); + + if (SparkleUI.Setup == null) { + SparkleUI.Setup = new SparkleSetup (); + SparkleUI.Setup.Controller.ShowAddPage (); + } + + if (!SparkleUI.Setup.IsVisible) + SparkleUI.Setup.Controller.ShowAddPage (); + + SparkleUI.Setup.OrderFrontRegardless (); + SparkleUI.Setup.MakeKeyAndOrderFront (this); + }); + }; + } + + Menu.AddItem (SyncMenuItem); + Menu.AddItem (NSMenuItem.SeparatorItem); + + RecentEventsMenuItem = new NSMenuItem () { + Title = "Show Recent Events" + }; + + if (Controller.Folders.Length > 0) { + RecentEventsMenuItem.Activated += delegate { + InvokeOnMainThread (delegate { + NSApplication.SharedApplication.ActivateIgnoringOtherApps (true); + + if (SparkleUI.EventLog == null) + SparkleUI.EventLog = new SparkleEventLog (); + + SparkleUI.EventLog.OrderFrontRegardless (); + SparkleUI.EventLog.MakeKeyAndOrderFront (this); + }); + }; + } + + Menu.AddItem (RecentEventsMenuItem); + + NotificationsMenuItem = new NSMenuItem (); + + if (SparkleShare.Controller.NotificationsEnabled) + NotificationsMenuItem.Title = "Turn Notifications Off"; + else + NotificationsMenuItem.Title = "Turn Notifications On"; + + NotificationsMenuItem.Activated += delegate { + SparkleShare.Controller.ToggleNotifications (); + + InvokeOnMainThread (delegate { + if (SparkleShare.Controller.NotificationsEnabled) + NotificationsMenuItem.Title = "Turn Notifications Off"; + else + NotificationsMenuItem.Title = "Turn Notifications On"; + }); + }; + + Menu.AddItem (NotificationsMenuItem); + Menu.AddItem (NSMenuItem.SeparatorItem); + + AboutMenuItem = new NSMenuItem () { + Title = "About SparkleShare" + }; + + AboutMenuItem.Activated += delegate { + InvokeOnMainThread (delegate { + NSApplication.SharedApplication.ActivateIgnoringOtherApps (true); + + if (SparkleUI.About == null) + SparkleUI.About = new SparkleAbout (); + }); + }; + + + Menu.AddItem (AboutMenuItem); + + StatusItem.Menu = Menu; + StatusItem.Menu.Update (); + } + } + + + // A method reference that makes sure that opening the + // event log for each repository works correctly + private EventHandler OpenFolderDelegate (string name) + { + return delegate { + SparkleShare.Controller.OpenSparkleShareFolder (name); }; } @@ -113,7 +296,7 @@ namespace SparkleShare { FrameNumber = 0; Timer Animation = new Timer () { - Interval = 35 + Interval = 40 }; Animation.Elapsed += delegate { @@ -125,7 +308,7 @@ namespace SparkleShare { InvokeOnMainThread (delegate { string image_path = Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "idle" + FrameNumber + ".png"); - + string alternate_image_path = Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "idle" + FrameNumber + "-active.png"); @@ -139,243 +322,6 @@ namespace SparkleShare { return Animation; } - - // Creates the menu that is popped up when the - // user clicks the status icon - public void CreateMenu () - { - Menu = new NSMenu (); - - StateMenuItem = new NSMenuItem () { - Title = StateText - }; - - Menu.AddItem (StateMenuItem); - Menu.AddItem (NSMenuItem.SeparatorItem); - - FolderMenuItem = new NSMenuItem () { - Title = "SparkleShare" - }; - - FolderMenuItem.Activated += delegate { - SparkleShare.Controller.OpenSparkleShareFolder (); - }; - - string folder_icon_path = Path.Combine (NSBundle.MainBundle.ResourcePath, - "sparkleshare-mac.icns"); - - FolderMenuItem.Image = new NSImage (folder_icon_path); - FolderMenuItem.Image.Size = new SizeF (16, 16); - - Menu.AddItem (FolderMenuItem); - - if (SparkleShare.Controller.Folders.Count > 0) { - FolderMenuItems = new NSMenuItem [SparkleShare.Controller.Folders.Count]; - Tasks = new EventHandler [SparkleShare.Controller.Folders.Count]; - - int i = 0; - foreach (string folder_name in SparkleShare.Controller.Folders) { - NSMenuItem item = new NSMenuItem (); - - item.Title = folder_name; - - if (SparkleShare.Controller.UnsyncedFolders.Contains (folder_name)) - item.Image = NSImage.ImageNamed ("NSCaution"); - else - item.Image = NSImage.ImageNamed ("NSFolder"); - - item.Image.Size = new SizeF (16, 16); - Tasks [i] = OpenFolderDelegate (folder_name); - - FolderMenuItems [i] = item; - FolderMenuItems [i].Activated += Tasks [i]; - Menu.AddItem (FolderMenuItems [i]); - - i++; - }; - - - - } else { - FolderMenuItems = new NSMenuItem [1]; - - FolderMenuItems [0] = new NSMenuItem () { - Title = "No Remote Folders Yet" - }; - - Menu.AddItem (FolderMenuItems [0]); - } - - Menu.AddItem (NSMenuItem.SeparatorItem); - - SyncMenuItem = new NSMenuItem () { - Title = "Add Remote Folder…" - }; - - if (!SparkleShare.Controller.FirstRun) { - SyncMenuItem.Activated += delegate { - InvokeOnMainThread (delegate { - NSApplication.SharedApplication.ActivateIgnoringOtherApps (true); - - if (SparkleUI.Intro == null) { - SparkleUI.Intro = new SparkleIntro (); - SparkleUI.Intro.ShowServerForm (true); - } - - if (!SparkleUI.Intro.IsVisible) - SparkleUI.Intro.ShowServerForm (true); - - SparkleUI.Intro.OrderFrontRegardless (); - SparkleUI.Intro.MakeKeyAndOrderFront (this); - }); - }; - } - - Menu.AddItem (SyncMenuItem); - Menu.AddItem (NSMenuItem.SeparatorItem); - - RecentEventsMenuItem = new NSMenuItem () { - Title = "Show Recent Events" - }; - - if (SparkleShare.Controller.Folders.Count > 0) { - RecentEventsMenuItem.Activated += delegate { - InvokeOnMainThread (delegate { - NSApplication.SharedApplication.ActivateIgnoringOtherApps (true); - - if (SparkleUI.EventLog == null) - SparkleUI.EventLog = new SparkleEventLog (); - - SparkleUI.EventLog.OrderFrontRegardless (); - SparkleUI.EventLog.MakeKeyAndOrderFront (this); - }); - }; - } - - Menu.AddItem (RecentEventsMenuItem); - - NotificationsMenuItem = new NSMenuItem (); - - if (SparkleShare.Controller.NotificationsEnabled) - NotificationsMenuItem.Title = "Turn Notifications Off"; - else - NotificationsMenuItem.Title = "Turn Notifications On"; - - NotificationsMenuItem.Activated += delegate { - SparkleShare.Controller.ToggleNotifications (); - - InvokeOnMainThread (delegate { - if (SparkleShare.Controller.NotificationsEnabled) - NotificationsMenuItem.Title = "Turn Notifications Off"; - else - NotificationsMenuItem.Title = "Turn Notifications On"; - }); - }; - - Menu.AddItem (NotificationsMenuItem); - Menu.AddItem (NSMenuItem.SeparatorItem); - - AboutMenuItem = new NSMenuItem () { - Title = "About SparkleShare" - }; - - AboutMenuItem.Activated += delegate { - InvokeOnMainThread (delegate { - NSApplication.SharedApplication.ActivateIgnoringOtherApps (true); - - if (SparkleUI.About == null) - SparkleUI.About = new SparkleAbout (); - - SparkleUI.About.OrderFrontRegardless (); - SparkleUI.About.MakeKeyAndOrderFront (this); - SparkleUI.About.CheckForNewVersion (); - }); - }; - - - Menu.AddItem (AboutMenuItem); - - - - StatusItem.Menu = Menu; - StatusItem.Menu.Update (); - } - - - // A method reference that makes sure that opening the - // event log for each repository works correctly - private EventHandler OpenFolderDelegate (string name) - { - return delegate { - SparkleShare.Controller.OpenSparkleShareFolder (name); - }; - } - - - public void UpdateMenu () - { - StateMenuItem.Title = StateText; - } - - - // The state when there's nothing going on - private void SetNormalState () - { - if (SparkleShare.Controller.UnsyncedFolders.Count > 0) - SetNormalState (true); - else - SetNormalState (false); - } - - - // The state when there's nothing going on - private void SetNormalState (bool error) - { - Animation.Stop (); - - if (SparkleShare.Controller.Folders.Count == 0) { - StateText = _("Welcome to SparkleShare!"); - - InvokeOnMainThread (delegate { - StatusItem.Image = new NSImage (NSBundle.MainBundle.ResourcePath + "/Pixmaps/idle0.png"); - StatusItem.AlternateImage = new NSImage (NSBundle.MainBundle.ResourcePath + "/Pixmaps/idle0-active.png"); - StatusItem.Image.Size = new SizeF (16, 16); - StatusItem.AlternateImage.Size = new SizeF (16, 16); - }); - - } else { - if (error) { - StateText = _("Not everything is synced"); - - InvokeOnMainThread (delegate { - StatusItem.Image = new NSImage (NSBundle.MainBundle.ResourcePath + "/Pixmaps/error.png"); - StatusItem.AlternateImage = new NSImage (NSBundle.MainBundle.ResourcePath + "/Pixmaps/error-active.png"); - StatusItem.Image.Size = new SizeF (16, 16); - StatusItem.AlternateImage.Size = new SizeF (16, 16); - }); - - } else { - StateText = _("Up to date") + " (" + SparkleShare.Controller.FolderSize + ")"; - - InvokeOnMainThread (delegate { - StatusItem.Image = new NSImage (NSBundle.MainBundle.ResourcePath + "/Pixmaps/idle0.png"); - StatusItem.AlternateImage = new NSImage (NSBundle.MainBundle.ResourcePath + "/Pixmaps/idle0-active.png"); - StatusItem.Image.Size = new SizeF (16, 16); - StatusItem.AlternateImage.Size = new SizeF (16, 16); - }); - } - } - } - - - // The state when animating - private void SetAnimationState () - { - StateText = _("Syncing…"); - - if (!Animation.Enabled) - Animation.Start (); - } } diff --git a/SparkleShare/Mac/SparkleUI.cs b/SparkleShare/Mac/SparkleUI.cs index e793def9..eb3721aa 100644 --- a/SparkleShare/Mac/SparkleUI.cs +++ b/SparkleShare/Mac/SparkleUI.cs @@ -14,13 +14,14 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . - + using System; using System.Collections.Generic; using System.Drawing; using System.IO; using System.Timers; +using Mono.Unix; using MonoMac.Foundation; using MonoMac.AppKit; using MonoMac.ObjCRuntime; @@ -28,39 +29,20 @@ using MonoMac.Growl; namespace SparkleShare { - public partial class AppDelegate : NSApplicationDelegate { + public class SparkleUI : AppDelegate { - public override void WillBecomeActive (NSNotification notification) - { - NSApplication.SharedApplication.DockTile.BadgeLabel = null; - } - - public override void OrderFrontStandardAboutPanel (NSObject sender) - { - // FIXME: Doesn't work - new SparkleAbout (); - } - - public override void WillTerminate (NSNotification notification) - { - SparkleShare.Controller.Quit (); - } - } - - - public class SparkleUI : AppDelegate { - - public static SparkleStatusIcon StatusIcon; - public static SparkleEventLog EventLog; - public static SparkleIntro Intro; + public static SparkleStatusIcon StatusIcon; + public static SparkleEventLog EventLog; + public static SparkleSetup Setup; + public static SparkleBubbles Bubbles; public static SparkleAbout About; - public static NSFont Font; + public static NSFont Font; private NSAlert alert; - public SparkleUI () - { + public SparkleUI () + { string content_path = Directory.GetParent ( System.AppDomain.CurrentDomain.BaseDirectory).ToString (); @@ -71,6 +53,10 @@ namespace SparkleShare { Dlfcn.dlopen (growl_path, 0); NSApplication.Init (); + // Use translations + Catalog.Init ("sparkleshare", + Path.Combine (NSBundle.MainBundle.ResourcePath, "Translations")); + using (NSAutoreleasePool pool = new NSAutoreleasePool ()) { // Needed for Growl @@ -79,106 +65,44 @@ namespace SparkleShare { NSApplication.SharedApplication.ApplicationIconImage = NSImage.ImageNamed ("sparkleshare.icns"); - SetFolderIcon (); - if (!SparkleShare.Controller.BackendIsPresent) { this.alert = new SparkleAlert (); this.alert.RunModal (); return; } + + SetFolderIcon (); Font = NSFontManager.SharedFontManager.FontWithFamily ("Lucida Grande", NSFontTraitMask.Condensed, 0, 13); StatusIcon = new SparkleStatusIcon (); + Bubbles = new SparkleBubbles (); + + if (SparkleShare.Controller.FirstRun) { + Setup = new SparkleSetup (); + Setup.Controller.ShowSetupPage (); + } } + } + - SparkleShare.Controller.NotificationRaised += delegate (string user_name, string user_email, - string message, string repository_path) { - InvokeOnMainThread (delegate { - if (EventLog != null) - EventLog.UpdateEvents (); + public void SetFolderIcon () + { + string folder_icon_path = Path.Combine (NSBundle.MainBundle.ResourcePath, + "sparkleshare-mac.icns"); - if (SparkleShare.Controller.NotificationsEnabled) { - if (NSApplication.SharedApplication.DockTile.BadgeLabel == null) - NSApplication.SharedApplication.DockTile.BadgeLabel = "1"; - else - NSApplication.SharedApplication.DockTile.BadgeLabel = - (int.Parse (NSApplication.SharedApplication.DockTile.BadgeLabel) + 1).ToString (); - - if (GrowlApplicationBridge.IsGrowlRunning ()) { - SparkleBubble bubble = new SparkleBubble (user_name, message) { - ImagePath = SparkleShare.Controller.GetAvatar (user_email, 36) - }; - - bubble.Show (); - - } else { - NSApplication.SharedApplication.RequestUserAttention - (NSRequestUserAttentionType.InformationalRequest); - } - } - }); - }; - - - SparkleShare.Controller.ConflictNotificationRaised += delegate { - string title = "Ouch! Mid-air collision!"; - string subtext = "Don't worry, SparkleShare made a copy of each conflicting file."; - - new SparkleBubble (title, subtext).Show (); - }; + NSImage folder_icon = new NSImage (folder_icon_path); + + NSWorkspace.SharedWorkspace.SetIconforFile (folder_icon, + SparkleShare.Controller.SparklePath, 0); + } - SparkleShare.Controller.AvatarFetched += delegate { - InvokeOnMainThread (delegate { - if (EventLog != null) - EventLog.UpdateEvents (); - }); - }; - - - SparkleShare.Controller.OnIdle += delegate { - InvokeOnMainThread (delegate { - if (EventLog != null) - EventLog.UpdateEvents (); - }); - }; - - - SparkleShare.Controller.FolderListChanged += delegate { - InvokeOnMainThread (delegate { - if (EventLog != null) { - EventLog.UpdateChooser (); - EventLog.UpdateEvents (); - } - }); - }; - - - if (SparkleShare.Controller.FirstRun) { - Intro = new SparkleIntro (); - Intro.ShowAccountForm (); - } - } - - - public void SetFolderIcon () - { - string folder_icon_path = Path.Combine (NSBundle.MainBundle.ResourcePath, - "sparkleshare-mac.icns"); - - NSImage folder_icon = new NSImage (folder_icon_path); - - NSWorkspace.SharedWorkspace.SetIconforFile (folder_icon, - SparkleShare.Controller.SparklePath, 0); - } - - - public void Run () - { + public void Run () + { NSApplication.Main (new string [0]); - } + } [Export("registrationDictionaryForGrowl")] @@ -188,4 +112,18 @@ namespace SparkleShare { return NSDictionary.FromFile (path); } } + + + public partial class AppDelegate : NSApplicationDelegate { + + public override void WillBecomeActive (NSNotification notification) + { + NSApplication.SharedApplication.DockTile.BadgeLabel = null; + } + + public override void WillTerminate (NSNotification notification) + { + SparkleShare.Controller.Quit (); + } + } } diff --git a/SparkleShare/Makefile.am b/SparkleShare/Makefile.am index c757da22..15dee260 100644 --- a/SparkleShare/Makefile.am +++ b/SparkleShare/Makefile.am @@ -13,19 +13,39 @@ endif SOURCES = \ SparkleAbout.cs \ - SparkleBubble.cs \ + SparkleAboutController.cs \ + SparkleBubbles.cs \ + SparkleBubblesController.cs \ SparkleController.cs \ SparkleEntry.cs \ - SparkleInfobar.cs \ - SparkleIntro.cs \ - SparkleLinController.cs \ SparkleEventLog.cs \ + SparkleEventLogController.cs \ + SparkleLinController.cs \ + SparkleSetup.cs \ + SparkleSetupController.cs \ + SparkleSetupWindow.cs \ SparkleShare.cs \ SparkleSpinner.cs \ SparkleStatusIcon.cs \ + SparkleStatusIconController.cs \ SparkleUI.cs \ - SparkleUIHelpers.cs \ - SparkleWindow.cs + SparkleUIHelpers.cs + SparkleBubbles.cs \ + SparkleBubblesController.cs \ + SparkleController.cs \ + SparkleEntry.cs \ + SparkleEventLog.cs \ + SparkleEventLogController.cs \ + SparkleLinController.cs \ + SparkleSetup.cs \ + SparkleSetupController.cs \ + SparkleSetupWindow.cs \ + SparkleShare.cs \ + SparkleSpinner.cs \ + SparkleStatusIcon.cs \ + SparkleStatusIconController.cs \ + SparkleUI.cs \ + SparkleUIHelpers.cs include $(top_srcdir)/build/build.mk diff --git a/SparkleShare/SparkleAbout.cs b/SparkleShare/SparkleAbout.cs index 7afe214a..c8b9a682 100644 --- a/SparkleShare/SparkleAbout.cs +++ b/SparkleShare/SparkleAbout.cs @@ -26,7 +26,9 @@ namespace SparkleShare { public class SparkleAbout : Window { - private Label version; + public SparkleAboutController Controller = new SparkleAboutController (); + + private Label updates; // Short alias for the translations @@ -38,30 +40,54 @@ namespace SparkleShare { public SparkleAbout () : base ("") { - DefaultSize = new Gdk.Size (360, 260); + DeleteEvent += delegate (object o, DeleteEventArgs args) { + HideAll (); + args.RetVal = true; + }; + + DefaultSize = new Gdk.Size (600, 260); + Resizable = false; BorderWidth = 0; IconName = "folder-sparkleshare"; WindowPosition = WindowPosition.Center; Title = _("About SparkleShare"); - Resizable = false; + AppPaintable = true; + + // TODO: Should be able to do without referencing SparkleLib... + //string image_path = SparkleLib.SparkleHelpers.CombineMore (SparkleLib.Defines.DATAROOTDIR, + // "sparkleshare", "pixmaps", "about.png"); + + Realize (); + //Gdk.Pixbuf buf = new Gdk.Pixbuf (image_path); + //Gdk.Pixmap map, map2; + //buf.RenderPixmapAndMask (out map, out map2, 255); + //GdkWindow.SetBackPixmap (map, false); CreateAbout (); - SparkleShare.Controller.NewVersionAvailable += delegate (string new_version) { + Controller.NewVersionEvent += delegate (string new_version) { Application.Invoke (delegate { - this.version.Markup = String.Format ("{0}: {1}", _("A newer version is available"), new_version); - this.version.ShowAll (); + this.updates.Markup = String.Format ("{0}", + String.Format (_("A newer version ({0}) is available!"), new_version)); + this.updates.ShowAll (); }); }; - SparkleShare.Controller.VersionUpToDate += delegate { + Controller.VersionUpToDateEvent += delegate { Application.Invoke (delegate { - this.version.Markup = String.Format ("{0}", _("You are running the latest version.")); - this.version.ShowAll (); + this.updates.Markup = String.Format ("{0}", + _("You are running the latest version.")); + this.updates.ShowAll (); }); }; - SparkleShare.Controller.CheckForNewVersion (); + Controller.CheckingForNewVersionEvent += delegate { + Application.Invoke (delegate { + this.updates.Markup = String.Format ("{0}", + _("Checking for updates...")); + this.updates.ShowAll (); + }); + }; } @@ -70,84 +96,58 @@ namespace SparkleShare { Gdk.Color color = Style.Foreground (StateType.Insensitive); string secondary_text_color = SparkleUIHelpers.GdkColorToHex (color); - EventBox box = new EventBox (); - box.ModifyBg (StateType.Normal, new TreeView ().Style.Base (StateType.Normal)); - - Label header = new Label () { - Markup = "SparkleShare\n" + SparkleShare.Controller.Version + "", - Xalign = 0, - Xpad = 18, - Ypad = 18 - }; - - box.Add (header); - - this.version = new Label () { - Markup = String.Format ("{0}", _("Checking for updates...")), + Label version = new Label () { + Markup = "" + + "version " + Controller.RunningVersion + + "", Xalign = 0, - Xpad = 18, - Ypad = 22, + Xpad = 300 + }; + + this.updates = new Label () { + Markup = "" + + _("Checking for updates...") + + "", + Xalign = 0, + Xpad = 300 + }; + + Label copyright = new Label () { + Markup = "" + + "Copyright © 2010–" + DateTime.Now.Year + " " + + "Hylke Bons and others." + + "", + Xalign = 0, + Xpad = 300 }; Label license = new Label () { - Xalign = 0, - Xpad = 18, - Ypad = 0, LineWrap = true, - Wrap = true, LineWrapMode = Pango.WrapMode.Word, - - Markup = "Copyright © 2010–" + DateTime.Now.Year + " Hylke Bons and others\n" + - "\n" + - "SparkleShare is Free and Open Source Software. " + - "You are free to use, modify, and redistribute it " + - "under the terms of the GNU General Public License version 3 or later." + Markup = "" + + "SparkleShare is Free and Open Source Software. You are free to use, modify, " + + "and redistribute it under the GNU General Public License version 3 or later." + + "", + WidthRequest = 330, + Wrap = true, + Xalign = 0, + Xpad = 300, }; - VBox vbox = new VBox (false, 0) { - BorderWidth = 0 + VBox layout_horizontal = new VBox (false, 0) { + BorderWidth = 0, + HeightRequest = 260, + WidthRequest = 640 }; - HButtonBox button_bar = new HButtonBox () { - BorderWidth = 12 - }; + layout_horizontal.PackStart (new Label (""), false, false, 42); + layout_horizontal.PackStart (version, false, false, 0); + layout_horizontal.PackStart (this.updates, false, false, 0); + layout_horizontal.PackStart (copyright, false, false, 9); + layout_horizontal.PackStart (license, false, false, 0); + layout_horizontal.PackStart (new Label (""), false, false, 0); - Button credits_button = new Button (_("_Show Credits")) { - UseUnderline = true - }; - - credits_button.Clicked += delegate { - - Process process = new Process (); - process.StartInfo.FileName = "xdg-open"; - process.StartInfo.Arguments = "http://www.sparkleshare.org/credits"; - process.Start (); - - }; - - Button website_button = new Button (_("_Visit Website")) { - UseUnderline = true - }; - - website_button.Clicked += delegate { - - Process process = new Process (); - process.StartInfo.FileName = "xdg-open"; - process.StartInfo.Arguments = "http://www.sparkleshare.org/"; - process.Start (); - - }; - - button_bar.Add (website_button); - button_bar.Add (credits_button); - - vbox.PackStart (box, true, true, 0); - vbox.PackStart (this.version, false, false, 0); - vbox.PackStart (license, true, true, 0); - vbox.PackStart (new Label (""), true, true, 0); - vbox.PackStart (button_bar, false, false, 0); - - Add (vbox); + Add (layout_horizontal); } } } diff --git a/SparkleShare/SparkleAboutController.cs b/SparkleShare/SparkleAboutController.cs new file mode 100644 index 00000000..5495dfc9 --- /dev/null +++ b/SparkleShare/SparkleAboutController.cs @@ -0,0 +1,95 @@ +// SparkleShare, a collaboration and sharing tool. +// Copyright (C) 2010 Hylke Bons +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + + +using System; +using System.Net; +using System.Threading; +using System.Timers; + +using SparkleLib; + +namespace SparkleShare { + + public class SparkleAboutController { + + public event NewVersionEventHandler NewVersionEvent; + public delegate void NewVersionEventHandler (string new_version); + + public event VersionUpToDateEventHandler VersionUpToDateEvent; + public delegate void VersionUpToDateEventHandler (); + + public event CheckingForNewVersionEventHandler CheckingForNewVersionEvent; + public delegate void CheckingForNewVersionEventHandler (); + + public string RunningVersion { + get { + return SparkleBackend.Version; + } + } + + // Check for a new version once a day + private System.Timers.Timer version_checker = new System.Timers.Timer () { + Enabled = true, + Interval = 24 * 60 * 60 * 1000 + }; + + + public SparkleAboutController () + { + CheckForNewVersion (); + + this.version_checker.Elapsed += delegate { + CheckForNewVersion (); + }; + } + + + public void CheckForNewVersion () + { + this.version_checker.Stop (); + if (CheckingForNewVersionEvent != null) + CheckingForNewVersionEvent (); + + WebClient web_client = new WebClient (); + Uri uri = new Uri ("http://www.sparkleshare.org/version"); + + web_client.DownloadStringCompleted += delegate (object o, DownloadStringCompletedEventArgs args) { + if (args.Error != null) + return; + + string new_version = args.Result.Trim (); + + // Add a little delay, making it seems we're + // actually doing hard work + Thread.Sleep (2 * 1000); + + if (RunningVersion.Equals (new_version)) { + if (VersionUpToDateEvent != null) + VersionUpToDateEvent (); + + } else { + if (NewVersionEvent != null) + NewVersionEvent (new_version); + } + + this.version_checker.Start (); + }; + + web_client.DownloadStringAsync (uri); + } + } +} diff --git a/SparkleShare/SparkleBubble.cs b/SparkleShare/SparkleBubbles.cs similarity index 51% rename from SparkleShare/SparkleBubble.cs rename to SparkleShare/SparkleBubbles.cs index 61275449..7f0f2cf3 100644 --- a/SparkleShare/SparkleBubble.cs +++ b/SparkleShare/SparkleBubbles.cs @@ -16,26 +16,41 @@ using System; + +using Gtk; using Notifications; namespace SparkleShare { - public class SparkleBubble : Notification { + public class SparkleBubbles { - public SparkleBubble (string title, string subtext) : base (title, subtext) + public SparkleBubblesController Controller = new SparkleBubblesController (); + + + public SparkleBubbles () { - IconName = "folder-sparkleshare"; - Timeout = 4500; - Urgency = Urgency.Low; + Controller.ShowBubbleEvent += delegate (string title, string subtext, string image_path) { + Notification notification = new Notification () { + Timeout = 5 * 1000, + Urgency = Urgency.Low + }; + + if (image_path != null) + notification.Icon = new Gdk.Pixbuf (image_path); + else + notification.IconName = "folder-sparkleshare"; + + notification.Show (); + }; } // Checks whether the system allows adding buttons to a notification, // prevents error messages in Ubuntu. - new public void AddAction (string action, string label, ActionHandler handler) - { - if (Array.IndexOf (Notifications.Global.Capabilities, "actions") > -1) - base.AddAction (action, label, handler); - } +// new public void AddAction (string action, string label, ActionHandler handler) +// { +// if (Array.IndexOf (Notifications.Global.Capabilities, "actions") > -1) +// base.AddAction (action, label, handler); +// } } } diff --git a/SparkleShare/SparkleBubblesController.cs b/SparkleShare/SparkleBubblesController.cs new file mode 100644 index 00000000..56ffd3a9 --- /dev/null +++ b/SparkleShare/SparkleBubblesController.cs @@ -0,0 +1,45 @@ +// SparkleShare, a collaboration and sharing tool. +// Copyright (C) 2010 Hylke Bons +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + + +using System; + +namespace SparkleShare { + + public class SparkleBubblesController { + + public event ShowBubbleEventHandler ShowBubbleEvent; + public delegate void ShowBubbleEventHandler (string title, string subtext, string image_path); + + + public SparkleBubblesController () + { + SparkleShare.Controller.ConflictNotificationRaised += delegate { + if (ShowBubbleEvent != null && SparkleShare.Controller.NotificationsEnabled) + ShowBubbleEvent ("Ouch! Mid-air collision!", + "Don't worry, SparkleShare made a copy of each conflicting file.", null); + }; + + SparkleShare.Controller.NotificationRaised += delegate (string user_name, string user_email, + string message, string folder_path) { + + if (ShowBubbleEvent != null && SparkleShare.Controller.NotificationsEnabled) + ShowBubbleEvent (user_name, message, + SparkleShare.Controller.GetAvatar (user_email, 36)); + }; + } + } +} diff --git a/SparkleShare/SparkleController.cs b/SparkleShare/SparkleController.cs index 8655e1f9..d78c7124 100644 --- a/SparkleShare/SparkleController.cs +++ b/SparkleShare/SparkleController.cs @@ -74,12 +74,6 @@ namespace SparkleShare { public delegate void NotificationRaisedEventHandler (string user_name, string user_email, string message, string repository_path); - public event NewVersionAvailableEventHandler NewVersionAvailable; - public delegate void NewVersionAvailableEventHandler (string new_version); - - public event VersionUpToDateEventHandler VersionUpToDate; - public delegate void VersionUpToDateEventHandler (); - // Short alias for the translations public static string _ (string s) @@ -285,6 +279,7 @@ namespace SparkleShare { public string GetHTMLLog (List change_sets) { List activity_days = new List (); + List emails = new List (); change_sets.Sort ((x, y) => (x.Timestamp.CompareTo (y.Timestamp))); change_sets.Reverse (); @@ -293,7 +288,8 @@ namespace SparkleShare { return null; foreach (SparkleChangeSet change_set in change_sets) { - GetAvatar (change_set.UserEmail, 36); + if (!emails.Contains (change_set.UserEmail)) + emails.Add (change_set.UserEmail); bool change_set_inserted = false; foreach (ActivityDay stored_activity_day in activity_days) { @@ -314,6 +310,10 @@ namespace SparkleShare { } } + new Thread (new ThreadStart (delegate { + FetchAvatars (emails, 48); + })).Start (); + string event_log_html = EventLogHTML; string day_entry_html = DayEntryHTML; string event_entry_html = EventEntryHTML; @@ -324,7 +324,7 @@ namespace SparkleShare { foreach (SparkleChangeSet change_set in activity_day) { string event_entry = "
"; - + if (change_set.IsMerge) { event_entry += "
Did something magical
"; @@ -335,9 +335,9 @@ namespace SparkleShare { change_set.Folder, file_path); if (File.Exists (absolute_file_path)) - event_entry += "
" + file_path + "
"; + event_entry += "
" + file_path + "
"; else - event_entry += "
" + file_path + "
"; + event_entry += "
" + file_path + "
"; } } @@ -347,9 +347,9 @@ namespace SparkleShare { change_set.Folder, file_path); if (File.Exists (absolute_file_path)) - event_entry += "
" + file_path + "
"; + event_entry += "
" + file_path + "
"; else - event_entry += "
" + file_path + "
"; + event_entry += "
" + file_path + "
"; } } @@ -359,9 +359,9 @@ namespace SparkleShare { change_set.Folder, file_path); if (File.Exists (absolute_file_path)) - event_entry += "
" + file_path + "
"; + event_entry += "
" + file_path + "
"; else - event_entry += "
" + file_path + "
"; + event_entry += "
" + file_path + "
"; } } @@ -375,9 +375,9 @@ namespace SparkleShare { change_set.Folder, to_file_path); if (File.Exists (absolute_file_path)) - event_entry += "
" + file_path + "
"; + event_entry += "
" + file_path + "
"; else - event_entry += "
" + file_path + "
"; + event_entry += "
" + file_path + "
"; if (File.Exists (absolute_to_file_path)) event_entry += "" + to_file_path + "
"; @@ -388,14 +388,38 @@ namespace SparkleShare { } } } - + + string comments = ""; + comments = "
"; + + if (change_set.Notes != null) { + change_set.Notes.Sort ((x, y) => (x.Timestamp.CompareTo (y.Timestamp))); + + foreach (SparkleNote note in change_set.Notes) { + comments += "
" + + "

" + + note.UserName + "

" + + note.Body + + "
"; + } + } + + comments += "
"; + + string avatar_email = ""; + if (File.Exists (GetAvatar (change_set.UserEmail, 48))) + avatar_email = change_set.UserEmail; + event_entry += "
"; event_entries += event_entry_html.Replace ("", event_entry) .Replace ("", change_set.UserName) - .Replace ("", "file://" + GetAvatar (change_set.UserEmail, 36)) + .Replace ("", "file://" + GetAvatar (avatar_email, 48)) .Replace ("", change_set.Timestamp.ToString ("H:mm")) .Replace ("", change_set.Folder) - .Replace ("", AssignColor (change_set.Folder)); + .Replace ("", change_set.Revision) + .Replace ("", AssignColor (change_set.Folder)) + .Replace ("", comments); } string day_entry = ""; @@ -406,31 +430,35 @@ namespace SparkleShare { today.Month == activity_day.DateTime.Month && today.Year == activity_day.DateTime.Year) { - day_entry = day_entry_html.Replace ("", "Today"); + day_entry = day_entry_html.Replace ("", "Today"); } else if (yesterday.Day == activity_day.DateTime.Day && yesterday.Month == activity_day.DateTime.Month && yesterday.Year == activity_day.DateTime.Year) { - day_entry = day_entry_html.Replace ("", "Yesterday"); + day_entry = day_entry_html.Replace ("", "Yesterday"); } else { if (activity_day.DateTime.Year != DateTime.Now.Year) { // TRANSLATORS: This is the date in the event logs day_entry = day_entry_html.Replace ("", - "" + activity_day.DateTime.ToString (_("ddd MMM d, yyyy")) + ""); + activity_day.DateTime.ToString (_("dddd, MMMM d, yyyy"))); } else { // TRANSLATORS: This is the date in the event logs, without the year day_entry = day_entry_html.Replace ("", - "" + activity_day.DateTime.ToString (_("ddd MMM d")) + ""); + activity_day.DateTime.ToString (_("dddd, MMMM d"))); } } event_log += day_entry.Replace ("", event_entries); } - return event_log_html.Replace ("", event_log); + string html = event_log_html.Replace ("", event_log) + .Replace ("", UserName) + .Replace ("", "file://" + GetAvatar (UserEmail, 48)); + + return html; } @@ -454,7 +482,7 @@ namespace SparkleShare { // Fires events for the current syncing state - private void UpdateState () + public void UpdateState () { foreach (SparkleRepoBase repo in Repositories) { if (repo.Status == SyncStatus.SyncDown || @@ -495,7 +523,6 @@ namespace SparkleShare { if (backend == null) return; - SparkleRepoBase repo = null; @@ -508,7 +535,6 @@ namespace SparkleShare { else repo = new SparkleRepoGit (folder_path, SparkleBackend.DefaultBackend); - repo.NewChangeSet += delegate (SparkleChangeSet change_set, string repository_path) { string message = FormatMessage (change_set); @@ -522,6 +548,11 @@ namespace SparkleShare { }; repo.SyncStatusChanged += delegate (SyncStatus status) { +/* if (status == SyncStatus.SyncUp) { + foreach (string path in repo.UnsyncedFilePaths) + Console.WriteLine (path); + } +*/ if (status == SyncStatus.Idle || status == SyncStatus.SyncUp || status == SyncStatus.SyncDown || @@ -814,68 +845,77 @@ namespace SparkleShare { // Gets the avatar for a specific email address and size - public string GetAvatar (string email, int size) + public void FetchAvatars (List emails, int size) { - string avatar_path = SparkleHelpers.CombineMore (SparklePaths.SparkleLocalIconPath, - size + "x" + size, "status"); + List old_avatars = new List (); + bool avatar_fetched = false; + string avatar_path = SparkleHelpers.CombineMore ( + SparklePaths.SparkleLocalIconPath, size + "x" + size, "status"); - string avatar_file_path = Path.Combine (avatar_path, "avatar-" + email); + if (!Directory.Exists (avatar_path)) { + Directory.CreateDirectory (avatar_path); + SparkleHelpers.DebugInfo ("Config", "Created '" + avatar_path + "'"); + } - if (File.Exists (avatar_file_path)) { - FileInfo avatar_info = new FileInfo (avatar_file_path); + foreach (string email in emails) { + string avatar_file_path = Path.Combine (avatar_path, "avatar-" + email); - // Delete avatars older than a month and get a new one - if (avatar_info.CreationTime < DateTime.Now.AddMonths (-1)) { - avatar_info.Delete (); - return GetAvatar (email, size); + if (File.Exists (avatar_file_path)) { + FileInfo avatar_info = new FileInfo (avatar_file_path); + + // Delete avatars older than a month + if (avatar_info.CreationTime < DateTime.Now.AddMonths (-1)) { + avatar_info.Delete (); + old_avatars.Add (email); + } } else { - return avatar_file_path; - } + WebClient client = new WebClient (); + string url = "http://gravatar.com/avatar/" + GetMD5 (email) + + ".jpg?s=" + size + "&d=404"; - } else { - if (!Directory.Exists (avatar_path)) { - Directory.CreateDirectory (avatar_path); - SparkleHelpers.DebugInfo ("Config", "Created '" + avatar_path + "'"); - } + try { + // Fetch the avatar + byte [] buffer = client.DownloadData (url); - // Let's try to get the person's gravatar for next time - WebClient web_client = new WebClient (); - Uri uri = new Uri ("https://secure.gravatar.com/avatar/" + GetMD5 (email) + - ".jpg?s=" + size + "&d=404"); + // Write the avatar data to a + // if not empty + if (buffer.Length > 255) { + avatar_fetched = true; + File.WriteAllBytes (avatar_file_path, buffer); + SparkleHelpers.DebugInfo ("Controller", "Fetched gravatar for " + email); + } - string tmp_file_path = SparkleHelpers.CombineMore (SparklePaths.SparkleTmpPath, email + size); - - if (!File.Exists (tmp_file_path)) { - web_client.DownloadFileAsync (uri, tmp_file_path); - - web_client.DownloadFileCompleted += delegate { - if (File.Exists (avatar_file_path)) - File.Delete (avatar_file_path); - - FileInfo tmp_file_info = new FileInfo (tmp_file_path); - - if (tmp_file_info.Length > 255) - File.Move (tmp_file_path, avatar_file_path); - - SparkleHelpers.DebugInfo ("Controller", "Fetched gravatar: " + email); - - if (AvatarFetched != null) - AvatarFetched (); - }; - } - - // Fall back to a generic icon if there is no gravatar - if (File.Exists (avatar_file_path)) - return avatar_file_path; - else - return null; + } catch (WebException) { + SparkleHelpers.DebugInfo ("Controller", "Failed fetching gravatar for " + email); + } + } } + + // Fetch new versions of the avatars that we + // deleted because they were too old + if (old_avatars.Count > 0) + FetchAvatars (old_avatars, size); + + if (AvatarFetched != null && avatar_fetched) + AvatarFetched (); + } + + + public string GetAvatar (string email, int size) + { + string avatar_file_path = SparkleHelpers.CombineMore ( + SparklePaths.SparkleLocalIconPath, size + "x" + size, "status", "avatar-" + email); + + return avatar_file_path; } public void FetchFolder (string server, string remote_folder) { + server = server.Trim (); + remote_folder = remote_folder.Trim (); + if (!Directory.Exists (SparklePaths.SparkleTmpPath)) Directory.CreateDirectory (SparklePaths.SparkleTmpPath); @@ -950,7 +990,6 @@ namespace SparkleShare { fetcher.Failed += delegate { - if (FolderFetchError != null) FolderFetchError (); @@ -1012,36 +1051,17 @@ namespace SparkleShare { } - public string Version { - get { - return SparkleBackend.Version; + + + public void AddNoteToFolder (string folder_name, string revision, string note) + { + foreach (SparkleRepoBase repo in Repositories) { + if (repo.Name.Equals (folder_name)) + repo.AddNote (revision, note); } } - public void CheckForNewVersion () - { - WebClient web_client = new WebClient (); - Uri uri = new Uri ("http://www.sparkleshare.org/version"); - - web_client.DownloadStringCompleted += delegate (object o, DownloadStringCompletedEventArgs args) { - if (args.Error != null) - return; - - string new_version = args.Result.Trim (); - - if (Version.Equals (new_version)) { - if (VersionUpToDate != null) - VersionUpToDate (); - - } else { - if (NewVersionAvailable != null) - NewVersionAvailable (new_version); - } - }; - - web_client.DownloadStringAsync (uri); - } private string [] tango_palette = new string [] {"#eaab00", "#e37222", diff --git a/SparkleShare/SparkleEntry.cs b/SparkleShare/SparkleEntry.cs index 96ac5bef..3d0f846c 100644 --- a/SparkleShare/SparkleEntry.cs +++ b/SparkleShare/SparkleEntry.cs @@ -17,6 +17,7 @@ using Gtk; +// TODO: Remove with Gtk3 namespace SparkleShare { public class SparkleEntry : Entry { @@ -33,7 +34,6 @@ namespace SparkleShare { ClipboardPasted += delegate { OnEntered (); }; FocusOutEvent += delegate { - if (Text.Equals ("") || Text == null) ExampleTextActive = true; diff --git a/SparkleShare/SparkleEventLog.cs b/SparkleShare/SparkleEventLog.cs index eb9695ba..4379e9a8 100644 --- a/SparkleShare/SparkleEventLog.cs +++ b/SparkleShare/SparkleEventLog.cs @@ -84,7 +84,6 @@ namespace SparkleShare { LinkStatus = args.Link; }; - // FIXME: Use the right event, waiting for newer webkit bindings: NavigationPolicyDecisionRequested WebView.NavigationRequested += delegate (object o, WebKit.NavigationRequestedArgs args) { if (args.Request.Uri == LinkStatus) { Process process = new Process (); @@ -92,9 +91,26 @@ namespace SparkleShare { process.StartInfo.Arguments = args.Request.Uri.Replace (" ", "\\ "); // Escape space-characters process.Start (); - // Don't follow HREFs (as this would cause a page refresh) - args.RetVal = 1; + } else { + Regex regex = new Regex (@"(.+)~(.+)~(.+)"); + Match match = regex.Match (args.Request.Uri); + + if (match.Success) { + string folder_name = match.Groups [1].Value; + string revision = match.Groups [2].Value; + string note = match.Groups [3].Value.Replace ("%20", " "); + + Thread thread = new Thread (new ThreadStart (delegate { + SparkleShare.Controller.AddNoteToFolder (folder_name, revision, note); + })); + + thread.Start (); + } } + + // Don't follow HREFs (as this would cause a page refresh) + if (!args.Request.Uri.Equals ("file:")) + args.RetVal = 1; }; ScrolledWindow.Add (WebView); @@ -142,6 +158,12 @@ namespace SparkleShare { return (item == "---"); }; + if (this.selected_log != null && + !SparkleShare.Controller.Folders.Contains (this.selected_log)) { + + this.selected_log = null; + } + this.combo_box.Changed += delegate { TreeIter iter; this.combo_box.GetActiveIter (out iter); diff --git a/SparkleShare/SparkleEventLogController.cs b/SparkleShare/SparkleEventLogController.cs new file mode 100644 index 00000000..fdc99f3d --- /dev/null +++ b/SparkleShare/SparkleEventLogController.cs @@ -0,0 +1,119 @@ +// SparkleShare, a collaboration and sharing tool. +// Copyright (C) 2010 Hylke Bons +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + + +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Threading; + +using SparkleLib; + +namespace SparkleShare { + + public class SparkleEventLogController { + + public event UpdateContentEventEventHandler UpdateContentEvent; + public delegate void UpdateContentEventEventHandler (string html); + + public event UpdateChooserEventHandler UpdateChooserEvent; + public delegate void UpdateChooserEventHandler (string [] folders); + + public event ContentLoadingEventHandler ContentLoadingEvent; + public delegate void ContentLoadingEventHandler (); + + + public string SelectedFolder { + get { + return this.selected_folder; + } + + set { + this.selected_folder = value; + + if (ContentLoadingEvent != null) + ContentLoadingEvent (); + + Stopwatch watch = new Stopwatch (); + watch.Start (); + + Thread thread = new Thread (new ThreadStart (delegate { + string html = HTML; + watch.Stop (); + + // A short delay is less annoying than + // a flashing window + if (watch.ElapsedMilliseconds < 500) + Thread.Sleep (500 - (int) watch.ElapsedMilliseconds); + + if (UpdateContentEvent != null) + UpdateContentEvent (html); + })); + + thread.Start (); + } + } + + public string HTML { + get { + List change_sets = SparkleShare.Controller.GetLog (this.selected_folder); + return SparkleShare.Controller.GetHTMLLog (change_sets); + } + } + + public string [] Folders { + get { + return SparkleShare.Controller.Folders.ToArray (); + } + } + + + private string selected_folder; + + + public SparkleEventLogController () + { + SparkleShare.Controller.AvatarFetched += delegate { + if (UpdateContentEvent != null) + UpdateContentEvent (HTML); + }; + + SparkleShare.Controller.OnIdle += delegate { + if (UpdateContentEvent != null) + UpdateContentEvent (HTML); + }; + + SparkleShare.Controller.FolderListChanged += delegate { + if (this.selected_folder != null && + !SparkleShare.Controller.Folders.Contains (this.selected_folder)) { + + this.selected_folder = null; + } + + if (UpdateChooserEvent != null) + UpdateChooserEvent (Folders); + + if (UpdateContentEvent != null) + UpdateContentEvent (HTML); + }; + + SparkleShare.Controller.NotificationRaised += delegate { + if (UpdateContentEvent != null) + UpdateContentEvent (HTML); + }; + } + } +} diff --git a/SparkleShare/SparkleInfobar.cs b/SparkleShare/SparkleInfobar.cs deleted file mode 100644 index b211771f..00000000 --- a/SparkleShare/SparkleInfobar.cs +++ /dev/null @@ -1,50 +0,0 @@ -// SparkleShare, a collaboration and sharing tool. -// Copyright (C) 2010 Hylke Bons -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . - - -using Gtk; - -namespace SparkleShare { - - // An infobar - public class SparkleInfobar : EventBox { - - public SparkleInfobar (string icon_name, string title, string text) - { - Window window = new Window (WindowType.Popup) { - Name = "gtk-tooltip" - }; - - window.EnsureStyle (); - Style = window.Style; - - Label label = new Label () { - Markup = "" + title + "\n" + text - }; - - HBox hbox = new HBox (false, 12) { - BorderWidth = 12 - }; - - hbox.PackStart (new Image (SparkleUIHelpers.GetIcon (icon_name, 24)), - false, false, 0); - - hbox.PackStart (label, false, false, 0); - - Add (hbox); - } - } -} diff --git a/SparkleShare/SparkleIntro.cs b/SparkleShare/SparkleIntro.cs deleted file mode 100644 index fe92455e..00000000 --- a/SparkleShare/SparkleIntro.cs +++ /dev/null @@ -1,667 +0,0 @@ -// SparkleShare, a collaboration and sharing tool. -// Copyright (C) 2010 Hylke Bons -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General private License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General private License for more details. -// -// You should have received a copy of the GNU General private License -// along with this program. If not, see . - - -using System; -using System.Diagnostics; -using System.IO; -using System.Text.RegularExpressions; -using System.Timers; - -using Gtk; -using Notifications; - -namespace SparkleShare { - - public class SparkleIntro : SparkleWindow { - - private Entry NameEntry; - private Entry EmailEntry; - private SparkleEntry ServerEntry; - private SparkleEntry FolderEntry; - private Button NextButton; - private Button SyncButton; - private bool ServerFormOnly; - private string SecondaryTextColor; - private ProgressBar progress_bar = new ProgressBar () { PulseStep = 0.01 }; - private Timer progress_bar_pulse_timer = new Timer () { Interval = 25, Enabled = true }; - - - // Short alias for the translations - public static string _ (string s) - { - return s; - } - - - public SparkleIntro () : base () - { - ServerFormOnly = false; - SecondaryTextColor = SparkleUIHelpers.GdkColorToHex (Style.Foreground (StateType.Insensitive)); - } - - - public void ShowAccountForm () - { - Reset (); - - VBox layout_vertical = new VBox (false, 0); - - Deletable = false; - - Label header = new Label ("" + - _("Welcome to SparkleShare!") + - "") { - UseMarkup = true, - Xalign = 0 - }; - - Label information = new Label (_("Before we can create a SparkleShare folder on this " + - "computer, we need a few bits of information from you.")) { - Xalign = 0, - Wrap = true - }; - - Table table = new Table (4, 2, true) { - RowSpacing = 6 - }; - - Label name_label = new Label ("" + _("Full Name:") + "") { - UseMarkup = true, - Xalign = 0 - }; - - NameEntry = new Entry (SparkleShare.Controller.UserName); - NameEntry.Changed += delegate { - CheckAccountForm (); - }; - - EmailEntry = new Entry (); - EmailEntry.Changed += delegate { - CheckAccountForm (); - }; - - Label email_label = new Label ("" + _("Email:") + "") { - UseMarkup = true, - Xalign = 0 - }; - - - table.Attach (name_label, 0, 1, 0, 1); - table.Attach (NameEntry, 1, 2, 0, 1); - table.Attach (email_label, 0, 1, 1, 2); - table.Attach (EmailEntry, 1, 2, 1, 2); - - NextButton = new Button (_("Next")) { - Sensitive = false - }; - - NextButton.Clicked += delegate (object o, EventArgs args) { - NextButton.Remove (NextButton.Child); - NextButton.Add (new Label (_("Configuring…"))); - - NextButton.Sensitive = false; - table.Sensitive = false; - - NextButton.ShowAll (); - - SparkleShare.Controller.UserName = NameEntry.Text; - SparkleShare.Controller.UserEmail = EmailEntry.Text; - - SparkleShare.Controller.GenerateKeyPair (); - SparkleShare.Controller.AddKey (); - - SparkleUI.StatusIcon.CreateMenu (); - - Deletable = true; - ShowServerForm (); - }; - - AddButton (NextButton); - - layout_vertical.PackStart (header, false, false, 0); - layout_vertical.PackStart (information, false, false, 21); - layout_vertical.PackStart (new Label (""), false, false, 0); - layout_vertical.PackStart (table, false, false, 0); - - Add (layout_vertical); - CheckAccountForm (); - ShowAll (); - } - - - public void ShowServerForm (bool server_form_only) - { - ServerFormOnly = server_form_only; - ShowServerForm (); - } - - - public void ShowServerForm () - { - Reset (); - - VBox layout_vertical = new VBox (false, 0); - - Label header = new Label ("" + - _("Where is your remote folder?") + - "") { - UseMarkup = true, - Xalign = 0 - }; - - Table table = new Table (7, 2, false) { - RowSpacing = 12 - }; - - HBox layout_server = new HBox (true, 0); - - ServerEntry = new SparkleEntry () { - ExampleText = _("address-to-server.com") - }; - - ServerEntry.Changed += CheckServerForm; - - RadioButton radio_button = new RadioButton ("" + _("On my own server:") + ""); - - layout_server.Add (radio_button); - layout_server.Add (ServerEntry); - - string github_text = "" + "Github" + "\n" + - "" + - _("Free hosting for Free and Open Source Software projects.") + "\n" + - _("Also has paid accounts for extra private space and bandwidth.") + - ""; - - RadioButton radio_button_github = new RadioButton (radio_button, github_text); - - (radio_button_github.Child as Label).UseMarkup = true; - (radio_button_github.Child as Label).Wrap = true; - - string gnome_text = "" + _("The GNOME Project") + "\n" + - "" + - _("GNOME is an easy to understand interface to your computer.") + "\n" + - _("Select this option if you’re a developer or designer working on GNOME.") + - ""; - - RadioButton radio_button_gnome = new RadioButton (radio_button, gnome_text); - - (radio_button_gnome.Child as Label).UseMarkup = true; - (radio_button_gnome.Child as Label).Wrap = true; - - string gitorious_text = "" + _("Gitorious") + "\n" + - "" + - _("Completely Free as in Freedom infrastructure.") + "\n" + - _("Free accounts for Free and Open Source projects.") + - ""; - RadioButton radio_button_gitorious = new RadioButton (radio_button, gitorious_text) { - Xalign = 0 - }; - - (radio_button_gitorious.Child as Label).UseMarkup = true; - (radio_button_gitorious.Child as Label).Wrap = true; - - radio_button_github.Toggled += delegate { - if (radio_button_github.Active) - FolderEntry.ExampleText = _("Username/Folder"); - }; - - radio_button_gitorious.Toggled += delegate { - if (radio_button_gitorious.Active) - FolderEntry.ExampleText = _("Project/Folder"); - }; - - radio_button_gnome.Toggled += delegate { - if (radio_button_gnome.Active) - FolderEntry.ExampleText = _("Project"); - }; - - radio_button.Toggled += delegate { - if (radio_button.Active) { - FolderEntry.ExampleText = _("Folder"); - ServerEntry.Sensitive = true; - CheckServerForm (); - } else { - ServerEntry.Sensitive = false; - CheckServerForm (); - } - - ShowAll (); - }; - - table.Attach (layout_server, 0, 2, 1, 2); - table.Attach (radio_button_github, 0, 2, 2, 3); - table.Attach (radio_button_gitorious, 0, 2, 3, 4); - table.Attach (radio_button_gnome, 0, 2, 4, 5); - - HBox layout_folder = new HBox (true, 0); - - FolderEntry = new SparkleEntry () { - ExampleText = _("Folder") - }; - - FolderEntry.Changed += CheckServerForm; - - Label folder_label = new Label (_("Folder Name:")) { - UseMarkup = true, - Xalign = 1 - }; - - (radio_button.Child as Label).UseMarkup = true; - - layout_folder.PackStart (folder_label, true, true, 12); - layout_folder.PackStart (FolderEntry, true, true, 0); - - SyncButton = new Button (_("Sync")); - - SyncButton.Clicked += delegate { - string folder_name = FolderEntry.Text; - string server = ServerEntry.Text; - string canonical_name = System.IO.Path.GetFileNameWithoutExtension (folder_name); - - if (radio_button_gitorious.Active) - server = "gitorious.org"; - - if (radio_button_github.Active) - server = "github.com"; - - if (radio_button_gnome.Active) - server = "gnome.org"; - - Application.Invoke (delegate { - Deletable = false; - ShowSyncingPage (canonical_name); - }); - - SparkleShare.Controller.FolderFetched += delegate { - Application.Invoke (delegate { - this.progress_bar_pulse_timer.Stop (); - Deletable = true; - UrgencyHint = true; - ShowSuccessPage (canonical_name); - }); - }; - - SparkleShare.Controller.FolderFetchError += delegate { - Application.Invoke (delegate { - this.progress_bar_pulse_timer.Stop (); - Deletable = true; - ShowErrorPage (); - }); - }; - - SparkleShare.Controller.FetchFolder (server, folder_name); - }; - - - if (ServerFormOnly) { - Button cancel_button = new Button (_("Cancel")); - - cancel_button.Clicked += delegate { - Close (); - }; - - AddButton (cancel_button); - } else { - Button skip_button = new Button (_("Skip")); - - skip_button.Clicked += delegate { - ShowCompletedPage (); - }; - - AddButton (skip_button); - } - - AddButton (SyncButton); - - layout_vertical.PackStart (header, false, false, 0); - layout_vertical.PackStart (new Label (""), false, false, 3); - layout_vertical.PackStart (table, false, false, 0); - layout_vertical.PackStart (layout_folder, false, false, 6); - - Add (layout_vertical); - CheckServerForm (); - ShowAll (); - } - - - public void ShowInvitationPage (string server, string folder, string token) - { - VBox layout_vertical = new VBox (false, 0); - - Label header = new Label ("" + - _("Invitation received!") + - "") { - UseMarkup = true, - Xalign = 0 - }; - - Label information = new Label (_("You've received an invitation to join a shared folder.\n" + - "We're ready to hook you up immediately if you wish.")) { - Xalign = 0, - Wrap = true - }; - - Label question = new Label (_("Do you accept this invitation?")) { - Xalign = 0, - Wrap = true - }; - - Table table = new Table (2, 2, false) { - RowSpacing = 6 - }; - - Label server_label = new Label (_("Server Address:")) { - Xalign = 0 - }; - - Label server_text = new Label ("" + server + "") { - UseMarkup = true, - Xalign = 0 - }; - - Label folder_label = new Label (_("Folder Name:")) { - Xalign = 0 - }; - - Label folder_text = new Label ("" + folder + "") { - UseMarkup = true, - Xalign = 0 - }; - - table.Attach (folder_label, 0, 1, 0, 1); - table.Attach (folder_text, 1, 2, 0, 1); - table.Attach (server_label, 0, 1, 1, 2); - table.Attach (server_text, 1, 2, 1, 2); - - Button reject_button = new Button (_("Reject")); - Button accept_button = new Button (_("Accept and Sync")); - - reject_button.Clicked += delegate { - Close (); - }; - - accept_button.Clicked += delegate { - string url = "ssh://git@" + server + "/" + folder; - - SparkleShare.Controller.FolderFetched += delegate { - Application.Invoke (delegate { - this.progress_bar_pulse_timer.Stop (); - ShowSuccessPage (folder); - }); - }; - - SparkleShare.Controller.FolderFetchError += delegate { - Application.Invoke (delegate { - this.progress_bar_pulse_timer.Stop (); - ShowErrorPage (); - }); - }; - - - SparkleShare.Controller.FetchFolder (url, folder); - }; - - AddButton (reject_button); - AddButton (accept_button); - - layout_vertical.PackStart (header, false, false, 0); - layout_vertical.PackStart (information, false, false, 21); - layout_vertical.PackStart (new Label (""), false, false, 0); - layout_vertical.PackStart (table, false, false, 0); - layout_vertical.PackStart (new Label (""), false, false, 0); - layout_vertical.PackStart (question, false, false, 21); - - Add (layout_vertical); - ShowAll (); - } - - - // The page shown when syncing has failed - private void ShowErrorPage () - { - Reset (); - - VBox layout_vertical = new VBox (false, 0); - - Label header = new Label ("" + - _("Something went wrong…") + - "\n") { - UseMarkup = true, - Xalign = 0 - }; - - Button try_again_button = new Button (_("Try Again")) { - Sensitive = true - }; - - try_again_button.Clicked += delegate (object o, EventArgs args) { - ShowServerForm (); - }; - - AddButton (try_again_button); - - layout_vertical.PackStart (header, false, false, 0); - - Add (layout_vertical); - ShowAll (); - } - - - // The page shown when syncing has succeeded - private void ShowSuccessPage (string folder_name) - { - Reset (); - - UrgencyHint = true; - - if (!HasToplevelFocus) { - string title = String.Format (_("‘{0}’ has been successfully added"), folder_name); - string subtext = _(""); - - new SparkleBubble (title, subtext).Show (); - } - - VBox layout_vertical = new VBox (false, 0); - - Label header = new Label ("" + - _("Folder synced successfully!") + - "") { - UseMarkup = true, - Xalign = 0 - }; - - Label information = new Label ( - String.Format (_("Now you can access the synced files from ‘{0}’ in your SparkleShare folder."), - folder_name)) { - Xalign = 0, - Wrap = true, - UseMarkup = true - }; - - // A button that opens the synced folder - Button open_folder_button = new Button (_("Open Folder")); - - open_folder_button.Clicked += delegate { - SparkleShare.Controller.OpenSparkleShareFolder (folder_name); - }; - - Button finish_button = new Button (_("Finish")); - - finish_button.Clicked += delegate (object o, EventArgs args) { - Close (); - }; - - AddButton (open_folder_button); - AddButton (finish_button); - - layout_vertical.PackStart (header, false, false, 0); - layout_vertical.PackStart (information, false, false, 21); - - Add (layout_vertical); - ShowAll (); - } - - - // The page shown whilst syncing - private void ShowSyncingPage (string name) - { - Reset (); - - VBox layout_vertical = new VBox (false, 0); - - Label header = new Label ("" + - String.Format (_("Syncing folder ‘{0}’…"), name) + - "") { - UseMarkup = true, - Xalign = 0, - Wrap = true - }; - - Label information = new Label (_("This may take a while.\n") + - _("Are you sure it’s not coffee o'clock?")) { - UseMarkup = true, - Xalign = 0 - }; - - Button button = new Button () { - Sensitive = false, - Label = _("Finish") - }; - - button.Clicked += delegate { - Close (); - }; - - AddButton (button); - - layout_vertical.PackStart (header, false, false, 0); - layout_vertical.PackStart (information, false, false, 21); - - this.progress_bar_pulse_timer.Elapsed += delegate { - Application.Invoke (delegate { - progress_bar.Pulse (); - }); - }; - - if (this.progress_bar.Parent != null) - layout_vertical.Reparent(this.progress_bar); - - layout_vertical.PackStart (this.progress_bar, false, false, 54); - - Add (layout_vertical); - ShowAll (); - } - - - // The page shown when the setup has been completed - private void ShowCompletedPage () - { - Reset (); - - VBox layout_vertical = new VBox (false, 0); - - Label header = new Label ("" + - _("SparkleShare is ready to go!") + - "") { - UseMarkup = true, - Xalign = 0 - }; - - Label information = new Label (_("Now you can start accepting invitations from others. " + "\n" + - "Just click on invitations you get by email and " + - "we will take care of the rest.")) { - UseMarkup = true, - Wrap = true, - Xalign = 0 - }; - - - HBox link_wrapper = new HBox (false, 0); - LinkButton link = new LinkButton ("http://www.sparkleshare.org/", - _("Learn how to host your own SparkleServer")); - - link_wrapper.PackStart (link, false, false, 0); - - layout_vertical.PackStart (header, false, false, 0); - layout_vertical.PackStart (information, false, false, 21); - layout_vertical.PackStart (link_wrapper, false, false, 0); - - Button finish_button = new Button (_("Finish")); - - finish_button.Clicked += delegate (object o, EventArgs args) { - Close (); - }; - - AddButton (finish_button); - - Add (layout_vertical); - ShowAll (); - } - - - // Enables or disables the 'Next' button depending on the - // entries filled in by the user - private void CheckAccountForm () - { - if (NameEntry.Text.Length > 0 && - IsValidEmail (EmailEntry.Text)) { - - NextButton.Sensitive = true; - } else { - NextButton.Sensitive = false; - } - } - - - // Enables the Add button when the fields are - // filled in correctly - public void CheckServerForm (object o, EventArgs args) - { - CheckServerForm (); - } - - - // Enables the Add button when the fields are - // filled in correctly - public void CheckServerForm () - { - SyncButton.Sensitive = false; - - if (FolderEntry.ExampleTextActive || - (ServerEntry.Sensitive && ServerEntry.ExampleTextActive)) - return; - - bool IsFolder = !FolderEntry.Text.Trim ().Equals (""); - bool IsServer = !ServerEntry.Text.Trim ().Equals (""); - - if (ServerEntry.Sensitive == true) { - if (IsServer && IsFolder) - SyncButton.Sensitive = true; - } else if (IsFolder) { - SyncButton.Sensitive = true; - } - } - - - // Checks to see if an email address is valid - private bool IsValidEmail (string email) - { - Regex regex = new Regex (@"^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$", RegexOptions.IgnoreCase); - return regex.IsMatch (email); - } - } -} diff --git a/SparkleShare/SparkleInvitation.cs b/SparkleShare/SparkleInvitation.cs deleted file mode 100644 index 3f2ff2d6..00000000 --- a/SparkleShare/SparkleInvitation.cs +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/SparkleShare/SparkleLinController.cs b/SparkleShare/SparkleLinController.cs index 7ffb0fc4..34e27385 100644 --- a/SparkleShare/SparkleLinController.cs +++ b/SparkleShare/SparkleLinController.cs @@ -166,8 +166,13 @@ namespace SparkleShare { get { string path = SparkleHelpers.CombineMore (Defines.PREFIX, "share", "sparkleshare", "html", "event-log.html"); + + string html = String.Join (Environment.NewLine, File.ReadAllLines (path)); + + html = html.Replace ("", "file://" + + SparkleHelpers.CombineMore (Defines.PREFIX, "share", "sparkleshare", "html", "jquery.js")); - return String.Join (Environment.NewLine, File.ReadAllLines (path)); + return html; } } diff --git a/SparkleShare/SparkleSetup.cs b/SparkleShare/SparkleSetup.cs new file mode 100644 index 00000000..0e7ecb72 --- /dev/null +++ b/SparkleShare/SparkleSetup.cs @@ -0,0 +1,432 @@ +// SparkleShare, a collaboration and sharing tool. +// Copyright (C) 2010 Hylke Bons +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General private License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General private License for more details. +// +// You should have received a copy of the GNU General private License +// along with this program. If not, see . + + +using System; +using System.Diagnostics; +using System.IO; +using System.Text.RegularExpressions; +using System.Timers; +using System.Collections.Generic; + +using Gtk; +using Mono.Unix; + + +namespace SparkleShare { + + public class SparkleSetup : SparkleSetupWindow { + + public SparkleSetupController Controller = new SparkleSetupController (); + + private string SecondaryTextColor; + + private Entry NameEntry; + private Entry EmailEntry; + private SparkleEntry ServerEntry; + private SparkleEntry FolderEntry; + + private Button NextButton; + private Button SyncButton; + + private Table Table; + + private ProgressBar progress_bar = new ProgressBar () { PulseStep = 0.01 }; + private Timer progress_bar_pulse_timer = new Timer () { Interval = 25, Enabled = true }; + + + // Short alias for the translations + public static string _ (string s) + { + return Catalog.GetString (s); + } + + + public SparkleSetup () : base () + { + SecondaryTextColor = SparkleUIHelpers.GdkColorToHex (Style.Foreground (StateType.Insensitive)); + + Controller.ChangePageEvent += delegate (PageType type) { + Application.Invoke (delegate { + Reset (); + + switch (type) { + case PageType.Setup: + + Header = _("Welcome to SparkleShare!"); + Description = _("Before we can create a SparkleShare folder on this " + + "computer, we need a few bits of information from you."); + + Table = new Table (4, 2, true) { + RowSpacing = 6 + }; + + Label name_label = new Label ("" + _("Full Name:") + "") { + UseMarkup = true, + Xalign = 0 + }; + + NameEntry = new Entry (SparkleShare.Controller.UserName); + NameEntry.Changed += delegate { + CheckSetupPage (); + }; + + EmailEntry = new Entry (); + EmailEntry.Changed += delegate { + CheckSetupPage (); + }; + + Label email_label = new Label ("" + _("Email:") + "") { + UseMarkup = true, + Xalign = 0 + }; + + Table.Attach (name_label, 0, 1, 0, 1); + Table.Attach (NameEntry, 1, 2, 0, 1); + Table.Attach (email_label, 0, 1, 1, 2); + Table.Attach (EmailEntry, 1, 2, 1, 2); + + NextButton = new Button (_("Next")) { + Sensitive = false + }; + + NextButton.Clicked += delegate (object o, EventArgs args) { + string full_name = NameEntry.Text; + string email = EmailEntry.Text; + + Controller.SetupPageCompleted (full_name, email); + }; + + AddButton (NextButton); + Add (Table); + + CheckSetupPage (); + + break; + + case PageType.Add: + + Header = _("Where is your remote folder?"); + + Table = new Table (6, 2, false) { + RowSpacing = 12 + }; + + HBox layout_server = new HBox (true, 0); + + // Own server radiobutton + RadioButton radio_button = new RadioButton ("" + _("On my own server:") + ""); + (radio_button.Child as Label).UseMarkup = true; + + radio_button.Toggled += delegate { + if (radio_button.Active) { + FolderEntry.ExampleText = _("Folder"); + ServerEntry.Sensitive = true; + CheckAddPage (); + } else { + ServerEntry.Sensitive = false; + CheckAddPage (); + } + + ShowAll (); + }; + + // Own server entry + ServerEntry = new SparkleEntry () { }; + ServerEntry.Completion = new EntryCompletion(); + + ListStore server_store = new ListStore (typeof (string)); + + //TODO foreach (string host in SparkleShare.Controller.PreviousHosts) + // server_store.AppendValues (host); + + ServerEntry.Completion.Model = server_store; + ServerEntry.Completion.TextColumn = 0; + + if (!string.IsNullOrEmpty (Controller.PreviousServer)) { + ServerEntry.Text = Controller.PreviousServer; + ServerEntry.ExampleTextActive = false; + } else { + ServerEntry.ExampleText = _("address-to-server.com"); + } + + ServerEntry.Changed += delegate { + CheckAddPage (); + }; + + layout_server.Add (radio_button); + layout_server.Add (ServerEntry); + + Table.Attach (layout_server, 0, 2, 1, 2); + + // Github radiobutton + string github_text = "" + "Github" + "\n" + + "" + + _("Free hosting for Free and Open Source Software projects.") + "\n" + + _("Also has paid accounts for extra private space and bandwidth.") + + ""; + + RadioButton radio_button_github = new RadioButton (radio_button, github_text); + (radio_button_github.Child as Label).UseMarkup = true; + (radio_button_github.Child as Label).Wrap = true; + + radio_button_github.Toggled += delegate { + if (radio_button_github.Active) + FolderEntry.ExampleText = _("Username/Folder"); + }; + + + // Gitorious radiobutton + string gitorious_text = "" + _("Gitorious") + "\n" + + "" + + _("Completely Free as in Freedom infrastructure.") + "\n" + + _("Free accounts for Free and Open Source projects.") + + ""; + + RadioButton radio_button_gitorious = new RadioButton (radio_button, gitorious_text); + (radio_button_gitorious.Child as Label).UseMarkup = true; + (radio_button_gitorious.Child as Label).Wrap = true; + + radio_button_gitorious.Toggled += delegate { + if (radio_button_gitorious.Active) + FolderEntry.ExampleText = _("Project/Folder"); + }; + + + // GNOME radiobutton + string gnome_text = "" + _("The GNOME Project") + "\n"+ + "" + + _("GNOME is an easy to understand interface to your computer.") + "\n" + + _("Select this option if you’re a developer or designer working on GNOME.") + + ""; + + RadioButton radio_button_gnome = new RadioButton (radio_button, gnome_text); + (radio_button_gnome.Child as Label).UseMarkup = true; + (radio_button_gnome.Child as Label).Wrap = true; + + radio_button_gnome.Toggled += delegate { + if (radio_button_gnome.Active) + FolderEntry.ExampleText = _("Project"); + }; + + Table.Attach (radio_button_github, 0, 2, 2, 3); + Table.Attach (radio_button_gitorious, 0, 2, 3, 4); + Table.Attach (radio_button_gnome, 0, 2, 4, 5); + + // Folder label and entry + HBox layout_folder = new HBox (true, 0); + + Label folder_label = new Label (_("Folder Name:")) { + UseMarkup = true, + Xalign = 1 + }; + + FolderEntry = new SparkleEntry (); + FolderEntry.ExampleText = _("Folder"); + + FolderEntry.Changed += delegate { + CheckAddPage (); + }; + + layout_folder.PackStart (folder_label, true, true, 12); + layout_folder.PackStart (FolderEntry, true, true, 0); + + Table.Attach (layout_folder, 0, 2, 5, 6); + Add (Table); + + // Cancel button + Button cancel_button = new Button (_("Cancel")); + + cancel_button.Clicked += delegate { + Close (); + }; + + + // Sync button + SyncButton = new Button (_("Sync")); + + SyncButton.Clicked += delegate { + string server = ServerEntry.Text; + string folder_name = FolderEntry.Text; + + if (radio_button_gitorious.Active) + server = "gitorious.org"; + + if (radio_button_github.Active) + server = "github.com"; + + if (radio_button_gnome.Active) + server = "gnome.org"; + + Controller.AddPageCompleted (server, folder_name); + }; + + AddButton (cancel_button); + AddButton (SyncButton); + + CheckAddPage (); + + break; + + case PageType.Syncing: + + Header = String.Format (_("Syncing folder ‘{0}’…"), Controller.SyncingFolder); + Description = _("This may take a while." + Environment.NewLine) + + _("Are you sure it’s not coffee o'clock?"); + + Button button = new Button () { + Sensitive = false, + Label = _("Finish") + }; + + button.Clicked += delegate { + Close (); + }; + + AddButton (button); + + this.progress_bar_pulse_timer.Elapsed += delegate { + Application.Invoke (delegate { + progress_bar.Pulse (); + }); + }; + + if (this.progress_bar.Parent != null) + (this.progress_bar.Parent as Container).Remove (this.progress_bar); + + VBox bar_wrapper = new VBox (false , 0); + bar_wrapper.PackStart (this.progress_bar, false, false, 0); + + Add (bar_wrapper); + + break; + + case PageType.Error: + + string n = Environment.NewLine; + + Header = _("Something went wrong") + "…"; + Description = "We don't know exactly what the problem is, " + + "but we can try to help you pinpoint it."; + + + Label l = new Label ( + "First, have you tried turning it off and on again?" + n + + n + + Controller.SyncingFolder +" is the address we've compiled from the information " + + "you entered. Does this look correct?" + n + + n + + "The host needs to know who you are. Have you uploaded the key that sits in your SparkleShare folder?"); + + + + l.Xpad = 12; + l.Wrap = true; + + + + Button try_again_button = new Button (_("Try Again")) { + Sensitive = true + }; + + try_again_button.Clicked += delegate { + Controller.ErrorPageCompleted (); + }; + + AddButton (try_again_button); + Add (l); + + break; + + case PageType.Finished: + + UrgencyHint = true; + + if (!HasToplevelFocus) { + string title = String.Format (_("‘{0}’ has been successfully added"), Controller.SyncingFolder); + string subtext = _(""); + + //TODO new SparkleBubble (title, subtext).Show (); + } + + Header = _("Folder synced successfully!"); + Description = _("Access the synced files from your SparkleShare folder."); + + // A button that opens the synced folder + Button open_folder_button = new Button (_("Open Folder")); + + open_folder_button.Clicked += delegate { + SparkleShare.Controller.OpenSparkleShareFolder (Controller.SyncingFolder); + }; + + Button finish_button = new Button (_("Finish")); + + finish_button.Clicked += delegate { + Close (); + }; + + Add (null); + + AddButton (open_folder_button); + AddButton (finish_button); + + break; + } + + ShowAll (); + }); + }; + + } + + + // Enables or disables the 'Next' button depending on the + // entries filled in by the user + private void CheckSetupPage () + { + if (NameEntry.Text.Length > 0 && + SparkleShare.Controller.IsValidEmail (EmailEntry.Text)) { + + NextButton.Sensitive = true; + } else { + NextButton.Sensitive = false; + } + } + + + // Enables or disables the 'Next' button depending on the + // entries filled in by the user + public void CheckAddPage () + { + SyncButton.Sensitive = false; + + if (FolderEntry.ExampleTextActive || + (ServerEntry.Sensitive && ServerEntry.ExampleTextActive)) + return; + + bool IsFolder = !FolderEntry.Text.Trim ().Equals (""); + bool IsServer = !ServerEntry.Text.Trim ().Equals (""); + + if (ServerEntry.Sensitive == true) { + if (IsServer && IsFolder) + SyncButton.Sensitive = true; + } else if (IsFolder) { + SyncButton.Sensitive = true; + } + } + + } +} diff --git a/SparkleShare/SparkleSetupController.cs b/SparkleShare/SparkleSetupController.cs new file mode 100644 index 00000000..02cd880e --- /dev/null +++ b/SparkleShare/SparkleSetupController.cs @@ -0,0 +1,142 @@ +// SparkleShare, a collaboration and sharing tool. +// Copyright (C) 2010 Hylke Bons +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + + +using System; +using System.IO; + +namespace SparkleShare { + + public enum PageType { + Setup, + Add, + Syncing, + Error, + Finished + } + + + public class SparkleSetupController { + + public event ChangePageEventHandler ChangePageEvent; + public delegate void ChangePageEventHandler (PageType page); + + public string PreviousServer { + get { + return this.previous_server; + } + } + + public string PreviousFolder { + get { + return this.previous_folder; + } + } + + public string SyncingFolder { + get { + return this.syncing_folder; + } + } + + public PageType PreviousPage { + get { + return this.previous_page; + } + } + + private string previous_server = ""; + private string previous_folder = ""; + private string syncing_folder = ""; + private PageType previous_page; + + public SparkleSetupController () + { + ChangePageEvent += delegate (PageType page) { + this.previous_page = page; + }; + } + + + public void ShowAddPage () + { + if (ChangePageEvent != null) + ChangePageEvent (PageType.Add); + } + + + public void ShowSetupPage () + { + if (ChangePageEvent != null) + ChangePageEvent (PageType.Setup); + } + + + public void SetupPageCompleted (string full_name, string email) + { + SparkleShare.Controller.UserName = full_name; + SparkleShare.Controller.UserEmail = email; + + SparkleShare.Controller.GenerateKeyPair (); + SparkleShare.Controller.UpdateState (); + + if (ChangePageEvent != null) + ChangePageEvent (PageType.Add); + } + + + public void AddPageCompleted (string server, string folder_name) + { + this.syncing_folder = Path.GetFileNameWithoutExtension (folder_name); + this.previous_server = server; + this.previous_folder = folder_name; + + if (ChangePageEvent != null) + ChangePageEvent (PageType.Syncing); + + SparkleShare.Controller.FolderFetched += delegate { + if (ChangePageEvent != null) + ChangePageEvent (PageType.Finished); + + this.syncing_folder = ""; + }; + + SparkleShare.Controller.FolderFetchError += delegate { + if (ChangePageEvent != null) + ChangePageEvent (PageType.Error); + + this.syncing_folder = ""; + }; + + SparkleShare.Controller.FetchFolder (server, this.syncing_folder); + } + + + public void ErrorPageCompleted () + { + if (ChangePageEvent != null) + ChangePageEvent (PageType.Add); + } + + + public void FinishedPageCompleted () + { + this.previous_server = ""; + this.previous_folder = ""; + SparkleShare.Controller.UpdateState (); + } + } +} diff --git a/SparkleShare/SparkleWindow.cs b/SparkleShare/SparkleSetupWindow.cs similarity index 77% rename from SparkleShare/SparkleWindow.cs rename to SparkleShare/SparkleSetupWindow.cs index c2392455..68284636 100644 --- a/SparkleShare/SparkleWindow.cs +++ b/SparkleShare/SparkleSetupWindow.cs @@ -27,21 +27,26 @@ using SparkleLib; namespace SparkleShare { - public class SparkleWindow : Window { + public class SparkleSetupWindow : Window { private HBox HBox; private VBox VBox; private VBox Wrapper; private HButtonBox Buttons; + public string Header; + public string Description; - public SparkleWindow () : base ("") + public Container Content; + + public SparkleSetupWindow () : base ("") { Title = "SparkleShare Setup"; BorderWidth = 0; IconName = "folder-sparkleshare"; Resizable = false; WindowPosition = WindowPosition.Center; + Deletable = false; SetSizeRequest (680, 440); @@ -103,13 +108,35 @@ namespace SparkleShare { new public void Add (Widget widget) { - Wrapper.PackStart (widget, true, true, 0); + Label header = new Label ("" + Header + "") { + UseMarkup = true, + Xalign = 0 + }; + + Label description = new Label (Description) { + Xalign = 0, + Wrap = true + }; + + VBox layout_vertical = new VBox (false, 0); + layout_vertical.PackStart (header, false, false, 0); + + if (!string.IsNullOrEmpty (Description)) + layout_vertical.PackStart (description, false, false, 21); + + if (widget != null) + layout_vertical.PackStart (widget, true, true, 21); + + Wrapper.PackStart (layout_vertical, true, true, 0); ShowAll (); } public void Reset () { + Header = ""; + Description = ""; + if (Wrapper.Children.Length > 0) Wrapper.Remove (Wrapper.Children [0]); @@ -121,7 +148,9 @@ namespace SparkleShare { new public void ShowAll () { - Present (); + + Present (); + base.ShowAll (); } diff --git a/SparkleShare/SparkleShare.cs b/SparkleShare/SparkleShare.cs index ae6de9c6..5352e974 100644 --- a/SparkleShare/SparkleShare.cs +++ b/SparkleShare/SparkleShare.cs @@ -43,11 +43,6 @@ namespace SparkleShare { public static void Main (string [] args) { - // Use translations - 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) && @@ -59,17 +54,14 @@ namespace SparkleShare { } // Parse the command line options - bool hide_ui = false; - bool show_help = false; - - var p = new OptionSet () { - { "d|disable-gui", _("Don't show the notification icon"), v => hide_ui = v != null }, + bool show_help = false; + OptionSet option_set = new OptionSet () { { "v|version", _("Print version information"), v => { PrintVersion (); } }, { "h|help", _("Show this help text"), v => show_help = v != null } }; try { - p.Parse (args); + option_set.Parse (args); } catch (OptionException e) { Console.Write ("SparkleShare: "); @@ -78,7 +70,7 @@ namespace SparkleShare { } if (show_help) - ShowHelp (p); + ShowHelp (option_set); // Load the right controller for the OS string controller_name = "Lin"; @@ -101,7 +93,7 @@ namespace SparkleShare { Controller.Initialize (); - if (Controller != null && !hide_ui) { + if (Controller != null) { UI = new SparkleUI (); UI.Run (); } diff --git a/SparkleShare/SparkleShare.csproj b/SparkleShare/SparkleShare.csproj index 839d9223..079ec8de 100644 --- a/SparkleShare/SparkleShare.csproj +++ b/SparkleShare/SparkleShare.csproj @@ -37,22 +37,6 @@ - - - - - - - - - - - - - - - - {2C914413-B31C-4362-93C7-1AE34F09112A} @@ -74,4 +58,24 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/SparkleShare/SparkleStatusIcon.cs b/SparkleShare/SparkleStatusIcon.cs index 060bea2c..c468bc9d 100644 --- a/SparkleShare/SparkleStatusIcon.cs +++ b/SparkleShare/SparkleStatusIcon.cs @@ -223,16 +223,16 @@ namespace SparkleShare { sync_item.Activated += delegate { Application.Invoke (delegate { - if (SparkleUI.Intro == null) { - SparkleUI.Intro = new SparkleIntro (); - SparkleUI.Intro.ShowServerForm (true); + if (SparkleUI.Setup == null) { + SparkleUI.Setup = new SparkleSetup (); + SparkleUI.Setup.Controller.ShowAddPage (); } - if (!SparkleUI.Intro.Visible) - SparkleUI.Intro.ShowServerForm (true); + if (!SparkleUI.Setup.Visible) + SparkleUI.Setup.Controller.ShowAddPage (); - SparkleUI.Intro.ShowAll (); - SparkleUI.Intro.Present (); + //SparkleUI.Intro.ShowAll (); + //SparkleUI.Intro.Present (); }); }; @@ -275,8 +275,13 @@ namespace SparkleShare { MenuItem about_item = new MenuItem (_("About SparkleShare")); about_item.Activated += delegate { - SparkleAbout about = new SparkleAbout (); - about.ShowAll (); + Application.Invoke (delegate { + if (SparkleUI.About == null) + SparkleUI.About = new SparkleAbout (); + + SparkleUI.About.ShowAll (); + SparkleUI.About.Present (); + }); }; Menu.Add (about_item); diff --git a/SparkleShare/SparkleStatusIconController.cs b/SparkleShare/SparkleStatusIconController.cs new file mode 100644 index 00000000..0353c214 --- /dev/null +++ b/SparkleShare/SparkleStatusIconController.cs @@ -0,0 +1,86 @@ +// SparkleShare, a collaboration and sharing tool. +// Copyright (C) 2010 Hylke Bons +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + + +using System; +using System.IO; + +namespace SparkleShare { + + public enum IconState { + Idle, + Syncing, + Error + } + + + public class SparkleStatusIconController { + + public delegate void UpdateStatusLineEventHandler (); + + public event UpdateMenuEventHandler UpdateMenuEvent; + public delegate void UpdateMenuEventHandler (IconState state); + + public IconState CurrentState = IconState.Idle; + + public string [] Folders { + get { + return SparkleShare.Controller.Folders.ToArray (); + } + } + + public string FolderSize { + get { + return SparkleShare.Controller.FolderSize; + } + } + + public SparkleStatusIconController () + { + SparkleShare.Controller.FolderSizeChanged += delegate { + if (UpdateMenuEvent != null) + UpdateMenuEvent (CurrentState); + }; + + SparkleShare.Controller.FolderListChanged += delegate { + if (UpdateMenuEvent != null) + UpdateMenuEvent (CurrentState); + }; + + SparkleShare.Controller.OnIdle += delegate { + if (CurrentState != IconState.Error) + CurrentState = IconState.Idle; + + if (UpdateMenuEvent != null) + UpdateMenuEvent (CurrentState); + }; + + SparkleShare.Controller.OnSyncing += delegate { + CurrentState = IconState.Syncing; + + if (UpdateMenuEvent != null) + UpdateMenuEvent (IconState.Syncing); + }; + + SparkleShare.Controller.OnError += delegate { + CurrentState = IconState.Error; + + if (UpdateMenuEvent != null) + UpdateMenuEvent (IconState.Error); + }; + } + } +} diff --git a/SparkleShare/SparkleUI.cs b/SparkleShare/SparkleUI.cs index e343aa21..501dfb56 100644 --- a/SparkleShare/SparkleUI.cs +++ b/SparkleShare/SparkleUI.cs @@ -32,7 +32,8 @@ namespace SparkleShare { public static SparkleStatusIcon StatusIcon; public static SparkleEventLog EventLog; - public static SparkleIntro Intro; + public static SparkleSetup Setup; + public static SparkleAbout About; // Short alias for the translations @@ -72,76 +73,14 @@ namespace SparkleShare { StatusIcon = new SparkleStatusIcon (); if (SparkleShare.Controller.FirstRun) { - Intro = new SparkleIntro (); - Intro.ShowAccountForm (); + Setup = new SparkleSetup (); + Setup.Controller.ShowSetupPage (); } SparkleShare.Controller.OnQuitWhileSyncing += delegate { // TODO: Pop up a warning when quitting whilst syncing }; - - SparkleShare.Controller.OnInvitation += delegate (string server, string folder, string token) { - Application.Invoke (delegate { - SparkleIntro intro = new SparkleIntro (); - intro.ShowInvitationPage (server, folder, token); - }); - }; - - // Show a bubble when there are new changes - SparkleShare.Controller.NotificationRaised += delegate (string user_name, string user_email, - string message, string repository_path) { - Application.Invoke (delegate { - if (EventLog != null) - EventLog.UpdateEvents (); - - if (!SparkleShare.Controller.NotificationsEnabled) - return; - - SparkleBubble bubble = new SparkleBubble (user_name, message); - string avatar_file_path = SparkleShare.Controller.GetAvatar (user_email, 32); - - if (avatar_file_path != null) - bubble.Icon = new Gdk.Pixbuf (avatar_file_path); - else - bubble.Icon = SparkleUIHelpers.GetIcon ("avatar-default", 32); - - bubble.Show (); - }); - }; - - // Show a bubble when there was a conflict - SparkleShare.Controller.ConflictNotificationRaised += delegate { - Application.Invoke (delegate { - string title = _("Ouch! Mid-air collision!"); - string subtext = _("Don't worry, SparkleShare made a copy of each conflicting file."); - - new SparkleBubble (title, subtext).Show (); - }); - }; - - SparkleShare.Controller.AvatarFetched += delegate { - Application.Invoke (delegate { - if (EventLog != null) - EventLog.UpdateEvents (); - }); - }; - - SparkleShare.Controller.OnIdle += delegate { - Application.Invoke (delegate { - if (EventLog != null) - EventLog.UpdateEvents (); - }); - }; - - SparkleShare.Controller.FolderListChanged += delegate { - Application.Invoke (delegate { - if (EventLog != null) { - EventLog.UpdateChooser (); - EventLog.UpdateEvents (); - } - }); - }; - } + } // Runs the application public void Run () diff --git a/SparkleShare/Windows/Icons.resx b/SparkleShare/Windows/Icons.resx index 111a44f9..76390d68 100644 --- a/SparkleShare/Windows/Icons.resx +++ b/SparkleShare/Windows/Icons.resx @@ -156,39 +156,21 @@ ..\..\data\icons\error.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\..\data\icons\folder-sparkleshare-16-mist.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\..\data\icons\folder-sparkleshare-16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\..\data\icons\folder-sparkleshare-22-mist.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\..\data\icons\folder-sparkleshare-22.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\..\data\icons\folder-sparkleshare-24-mist.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\..\data\icons\folder-sparkleshare-24.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\..\data\icons\folder-sparkleshare-256-mist.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\..\data\icons\folder-sparkleshare-256.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\..\data\icons\folder-sparkleshare-32-mist.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\..\data\icons\folder-sparkleshare-32.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\..\data\icons\folder-sparkleshare-48-mist.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\..\data\icons\folder-sparkleshare-48.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -222,9 +204,6 @@ ..\..\data\icons\idle4.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\..\data\icons\process-syncing-sparkleshare-24-mist.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\..\data\icons\process-syncing-sparkleshare-24.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/SparkleShare/Windows/SparkleShare.csproj b/SparkleShare/Windows/SparkleShare.csproj index 3566a214..95fd656d 100644 --- a/SparkleShare/Windows/SparkleShare.csproj +++ b/SparkleShare/Windows/SparkleShare.csproj @@ -89,17 +89,18 @@ Form - + + + - - + @@ -179,4 +180,4 @@ - \ No newline at end of file + diff --git a/SparkleShare/sparkleshare.in b/SparkleShare/sparkleshare.in index 6352c66d..88302a5c 100644 --- a/SparkleShare/sparkleshare.in +++ b/SparkleShare/sparkleshare.in @@ -19,7 +19,11 @@ start() { fi echo -n "Starting SparkleShare... " - ssh-agent mono "@expanded_libdir@/@PACKAGE@/SparkleShare.exe" $2 & + if [ -n "${SSH_AGENT_PID}" -o -n "${SSH_AUTH_SOCK}" ] ; then + mono "@expanded_libdir@/@PACKAGE@/SparkleShare.exe" $2 & + else + ssh-agent mono "@expanded_libdir@/@PACKAGE@/SparkleShare.exe" $2 & + fi ( umask 066; echo $! > ${pidfile} ) echo "Done." } diff --git a/configure.ac b/configure.ac index cb528c02..5f8aa07e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,9 +1,9 @@ dnl Process this file with autoconf to produce a configure script. m4_define([sparkleshare_version], - [0.2.2]) + [0.2.4]) m4_define([sparkleshare_asm_version], - [0.2.2]) + [0.2.4]) AC_PREREQ([2.54]) AC_INIT([SparkleShare], sparkleshare_version) @@ -38,13 +38,21 @@ AC_PROG_INSTALL dnl Mono and gmcs SHAMROCK_CHECK_MONO_MODULE(2.2) -SHAMROCK_FIND_MONO_2_0_COMPILER SHAMROCK_FIND_MONO_RUNTIME + +PKG_CHECK_EXISTS([mono >= 2.8], +[SHAMROCK_FIND_MONO_4_0_COMPILER +SHAMROCK_CHECK_MONO_4_0_GAC_ASSEMBLIES([ + System + System.Security + Mono.Posix +])], +[SHAMROCK_FIND_MONO_2_0_COMPILER SHAMROCK_CHECK_MONO_2_0_GAC_ASSEMBLIES([ System System.Security Mono.Posix -]) +])]) SPARKLESHARE_CHECK_NOTIFY_SHARP @@ -91,42 +99,64 @@ PKG_CHECK_MODULES([SMARTIRC4NET], [smartirc4net], ) AM_CONDITIONAL([HAVE_SMARTIRC4NET], test x$SPARKLE_SMARTIRC4NETDIR = x) -dnl check for webkit-sharp -PKG_CHECK_MODULES(WEBKIT_SHARP, webkit-sharp-1.0, have_webkit_sharp=yes, have_webkit_sharp=no) -AC_SUBST(WEBKIT_SHARP_LIBS) - -SHAMROCK_CHECK_NUNIT - -APPINDICATOR_REQUIRED=0.0.7 +AC_ARG_ENABLE(gtkui, + AS_HELP_STRING([--disable-gtkui], [Do not build the Gtk+ user interface]), + [ enable_gtkui=no ], [ enable_gtkui=yes ]) AC_ARG_ENABLE(appindicator, - AS_HELP_STRING([--enable-appindicator[=@<:@no/auto/yes@:>@]],[Build support for application indicators ]), - [enable_appindicator=$enableval], - [enable_appindicator="auto"]) + AS_HELP_STRING([--enable-appindicator[=@<:@no/auto/yes@:>@]],[Build support for application indicators ]), + [enable_appindicator=$enableval], + [enable_appindicator="auto"]) -if test x$enable_appindicator = xauto ; then - PKG_CHECK_EXISTS([appindicator-sharp-0.1 >= $APPINDICATOR_REQUIRED], - enable_appindicator="yes", - enable_appindicator="no") +AM_CONDITIONAL(ENABLE_GTKUI, test x$enable_gtkui = xyes) +if test "x$enable_gtkui" = "xyes" ; then + dnl check for webkit-sharp + PKG_CHECK_MODULES(WEBKIT_SHARP, webkit-sharp-1.0, have_webkit_sharp=yes, have_webkit_sharp=no) + if test "x$have_webkit_sharp" = "xno" ; then + AC_ERROR("webkit-sharp is a required dependency: you need to install the appropriate devel package before you can compile") + fi + AC_SUBST(WEBKIT_SHARP_LIBS) + + dnl check for notify-sharp + PKG_CHECK_MODULES(NOTIFY_SHARP, notify-sharp, have_notify_sharp=yes, have_notify_sharp=no) + if test "x$have_notify_sharp" = "xno" ; then + AC_ERROR("notify-sharp is a required dependency: you need to install the appropriate devel package before you can compile") + fi + AC_SUBST(NOTIFY_SHARP_LIBS) + + APPINDICATOR_REQUIRED=0.0.7 + + if test x$enable_appindicator = xauto ; then + PKG_CHECK_EXISTS([appindicator-sharp-0.1 >= $APPINDICATOR_REQUIRED], + enable_appindicator="yes", + enable_appindicator="no") + fi + + if test x$enable_appindicator = xyes ; then + PKG_CHECK_EXISTS([appindicator-sharp-0.1 >= $APPINDICATOR_REQUIRED],, + AC_MSG_ERROR([appindicator-sharp-0.1 is not installed])) + PKG_CHECK_MODULES(APP_INDICATOR, + appindicator-sharp-0.1 >= $APPINDICATOR_REQUIRED) + AC_SUBST(APP_INDICATOR_CFLAGS) + AC_SUBST(APP_INDICATOR_LIBS) + AC_DEFINE(HAVE_APP_INDICATOR, 1, [Have AppIndicator]) + fi + + GUISUBDIRS=SparkleShare +else + GUISUBDIRS= fi -if test x$enable_appindicator = xyes ; then - PKG_CHECK_EXISTS([appindicator-sharp-0.1 >= $APPINDICATOR_REQUIRED],, - AC_MSG_ERROR([appindicator-sharp-0.1 is not installed])) - PKG_CHECK_MODULES(APP_INDICATOR, - appindicator-sharp-0.1 >= $APPINDICATOR_REQUIRED) - AC_SUBST(APP_INDICATOR_CFLAGS) - AC_SUBST(APP_INDICATOR_LIBS) - AC_DEFINE(HAVE_APP_INDICATOR, 1, [Have AppIndicator]) -fi AM_CONDITIONAL(HAVE_APP_INDICATOR, test x"$enable_appindicator" = xyes) +AC_SUBST([GUISUBDIRS]) + +SHAMROCK_CHECK_NUNIT dnl Get nautilus extensions directory SPARKLESHARE_NAUTILUS_PYTHON SHAVE_INIT([build/m4/shave], [enable]) - AC_OUTPUT([ build/Makefile build/m4/Makefile @@ -153,6 +183,7 @@ SparkleShare ${VERSION} Configuration: Prefix : ${prefix} + Build Gtk+ UI : ${enable_gtkui} Nautilus plugin : ${have_nautilus_python} User Help : ${enable_user_help} (requires gnome-doc-utils >= 0.17.3) diff --git a/data/Makefile.am b/data/Makefile.am index 24edd829..6f452209 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -3,9 +3,8 @@ SUBDIRS = \ html dist_pixmaps_DATA = \ - sparkleshare-gnome.svg \ - sparkleshare-mist.svg \ - side-splash.png + side-splash.png \ + about.png pixmapsdir = $(pkgdatadir)/pixmaps/ diff --git a/data/about.png b/data/about.png new file mode 100644 index 00000000..89f7d71f Binary files /dev/null and b/data/about.png differ diff --git a/data/actions.svg b/data/actions.svg deleted file mode 100644 index c349857c..00000000 --- a/data/actions.svg +++ /dev/null @@ -1,1960 +0,0 @@ - - - - - Text Editor - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - Jakub Steiner - - - http://jimmac.musichall.cz - - Text Editor - - - text - editor - gedit - - - - - - - - - - - - - - - - - - - - - Lapo Calamandrei - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/gnome-design.sparkle b/data/gnome-design.sparkle deleted file mode 100644 index b44c8a77..00000000 --- a/data/gnome-design.sparkle +++ /dev/null @@ -1,9 +0,0 @@ - - - - - git.gnome.org - gnome-design - a22bc6f4b9ffe8e5acd4be0838d41aa10a1187dd - - diff --git a/data/html/Makefile.am b/data/html/Makefile.am index a12e3bf5..dffbf0a4 100644 --- a/data/html/Makefile.am +++ b/data/html/Makefile.am @@ -1,7 +1,8 @@ dist_html_DATA = \ day-entry.html \ event-entry.html \ - event-log.html + event-log.html \ + jquery.js htmldir = $(pkgdatadir)/html/ diff --git a/data/html/event-entry.html b/data/html/event-entry.html index ba026cb9..b9d4bdaf 100644 --- a/data/html/event-entry.html +++ b/data/html/event-entry.html @@ -1,16 +1,22 @@ -
-
-
-
-
-
-
-
- -
-
-
- +
+
+
+ + + +
+
+
Add note
+
Show all
+ +
+ +
+ + +
+
diff --git a/data/html/event-log.html b/data/html/event-log.html index 7dd42399..680ccdff 100644 --- a/data/html/event-log.html +++ b/data/html/event-log.html @@ -2,9 +2,81 @@ SparkleShare Event Log + + + diff --git a/data/html/jquery.js b/data/html/jquery.js new file mode 100644 index 00000000..3a8cd466 --- /dev/null +++ b/data/html/jquery.js @@ -0,0 +1,18 @@ +/*! + * jQuery JavaScript Library v1.6.1 + * http://jquery.com/ + * + * Copyright 2011, John Resig + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * Includes Sizzle.js + * http://sizzlejs.com/ + * Copyright 2011, The Dojo Foundation + * Released under the MIT, BSD, and GPL Licenses. + * + * Date: Thu May 12 15:04:36 2011 -0400 + */ +(function(a,b){function cy(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cv(a){if(!cj[a]){var b=f("<"+a+">").appendTo("body"),d=b.css("display");b.remove();if(d==="none"||d===""){ck||(ck=c.createElement("iframe"),ck.frameBorder=ck.width=ck.height=0),c.body.appendChild(ck);if(!cl||!ck.createElement)cl=(ck.contentWindow||ck.contentDocument).document,cl.write("");b=cl.createElement(a),cl.body.appendChild(b),d=f.css(b,"display"),c.body.removeChild(ck)}cj[a]=d}return cj[a]}function cu(a,b){var c={};f.each(cp.concat.apply([],cp.slice(0,b)),function(){c[this]=a});return c}function ct(){cq=b}function cs(){setTimeout(ct,0);return cq=f.now()}function ci(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ch(){try{return new a.XMLHttpRequest}catch(b){}}function cb(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g=0===c})}function W(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function O(a,b){return(a&&a!=="*"?a+".":"")+b.replace(A,"`").replace(B,"&")}function N(a){var b,c,d,e,g,h,i,j,k,l,m,n,o,p=[],q=[],r=f._data(this,"events");if(!(a.liveFired===this||!r||!r.live||a.target.disabled||a.button&&a.type==="click")){a.namespace&&(n=new RegExp("(^|\\.)"+a.namespace.split(".").join("\\.(?:.*\\.)?")+"(\\.|$)")),a.liveFired=this;var s=r.live.slice(0);for(i=0;ic)break;a.currentTarget=e.elem,a.data=e.handleObj.data,a.handleObj=e.handleObj,o=e.handleObj.origHandler.apply(e.elem,arguments);if(o===!1||a.isPropagationStopped()){c=e.level,o===!1&&(b=!1);if(a.isImmediatePropagationStopped())break}}return b}}function L(a,c,d){var e=f.extend({},d[0]);e.type=a,e.originalEvent={},e.liveFired=b,f.event.handle.call(c,e),e.isDefaultPrevented()&&d[0].preventDefault()}function F(){return!0}function E(){return!1}function m(a,c,d){var e=c+"defer",g=c+"queue",h=c+"mark",i=f.data(a,e,b,!0);i&&(d==="queue"||!f.data(a,g,b,!0))&&(d==="mark"||!f.data(a,h,b,!0))&&setTimeout(function(){!f.data(a,g,b,!0)&&!f.data(a,h,b,!0)&&(f.removeData(a,e,!0),i.resolve())},0)}function l(a){for(var b in a)if(b!=="toJSON")return!1;return!0}function k(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(j,"$1-$2").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNaN(d)?i.test(d)?f.parseJSON(d):d:parseFloat(d)}catch(g){}f.data(a,c,d)}else d=b}return d}var c=a.document,d=a.navigator,e=a.location,f=function(){function H(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(H,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/\d/,n=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,o=/^[\],:{}\s]*$/,p=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,q=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,r=/(?:^|:|,)(?:\s*\[)+/g,s=/(webkit)[ \/]([\w.]+)/,t=/(opera)(?:.*version)?[ \/]([\w.]+)/,u=/(msie) ([\w.]+)/,v=/(mozilla)(?:.*? rv:([\w.]+))?/,w=d.userAgent,x,y,z,A=Object.prototype.toString,B=Object.prototype.hasOwnProperty,C=Array.prototype.push,D=Array.prototype.slice,E=String.prototype.trim,F=Array.prototype.indexOf,G={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=n.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.6.1",length:0,size:function(){return this.length},toArray:function(){return D.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?C.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),y.done(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(D.apply(this,arguments),"slice",D.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:C,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j0)return;y.resolveWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").unbind("ready")}},bindReady:function(){if(!y){y=e._Deferred();if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",z,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",z),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&H()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNaN:function(a){return a==null||!m.test(a)||isNaN(a)},type:function(a){return a==null?String(a):G[A.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;if(a.constructor&&!B.call(a,"constructor")&&!B.call(a.constructor.prototype,"isPrototypeOf"))return!1;var c;for(c in a);return c===b||B.call(a,c)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw a},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(o.test(b.replace(p,"@").replace(q,"]").replace(r,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(b,c,d){a.DOMParser?(d=new DOMParser,c=d.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b)),d=c.documentElement,(!d||!d.nodeName||d.nodeName==="parsererror")&&e.error("Invalid XML: "+b);return c},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i1?h.call(arguments,0):c,--e||g.resolveWith(g,h.call(b,0))}}var b=arguments,c=0,d=b.length,e=d,g=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred();if(d>1){for(;c
a",d=a.getElementsByTagName("*"),e=a.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};f=c.createElement("select"),g=f.appendChild(c.createElement("option")),h=a.getElementsByTagName("input")[0],j={leadingWhitespace:a.firstChild.nodeType===3,tbody:!a.getElementsByTagName("tbody").length,htmlSerialize:!!a.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55$/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:h.value==="on",optSelected:g.selected,getSetAttribute:a.className!=="t",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},h.checked=!0,j.noCloneChecked=h.cloneNode(!0).checked,f.disabled=!0,j.optDisabled=!g.disabled;try{delete a.test}catch(s){j.deleteExpando=!1}!a.addEventListener&&a.attachEvent&&a.fireEvent&&(a.attachEvent("onclick",function b(){j.noCloneEvent=!1,a.detachEvent("onclick",b)}),a.cloneNode(!0).fireEvent("onclick")),h=c.createElement("input"),h.value="t",h.setAttribute("type","radio"),j.radioValue=h.value==="t",h.setAttribute("checked","checked"),a.appendChild(h),k=c.createDocumentFragment(),k.appendChild(a.firstChild),j.checkClone=k.cloneNode(!0).cloneNode(!0).lastChild.checked,a.innerHTML="",a.style.width=a.style.paddingLeft="1px",l=c.createElement("body"),m={visibility:"hidden",width:0,height:0,border:0,margin:0,background:"none"};for(q in m)l.style[q]=m[q];l.appendChild(a),b.insertBefore(l,b.firstChild),j.appendChecked=h.checked,j.boxModel=a.offsetWidth===2,"zoom"in a.style&&(a.style.display="inline",a.style.zoom=1,j.inlineBlockNeedsLayout=a.offsetWidth===2,a.style.display="",a.innerHTML="
",j.shrinkWrapBlocks=a.offsetWidth!==2),a.innerHTML="
t
",n=a.getElementsByTagName("td"),r=n[0].offsetHeight===0,n[0].style.display="",n[1].style.display="none",j.reliableHiddenOffsets=r&&n[0].offsetHeight===0,a.innerHTML="",c.defaultView&&c.defaultView.getComputedStyle&&(i=c.createElement("div"),i.style.width="0",i.style.marginRight="0",a.appendChild(i),j.reliableMarginRight=(parseInt((c.defaultView.getComputedStyle(i,null)||{marginRight:0}).marginRight,10)||0)===0),l.innerHTML="",b.removeChild(l);if(a.attachEvent)for(q in{submit:1,change:1,focusin:1})p="on"+q,r=p in a,r||(a.setAttribute(p,"return;"),r=typeof a[p]=="function"),j[q+"Bubbles"]=r;return j}(),f.boxModel=f.support.boxModel;var i=/^(?:\{.*\}|\[.*\])$/,j=/([a-z])([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!l(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g=f.expando,h=typeof c=="string",i,j=a.nodeType,k=j?f.cache:a,l=j?a[f.expando]:a[f.expando]&&f.expando;if((!l||e&&l&&!k[l][g])&&h&&d===b)return;l||(j?a[f.expando]=l=++f.uuid:l=f.expando),k[l]||(k[l]={},j||(k[l].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?k[l][g]=f.extend(k[l][g],c):k[l]=f.extend(k[l],c);i=k[l],e&&(i[g]||(i[g]={}),i=i[g]),d!==b&&(i[f.camelCase(c)]=d);if(c==="events"&&!i[c])return i[g]&&i[g].events;return h?i[f.camelCase(c)]:i}},removeData:function(b,c,d){if(!!f.acceptData(b)){var e=f.expando,g=b.nodeType,h=g?f.cache:b,i=g?b[f.expando]:f.expando;if(!h[i])return;if(c){var j=d?h[i][e]:h[i];if(j){delete j[c];if(!l(j))return}}if(d){delete h[i][e];if(!l(h[i]))return}var k=h[i][e];f.support.deleteExpando||h!=a?delete h[i]:h[i]=null,k?(h[i]={},g||(h[i].toJSON=f.noop),h[i][e]=k):g&&(f.support.deleteExpando?delete b[f.expando]:b.removeAttribute?b.removeAttribute(f.expando):b[f.expando]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d=null;if(typeof a=="undefined"){if(this.length){d=f.data(this[0]);if(this[0].nodeType===1){var e=this[0].attributes,g;for(var h=0,i=e.length;h-1)return!0;return!1},val:function(a){var c,d,e=this[0];if(!arguments.length){if(e){c=f.valHooks[e.nodeName.toLowerCase()]||f.valHooks[e.type];if(c&&"get"in c&&(d=c.get(e,"value"))!==b)return d;return(e.value||"").replace(p,"")}return b}var g=f.isFunction(a);return this.each(function(d){var e=f(this),h;if(this.nodeType===1){g?h=a.call(this,d,e.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c=a.selectedIndex,d=[],e=a.options,g=a.type==="select-one";if(c<0)return null;for(var h=g?c:0,i=g?c+1:e.length;h=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attrFix:{tabindex:"tabIndex"},attr:function(a,c,d,e){var g=a.nodeType;if(!a||g===3||g===8||g===2)return b;if(e&&c in f.attrFn)return f(a)[c](d);if(!("getAttribute"in a))return f.prop(a,c,d);var h,i,j=g!==1||!f.isXMLDoc(a);c=j&&f.attrFix[c]||c,i=f.attrHooks[c],i||(!t.test(c)||typeof d!="boolean"&&d!==b&&d.toLowerCase()!==c.toLowerCase()?v&&(f.nodeName(a,"form")||u.test(c))&&(i=v):i=w);if(d!==b){if(d===null){f.removeAttr(a,c);return b}if(i&&"set"in i&&j&&(h=i.set(a,d,c))!==b)return h;a.setAttribute(c,""+d);return d}if(i&&"get"in i&&j)return i.get(a,c);h=a.getAttribute(c);return h===null?b:h},removeAttr:function(a,b){var c;a.nodeType===1&&(b=f.attrFix[b]||b,f.support.getSetAttribute?a.removeAttribute(b):(f.attr(a,b,""),a.removeAttributeNode(a.getAttributeNode(b))),t.test(b)&&(c=f.propFix[b]||b)in a&&(a[c]=!1))},attrHooks:{type:{set:function(a,b){if(q.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},tabIndex:{get:function(a){var c=a.getAttributeNode("tabIndex");return c&&c.specified?parseInt(c.value,10):r.test(a.nodeName)||s.test(a.nodeName)&&a.href?0:b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e=a.nodeType;if(!a||e===3||e===8||e===2)return b;var g,h,i=e!==1||!f.isXMLDoc(a);c=i&&f.propFix[c]||c,h=f.propHooks[c];return d!==b?h&&"set"in h&&(g=h.set(a,d,c))!==b?g:a[c]=d:h&&"get"in h&&(g=h.get(a,c))!==b?g:a[c]},propHooks:{}}),w={get:function(a,c){return a[f.propFix[c]||c]?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=b),a.setAttribute(c,c.toLowerCase()));return c}},f.attrHooks.value={get:function(a,b){if(v&&f.nodeName(a,"button"))return v.get(a,b);return a.value},set:function(a,b,c){if(v&&f.nodeName(a,"button"))return v.set(a,b,c);a.value=b}},f.support.getSetAttribute||(f.attrFix=f.propFix,v=f.attrHooks.name=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&d.nodeValue!==""?d.nodeValue:b},set:function(a,b,c){var d=a.getAttributeNode(c);if(d){d.nodeValue=b;return b}}},f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})})),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex)}})),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var x=Object.prototype.hasOwnProperty,y=/\.(.*)$/,z=/^(?:textarea|input|select)$/i,A=/\./g,B=/ /g,C=/[^\w\s.|`]/g,D=function(a){return a.replace(C,"\\$&")};f.event={add:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){if(d===!1)d=E;else if(!d)return;var g,h;d.handler&&(g=d,d=g.handler),d.guid||(d.guid=f.guid++);var i=f._data(a);if(!i)return;var j=i.events,k=i.handle;j||(i.events=j={}),k||(i.handle=k=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.handle.apply(k.elem,arguments):b}),k.elem=a,c=c.split(" ");var l,m=0,n;while(l=c[m++]){h=g?f.extend({},g):{handler:d,data:e},l.indexOf(".")>-1?(n=l.split("."),l=n.shift(),h.namespace=n.slice(0).sort().join(".")):(n=[],h.namespace=""),h.type=l,h.guid||(h.guid=d.guid);var o=j[l],p=f.event.special[l]||{};if(!o){o=j[l]=[];if(!p.setup||p.setup.call(a,e,n,k)===!1)a.addEventListener?a.addEventListener(l,k,!1):a.attachEvent&&a.attachEvent("on"+l,k)}p.add&&(p.add.call(a,h),h.handler.guid||(h.handler.guid=d.guid)),o.push(h),f.event.global[l]=!0}a=null}},global:{},remove:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){d===!1&&(d=E);var g,h,i,j,k=0,l,m,n,o,p,q,r,s=f.hasData(a)&&f._data(a),t=s&&s.events;if(!s||!t)return;c&&c.type&&(d=c.handler,c=c.type);if(!c||typeof c=="string"&&c.charAt(0)==="."){c=c||"";for(h in t)f.event.remove(a,h+c);return}c=c.split(" ");while(h=c[k++]){r=h,q=null,l=h.indexOf(".")<0,m=[],l||(m=h.split("."),h=m.shift(),n=new RegExp("(^|\\.)"+f.map(m.slice(0).sort(),D).join("\\.(?:.*\\.)?")+"(\\.|$)")),p=t[h];if(!p)continue;if(!d){for(j=0;j=0&&(h=h.slice(0,-1),j=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if(!!e&&!f.event.customEvent[h]||!!f.event.global[h]){c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.exclusive=j,c.namespace=i.join("."),c.namespace_re=new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)");if(g||!e)c.preventDefault(),c.stopPropagation();if(!e){f.each(f.cache,function(){var a=f.expando,b=this[a];b&&b.events&&b.events[h]&&f.event.trigger(c,d,b.handle.elem +)});return}if(e.nodeType===3||e.nodeType===8)return;c.result=b,c.target=e,d=d?f.makeArray(d):[],d.unshift(c);var k=e,l=h.indexOf(":")<0?"on"+h:"";do{var m=f._data(k,"handle");c.currentTarget=k,m&&m.apply(k,d),l&&f.acceptData(k)&&k[l]&&k[l].apply(k,d)===!1&&(c.result=!1,c.preventDefault()),k=k.parentNode||k.ownerDocument||k===c.target.ownerDocument&&a}while(k&&!c.isPropagationStopped());if(!c.isDefaultPrevented()){var n,o=f.event.special[h]||{};if((!o._default||o._default.call(e.ownerDocument,c)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)){try{l&&e[h]&&(n=e[l],n&&(e[l]=null),f.event.triggered=h,e[h]())}catch(p){}n&&(e[l]=n),f.event.triggered=b}}return c.result}},handle:function(c){c=f.event.fix(c||a.event);var d=((f._data(this,"events")||{})[c.type]||[]).slice(0),e=!c.exclusive&&!c.namespace,g=Array.prototype.slice.call(arguments,0);g[0]=c,c.currentTarget=this;for(var h=0,i=d.length;h-1?f.map(a.options,function(a){return a.selected}).join("-"):"":f.nodeName(a,"select")&&(c=a.selectedIndex);return c},K=function(c){var d=c.target,e,g;if(!!z.test(d.nodeName)&&!d.readOnly){e=f._data(d,"_change_data"),g=J(d),(c.type!=="focusout"||d.type!=="radio")&&f._data(d,"_change_data",g);if(e===b||g===e)return;if(e!=null||g)c.type="change",c.liveFired=b,f.event.trigger(c,arguments[1],d)}};f.event.special.change={filters:{focusout:K,beforedeactivate:K,click:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(c==="radio"||c==="checkbox"||f.nodeName(b,"select"))&&K.call(this,a)},keydown:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(a.keyCode===13&&!f.nodeName(b,"textarea")||a.keyCode===32&&(c==="checkbox"||c==="radio")||c==="select-multiple")&&K.call(this,a)},beforeactivate:function(a){var b=a.target;f._data(b,"_change_data",J(b))}},setup:function(a,b){if(this.type==="file")return!1;for(var c in I)f.event.add(this,c+".specialChange",I[c]);return z.test(this.nodeName)},teardown:function(a){f.event.remove(this,".specialChange");return z.test(this.nodeName)}},I=f.event.special.change.filters,I.focus=I.beforeactivate}f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){function e(a){var c=f.event.fix(a);c.type=b,c.originalEvent={},f.event.trigger(c,null,c.target),c.isDefaultPrevented()&&a.preventDefault()}var d=0;f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.each(["bind","one"],function(a,c){f.fn[c]=function(a,d,e){var g;if(typeof a=="object"){for(var h in a)this[c](h,d,a[h],e);return this}if(arguments.length===2||d===!1)e=d,d=b;c==="one"?(g=function(a){f(this).unbind(a,g);return e.apply(this,arguments)},g.guid=e.guid||f.guid++):g=e;if(a==="unload"&&c!=="one")this.one(a,d,e);else for(var i=0,j=this.length;i0?this.bind(b,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0)}),function(){function u(a,b,c,d,e,f){for(var g=0,h=d.length;g0){j=i;break}}i=i[a]}d[g]=j}}}function t(a,b,c,d,e,f){for(var g=0,h=d.length;g+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d=0,e=Object.prototype.toString,g=!1,h=!0,i=/\\/g,j=/\W/;[0,0].sort(function(){h=!1;return 0});var k=function(b,d,f,g){f=f||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return f;var i,j,n,o,q,r,s,t,u=!0,w=k.isXML(d),x=[],y=b;do{a.exec(""),i=a.exec(y);if(i){y=i[3],x.push(i[1]);if(i[2]){o=i[3];break}}}while(i);if(x.length>1&&m.exec(b))if(x.length===2&&l.relative[x[0]])j=v(x[0]+x[1],d);else{j=l.relative[x[0]]?[d]:k(x.shift(),d);while(x.length)b=x.shift(),l.relative[b]&&(b+=x.shift()),j=v(b,j)}else{!g&&x.length>1&&d.nodeType===9&&!w&&l.match.ID.test(x[0])&&!l.match.ID.test(x[x.length-1])&&(q=k.find(x.shift(),d,w),d=q.expr?k.filter(q.expr,q.set)[0]:q.set[0]);if(d){q=g?{expr:x.pop(),set:p(g)}:k.find(x.pop(),x.length===1&&(x[0]==="~"||x[0]==="+")&&d.parentNode?d.parentNode:d,w),j=q.expr?k.filter(q.expr,q.set):q.set,x.length>0?n=p(j):u=!1;while(x.length)r=x.pop(),s=r,l.relative[r]?s=x.pop():r="",s==null&&(s=d),l.relative[r](n,s,w)}else n=x=[]}n||(n=j),n||k.error(r||b);if(e.call(n)==="[object Array]")if(!u)f.push.apply(f,n);else if(d&&d.nodeType===1)for(t=0;n[t]!=null;t++)n[t]&&(n[t]===!0||n[t].nodeType===1&&k.contains(d,n[t]))&&f.push(j[t]);else for(t=0;n[t]!=null;t++)n[t]&&n[t].nodeType===1&&f.push(j[t]);else p(n,f);o&&(k(o,h,f,g),k.uniqueSort(f));return f};k.uniqueSort=function(a){if(r){g=h,a.sort(r);if(g)for(var b=1;b0},k.find=function(a,b,c){var d;if(!a)return[];for(var e=0,f=l.order.length;e":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!j.test(b)){b=b.toLowerCase();for(;e=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(i,"")},TAG:function(a,b){return a[1].replace(i,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||k.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&k.error(a[0]);a[0]=d++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(i,"");!f&&l.attrMap[g]&&(a[1]=l.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(i,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=k(b[3],null,null,c);else{var g=k.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(l.match.POS.test(b[0])||l.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!k(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return bc[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=l.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||k.getText([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=l.attrHandle[c]?l.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=l.setFilters[e];if(f)return f(a,c,b,d)}}},m=l.match.POS,n=function(a,b){return"\\"+(b-0+1)};for(var o in l.match)l.match[o]=new RegExp(l.match[o].source+/(?![^\[]*\])(?![^\(]*\))/.source),l.leftMatch[o]=new RegExp(/(^(?:.|\r|\n)*?)/.source+l.match[o].source.replace(/\\(\d+)/g,n));var p=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(q){p=function(a,b){var c=0,d=b||[];if(e.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var f=a.length;c",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(l.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},l.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(l.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(l.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=k,b=c.createElement("div"),d="__sizzle__";b.innerHTML="

";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){k=function(b,e,f,g){e=e||c;if(!g&&!k.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return p(e.getElementsByTagName(b),f);if(h[2]&&l.find.CLASS&&e.getElementsByClassName)return p(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return p([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return p([],f);if(i.id===h[3])return p([i],f)}try{return p(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var m=e,n=e.getAttribute("id"),o=n||d,q=e.parentNode,r=/^\s*[+~]/.test(b);n?o=o.replace(/'/g,"\\$&"):e.setAttribute("id",o),r&&q&&(e=e.parentNode);try{if(!r||q)return p(e.querySelectorAll("[id='"+o+"'] "+b),f)}catch(s){}finally{n||m.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)k[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}k.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!k.isXML(a))try{if(e||!l.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return k(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="
";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;l.order.splice(1,0,"CLASS"),l.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?k.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?k.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:k.contains=function(){return!1},k.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var v=function(a,b){var c,d=[],e="",f=b.nodeType?[b]:b;while(c=l.match.PSEUDO.exec(a))e+=c[0],a=a.replace(l.match.PSEUDO,"");a=l.relative[a]?a+"*":a;for(var g=0,h=f.length;g0)for(h=g;h0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h,i,j={},k=1;if(g&&a.length){for(d=0,e=a.length;d-1:f(g).is(h))&&c.push({selector:i,elem:g,level:k});g=g.parentNode,k++}}return c}var l=U.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a||typeof a=="string")return f.inArray(this[0],a?f(a):this.parent().children());return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(W(c[0])||W(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c),g=T.call(arguments);P.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!V[a]?f.unique(e):e,(this.length>1||R.test(d))&&Q.test(a)&&(e=e.reverse());return this.pushStack(e,a,g.join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var Y=/ jQuery\d+="(?:\d+|null)"/g,Z=/^\s+/,$=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,_=/<([\w:]+)/,ba=/",""],legend:[1,"
","
"],thead:[1,"","
"],tr:[2,"","
"],td:[3,"","
"],col:[2,"","
"],area:[1,"",""],_default:[0,"",""]};bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div
","
"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){f(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f(arguments[0]).toArray());return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(Y,""):null;if(typeof a=="string"&&!bc.test(a)&&(f.support.leadingWhitespace||!Z.test(a))&&!bg[(_.exec(a)||["",""])[1].toLowerCase()]){a=a.replace($,"<$1>");try{for(var c=0,d=this.length;c1&&l0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d=a.cloneNode(!0),e,g,h;if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bj(a,d),e=bk(a),g=bk(d);for(h=0;e[h];++h)bj(e[h],g[h])}if(b){bi(a,d);if(c){e=bk(a),g=bk(d);for(h=0;e[h];++h)bi(e[h],g[h])}}return d},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument|| +b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!bb.test(k))k=b.createTextNode(k);else{k=k.replace($,"<$1>");var l=(_.exec(k)||["",""])[1].toLowerCase(),m=bg[l]||bg._default,n=m[0],o=b.createElement("div");o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=ba.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]===""&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&Z.test(k)&&o.insertBefore(b.createTextNode(Z.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return bp.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle;c.zoom=1;var e=f.isNaN(b)?"":"alpha(opacity="+b*100+")",g=d&&d.filter||c.filter||"";c.filter=bo.test(g)?g.replace(bo,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bz(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(bA=function(a,c){var d,e,g;c=c.replace(br,"-$1").toLowerCase();if(!(e=a.ownerDocument.defaultView))return b;if(g=e.getComputedStyle(a,null))d=g.getPropertyValue(c),d===""&&!f.contains(a.ownerDocument.documentElement,a)&&(d=f.style(a,c));return d}),c.documentElement.currentStyle&&(bB=function(a,b){var c,d=a.currentStyle&&a.currentStyle[b],e=a.runtimeStyle&&a.runtimeStyle[b],f=a.style;!bs.test(d)&&bt.test(d)&&(c=f.left,e&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":d||0,d=f.pixelLeft+"px",f.left=c,e&&(a.runtimeStyle.left=e));return d===""?"auto":d}),bz=bA||bB,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bE=/%20/g,bF=/\[\]$/,bG=/\r?\n/g,bH=/#.*$/,bI=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bJ=/^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bK=/^(?:about|app|app\-storage|.+\-extension|file|widget):$/,bL=/^(?:GET|HEAD)$/,bM=/^\/\//,bN=/\?/,bO=/)<[^<]*)*<\/script>/gi,bP=/^(?:select|textarea)/i,bQ=/\s+/,bR=/([?&])_=[^&]*/,bS=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bT=f.fn.load,bU={},bV={},bW,bX;try{bW=e.href}catch(bY){bW=c.createElement("a"),bW.href="",bW=bW.href}bX=bS.exec(bW.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bT)return bT.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("
").append(c.replace(bO,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bP.test(this.nodeName)||bJ.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bG,"\r\n")}}):{name:b.name,value:c.replace(bG,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.bind(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?f.extend(!0,a,f.ajaxSettings,b):(b=a,a=f.extend(!0,f.ajaxSettings,b));for(var c in{context:1,url:1})c in b?a[c]=b[c]:c in f.ajaxSettings&&(a[c]=f.ajaxSettings[c]);return a},ajaxSettings:{url:bW,isLocal:bK.test(bX[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":"*/*"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML}},ajaxPrefilter:bZ(bU),ajaxTransport:bZ(bV),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a?4:0;var o,r,u,w=l?ca(d,v,l):b,x,y;if(a>=200&&a<300||a===304){if(d.ifModified){if(x=v.getResponseHeader("Last-Modified"))f.lastModified[k]=x;if(y=v.getResponseHeader("Etag"))f.etag[k]=y}if(a===304)c="notmodified",o=!0;else try{r=cb(d,w),c="success",o=!0}catch(z){c="parsererror",u=z}}else{u=c;if(!c||a)c="error",a<0&&(a=0)}v.status=a,v.statusText=c,o?h.resolveWith(e,[r,c,v]):h.rejectWith(e,[v,c,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.resolveWith(e,[v,c]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f._Deferred(),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bI.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.done,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bH,"").replace(bM,bX[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bQ),d.crossDomain==null&&(r=bS.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bX[1]&&r[2]==bX[2]&&(r[3]||(r[1]==="http:"?80:443))==(bX[3]||(bX[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),b$(bU,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bL.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bN.test(d.url)?"&":"?")+d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bR,"$1_="+x);d.url=y+(y===d.url?(bN.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", */*; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=b$(bV,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){status<2?w(-1,z):f.error(z)}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)b_(g,a[g],c,e);return d.join("&").replace(bE,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cc=f.now(),cd=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cc++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(cd.test(b.url)||e&&cd.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(cd,l),b.url===j&&(e&&(k=k.replace(cd,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var ce=a.ActiveXObject?function(){for(var a in cg)cg[a](0,1)}:!1,cf=0,cg;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ch()||ci()}:ch,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,ce&&delete cg[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cf,ce&&(cg||(cg={},f(a).unload(ce)),cg[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var cj={},ck,cl,cm=/^(?:toggle|show|hide)$/,cn=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,co,cp=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cq,cr=a.webkitRequestAnimationFrame||a.mozRequestAnimationFrame||a.oRequestAnimationFrame;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cu("show",3),a,b,c);for(var g=0,h=this.length;g=e.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),e.animatedProperties[this.prop]=!0;for(g in e.animatedProperties)e.animatedProperties[g]!==!0&&(c=!1);if(c){e.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){d.style["overflow"+b]=e.overflow[a]}),e.hide&&f(d).hide();if(e.hide||e.show)for(var i in e.animatedProperties)f.style(d,i,e.orig[i]);e.complete.call(d)}return!1}e.duration==Infinity?this.now=b:(h=b-this.startTime,this.state=h/e.duration,this.pos=f.easing[e.animatedProperties[this.prop]](this.state,h,0,1,e.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){for(var a=f.timers,b=0;b
";f.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"}),b.innerHTML=j,a.insertBefore(b,a.firstChild),d=b.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,this.doesNotAddBorder=e.offsetTop!==5,this.doesAddBorderForTableAndCells=h.offsetTop===5,e.style.position="fixed",e.style.top="20px",this.supportsFixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",this.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==i,a.removeChild(b),f.offset.initialize=f.noop},bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.offset.initialize(),f.offset.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cy(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cy(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){return this[0]?parseFloat(f.css(this[0],d,"padding")):null},f.fn["outer"+c]=function(a){return this[0]?parseFloat(f.css(this[0],d,a?"margin":"border")):null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c];return e.document.compatMode==="CSS1Compat"&&g||e.document.body["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var h=f.css(e,d),i=parseFloat(h);return f.isNaN(i)?h:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f})(window); diff --git a/data/icons/document-added-12.png b/data/icons/document-added-12.png index 409867db..b30995ae 100644 Binary files a/data/icons/document-added-12.png and b/data/icons/document-added-12.png differ diff --git a/data/icons/document-deleted-12.png b/data/icons/document-deleted-12.png index f5585742..0e3253bf 100644 Binary files a/data/icons/document-deleted-12.png and b/data/icons/document-deleted-12.png differ diff --git a/data/icons/document-edited-12.png b/data/icons/document-edited-12.png index 57b50968..610af6eb 100644 Binary files a/data/icons/document-edited-12.png and b/data/icons/document-edited-12.png differ diff --git a/data/icons/document-moved-12.png b/data/icons/document-moved-12.png index 50f4fb32..d68102f7 100644 Binary files a/data/icons/document-moved-12.png and b/data/icons/document-moved-12.png differ diff --git a/data/icons/folder-sparkleshare-16-mist.png b/data/icons/folder-sparkleshare-16-mist.png deleted file mode 100644 index 2deaee4b..00000000 Binary files a/data/icons/folder-sparkleshare-16-mist.png and /dev/null differ diff --git a/data/icons/folder-sparkleshare-22-mist.png b/data/icons/folder-sparkleshare-22-mist.png deleted file mode 100644 index d6f920fe..00000000 Binary files a/data/icons/folder-sparkleshare-22-mist.png and /dev/null differ diff --git a/data/icons/folder-sparkleshare-24-mist.png b/data/icons/folder-sparkleshare-24-mist.png deleted file mode 100644 index 12727a3e..00000000 Binary files a/data/icons/folder-sparkleshare-24-mist.png and /dev/null differ diff --git a/data/icons/folder-sparkleshare-256-mist.png b/data/icons/folder-sparkleshare-256-mist.png deleted file mode 100644 index b1027271..00000000 Binary files a/data/icons/folder-sparkleshare-256-mist.png and /dev/null differ diff --git a/data/icons/folder-sparkleshare-32-mist.png b/data/icons/folder-sparkleshare-32-mist.png deleted file mode 100644 index 795f6650..00000000 Binary files a/data/icons/folder-sparkleshare-32-mist.png and /dev/null differ diff --git a/data/icons/folder-sparkleshare-48-mist.png b/data/icons/folder-sparkleshare-48-mist.png deleted file mode 100644 index 2a9d6e57..00000000 Binary files a/data/icons/folder-sparkleshare-48-mist.png and /dev/null differ diff --git a/data/icons/process-syncing-sparkleshare-24-mist.png b/data/icons/process-syncing-sparkleshare-24-mist.png deleted file mode 100644 index 2d68cd49..00000000 Binary files a/data/icons/process-syncing-sparkleshare-24-mist.png and /dev/null differ diff --git a/data/icons/sparkleshare-windows-status.png b/data/icons/sparkleshare-windows-status.png new file mode 100644 index 00000000..1e87ea78 Binary files /dev/null and b/data/icons/sparkleshare-windows-status.png differ diff --git a/data/info.plist b/data/info.plist deleted file mode 100644 index 971a6798..00000000 --- a/data/info.plist +++ /dev/null @@ -1,28 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - sparkleshare - CFBundleIconFile - sparkleshare.icns - CFBundleIdentifier - org.sparkleshare.sparkleshare - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - SparkleShare - CFBundlePackageType - APPL - CFBundleShortVersionString - 0.2 - CFBundleSignature - xmmd - CFBundleVersion - 0.2 - NSAppleScriptEnabled - NO - - diff --git a/data/src/actions.svg b/data/src/actions.svg new file mode 100644 index 00000000..5afacefa --- /dev/null +++ b/data/src/actions.svg @@ -0,0 +1,21204 @@ + + + + + Text Editor + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + Text Editor + + + text + editor + gedit + + + + + + + + + + + + + + + + + + + + + Lapo Calamandrei + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/side-splash.svg b/data/src/side-splash.svg similarity index 100% rename from data/side-splash.svg rename to data/src/side-splash.svg diff --git a/data/sparkleshare-gnome.svg b/data/src/sparkleshare-gnome.svg similarity index 99% rename from data/sparkleshare-gnome.svg rename to data/src/sparkleshare-gnome.svg index 77504040..e6c64277 100644 --- a/data/sparkleshare-gnome.svg +++ b/data/src/sparkleshare-gnome.svg @@ -16,7 +16,7 @@ inkscape:export-xdpi="90.000000" inkscape:export-ydpi="90.000000" inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:version="0.48.0 r9654" + inkscape:version="0.48.1 r9760" sodipodi:docname="sparkleshare-gnome.svg" sodipodi:version="0.32" style="display:inline;enable-background:new" @@ -31,20 +31,20 @@ height="300px" id="base" inkscape:current-layer="layer20" - inkscape:cx="464.56664" - inkscape:cy="123.20561" + inkscape:cx="489.3933" + inkscape:cy="158.04102" inkscape:document-units="px" inkscape:grid-bbox="true" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:showpageshadow="false" - inkscape:snap-bbox="true" + inkscape:snap-bbox="false" inkscape:snap-nodes="false" - inkscape:window-height="756" - inkscape:window-width="1280" + inkscape:window-height="852" + inkscape:window-width="1440" inkscape:window-x="0" inkscape:window-y="0" - inkscape:zoom="8" + inkscape:zoom="2" objecttolerance="10000" pagecolor="#ffffff" showgrid="true" @@ -53,7 +53,7 @@ showguides="false" inkscape:guide-bbox="true" inkscape:snap-global="true" - inkscape:window-maximized="0" + inkscape:window-maximized="1" inkscape:bbox-paths="false" inkscape:bbox-nodes="false"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \n" +"POT-Creation-Date: 2011-06-29 11:38+0200\n" +"PO-Revision-Date: 2011-06-26 09:22+0000\n" +"Last-Translator: deejay1 \n" +"Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ar\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:338 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:337 #: ../SparkleShare/SparkleIntro.cs:67 ../SparkleShare/SparkleStatusIcon.cs:345 msgid "Welcome to SparkleShare!" msgstr "مرحبًا بك في سباركل‌شير!" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:349 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:348 #: ../SparkleShare/SparkleStatusIcon.cs:357 msgid "Not everything is synced" msgstr "ليس كل شيء مزامَنًا" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:359 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:358 #: ../SparkleShare/SparkleStatusIcon.cs:367 msgid "Up to date" msgstr "محدَّث" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:375 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:374 #: ../SparkleShare/SparkleStatusIcon.cs:383 msgid "Syncing…" msgstr "يزامن..." @@ -83,35 +84,35 @@ msgstr "أظهر الإ_شادات" msgid "_Visit Website" msgstr "_زر الموقع الإلكتروني" -#: ../SparkleShare/SparkleController.cs:422 +#: ../SparkleShare/SparkleController.cs:455 msgid "ddd MMM d, yyyy" msgstr "ddd MMM d, yyyy" -#: ../SparkleShare/SparkleController.cs:427 +#: ../SparkleShare/SparkleController.cs:460 msgid "ddd MMM d" msgstr "ddd MMM d" -#: ../SparkleShare/SparkleController.cs:629 +#: ../SparkleShare/SparkleController.cs:661 #, csharp-format msgid "added ‘{0}’" msgstr "أضيفَ ‘{0}’" -#: ../SparkleShare/SparkleController.cs:634 +#: ../SparkleShare/SparkleController.cs:666 #, csharp-format msgid "moved ‘{0}’" msgstr "نُقل ‘{0}’" -#: ../SparkleShare/SparkleController.cs:639 +#: ../SparkleShare/SparkleController.cs:671 #, csharp-format msgid "edited ‘{0}’" msgstr "حرِّر ‘{0}’" -#: ../SparkleShare/SparkleController.cs:644 +#: ../SparkleShare/SparkleController.cs:676 #, csharp-format msgid "deleted ‘{0}’" msgstr "حُذف ‘{0}’" -#: ../SparkleShare/SparkleController.cs:653 +#: ../SparkleShare/SparkleController.cs:685 #, csharp-format msgid "and {0} more" msgid_plural "and {0} more" @@ -122,7 +123,7 @@ msgstr[3] "و{0} ملفات أخرى" msgstr[4] "و{ملف آخر" msgstr[5] "و{0} ملف آخر" -#: ../SparkleShare/SparkleController.cs:657 +#: ../SparkleShare/SparkleController.cs:689 msgid "did something magical" msgstr "فعلتُ شيئًا سحريًا" @@ -320,74 +321,70 @@ msgstr "تعلم كيف تستضيف خادوم سباركل‌شير بنفسك msgid "Recent Events" msgstr "الأحداث الأخيرة" -#: ../SparkleShare/SparkleEventLog.cs:131 -#: ../SparkleShare/SparkleEventLog.cs:150 +#: ../SparkleShare/SparkleEventLog.cs:148 +#: ../SparkleShare/SparkleEventLog.cs:173 msgid "All Folders" msgstr "كل المجلدات" -#: ../SparkleShare/SparkleShare.cs:56 +#: ../SparkleShare/SparkleShare.cs:53 msgid "Sorry, you can't run SparkleShare with these permissions." msgstr "المعذرة، لا يمكنك تشغيل سباركل‌شير بهذه الأذون." -#: ../SparkleShare/SparkleShare.cs:57 +#: ../SparkleShare/SparkleShare.cs:54 msgid "Things would go utterly wrong." msgstr "وإلا فستسير الأمور على غير ما يرام." -#: ../SparkleShare/SparkleShare.cs:66 -msgid "Don't show the notification icon" -msgstr "لا تظهِر أيقونة التنبيه" - -#: ../SparkleShare/SparkleShare.cs:67 +#: ../SparkleShare/SparkleShare.cs:61 msgid "Print version information" msgstr "اطبع معلومات الإصدارة" -#: ../SparkleShare/SparkleShare.cs:68 +#: ../SparkleShare/SparkleShare.cs:62 msgid "Show this help text" msgstr "أظهر نص المساعدة هذا" -#: ../SparkleShare/SparkleShare.cs:115 +#: ../SparkleShare/SparkleShare.cs:109 msgid "SparkleShare, a collaboration and sharing tool." msgstr "سباركل‌شير، أداة تعاون ومشاركة." -#: ../SparkleShare/SparkleShare.cs:116 +#: ../SparkleShare/SparkleShare.cs:110 msgid "Copyright (C) 2010 Hylke Bons" msgstr "Copyright (C) 2010 Hylke Bons" -#: ../SparkleShare/SparkleShare.cs:118 +#: ../SparkleShare/SparkleShare.cs:112 msgid "This program comes with ABSOLUTELY NO WARRANTY." msgstr "لا يشمل هذا البرنامج أي ضمان" -#: ../SparkleShare/SparkleShare.cs:120 +#: ../SparkleShare/SparkleShare.cs:114 msgid "This is free software, and you are welcome to redistribute it " msgstr "هذا برنامج حر، ونحن نرحب بتوزيعه " -#: ../SparkleShare/SparkleShare.cs:121 +#: ../SparkleShare/SparkleShare.cs:115 msgid "under certain conditions. Please read the GNU GPLv3 for details." msgstr "" "ضمن شروط معينة. يرجى قراءة رخصة جنو العمومية - الإصدارة الثالثة للاطلاع على " "التفاصيل." -#: ../SparkleShare/SparkleShare.cs:123 +#: ../SparkleShare/SparkleShare.cs:117 msgid "SparkleShare automatically syncs Git repositories in " msgstr "يزامن سباركل‌شير مستودعات جِت الموجودة في " -#: ../SparkleShare/SparkleShare.cs:124 +#: ../SparkleShare/SparkleShare.cs:118 msgid "the ~/SparkleShare folder with their remote origins." msgstr "مجلد ~/SparkleShare مع أصولها البعيدة آليًا." -#: ../SparkleShare/SparkleShare.cs:126 +#: ../SparkleShare/SparkleShare.cs:120 msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..." msgstr "طريقة الاستخدام: sparkleshare [start|stop|restart] [OPTION]..." -#: ../SparkleShare/SparkleShare.cs:127 +#: ../SparkleShare/SparkleShare.cs:121 msgid "Sync SparkleShare folder with remote repositories." msgstr "زامن مجلد سباركل‌شير مع مستودعات بعيدة." -#: ../SparkleShare/SparkleShare.cs:129 +#: ../SparkleShare/SparkleShare.cs:123 msgid "Arguments:" msgstr "المعطيات:" -#: ../SparkleShare/SparkleShare.cs:139 +#: ../SparkleShare/SparkleShare.cs:133 msgid "SparkleShare " msgstr "سباركل‌شير " @@ -417,11 +414,11 @@ msgstr "فعِّل التنبيهات" msgid "Quit" msgstr "اخرج" -#: ../SparkleShare/SparkleUI.cs:96 +#: ../SparkleShare/SparkleUI.cs:99 msgid "Ouch! Mid-air collision!" msgstr "آخ! اصطدام هوائي!" -#: ../SparkleShare/SparkleUI.cs:97 +#: ../SparkleShare/SparkleUI.cs:100 msgid "Don't worry, SparkleShare made a copy of each conflicting file." msgstr "لا تقلق، صنع سباركل‌شير نسخة من كل ملف متعارض." diff --git a/po/bg.po b/po/bg.po index 2ff415ec..a4ec0bf0 100644 --- a/po/bg.po +++ b/po/bg.po @@ -9,31 +9,32 @@ msgid "" msgstr "" "Project-Id-Version: SparkleShare\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-17 12:09+0200\n" -"PO-Revision-Date: 2011-06-17 10:13+0000\n" +"POT-Creation-Date: 2011-06-29 11:38+0200\n" +"PO-Revision-Date: 2011-06-26 09:22+0000\n" "Last-Translator: deejay1 \n" +"Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: bg\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:338 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:337 #: ../SparkleShare/SparkleIntro.cs:67 ../SparkleShare/SparkleStatusIcon.cs:345 msgid "Welcome to SparkleShare!" msgstr "Здравейте в SparkleShare!" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:349 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:348 #: ../SparkleShare/SparkleStatusIcon.cs:357 msgid "Not everything is synced" msgstr "Синхронизирането не е приключило" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:359 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:358 #: ../SparkleShare/SparkleStatusIcon.cs:367 msgid "Up to date" msgstr "Обновено" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:375 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:374 #: ../SparkleShare/SparkleStatusIcon.cs:383 msgid "Syncing…" msgstr "Синхронизиране…" @@ -83,42 +84,42 @@ msgstr "_Заслуги" msgid "_Visit Website" msgstr "_Към уеб сайта" -#: ../SparkleShare/SparkleController.cs:422 +#: ../SparkleShare/SparkleController.cs:455 msgid "ddd MMM d, yyyy" msgstr "" -#: ../SparkleShare/SparkleController.cs:427 +#: ../SparkleShare/SparkleController.cs:460 msgid "ddd MMM d" msgstr "" -#: ../SparkleShare/SparkleController.cs:629 +#: ../SparkleShare/SparkleController.cs:661 #, csharp-format msgid "added ‘{0}’" msgstr "добавен е „{0}“" -#: ../SparkleShare/SparkleController.cs:634 +#: ../SparkleShare/SparkleController.cs:666 #, csharp-format msgid "moved ‘{0}’" msgstr "" -#: ../SparkleShare/SparkleController.cs:639 +#: ../SparkleShare/SparkleController.cs:671 #, csharp-format msgid "edited ‘{0}’" msgstr "редактиран е „{0}“" -#: ../SparkleShare/SparkleController.cs:644 +#: ../SparkleShare/SparkleController.cs:676 #, csharp-format msgid "deleted ‘{0}’" msgstr "изтрит е „{0}“" -#: ../SparkleShare/SparkleController.cs:653 +#: ../SparkleShare/SparkleController.cs:685 #, csharp-format msgid "and {0} more" msgid_plural "and {0} more" msgstr[0] "" msgstr[1] "" -#: ../SparkleShare/SparkleController.cs:657 +#: ../SparkleShare/SparkleController.cs:689 msgid "did something magical" msgstr "" @@ -318,75 +319,71 @@ msgstr "Научете как да създадете свой сървър за msgid "Recent Events" msgstr "" -#: ../SparkleShare/SparkleEventLog.cs:131 -#: ../SparkleShare/SparkleEventLog.cs:150 +#: ../SparkleShare/SparkleEventLog.cs:148 +#: ../SparkleShare/SparkleEventLog.cs:173 msgid "All Folders" msgstr "" -#: ../SparkleShare/SparkleShare.cs:56 +#: ../SparkleShare/SparkleShare.cs:53 msgid "Sorry, you can't run SparkleShare with these permissions." msgstr "С настоящите права не може да стартирате SparkleShare." -#: ../SparkleShare/SparkleShare.cs:57 +#: ../SparkleShare/SparkleShare.cs:54 msgid "Things would go utterly wrong." msgstr "Нещата могат изцяло да се объркат." -#: ../SparkleShare/SparkleShare.cs:66 -msgid "Don't show the notification icon" -msgstr "Без икона в областта за уведомяване" - -#: ../SparkleShare/SparkleShare.cs:67 +#: ../SparkleShare/SparkleShare.cs:61 msgid "Print version information" msgstr "Извеждане на информация за версията" -#: ../SparkleShare/SparkleShare.cs:68 +#: ../SparkleShare/SparkleShare.cs:62 msgid "Show this help text" msgstr "Показване на този помощен текст" -#: ../SparkleShare/SparkleShare.cs:115 +#: ../SparkleShare/SparkleShare.cs:109 msgid "SparkleShare, a collaboration and sharing tool." msgstr "" -#: ../SparkleShare/SparkleShare.cs:116 +#: ../SparkleShare/SparkleShare.cs:110 msgid "Copyright (C) 2010 Hylke Bons" msgstr "Авторски права: © 2010 Hylke Bons" -#: ../SparkleShare/SparkleShare.cs:118 +#: ../SparkleShare/SparkleShare.cs:112 msgid "This program comes with ABSOLUTELY NO WARRANTY." msgstr "Тази програма идва БЕЗ НИКАКВИ ГАРАНЦИИ." -#: ../SparkleShare/SparkleShare.cs:120 +#: ../SparkleShare/SparkleShare.cs:114 msgid "This is free software, and you are welcome to redistribute it " msgstr "" "Това е свободен софтуер, можете да го разпространявате при определени " "условия." -#: ../SparkleShare/SparkleShare.cs:121 +#: ../SparkleShare/SparkleShare.cs:115 msgid "under certain conditions. Please read the GNU GPLv3 for details." msgstr "За повече информация вижте Общия публичен лиценз на GNU, версия 3." -#: ../SparkleShare/SparkleShare.cs:123 +#: ../SparkleShare/SparkleShare.cs:117 msgid "SparkleShare automatically syncs Git repositories in " msgstr "SparkleShare автоматично синхронизира хранилища на Git" -#: ../SparkleShare/SparkleShare.cs:124 +#: ../SparkleShare/SparkleShare.cs:118 msgid "the ~/SparkleShare folder with their remote origins." msgstr "в папката ~/SparkleShare с отдалечените им източници." -#: ../SparkleShare/SparkleShare.cs:126 +#: ../SparkleShare/SparkleShare.cs:120 msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..." msgstr "Употреба: sparkleshare [start|stop|restart] [ОПЦИЯ]…" -#: ../SparkleShare/SparkleShare.cs:127 +#: ../SparkleShare/SparkleShare.cs:121 msgid "Sync SparkleShare folder with remote repositories." msgstr "" "Синхронизиране на папката ви за SparkleShare с отдалечените източници." -#: ../SparkleShare/SparkleShare.cs:129 +#: ../SparkleShare/SparkleShare.cs:123 msgid "Arguments:" msgstr "Аргументи:" -#: ../SparkleShare/SparkleShare.cs:139 +#: ../SparkleShare/SparkleShare.cs:133 msgid "SparkleShare " msgstr "SparkleShare " @@ -416,11 +413,11 @@ msgstr "Включване на уведомленията" msgid "Quit" msgstr "Спиране на програмата" -#: ../SparkleShare/SparkleUI.cs:96 +#: ../SparkleShare/SparkleUI.cs:99 msgid "Ouch! Mid-air collision!" msgstr "Опс, конфликт на версии!" -#: ../SparkleShare/SparkleUI.cs:97 +#: ../SparkleShare/SparkleUI.cs:100 msgid "Don't worry, SparkleShare made a copy of each conflicting file." msgstr "Без паника! SparkleShare е създал копие на всеки файл в конфликт." diff --git a/po/ca.po b/po/ca.po index e6ebf361..a8a6f8d6 100644 --- a/po/ca.po +++ b/po/ca.po @@ -6,36 +6,38 @@ # # , 2011. # Carles Mateu , 2011. +# , 2011. # alexandresaiz , 2011. msgid "" msgstr "" "Project-Id-Version: SparkleShare\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-17 12:09+0200\n" -"PO-Revision-Date: 2011-06-17 10:13+0000\n" -"Last-Translator: deejay1 \n" +"POT-Creation-Date: 2011-06-29 11:38+0200\n" +"PO-Revision-Date: 2011-07-02 21:33+0000\n" +"Last-Translator: alexandresaiz \n" +"Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ca\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:338 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:337 #: ../SparkleShare/SparkleIntro.cs:67 ../SparkleShare/SparkleStatusIcon.cs:345 msgid "Welcome to SparkleShare!" msgstr "Benvinguts a SparkleShare" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:349 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:348 #: ../SparkleShare/SparkleStatusIcon.cs:357 msgid "Not everything is synced" msgstr "No està tot sincronitzat" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:359 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:358 #: ../SparkleShare/SparkleStatusIcon.cs:367 msgid "Up to date" msgstr "Al dia" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:375 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:374 #: ../SparkleShare/SparkleStatusIcon.cs:383 msgid "Syncing…" msgstr "Sincronitzant ..." @@ -85,42 +87,42 @@ msgstr "Mostra els Credits" msgid "_Visit Website" msgstr "_Visitar lloc web" -#: ../SparkleShare/SparkleController.cs:422 +#: ../SparkleShare/SparkleController.cs:455 msgid "ddd MMM d, yyyy" -msgstr "" +msgstr "ddd MMM d, yyyy" -#: ../SparkleShare/SparkleController.cs:427 +#: ../SparkleShare/SparkleController.cs:460 msgid "ddd MMM d" -msgstr "" +msgstr "ddd MMM d" -#: ../SparkleShare/SparkleController.cs:629 +#: ../SparkleShare/SparkleController.cs:661 #, csharp-format msgid "added ‘{0}’" msgstr "afegit '{0}'" -#: ../SparkleShare/SparkleController.cs:634 +#: ../SparkleShare/SparkleController.cs:666 #, csharp-format msgid "moved ‘{0}’" msgstr "mogut ’{0}’" -#: ../SparkleShare/SparkleController.cs:639 +#: ../SparkleShare/SparkleController.cs:671 #, csharp-format msgid "edited ‘{0}’" msgstr "editat '{0}'" -#: ../SparkleShare/SparkleController.cs:644 +#: ../SparkleShare/SparkleController.cs:676 #, csharp-format msgid "deleted ‘{0}’" msgstr "eliminat '{0}'" -#: ../SparkleShare/SparkleController.cs:653 +#: ../SparkleShare/SparkleController.cs:685 #, csharp-format msgid "and {0} more" msgid_plural "and {0} more" msgstr[0] "i ‘{0}’ més" msgstr[1] "i ‘{0}’ més" -#: ../SparkleShare/SparkleController.cs:657 +#: ../SparkleShare/SparkleController.cs:689 msgid "did something magical" msgstr "va fer una cosa màgica" @@ -323,76 +325,72 @@ msgstr "Apren com gestionar el teu propi servidor SparkleShare" #: ../SparkleShare/SparkleEventLog.cs:61 msgid "Recent Events" -msgstr "" +msgstr "Accions recents" -#: ../SparkleShare/SparkleEventLog.cs:131 -#: ../SparkleShare/SparkleEventLog.cs:150 +#: ../SparkleShare/SparkleEventLog.cs:148 +#: ../SparkleShare/SparkleEventLog.cs:173 msgid "All Folders" -msgstr "" +msgstr "Totes les carpetes" -#: ../SparkleShare/SparkleShare.cs:56 +#: ../SparkleShare/SparkleShare.cs:53 msgid "Sorry, you can't run SparkleShare with these permissions." msgstr "Ho sentim, no pots executar SparkleShare amb aquests permisos." -#: ../SparkleShare/SparkleShare.cs:57 +#: ../SparkleShare/SparkleShare.cs:54 msgid "Things would go utterly wrong." msgstr "Les coses anirien molt malament." -#: ../SparkleShare/SparkleShare.cs:66 -msgid "Don't show the notification icon" -msgstr "No mostrar la icona de notificació" - -#: ../SparkleShare/SparkleShare.cs:67 +#: ../SparkleShare/SparkleShare.cs:61 msgid "Print version information" msgstr "Imprimir la informació de versió" -#: ../SparkleShare/SparkleShare.cs:68 +#: ../SparkleShare/SparkleShare.cs:62 msgid "Show this help text" msgstr "Mostra aquest text d'ajuda" -#: ../SparkleShare/SparkleShare.cs:115 +#: ../SparkleShare/SparkleShare.cs:109 msgid "SparkleShare, a collaboration and sharing tool." msgstr "una eina d'intercanvi i col·laboració" -#: ../SparkleShare/SparkleShare.cs:116 +#: ../SparkleShare/SparkleShare.cs:110 msgid "Copyright (C) 2010 Hylke Bons" msgstr "Copyright (C) 2010 Hylke Bons" -#: ../SparkleShare/SparkleShare.cs:118 +#: ../SparkleShare/SparkleShare.cs:112 msgid "This program comes with ABSOLUTELY NO WARRANTY." msgstr "Aquest programa ve sense, absolutament, cap garantia." -#: ../SparkleShare/SparkleShare.cs:120 +#: ../SparkleShare/SparkleShare.cs:114 msgid "This is free software, and you are welcome to redistribute it " msgstr "Aquest és programari lliure, i estas convidat a redistribuir-lo" -#: ../SparkleShare/SparkleShare.cs:121 +#: ../SparkleShare/SparkleShare.cs:115 msgid "under certain conditions. Please read the GNU GPLv3 for details." msgstr "" "sota certes condicions. Si us plau, llegeix la GNU GPLv3 per obtenir més " "detalls." -#: ../SparkleShare/SparkleShare.cs:123 +#: ../SparkleShare/SparkleShare.cs:117 msgid "SparkleShare automatically syncs Git repositories in " msgstr "SparkleShare sincronitza automàticament repositoris Git a" -#: ../SparkleShare/SparkleShare.cs:124 +#: ../SparkleShare/SparkleShare.cs:118 msgid "the ~/SparkleShare folder with their remote origins." msgstr "carpeta ~ / SparkleShare amb els seus orígens remots." -#: ../SparkleShare/SparkleShare.cs:126 +#: ../SparkleShare/SparkleShare.cs:120 msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..." msgstr "Ús: sparkleshare [start|stop|restart] [OPCIÓ] ..." -#: ../SparkleShare/SparkleShare.cs:127 +#: ../SparkleShare/SparkleShare.cs:121 msgid "Sync SparkleShare folder with remote repositories." msgstr "Sincronitza carpeta SparkleShare amb repositoris remots." -#: ../SparkleShare/SparkleShare.cs:129 +#: ../SparkleShare/SparkleShare.cs:123 msgid "Arguments:" msgstr "Arguments:" -#: ../SparkleShare/SparkleShare.cs:139 +#: ../SparkleShare/SparkleShare.cs:133 msgid "SparkleShare " msgstr "SparkleShare" @@ -407,7 +405,7 @@ msgstr "Afegeix una carpeta remota" #: ../SparkleShare/SparkleStatusIcon.cs:242 msgid "Show Recent Events" -msgstr "" +msgstr "Mostra les accions més recents" #: ../SparkleShare/SparkleStatusIcon.cs:262 msgid "Turn Notifications Off" @@ -422,11 +420,11 @@ msgstr "Activa les Notificacions" msgid "Quit" msgstr "Sortir" -#: ../SparkleShare/SparkleUI.cs:96 +#: ../SparkleShare/SparkleUI.cs:99 msgid "Ouch! Mid-air collision!" msgstr "Ai! Col·lisió en ple vol!" -#: ../SparkleShare/SparkleUI.cs:97 +#: ../SparkleShare/SparkleUI.cs:100 msgid "Don't worry, SparkleShare made a copy of each conflicting file." msgstr "" "No et preocupis, SparkleShare ha fet una còpia de cada fitxer en conflicte." diff --git a/po/cs_CZ.po b/po/cs_CZ.po index 630c5ab2..c45973fa 100644 --- a/po/cs_CZ.po +++ b/po/cs_CZ.po @@ -4,36 +4,38 @@ # we apologise for any incovenience this may have caused and we hope to bring them # back in the future. # +# Jiri Slezka , 2011. # zzanzare , 2011. msgid "" msgstr "" "Project-Id-Version: SparkleShare\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-17 12:09+0200\n" -"PO-Revision-Date: 2011-06-17 10:13+0000\n" -"Last-Translator: deejay1 \n" +"POT-Creation-Date: 2011-06-29 11:38+0200\n" +"PO-Revision-Date: 2011-07-09 22:10+0000\n" +"Last-Translator: dron23 \n" +"Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: cs_CZ\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:338 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:337 #: ../SparkleShare/SparkleIntro.cs:67 ../SparkleShare/SparkleStatusIcon.cs:345 msgid "Welcome to SparkleShare!" msgstr "Vítejte ve SparkleShare!" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:349 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:348 #: ../SparkleShare/SparkleStatusIcon.cs:357 msgid "Not everything is synced" msgstr "Něco není synchronizováno" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:359 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:358 #: ../SparkleShare/SparkleStatusIcon.cs:367 msgid "Up to date" msgstr "Aktuální" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:375 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:374 #: ../SparkleShare/SparkleStatusIcon.cs:383 msgid "Syncing…" msgstr "Synchronizuji…" @@ -65,15 +67,15 @@ msgstr "O SparkleShare" #: ../SparkleShare/SparkleAbout.cs:53 msgid "A newer version is available" -msgstr "" +msgstr "Je k dispozici novější verze" #: ../SparkleShare/SparkleAbout.cs:60 msgid "You are running the latest version." -msgstr "" +msgstr "Provozujete aktuální verzi." #: ../SparkleShare/SparkleAbout.cs:87 msgid "Checking for updates..." -msgstr "" +msgstr "Kontroluji aktualizace..." #: ../SparkleShare/SparkleAbout.cs:116 msgid "_Show Credits" @@ -83,45 +85,45 @@ msgstr "_Zásluhy" msgid "_Visit Website" msgstr "_Navštívit domovskou stránku" -#: ../SparkleShare/SparkleController.cs:422 +#: ../SparkleShare/SparkleController.cs:455 msgid "ddd MMM d, yyyy" msgstr "ddd d. MMM, yyyy" -#: ../SparkleShare/SparkleController.cs:427 +#: ../SparkleShare/SparkleController.cs:460 msgid "ddd MMM d" msgstr "ddd d. MMM" -#: ../SparkleShare/SparkleController.cs:629 +#: ../SparkleShare/SparkleController.cs:661 #, csharp-format msgid "added ‘{0}’" msgstr "přidal(a) ‘{0}’" -#: ../SparkleShare/SparkleController.cs:634 +#: ../SparkleShare/SparkleController.cs:666 #, csharp-format msgid "moved ‘{0}’" -msgstr "" +msgstr "přesunuto \"{0}\"" -#: ../SparkleShare/SparkleController.cs:639 +#: ../SparkleShare/SparkleController.cs:671 #, csharp-format msgid "edited ‘{0}’" msgstr "upravil(a) ‘{0}’" -#: ../SparkleShare/SparkleController.cs:644 +#: ../SparkleShare/SparkleController.cs:676 #, csharp-format msgid "deleted ‘{0}’" msgstr "smazal(a) ‘{0}’" -#: ../SparkleShare/SparkleController.cs:653 +#: ../SparkleShare/SparkleController.cs:685 #, csharp-format msgid "and {0} more" msgid_plural "and {0} more" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "a {0} více" +msgstr[1] "a {0} více" +msgstr[2] "a {0} více" -#: ../SparkleShare/SparkleController.cs:657 +#: ../SparkleShare/SparkleController.cs:689 msgid "did something magical" -msgstr "" +msgstr "stalo se něco magického" #: ../SparkleShare/SparkleIntro.cs:73 msgid "" @@ -319,76 +321,72 @@ msgstr "Zjistěte jak připravit svůj vlastní SparkleServer" #: ../SparkleShare/SparkleEventLog.cs:61 msgid "Recent Events" -msgstr "" +msgstr "Nedávné události" -#: ../SparkleShare/SparkleEventLog.cs:131 -#: ../SparkleShare/SparkleEventLog.cs:150 +#: ../SparkleShare/SparkleEventLog.cs:148 +#: ../SparkleShare/SparkleEventLog.cs:173 msgid "All Folders" -msgstr "" +msgstr "Všechny složky" -#: ../SparkleShare/SparkleShare.cs:56 +#: ../SparkleShare/SparkleShare.cs:53 msgid "Sorry, you can't run SparkleShare with these permissions." msgstr "" "Je nám líto, ale nemůžete spouštět SparkleShare s těmito přístupovými právy." -#: ../SparkleShare/SparkleShare.cs:57 +#: ../SparkleShare/SparkleShare.cs:54 msgid "Things would go utterly wrong." msgstr "Věci by se mohly příšerně pokazit." -#: ../SparkleShare/SparkleShare.cs:66 -msgid "Don't show the notification icon" -msgstr "Nezobrazovat oznamovací ikonu" - -#: ../SparkleShare/SparkleShare.cs:67 +#: ../SparkleShare/SparkleShare.cs:61 msgid "Print version information" msgstr "Vypíše informace o verzi" -#: ../SparkleShare/SparkleShare.cs:68 +#: ../SparkleShare/SparkleShare.cs:62 msgid "Show this help text" msgstr "Zobrazit tuto nápovědu" -#: ../SparkleShare/SparkleShare.cs:115 +#: ../SparkleShare/SparkleShare.cs:109 msgid "SparkleShare, a collaboration and sharing tool." -msgstr "" +msgstr "SparkleShare, nástroj pro sdílení a spolupráci." -#: ../SparkleShare/SparkleShare.cs:116 +#: ../SparkleShare/SparkleShare.cs:110 msgid "Copyright (C) 2010 Hylke Bons" msgstr "Všechna práva vyhrazena (C) 2010 Hylke Bons" -#: ../SparkleShare/SparkleShare.cs:118 +#: ../SparkleShare/SparkleShare.cs:112 msgid "This program comes with ABSOLUTELY NO WARRANTY." msgstr "Tento program je ABSOLUTNĚ BEZ ZÁRUKY." -#: ../SparkleShare/SparkleShare.cs:120 +#: ../SparkleShare/SparkleShare.cs:114 msgid "This is free software, and you are welcome to redistribute it " msgstr "Toto je svobodný software a můžete jej dále šířit." -#: ../SparkleShare/SparkleShare.cs:121 +#: ../SparkleShare/SparkleShare.cs:115 msgid "under certain conditions. Please read the GNU GPLv3 for details." msgstr "" "za jistých podmínek. Prosím, přečtěte si GNU GPLv3 pro více informací." -#: ../SparkleShare/SparkleShare.cs:123 +#: ../SparkleShare/SparkleShare.cs:117 msgid "SparkleShare automatically syncs Git repositories in " msgstr "SparkleShare automaticky synchronizuje repozitáře Git v " -#: ../SparkleShare/SparkleShare.cs:124 +#: ../SparkleShare/SparkleShare.cs:118 msgid "the ~/SparkleShare folder with their remote origins." msgstr "složce ~/SparkleShare s jejich vzdálenými protistranami." -#: ../SparkleShare/SparkleShare.cs:126 +#: ../SparkleShare/SparkleShare.cs:120 msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..." msgstr "Použití: sparkleshare [start|stop|restart] [VOLBY]..." -#: ../SparkleShare/SparkleShare.cs:127 +#: ../SparkleShare/SparkleShare.cs:121 msgid "Sync SparkleShare folder with remote repositories." msgstr "Synchronizovat složku SparkleShare se vzdálenými repozitáři." -#: ../SparkleShare/SparkleShare.cs:129 +#: ../SparkleShare/SparkleShare.cs:123 msgid "Arguments:" msgstr "Argumenty:" -#: ../SparkleShare/SparkleShare.cs:139 +#: ../SparkleShare/SparkleShare.cs:133 msgid "SparkleShare " msgstr "SparkleShare " @@ -403,7 +401,7 @@ msgstr "Přidat vzdálenou složku…" #: ../SparkleShare/SparkleStatusIcon.cs:242 msgid "Show Recent Events" -msgstr "" +msgstr "Zobrazit nedávné události" #: ../SparkleShare/SparkleStatusIcon.cs:262 msgid "Turn Notifications Off" @@ -418,17 +416,17 @@ msgstr "Zapnout upozornění" msgid "Quit" msgstr "Ukončit" -#: ../SparkleShare/SparkleUI.cs:96 +#: ../SparkleShare/SparkleUI.cs:99 msgid "Ouch! Mid-air collision!" msgstr "Au! Nehoda na cestě!" -#: ../SparkleShare/SparkleUI.cs:97 +#: ../SparkleShare/SparkleUI.cs:100 msgid "Don't worry, SparkleShare made a copy of each conflicting file." msgstr "" "Nemějte strach, SparkleShare udělal kopie každého konfliktního souboru." #: ../SparkleShare/SparkleWindow.cs:41 msgid "SparkleShare Setup" -msgstr "" +msgstr "Nastavení SparkleShare" diff --git a/po/da.po b/po/da.po index d5a0a334..cb2ba9ee 100644 --- a/po/da.po +++ b/po/da.po @@ -9,31 +9,32 @@ msgid "" msgstr "" "Project-Id-Version: SparkleShare\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-17 12:09+0200\n" -"PO-Revision-Date: 2011-06-17 10:13+0000\n" +"POT-Creation-Date: 2011-06-29 11:38+0200\n" +"PO-Revision-Date: 2011-06-26 09:22+0000\n" "Last-Translator: deejay1 \n" +"Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: da\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:338 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:337 #: ../SparkleShare/SparkleIntro.cs:67 ../SparkleShare/SparkleStatusIcon.cs:345 msgid "Welcome to SparkleShare!" msgstr "Velkommen til SparkleShare!" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:349 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:348 #: ../SparkleShare/SparkleStatusIcon.cs:357 msgid "Not everything is synced" msgstr "Ikke alt er synkroniseret" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:359 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:358 #: ../SparkleShare/SparkleStatusIcon.cs:367 msgid "Up to date" msgstr "Opdateret" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:375 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:374 #: ../SparkleShare/SparkleStatusIcon.cs:383 msgid "Syncing…" msgstr "Synkroniseret" @@ -83,42 +84,42 @@ msgstr "" msgid "_Visit Website" msgstr "_Besøg hjemmeside" -#: ../SparkleShare/SparkleController.cs:422 +#: ../SparkleShare/SparkleController.cs:455 msgid "ddd MMM d, yyyy" msgstr "" -#: ../SparkleShare/SparkleController.cs:427 +#: ../SparkleShare/SparkleController.cs:460 msgid "ddd MMM d" msgstr "" -#: ../SparkleShare/SparkleController.cs:629 +#: ../SparkleShare/SparkleController.cs:661 #, csharp-format msgid "added ‘{0}’" msgstr "tilføjede '{0}'" -#: ../SparkleShare/SparkleController.cs:634 +#: ../SparkleShare/SparkleController.cs:666 #, csharp-format msgid "moved ‘{0}’" msgstr "" -#: ../SparkleShare/SparkleController.cs:639 +#: ../SparkleShare/SparkleController.cs:671 #, csharp-format msgid "edited ‘{0}’" msgstr "redigerede '{0}'" -#: ../SparkleShare/SparkleController.cs:644 +#: ../SparkleShare/SparkleController.cs:676 #, csharp-format msgid "deleted ‘{0}’" msgstr "slettede '{0}'" -#: ../SparkleShare/SparkleController.cs:653 +#: ../SparkleShare/SparkleController.cs:685 #, csharp-format msgid "and {0} more" msgid_plural "and {0} more" msgstr[0] "" msgstr[1] "" -#: ../SparkleShare/SparkleController.cs:657 +#: ../SparkleShare/SparkleController.cs:689 msgid "did something magical" msgstr "" @@ -319,72 +320,68 @@ msgstr "Lær hvordan du beværte din egen SparkleServer" msgid "Recent Events" msgstr "" -#: ../SparkleShare/SparkleEventLog.cs:131 -#: ../SparkleShare/SparkleEventLog.cs:150 +#: ../SparkleShare/SparkleEventLog.cs:148 +#: ../SparkleShare/SparkleEventLog.cs:173 msgid "All Folders" msgstr "" -#: ../SparkleShare/SparkleShare.cs:56 +#: ../SparkleShare/SparkleShare.cs:53 msgid "Sorry, you can't run SparkleShare with these permissions." msgstr "Beklager, du kan ikke køre SparkleShare med disse rettigheder." -#: ../SparkleShare/SparkleShare.cs:57 +#: ../SparkleShare/SparkleShare.cs:54 msgid "Things would go utterly wrong." msgstr "Det ville gå helt galt." -#: ../SparkleShare/SparkleShare.cs:66 -msgid "Don't show the notification icon" -msgstr "Vis ikke besked-ikon." - -#: ../SparkleShare/SparkleShare.cs:67 +#: ../SparkleShare/SparkleShare.cs:61 msgid "Print version information" msgstr "Vis versioninformation" -#: ../SparkleShare/SparkleShare.cs:68 +#: ../SparkleShare/SparkleShare.cs:62 msgid "Show this help text" msgstr "Vis denne hjælpetekst" -#: ../SparkleShare/SparkleShare.cs:115 +#: ../SparkleShare/SparkleShare.cs:109 msgid "SparkleShare, a collaboration and sharing tool." msgstr "" -#: ../SparkleShare/SparkleShare.cs:116 +#: ../SparkleShare/SparkleShare.cs:110 msgid "Copyright (C) 2010 Hylke Bons" msgstr "Copyright(C) 2010 Hylke Bons" -#: ../SparkleShare/SparkleShare.cs:118 +#: ../SparkleShare/SparkleShare.cs:112 msgid "This program comes with ABSOLUTELY NO WARRANTY." msgstr "Dette program modtages UDEN NOGEN GARANTIER OVERHOVEDET." -#: ../SparkleShare/SparkleShare.cs:120 +#: ../SparkleShare/SparkleShare.cs:114 msgid "This is free software, and you are welcome to redistribute it " msgstr "Dette er fri software, og du er velkommen til at distribuere den " -#: ../SparkleShare/SparkleShare.cs:121 +#: ../SparkleShare/SparkleShare.cs:115 msgid "under certain conditions. Please read the GNU GPLv3 for details." msgstr "under visse betingelser. Læs venligst GNU GPL v3 for detaljer." -#: ../SparkleShare/SparkleShare.cs:123 +#: ../SparkleShare/SparkleShare.cs:117 msgid "SparkleShare automatically syncs Git repositories in " msgstr "SparkleShare synkroniserer automatisk Git-depoter i " -#: ../SparkleShare/SparkleShare.cs:124 +#: ../SparkleShare/SparkleShare.cs:118 msgid "the ~/SparkleShare folder with their remote origins." msgstr "mappen ~/SparkleShare med deres fjerne kilder." -#: ../SparkleShare/SparkleShare.cs:126 +#: ../SparkleShare/SparkleShare.cs:120 msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..." msgstr "Anvendelse: sparkleshare [start|stop|restart] [OPTION]..." -#: ../SparkleShare/SparkleShare.cs:127 +#: ../SparkleShare/SparkleShare.cs:121 msgid "Sync SparkleShare folder with remote repositories." msgstr "Synkroniser SparkleShare-mappe med fjerndepot" -#: ../SparkleShare/SparkleShare.cs:129 +#: ../SparkleShare/SparkleShare.cs:123 msgid "Arguments:" msgstr "Argumenter:" -#: ../SparkleShare/SparkleShare.cs:139 +#: ../SparkleShare/SparkleShare.cs:133 msgid "SparkleShare " msgstr "SparkleShare " @@ -414,11 +411,11 @@ msgstr "" msgid "Quit" msgstr "Afslut" -#: ../SparkleShare/SparkleUI.cs:96 +#: ../SparkleShare/SparkleUI.cs:99 msgid "Ouch! Mid-air collision!" msgstr "Av! Luftkollision!" -#: ../SparkleShare/SparkleUI.cs:97 +#: ../SparkleShare/SparkleUI.cs:100 msgid "Don't worry, SparkleShare made a copy of each conflicting file." msgstr "" "Bare rolig, SparkleShare kopierede alle filer der gav anledning til " diff --git a/po/de.po b/po/de.po index f7558d89..3757fcdf 100644 --- a/po/de.po +++ b/po/de.po @@ -4,6 +4,7 @@ # we apologise for any incovenience this may have caused and we hope to bring them # back in the future. # +# , 2011. # , 2011. # kabum , 2011. # kxnop , 2011. @@ -14,31 +15,32 @@ msgid "" msgstr "" "Project-Id-Version: SparkleShare\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-17 12:09+0200\n" -"PO-Revision-Date: 2011-06-17 10:13+0000\n" +"POT-Creation-Date: 2011-06-29 11:38+0200\n" +"PO-Revision-Date: 2011-06-26 09:22+0000\n" "Last-Translator: deejay1 \n" +"Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:338 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:337 #: ../SparkleShare/SparkleIntro.cs:67 ../SparkleShare/SparkleStatusIcon.cs:345 msgid "Welcome to SparkleShare!" msgstr "Willkommen bei SparkleShare!" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:349 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:348 #: ../SparkleShare/SparkleStatusIcon.cs:357 msgid "Not everything is synced" msgstr "Nicht alles ist synchronisiert" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:359 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:358 #: ../SparkleShare/SparkleStatusIcon.cs:367 msgid "Up to date" msgstr "Schon auf dem aktuellsten Stand." -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:375 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:374 #: ../SparkleShare/SparkleStatusIcon.cs:383 msgid "Syncing…" msgstr "Abgleichen …" @@ -88,42 +90,42 @@ msgstr "_Zeige Mitwirkende" msgid "_Visit Website" msgstr "_Website besuchen" -#: ../SparkleShare/SparkleController.cs:422 +#: ../SparkleShare/SparkleController.cs:455 msgid "ddd MMM d, yyyy" msgstr "ddd MMM d, yyyy" -#: ../SparkleShare/SparkleController.cs:427 +#: ../SparkleShare/SparkleController.cs:460 msgid "ddd MMM d" msgstr "ddd MMM d" -#: ../SparkleShare/SparkleController.cs:629 +#: ../SparkleShare/SparkleController.cs:661 #, csharp-format msgid "added ‘{0}’" msgstr "‘{0}’ hinzugefügt" -#: ../SparkleShare/SparkleController.cs:634 +#: ../SparkleShare/SparkleController.cs:666 #, csharp-format msgid "moved ‘{0}’" msgstr "‘{0}’ verschoben" -#: ../SparkleShare/SparkleController.cs:639 +#: ../SparkleShare/SparkleController.cs:671 #, csharp-format msgid "edited ‘{0}’" msgstr "‘{0}’ bearbeitet" -#: ../SparkleShare/SparkleController.cs:644 +#: ../SparkleShare/SparkleController.cs:676 #, csharp-format msgid "deleted ‘{0}’" msgstr "‘{0}’ gelöscht" -#: ../SparkleShare/SparkleController.cs:653 +#: ../SparkleShare/SparkleController.cs:685 #, csharp-format msgid "and {0} more" msgid_plural "and {0} more" msgstr[0] "und {0} weitere Änderung" msgstr[1] "und {0} weitere Änderungen" -#: ../SparkleShare/SparkleController.cs:657 +#: ../SparkleShare/SparkleController.cs:689 msgid "did something magical" msgstr "etwas magisches wurde getan" @@ -325,78 +327,74 @@ msgstr "Lernen Sie, wie Sie Ihren eigenen SparkleServer betreiben können" #: ../SparkleShare/SparkleEventLog.cs:61 msgid "Recent Events" -msgstr "" +msgstr "Letzte Ereignisse" -#: ../SparkleShare/SparkleEventLog.cs:131 -#: ../SparkleShare/SparkleEventLog.cs:150 +#: ../SparkleShare/SparkleEventLog.cs:148 +#: ../SparkleShare/SparkleEventLog.cs:173 msgid "All Folders" -msgstr "" +msgstr "Alle Ordner" -#: ../SparkleShare/SparkleShare.cs:56 +#: ../SparkleShare/SparkleShare.cs:53 msgid "Sorry, you can't run SparkleShare with these permissions." msgstr "" "Entschuldigung, SparkleShare kann mit diesen Rechten nicht ausgeführt " "werden." -#: ../SparkleShare/SparkleShare.cs:57 +#: ../SparkleShare/SparkleShare.cs:54 msgid "Things would go utterly wrong." msgstr "Alles würde völlig schief gehen." -#: ../SparkleShare/SparkleShare.cs:66 -msgid "Don't show the notification icon" -msgstr "Benachrichtigungssymbol nicht anzeigen." - -#: ../SparkleShare/SparkleShare.cs:67 +#: ../SparkleShare/SparkleShare.cs:61 msgid "Print version information" msgstr "Versionsinformationen anzeigen" -#: ../SparkleShare/SparkleShare.cs:68 +#: ../SparkleShare/SparkleShare.cs:62 msgid "Show this help text" msgstr "Diesen Hilfetext anzeigen" -#: ../SparkleShare/SparkleShare.cs:115 +#: ../SparkleShare/SparkleShare.cs:109 msgid "SparkleShare, a collaboration and sharing tool." msgstr "SparkleShare, ein Werkzeug für verteilte Zusammenarbeit." -#: ../SparkleShare/SparkleShare.cs:116 +#: ../SparkleShare/SparkleShare.cs:110 msgid "Copyright (C) 2010 Hylke Bons" msgstr "Copyright (C) 2010 Hylke Bons" -#: ../SparkleShare/SparkleShare.cs:118 +#: ../SparkleShare/SparkleShare.cs:112 msgid "This program comes with ABSOLUTELY NO WARRANTY." msgstr "Diese Anwendung kommt OHNE IRGENDEINE GARANTIE." -#: ../SparkleShare/SparkleShare.cs:120 +#: ../SparkleShare/SparkleShare.cs:114 msgid "This is free software, and you are welcome to redistribute it " msgstr "Dies ist freie Software, die Sie gerne weitergeben dürfen" -#: ../SparkleShare/SparkleShare.cs:121 +#: ../SparkleShare/SparkleShare.cs:115 msgid "under certain conditions. Please read the GNU GPLv3 for details." msgstr "" "unter bestimmten Bedingungen. Bitte lesen Sie die GNU GPLv3 für weitere " "Details." -#: ../SparkleShare/SparkleShare.cs:123 +#: ../SparkleShare/SparkleShare.cs:117 msgid "SparkleShare automatically syncs Git repositories in " msgstr "SparkleShare synchronisiert sich automatisch mit Git Repositories" -#: ../SparkleShare/SparkleShare.cs:124 +#: ../SparkleShare/SparkleShare.cs:118 msgid "the ~/SparkleShare folder with their remote origins." msgstr "den SparkleShare-Ordner mit den entfernten Quellen." -#: ../SparkleShare/SparkleShare.cs:126 +#: ../SparkleShare/SparkleShare.cs:120 msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..." msgstr "Verwendung: sparkleshare [start|stop|restart] [OPTION]..." -#: ../SparkleShare/SparkleShare.cs:127 +#: ../SparkleShare/SparkleShare.cs:121 msgid "Sync SparkleShare folder with remote repositories." msgstr "SparkleShare Ordner mit dem Remote-Repository synchronisieren." -#: ../SparkleShare/SparkleShare.cs:129 +#: ../SparkleShare/SparkleShare.cs:123 msgid "Arguments:" msgstr "Parameter:" -#: ../SparkleShare/SparkleShare.cs:139 +#: ../SparkleShare/SparkleShare.cs:133 msgid "SparkleShare " msgstr "SparkleShare" @@ -411,7 +409,7 @@ msgstr "Remote-Ordner hinzufügen..." #: ../SparkleShare/SparkleStatusIcon.cs:242 msgid "Show Recent Events" -msgstr "" +msgstr "Zeige letzte Ereignisse" #: ../SparkleShare/SparkleStatusIcon.cs:262 msgid "Turn Notifications Off" @@ -426,11 +424,11 @@ msgstr "Benachrichtigungen aktivieren" msgid "Quit" msgstr "Beenden" -#: ../SparkleShare/SparkleUI.cs:96 +#: ../SparkleShare/SparkleUI.cs:99 msgid "Ouch! Mid-air collision!" msgstr "Autsch! Kollision in der Luft!" -#: ../SparkleShare/SparkleUI.cs:97 +#: ../SparkleShare/SparkleUI.cs:100 msgid "Don't worry, SparkleShare made a copy of each conflicting file." msgstr "" "Keine Sorge, SparkleShare hat eine Kopie jeder im Konflikt stehenden Datei " diff --git a/po/el.po b/po/el.po index 537c84c7..668e08a6 100644 --- a/po/el.po +++ b/po/el.po @@ -4,50 +4,52 @@ # we apologise for any incovenience this may have caused and we hope to bring them # back in the future. # +# , 2011. msgid "" msgstr "" "Project-Id-Version: SparkleShare\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-17 12:09+0200\n" -"PO-Revision-Date: 2011-06-17 10:13+0000\n" -"Last-Translator: deejay1 \n" +"POT-Creation-Date: 2011-06-29 11:38+0200\n" +"PO-Revision-Date: 2011-07-13 19:17+0000\n" +"Last-Translator: kapcom01 \n" +"Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: el\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:338 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:337 #: ../SparkleShare/SparkleIntro.cs:67 ../SparkleShare/SparkleStatusIcon.cs:345 msgid "Welcome to SparkleShare!" msgstr "" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:349 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:348 #: ../SparkleShare/SparkleStatusIcon.cs:357 msgid "Not everything is synced" msgstr "" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:359 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:358 #: ../SparkleShare/SparkleStatusIcon.cs:367 msgid "Up to date" msgstr "" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:375 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:374 #: ../SparkleShare/SparkleStatusIcon.cs:383 msgid "Syncing…" msgstr "" #: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113 msgid "Copy Web Link" -msgstr "" +msgstr "Αντιγραφή Συνδέσμου Ιστού" #: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:114 msgid "Copy the web address of this file to the clipboard" -msgstr "" +msgstr "Αντιγραφή της διεύθυνσης ιστού αυτού του αρχείου στο πρόχειρο" #: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:147 msgid "Get Earlier Version" -msgstr "" +msgstr "Λήψη Προηγούμενης Έκδοσης" #: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:148 msgid "Make a copy of an earlier version in this folder" @@ -82,42 +84,42 @@ msgstr "" msgid "_Visit Website" msgstr "" -#: ../SparkleShare/SparkleController.cs:422 +#: ../SparkleShare/SparkleController.cs:455 msgid "ddd MMM d, yyyy" msgstr "" -#: ../SparkleShare/SparkleController.cs:427 +#: ../SparkleShare/SparkleController.cs:460 msgid "ddd MMM d" msgstr "" -#: ../SparkleShare/SparkleController.cs:629 +#: ../SparkleShare/SparkleController.cs:661 #, csharp-format msgid "added ‘{0}’" msgstr "" -#: ../SparkleShare/SparkleController.cs:634 +#: ../SparkleShare/SparkleController.cs:666 #, csharp-format msgid "moved ‘{0}’" msgstr "" -#: ../SparkleShare/SparkleController.cs:639 +#: ../SparkleShare/SparkleController.cs:671 #, csharp-format msgid "edited ‘{0}’" msgstr "" -#: ../SparkleShare/SparkleController.cs:644 +#: ../SparkleShare/SparkleController.cs:676 #, csharp-format msgid "deleted ‘{0}’" msgstr "" -#: ../SparkleShare/SparkleController.cs:653 +#: ../SparkleShare/SparkleController.cs:685 #, csharp-format msgid "and {0} more" msgid_plural "and {0} more" msgstr[0] "" msgstr[1] "" -#: ../SparkleShare/SparkleController.cs:657 +#: ../SparkleShare/SparkleController.cs:689 msgid "did something magical" msgstr "" @@ -309,72 +311,68 @@ msgstr "" msgid "Recent Events" msgstr "" -#: ../SparkleShare/SparkleEventLog.cs:131 -#: ../SparkleShare/SparkleEventLog.cs:150 +#: ../SparkleShare/SparkleEventLog.cs:148 +#: ../SparkleShare/SparkleEventLog.cs:173 msgid "All Folders" msgstr "" -#: ../SparkleShare/SparkleShare.cs:56 +#: ../SparkleShare/SparkleShare.cs:53 msgid "Sorry, you can't run SparkleShare with these permissions." msgstr "" -#: ../SparkleShare/SparkleShare.cs:57 +#: ../SparkleShare/SparkleShare.cs:54 msgid "Things would go utterly wrong." msgstr "Τα πράγματα θα πάνε πολύ άσχημα." -#: ../SparkleShare/SparkleShare.cs:66 -msgid "Don't show the notification icon" -msgstr "" - -#: ../SparkleShare/SparkleShare.cs:67 +#: ../SparkleShare/SparkleShare.cs:61 msgid "Print version information" msgstr "" -#: ../SparkleShare/SparkleShare.cs:68 +#: ../SparkleShare/SparkleShare.cs:62 msgid "Show this help text" msgstr "" -#: ../SparkleShare/SparkleShare.cs:115 +#: ../SparkleShare/SparkleShare.cs:109 msgid "SparkleShare, a collaboration and sharing tool." msgstr "" -#: ../SparkleShare/SparkleShare.cs:116 +#: ../SparkleShare/SparkleShare.cs:110 msgid "Copyright (C) 2010 Hylke Bons" msgstr "" -#: ../SparkleShare/SparkleShare.cs:118 +#: ../SparkleShare/SparkleShare.cs:112 msgid "This program comes with ABSOLUTELY NO WARRANTY." msgstr "" -#: ../SparkleShare/SparkleShare.cs:120 +#: ../SparkleShare/SparkleShare.cs:114 msgid "This is free software, and you are welcome to redistribute it " msgstr "" -#: ../SparkleShare/SparkleShare.cs:121 +#: ../SparkleShare/SparkleShare.cs:115 msgid "under certain conditions. Please read the GNU GPLv3 for details." msgstr "" -#: ../SparkleShare/SparkleShare.cs:123 +#: ../SparkleShare/SparkleShare.cs:117 msgid "SparkleShare automatically syncs Git repositories in " msgstr "" -#: ../SparkleShare/SparkleShare.cs:124 +#: ../SparkleShare/SparkleShare.cs:118 msgid "the ~/SparkleShare folder with their remote origins." msgstr "" -#: ../SparkleShare/SparkleShare.cs:126 +#: ../SparkleShare/SparkleShare.cs:120 msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..." msgstr "" -#: ../SparkleShare/SparkleShare.cs:127 +#: ../SparkleShare/SparkleShare.cs:121 msgid "Sync SparkleShare folder with remote repositories." msgstr "" -#: ../SparkleShare/SparkleShare.cs:129 +#: ../SparkleShare/SparkleShare.cs:123 msgid "Arguments:" msgstr "" -#: ../SparkleShare/SparkleShare.cs:139 +#: ../SparkleShare/SparkleShare.cs:133 msgid "SparkleShare " msgstr "" @@ -404,11 +402,11 @@ msgstr "" msgid "Quit" msgstr "" -#: ../SparkleShare/SparkleUI.cs:96 +#: ../SparkleShare/SparkleUI.cs:99 msgid "Ouch! Mid-air collision!" msgstr "" -#: ../SparkleShare/SparkleUI.cs:97 +#: ../SparkleShare/SparkleUI.cs:100 msgid "Don't worry, SparkleShare made a copy of each conflicting file." msgstr "" diff --git a/po/eo.po b/po/eo.po index c124a822..a9284345 100644 --- a/po/eo.po +++ b/po/eo.po @@ -4,36 +4,38 @@ # we apologise for any incovenience this may have caused and we hope to bring them # back in the future. # +# , 2011. # eliovir , 2011. msgid "" msgstr "" "Project-Id-Version: SparkleShare\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-17 12:09+0200\n" -"PO-Revision-Date: 2011-06-17 10:13+0000\n" -"Last-Translator: deejay1 \n" +"POT-Creation-Date: 2011-06-29 11:38+0200\n" +"PO-Revision-Date: 2011-07-12 21:24+0000\n" +"Last-Translator: tzwenn \n" +"Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: eo\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:338 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:337 #: ../SparkleShare/SparkleIntro.cs:67 ../SparkleShare/SparkleStatusIcon.cs:345 msgid "Welcome to SparkleShare!" msgstr "Bonvenon ĉe SparkleShare!" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:349 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:348 #: ../SparkleShare/SparkleStatusIcon.cs:357 msgid "Not everything is synced" msgstr "" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:359 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:358 #: ../SparkleShare/SparkleStatusIcon.cs:367 msgid "Up to date" msgstr "" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:375 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:374 #: ../SparkleShare/SparkleStatusIcon.cs:383 msgid "Syncing…" msgstr "" @@ -83,42 +85,42 @@ msgstr "" msgid "_Visit Website" msgstr "_Viziti retejon" -#: ../SparkleShare/SparkleController.cs:422 +#: ../SparkleShare/SparkleController.cs:455 msgid "ddd MMM d, yyyy" msgstr "" -#: ../SparkleShare/SparkleController.cs:427 +#: ../SparkleShare/SparkleController.cs:460 msgid "ddd MMM d" msgstr "" -#: ../SparkleShare/SparkleController.cs:629 +#: ../SparkleShare/SparkleController.cs:661 #, csharp-format msgid "added ‘{0}’" msgstr "" -#: ../SparkleShare/SparkleController.cs:634 +#: ../SparkleShare/SparkleController.cs:666 #, csharp-format msgid "moved ‘{0}’" msgstr "" -#: ../SparkleShare/SparkleController.cs:639 +#: ../SparkleShare/SparkleController.cs:671 #, csharp-format msgid "edited ‘{0}’" msgstr "" -#: ../SparkleShare/SparkleController.cs:644 +#: ../SparkleShare/SparkleController.cs:676 #, csharp-format msgid "deleted ‘{0}’" msgstr "" -#: ../SparkleShare/SparkleController.cs:653 +#: ../SparkleShare/SparkleController.cs:685 #, csharp-format msgid "and {0} more" msgid_plural "and {0} more" msgstr[0] "" msgstr[1] "" -#: ../SparkleShare/SparkleController.cs:657 +#: ../SparkleShare/SparkleController.cs:689 msgid "did something magical" msgstr "" @@ -178,7 +180,7 @@ msgstr "" #: ../SparkleShare/SparkleIntro.cs:206 msgid "Gitorious" -msgstr "" +msgstr "Gitorious" #: ../SparkleShare/SparkleIntro.cs:208 msgid "Completely Free as in Freedom infrastructure." @@ -210,7 +212,7 @@ msgstr "Nomo de la dosierujo" #: ../SparkleShare/SparkleIntro.cs:269 msgid "Sync" -msgstr "" +msgstr "Sinkronigi" #: ../SparkleShare/SparkleIntro.cs:312 msgid "Cancel" @@ -282,7 +284,7 @@ msgstr "" #: ../SparkleShare/SparkleIntro.cs:528 #, csharp-format msgid "Syncing folder ‘{0}’…" -msgstr "" +msgstr "Sinkronigi dosierujon '{0}'..." #: ../SparkleShare/SparkleIntro.cs:535 msgid "This may take a while.\n" @@ -310,72 +312,68 @@ msgstr "" msgid "Recent Events" msgstr "" -#: ../SparkleShare/SparkleEventLog.cs:131 -#: ../SparkleShare/SparkleEventLog.cs:150 +#: ../SparkleShare/SparkleEventLog.cs:148 +#: ../SparkleShare/SparkleEventLog.cs:173 msgid "All Folders" -msgstr "" +msgstr "Ĉiuj dosierujoj" -#: ../SparkleShare/SparkleShare.cs:56 +#: ../SparkleShare/SparkleShare.cs:53 msgid "Sorry, you can't run SparkleShare with these permissions." msgstr "" -#: ../SparkleShare/SparkleShare.cs:57 +#: ../SparkleShare/SparkleShare.cs:54 msgid "Things would go utterly wrong." msgstr "" -#: ../SparkleShare/SparkleShare.cs:66 -msgid "Don't show the notification icon" -msgstr "" - -#: ../SparkleShare/SparkleShare.cs:67 +#: ../SparkleShare/SparkleShare.cs:61 msgid "Print version information" msgstr "" -#: ../SparkleShare/SparkleShare.cs:68 +#: ../SparkleShare/SparkleShare.cs:62 msgid "Show this help text" msgstr "" -#: ../SparkleShare/SparkleShare.cs:115 +#: ../SparkleShare/SparkleShare.cs:109 msgid "SparkleShare, a collaboration and sharing tool." msgstr "" -#: ../SparkleShare/SparkleShare.cs:116 +#: ../SparkleShare/SparkleShare.cs:110 msgid "Copyright (C) 2010 Hylke Bons" -msgstr "" +msgstr "Kopirajto (C) 2010 Hylke Bons" -#: ../SparkleShare/SparkleShare.cs:118 +#: ../SparkleShare/SparkleShare.cs:112 msgid "This program comes with ABSOLUTELY NO WARRANTY." msgstr "" -#: ../SparkleShare/SparkleShare.cs:120 +#: ../SparkleShare/SparkleShare.cs:114 msgid "This is free software, and you are welcome to redistribute it " msgstr "" -#: ../SparkleShare/SparkleShare.cs:121 +#: ../SparkleShare/SparkleShare.cs:115 msgid "under certain conditions. Please read the GNU GPLv3 for details." msgstr "" -#: ../SparkleShare/SparkleShare.cs:123 +#: ../SparkleShare/SparkleShare.cs:117 msgid "SparkleShare automatically syncs Git repositories in " msgstr "" -#: ../SparkleShare/SparkleShare.cs:124 +#: ../SparkleShare/SparkleShare.cs:118 msgid "the ~/SparkleShare folder with their remote origins." msgstr "" -#: ../SparkleShare/SparkleShare.cs:126 +#: ../SparkleShare/SparkleShare.cs:120 msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..." msgstr "" -#: ../SparkleShare/SparkleShare.cs:127 +#: ../SparkleShare/SparkleShare.cs:121 msgid "Sync SparkleShare folder with remote repositories." msgstr "" -#: ../SparkleShare/SparkleShare.cs:129 +#: ../SparkleShare/SparkleShare.cs:123 msgid "Arguments:" msgstr "" -#: ../SparkleShare/SparkleShare.cs:139 +#: ../SparkleShare/SparkleShare.cs:133 msgid "SparkleShare " msgstr "" @@ -405,11 +403,11 @@ msgstr "" msgid "Quit" msgstr "" -#: ../SparkleShare/SparkleUI.cs:96 +#: ../SparkleShare/SparkleUI.cs:99 msgid "Ouch! Mid-air collision!" msgstr "" -#: ../SparkleShare/SparkleUI.cs:97 +#: ../SparkleShare/SparkleUI.cs:100 msgid "Don't worry, SparkleShare made a copy of each conflicting file." msgstr "" diff --git a/po/es.po b/po/es.po index 39206733..d0b40118 100644 --- a/po/es.po +++ b/po/es.po @@ -4,16 +4,15 @@ # we apologise for any incovenience this may have caused and we hope to bring them # back in the future. # -# , 2011. # , 2011. -# jamelrom , 2011. +# , 2011. msgid "" msgstr "" "Project-Id-Version: SparkleShare\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-17 12:09+0200\n" -"PO-Revision-Date: 2011-06-17 10:13+0000\n" -"Last-Translator: deejay1 \n" +"POT-Creation-Date: 2011-06-29 11:38+0200\n" +"PO-Revision-Date: 2011-07-01 09:30+0000\n" +"Last-Translator: jamelrom \n" "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/sparkleshare/team/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,22 +20,22 @@ msgstr "" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:338 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:337 #: ../SparkleShare/SparkleIntro.cs:67 ../SparkleShare/SparkleStatusIcon.cs:345 msgid "Welcome to SparkleShare!" msgstr "¡Bienvenido a SparkleShare!" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:349 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:348 #: ../SparkleShare/SparkleStatusIcon.cs:357 msgid "Not everything is synced" msgstr "Pendiente de sincronizar" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:359 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:358 #: ../SparkleShare/SparkleStatusIcon.cs:367 msgid "Up to date" msgstr "Actualizado" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:375 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:374 #: ../SparkleShare/SparkleStatusIcon.cs:383 msgid "Syncing…" msgstr "Sincronizando..." @@ -86,42 +85,42 @@ msgstr "_Autores" msgid "_Visit Website" msgstr "_Visitar Página Web" -#: ../SparkleShare/SparkleController.cs:422 +#: ../SparkleShare/SparkleController.cs:455 msgid "ddd MMM d, yyyy" msgstr "d. ddd MMMM yyyy" -#: ../SparkleShare/SparkleController.cs:427 +#: ../SparkleShare/SparkleController.cs:460 msgid "ddd MMM d" msgstr "d. ddd MMM" -#: ../SparkleShare/SparkleController.cs:629 +#: ../SparkleShare/SparkleController.cs:661 #, csharp-format msgid "added ‘{0}’" msgstr "añadido '{0}'" -#: ../SparkleShare/SparkleController.cs:634 +#: ../SparkleShare/SparkleController.cs:666 #, csharp-format msgid "moved ‘{0}’" msgstr "movido '{0}'" -#: ../SparkleShare/SparkleController.cs:639 +#: ../SparkleShare/SparkleController.cs:671 #, csharp-format msgid "edited ‘{0}’" msgstr "editado '{0}'" -#: ../SparkleShare/SparkleController.cs:644 +#: ../SparkleShare/SparkleController.cs:676 #, csharp-format msgid "deleted ‘{0}’" msgstr "eliminado '{0}'" -#: ../SparkleShare/SparkleController.cs:653 +#: ../SparkleShare/SparkleController.cs:685 #, csharp-format msgid "and {0} more" msgid_plural "and {0} more" msgstr[0] "y {0} más" msgstr[1] "y {0} más" -#: ../SparkleShare/SparkleController.cs:657 +#: ../SparkleShare/SparkleController.cs:689 msgid "did something magical" msgstr "algo mágico ocurrió" @@ -324,75 +323,71 @@ msgstr "Aprenda como hospedar su propio SparkleServer" #: ../SparkleShare/SparkleEventLog.cs:61 msgid "Recent Events" -msgstr "" +msgstr "Eventos recientes" -#: ../SparkleShare/SparkleEventLog.cs:131 -#: ../SparkleShare/SparkleEventLog.cs:150 +#: ../SparkleShare/SparkleEventLog.cs:148 +#: ../SparkleShare/SparkleEventLog.cs:173 msgid "All Folders" -msgstr "" +msgstr "Todas las carpetas" -#: ../SparkleShare/SparkleShare.cs:56 +#: ../SparkleShare/SparkleShare.cs:53 msgid "Sorry, you can't run SparkleShare with these permissions." msgstr "Perdón, no puede ejecutar SparkleShare con estos permisos." -#: ../SparkleShare/SparkleShare.cs:57 +#: ../SparkleShare/SparkleShare.cs:54 msgid "Things would go utterly wrong." msgstr "Las cosas irían absolutamente mal." -#: ../SparkleShare/SparkleShare.cs:66 -msgid "Don't show the notification icon" -msgstr "No mostrar el icono de notificaciones" - -#: ../SparkleShare/SparkleShare.cs:67 +#: ../SparkleShare/SparkleShare.cs:61 msgid "Print version information" msgstr "Muestra la información de la versión" -#: ../SparkleShare/SparkleShare.cs:68 +#: ../SparkleShare/SparkleShare.cs:62 msgid "Show this help text" msgstr "Mostrar este texto de ayuda" -#: ../SparkleShare/SparkleShare.cs:115 +#: ../SparkleShare/SparkleShare.cs:109 msgid "SparkleShare, a collaboration and sharing tool." msgstr "SparkleShare, una herramienta de compartición y colaboración" -#: ../SparkleShare/SparkleShare.cs:116 +#: ../SparkleShare/SparkleShare.cs:110 msgid "Copyright (C) 2010 Hylke Bons" msgstr "Copyright (C) 2010 Hylke Bons" -#: ../SparkleShare/SparkleShare.cs:118 +#: ../SparkleShare/SparkleShare.cs:112 msgid "This program comes with ABSOLUTELY NO WARRANTY." msgstr "Este programa viene SIN NINGUNA GARANTÍA." -#: ../SparkleShare/SparkleShare.cs:120 +#: ../SparkleShare/SparkleShare.cs:114 msgid "This is free software, and you are welcome to redistribute it " msgstr "Esto es software libre, y esta invitado a redistribuirlo" -#: ../SparkleShare/SparkleShare.cs:121 +#: ../SparkleShare/SparkleShare.cs:115 msgid "under certain conditions. Please read the GNU GPLv3 for details." msgstr "" "bajo determinadas condiciones. Por favor lea la GNU GPLv3 para más detalles." -#: ../SparkleShare/SparkleShare.cs:123 +#: ../SparkleShare/SparkleShare.cs:117 msgid "SparkleShare automatically syncs Git repositories in " msgstr "SparkleShare sincroniza automaticamente repositorios Git en " -#: ../SparkleShare/SparkleShare.cs:124 +#: ../SparkleShare/SparkleShare.cs:118 msgid "the ~/SparkleShare folder with their remote origins." msgstr "La carpeta ~/SparkleShare con su origen remoto." -#: ../SparkleShare/SparkleShare.cs:126 +#: ../SparkleShare/SparkleShare.cs:120 msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..." msgstr "Uso: sparkleshare [start|stop|restart] [OPCION]..." -#: ../SparkleShare/SparkleShare.cs:127 +#: ../SparkleShare/SparkleShare.cs:121 msgid "Sync SparkleShare folder with remote repositories." msgstr "Sincronizar carpeta SparkleShare con el repositorio remoto." -#: ../SparkleShare/SparkleShare.cs:129 +#: ../SparkleShare/SparkleShare.cs:123 msgid "Arguments:" msgstr "Parámetros:" -#: ../SparkleShare/SparkleShare.cs:139 +#: ../SparkleShare/SparkleShare.cs:133 msgid "SparkleShare " msgstr "SparkleShare" @@ -407,7 +402,7 @@ msgstr "Añadir carpeta remota..." #: ../SparkleShare/SparkleStatusIcon.cs:242 msgid "Show Recent Events" -msgstr "" +msgstr "Mostrar eventos recientes" #: ../SparkleShare/SparkleStatusIcon.cs:262 msgid "Turn Notifications Off" @@ -422,11 +417,11 @@ msgstr "Activar las notificaciones" msgid "Quit" msgstr "Salir" -#: ../SparkleShare/SparkleUI.cs:96 +#: ../SparkleShare/SparkleUI.cs:99 msgid "Ouch! Mid-air collision!" msgstr "¡Ohh! ¡Hay una colisión!" -#: ../SparkleShare/SparkleUI.cs:97 +#: ../SparkleShare/SparkleUI.cs:100 msgid "Don't worry, SparkleShare made a copy of each conflicting file." msgstr "" "No se preocupe, SparkleShare hace una copia de cada archivo en conflicto." diff --git a/po/fi.po b/po/fi.po index 73c2134e..37e56ea9 100644 --- a/po/fi.po +++ b/po/fi.po @@ -11,31 +11,32 @@ msgid "" msgstr "" "Project-Id-Version: SparkleShare\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-17 12:09+0200\n" -"PO-Revision-Date: 2011-06-17 10:13+0000\n" +"POT-Creation-Date: 2011-06-29 11:38+0200\n" +"PO-Revision-Date: 2011-06-26 09:22+0000\n" "Last-Translator: deejay1 \n" +"Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: fi\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:338 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:337 #: ../SparkleShare/SparkleIntro.cs:67 ../SparkleShare/SparkleStatusIcon.cs:345 msgid "Welcome to SparkleShare!" msgstr "Tervetuloa SparkleShareen!" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:349 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:348 #: ../SparkleShare/SparkleStatusIcon.cs:357 msgid "Not everything is synced" msgstr "Kaikkea ei ole synkronoitu" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:359 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:358 #: ../SparkleShare/SparkleStatusIcon.cs:367 msgid "Up to date" msgstr "Ajantasalla" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:375 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:374 #: ../SparkleShare/SparkleStatusIcon.cs:383 msgid "Syncing…" msgstr "Synkronoidaan..." @@ -85,42 +86,42 @@ msgstr "_Näytä osallistujat" msgid "_Visit Website" msgstr "_Käy nettisivulla" -#: ../SparkleShare/SparkleController.cs:422 +#: ../SparkleShare/SparkleController.cs:455 msgid "ddd MMM d, yyyy" msgstr "ppp kkk d, vvvv" -#: ../SparkleShare/SparkleController.cs:427 +#: ../SparkleShare/SparkleController.cs:460 msgid "ddd MMM d" msgstr "ppp kkk d" -#: ../SparkleShare/SparkleController.cs:629 +#: ../SparkleShare/SparkleController.cs:661 #, csharp-format msgid "added ‘{0}’" msgstr "lisätty '{0}'" -#: ../SparkleShare/SparkleController.cs:634 +#: ../SparkleShare/SparkleController.cs:666 #, csharp-format msgid "moved ‘{0}’" msgstr "siirrettiin '{0}'" -#: ../SparkleShare/SparkleController.cs:639 +#: ../SparkleShare/SparkleController.cs:671 #, csharp-format msgid "edited ‘{0}’" msgstr "muokattu '{0}'" -#: ../SparkleShare/SparkleController.cs:644 +#: ../SparkleShare/SparkleController.cs:676 #, csharp-format msgid "deleted ‘{0}’" msgstr "poistettu '{0}'" -#: ../SparkleShare/SparkleController.cs:653 +#: ../SparkleShare/SparkleController.cs:685 #, csharp-format msgid "and {0} more" msgid_plural "and {0} more" msgstr[0] "" msgstr[1] "" -#: ../SparkleShare/SparkleController.cs:657 +#: ../SparkleShare/SparkleController.cs:689 msgid "did something magical" msgstr "teki jotain maagista" @@ -319,72 +320,68 @@ msgstr "Selvitä, kuinka voit pitää omaa SparkleServer-palvelinta" msgid "Recent Events" msgstr "" -#: ../SparkleShare/SparkleEventLog.cs:131 -#: ../SparkleShare/SparkleEventLog.cs:150 +#: ../SparkleShare/SparkleEventLog.cs:148 +#: ../SparkleShare/SparkleEventLog.cs:173 msgid "All Folders" msgstr "" -#: ../SparkleShare/SparkleShare.cs:56 +#: ../SparkleShare/SparkleShare.cs:53 msgid "Sorry, you can't run SparkleShare with these permissions." msgstr "Et voi ajaa SparkleSharea näillä oikeuksilla." -#: ../SparkleShare/SparkleShare.cs:57 +#: ../SparkleShare/SparkleShare.cs:54 msgid "Things would go utterly wrong." msgstr "Asiat menevät paljon pieleen." -#: ../SparkleShare/SparkleShare.cs:66 -msgid "Don't show the notification icon" -msgstr "Älä näytä huomautusikonia" - -#: ../SparkleShare/SparkleShare.cs:67 +#: ../SparkleShare/SparkleShare.cs:61 msgid "Print version information" msgstr "Tulosta versiotiedot" -#: ../SparkleShare/SparkleShare.cs:68 +#: ../SparkleShare/SparkleShare.cs:62 msgid "Show this help text" msgstr "Näytä tämä ohjeteksti" -#: ../SparkleShare/SparkleShare.cs:115 +#: ../SparkleShare/SparkleShare.cs:109 msgid "SparkleShare, a collaboration and sharing tool." msgstr "SparkleShare, yhteistyö- ja jakotyökalu." -#: ../SparkleShare/SparkleShare.cs:116 +#: ../SparkleShare/SparkleShare.cs:110 msgid "Copyright (C) 2010 Hylke Bons" msgstr "Copyright (C) 2010 Hylke Bons" -#: ../SparkleShare/SparkleShare.cs:118 +#: ../SparkleShare/SparkleShare.cs:112 msgid "This program comes with ABSOLUTELY NO WARRANTY." msgstr "Tällä ohjelmalla EI OLE TAKUUTA." -#: ../SparkleShare/SparkleShare.cs:120 +#: ../SparkleShare/SparkleShare.cs:114 msgid "This is free software, and you are welcome to redistribute it " msgstr "Tämä on vapaa ohjelma, ja saat vapaasti levittää sitä" -#: ../SparkleShare/SparkleShare.cs:121 +#: ../SparkleShare/SparkleShare.cs:115 msgid "under certain conditions. Please read the GNU GPLv3 for details." msgstr "tietyin ehdoin. Saat lisätietoja GNU GPLv3:sta." -#: ../SparkleShare/SparkleShare.cs:123 +#: ../SparkleShare/SparkleShare.cs:117 msgid "SparkleShare automatically syncs Git repositories in " msgstr "SparkleShare synkronoi automaattisesti Git-tietokannat" -#: ../SparkleShare/SparkleShare.cs:124 +#: ../SparkleShare/SparkleShare.cs:118 msgid "the ~/SparkleShare folder with their remote origins." msgstr "~/SparkleShare-kansiosta etäpalvelinten kanssa." -#: ../SparkleShare/SparkleShare.cs:126 +#: ../SparkleShare/SparkleShare.cs:120 msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..." msgstr "Käyttö: sparkleshare [start|stop|restart] [asetukset]" -#: ../SparkleShare/SparkleShare.cs:127 +#: ../SparkleShare/SparkleShare.cs:121 msgid "Sync SparkleShare folder with remote repositories." msgstr "Synkronoi SparkleShare-kansio etätietokantoihin." -#: ../SparkleShare/SparkleShare.cs:129 +#: ../SparkleShare/SparkleShare.cs:123 msgid "Arguments:" msgstr "Parametrit:" -#: ../SparkleShare/SparkleShare.cs:139 +#: ../SparkleShare/SparkleShare.cs:133 msgid "SparkleShare " msgstr "SparkleShare" @@ -414,11 +411,11 @@ msgstr "Ota ilmoitukset käyttöön" msgid "Quit" msgstr "Lopeta" -#: ../SparkleShare/SparkleUI.cs:96 +#: ../SparkleShare/SparkleUI.cs:99 msgid "Ouch! Mid-air collision!" msgstr "Auts! Törmäys!" -#: ../SparkleShare/SparkleUI.cs:97 +#: ../SparkleShare/SparkleUI.cs:100 msgid "Don't worry, SparkleShare made a copy of each conflicting file." msgstr "" "Ei huolta, SparkleShare teki kopion kaikista tiedostoista, joissa on " diff --git a/po/fr.po b/po/fr.po index 9ad5bf93..e017cce3 100644 --- a/po/fr.po +++ b/po/fr.po @@ -12,31 +12,32 @@ msgid "" msgstr "" "Project-Id-Version: SparkleShare\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-17 12:09+0200\n" -"PO-Revision-Date: 2011-06-20 09:05+0000\n" -"Last-Translator: barliguy \n" +"POT-Creation-Date: 2011-06-29 11:38+0200\n" +"PO-Revision-Date: 2011-06-26 09:22+0000\n" +"Last-Translator: deejay1 \n" +"Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:338 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:337 #: ../SparkleShare/SparkleIntro.cs:67 ../SparkleShare/SparkleStatusIcon.cs:345 msgid "Welcome to SparkleShare!" msgstr "Bienvenue sur SparkleShare !" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:349 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:348 #: ../SparkleShare/SparkleStatusIcon.cs:357 msgid "Not everything is synced" msgstr "Tout n'est pas synchronisé" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:359 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:358 #: ../SparkleShare/SparkleStatusIcon.cs:367 msgid "Up to date" msgstr "À jour" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:375 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:374 #: ../SparkleShare/SparkleStatusIcon.cs:383 msgid "Syncing…" msgstr "Synchronisation en cours…" @@ -86,42 +87,42 @@ msgstr "_Afficher les crédits" msgid "_Visit Website" msgstr "_Visiter le site web" -#: ../SparkleShare/SparkleController.cs:422 +#: ../SparkleShare/SparkleController.cs:455 msgid "ddd MMM d, yyyy" msgstr "ddd d MMM yyyy" -#: ../SparkleShare/SparkleController.cs:427 +#: ../SparkleShare/SparkleController.cs:460 msgid "ddd MMM d" msgstr "ddd d MMM" -#: ../SparkleShare/SparkleController.cs:629 +#: ../SparkleShare/SparkleController.cs:661 #, csharp-format msgid "added ‘{0}’" msgstr "Ajouté : « {0} »" -#: ../SparkleShare/SparkleController.cs:634 +#: ../SparkleShare/SparkleController.cs:666 #, csharp-format msgid "moved ‘{0}’" msgstr "Déplacé : « {0} »" -#: ../SparkleShare/SparkleController.cs:639 +#: ../SparkleShare/SparkleController.cs:671 #, csharp-format msgid "edited ‘{0}’" msgstr "Edité : « {0} »" -#: ../SparkleShare/SparkleController.cs:644 +#: ../SparkleShare/SparkleController.cs:676 #, csharp-format msgid "deleted ‘{0}’" msgstr "Supprimé : « {0} »" -#: ../SparkleShare/SparkleController.cs:653 +#: ../SparkleShare/SparkleController.cs:685 #, csharp-format msgid "and {0} more" msgid_plural "and {0} more" msgstr[0] "et {0} de plus" msgstr[1] "et {0} de plus" -#: ../SparkleShare/SparkleController.cs:657 +#: ../SparkleShare/SparkleController.cs:689 msgid "did something magical" msgstr "quelque chose de magique s'est passé" @@ -329,76 +330,72 @@ msgstr "Apprendre à héberger son propre serveur SparkleServer" msgid "Recent Events" msgstr "Évènements récents" -#: ../SparkleShare/SparkleEventLog.cs:131 -#: ../SparkleShare/SparkleEventLog.cs:150 +#: ../SparkleShare/SparkleEventLog.cs:148 +#: ../SparkleShare/SparkleEventLog.cs:173 msgid "All Folders" msgstr "Tous les dossiers" -#: ../SparkleShare/SparkleShare.cs:56 +#: ../SparkleShare/SparkleShare.cs:53 msgid "Sorry, you can't run SparkleShare with these permissions." msgstr "" "Désolé, vous ne disposez pas des autorisations nécessaires pour lancer " "SparkleShare." -#: ../SparkleShare/SparkleShare.cs:57 +#: ../SparkleShare/SparkleShare.cs:54 msgid "Things would go utterly wrong." msgstr "Les choses pourraient très mal tourner." -#: ../SparkleShare/SparkleShare.cs:66 -msgid "Don't show the notification icon" -msgstr "Masquer l’icône de notification" - -#: ../SparkleShare/SparkleShare.cs:67 +#: ../SparkleShare/SparkleShare.cs:61 msgid "Print version information" msgstr "Affiche les informations de la version" -#: ../SparkleShare/SparkleShare.cs:68 +#: ../SparkleShare/SparkleShare.cs:62 msgid "Show this help text" msgstr "Afficher ce texte d’aide" -#: ../SparkleShare/SparkleShare.cs:115 +#: ../SparkleShare/SparkleShare.cs:109 msgid "SparkleShare, a collaboration and sharing tool." msgstr "SparkleShare, outils de collaboration et de partage" -#: ../SparkleShare/SparkleShare.cs:116 +#: ../SparkleShare/SparkleShare.cs:110 msgid "Copyright (C) 2010 Hylke Bons" msgstr "Copyright (C) 2010 Hylke Bons" -#: ../SparkleShare/SparkleShare.cs:118 +#: ../SparkleShare/SparkleShare.cs:112 msgid "This program comes with ABSOLUTELY NO WARRANTY." msgstr "Ce logiciel est diffusé sans AUCUNE GARANTIE." -#: ../SparkleShare/SparkleShare.cs:120 +#: ../SparkleShare/SparkleShare.cs:114 msgid "This is free software, and you are welcome to redistribute it " msgstr "Ce logiciel est libre et vous êtes invité à le re‑distribuer " -#: ../SparkleShare/SparkleShare.cs:121 +#: ../SparkleShare/SparkleShare.cs:115 msgid "under certain conditions. Please read the GNU GPLv3 for details." msgstr "" "sous certaines conditions. Merci de lire la licence GNU GPLv3 pour de plus " "amples informations." -#: ../SparkleShare/SparkleShare.cs:123 +#: ../SparkleShare/SparkleShare.cs:117 msgid "SparkleShare automatically syncs Git repositories in " msgstr "SparkleShare synchronise automatiquement les dépôts Git dans " -#: ../SparkleShare/SparkleShare.cs:124 +#: ../SparkleShare/SparkleShare.cs:118 msgid "the ~/SparkleShare folder with their remote origins." msgstr "le dossier ~/SparkleShare avec leurs racines distantes." -#: ../SparkleShare/SparkleShare.cs:126 +#: ../SparkleShare/SparkleShare.cs:120 msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..." msgstr "Utilisation : sparkleshare [start|stop|restart] [OPTION]…" -#: ../SparkleShare/SparkleShare.cs:127 +#: ../SparkleShare/SparkleShare.cs:121 msgid "Sync SparkleShare folder with remote repositories." msgstr "Synchroniser le dossier SparkleShare avec les dépôts distants." -#: ../SparkleShare/SparkleShare.cs:129 +#: ../SparkleShare/SparkleShare.cs:123 msgid "Arguments:" msgstr "Paramètres :" -#: ../SparkleShare/SparkleShare.cs:139 +#: ../SparkleShare/SparkleShare.cs:133 msgid "SparkleShare " msgstr "SparkleShare" @@ -428,11 +425,11 @@ msgstr "Activer les notifications" msgid "Quit" msgstr "Quitter" -#: ../SparkleShare/SparkleUI.cs:96 +#: ../SparkleShare/SparkleUI.cs:99 msgid "Ouch! Mid-air collision!" msgstr "Outch ! Collision en plein ciel !" -#: ../SparkleShare/SparkleUI.cs:97 +#: ../SparkleShare/SparkleUI.cs:100 msgid "Don't worry, SparkleShare made a copy of each conflicting file." msgstr "" "Ne vous inquiétez pas, SparkleShare a effectué une copie de chacun des " diff --git a/po/he.po b/po/he.po index 63faa8a1..73e49af4 100644 --- a/po/he.po +++ b/po/he.po @@ -8,31 +8,32 @@ msgid "" msgstr "" "Project-Id-Version: SparkleShare\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-17 12:09+0200\n" -"PO-Revision-Date: 2011-06-17 10:13+0000\n" +"POT-Creation-Date: 2011-06-29 11:38+0200\n" +"PO-Revision-Date: 2011-06-26 09:22+0000\n" "Last-Translator: deejay1 \n" +"Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: he\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:338 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:337 #: ../SparkleShare/SparkleIntro.cs:67 ../SparkleShare/SparkleStatusIcon.cs:345 msgid "Welcome to SparkleShare!" msgstr "ברוכים הבאים לספארקלשר!" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:349 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:348 #: ../SparkleShare/SparkleStatusIcon.cs:357 msgid "Not everything is synced" msgstr "לא הכל מסונכרן" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:359 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:358 #: ../SparkleShare/SparkleStatusIcon.cs:367 msgid "Up to date" msgstr "מעודכן" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:375 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:374 #: ../SparkleShare/SparkleStatusIcon.cs:383 msgid "Syncing…" msgstr "מסנכרן..." @@ -82,42 +83,42 @@ msgstr "" msgid "_Visit Website" msgstr "_בקר באתר" -#: ../SparkleShare/SparkleController.cs:422 +#: ../SparkleShare/SparkleController.cs:455 msgid "ddd MMM d, yyyy" msgstr "" -#: ../SparkleShare/SparkleController.cs:427 +#: ../SparkleShare/SparkleController.cs:460 msgid "ddd MMM d" msgstr "" -#: ../SparkleShare/SparkleController.cs:629 +#: ../SparkleShare/SparkleController.cs:661 #, csharp-format msgid "added ‘{0}’" msgstr "הוסף ‘{0}’" -#: ../SparkleShare/SparkleController.cs:634 +#: ../SparkleShare/SparkleController.cs:666 #, csharp-format msgid "moved ‘{0}’" msgstr "" -#: ../SparkleShare/SparkleController.cs:639 +#: ../SparkleShare/SparkleController.cs:671 #, csharp-format msgid "edited ‘{0}’" msgstr "נערך ‘{0}’" -#: ../SparkleShare/SparkleController.cs:644 +#: ../SparkleShare/SparkleController.cs:676 #, csharp-format msgid "deleted ‘{0}’" msgstr "נמחק ‘{0}’" -#: ../SparkleShare/SparkleController.cs:653 +#: ../SparkleShare/SparkleController.cs:685 #, csharp-format msgid "and {0} more" msgid_plural "and {0} more" msgstr[0] "" msgstr[1] "" -#: ../SparkleShare/SparkleController.cs:657 +#: ../SparkleShare/SparkleController.cs:689 msgid "did something magical" msgstr "" @@ -312,72 +313,68 @@ msgstr "למד איך להקים שרת אכסון, ספארקלסרבר (Sparkl msgid "Recent Events" msgstr "" -#: ../SparkleShare/SparkleEventLog.cs:131 -#: ../SparkleShare/SparkleEventLog.cs:150 +#: ../SparkleShare/SparkleEventLog.cs:148 +#: ../SparkleShare/SparkleEventLog.cs:173 msgid "All Folders" msgstr "" -#: ../SparkleShare/SparkleShare.cs:56 +#: ../SparkleShare/SparkleShare.cs:53 msgid "Sorry, you can't run SparkleShare with these permissions." msgstr "מצטערים, אך אינך יכול להריץ ספארקלשר עם ההרשאות האלה." -#: ../SparkleShare/SparkleShare.cs:57 +#: ../SparkleShare/SparkleShare.cs:54 msgid "Things would go utterly wrong." msgstr "דברים בלתי תקינים עשויים לקרות." -#: ../SparkleShare/SparkleShare.cs:66 -msgid "Don't show the notification icon" -msgstr "אל תראה את סמל ההתרעה" - -#: ../SparkleShare/SparkleShare.cs:67 +#: ../SparkleShare/SparkleShare.cs:61 msgid "Print version information" msgstr "מידע גרסת ההדפסה" -#: ../SparkleShare/SparkleShare.cs:68 +#: ../SparkleShare/SparkleShare.cs:62 msgid "Show this help text" msgstr "הראה את מלל העזרה" -#: ../SparkleShare/SparkleShare.cs:115 +#: ../SparkleShare/SparkleShare.cs:109 msgid "SparkleShare, a collaboration and sharing tool." msgstr "" -#: ../SparkleShare/SparkleShare.cs:116 +#: ../SparkleShare/SparkleShare.cs:110 msgid "Copyright (C) 2010 Hylke Bons" msgstr "זכויות שמורות (C) 2010 Hylke Bons" -#: ../SparkleShare/SparkleShare.cs:118 +#: ../SparkleShare/SparkleShare.cs:112 msgid "This program comes with ABSOLUTELY NO WARRANTY." msgstr "תוכנה זו באה ללא כל אחריות." -#: ../SparkleShare/SparkleShare.cs:120 +#: ../SparkleShare/SparkleShare.cs:114 msgid "This is free software, and you are welcome to redistribute it " msgstr "תוכנה זו הינה חופשית ואתם מוזמנים להפיצה" -#: ../SparkleShare/SparkleShare.cs:121 +#: ../SparkleShare/SparkleShare.cs:115 msgid "under certain conditions. Please read the GNU GPLv3 for details." msgstr "תחת תנאים מסויימים. אנא קראו את רשיון GNU GPLv3 לקבלת פרטים." -#: ../SparkleShare/SparkleShare.cs:123 +#: ../SparkleShare/SparkleShare.cs:117 msgid "SparkleShare automatically syncs Git repositories in " msgstr "" -#: ../SparkleShare/SparkleShare.cs:124 +#: ../SparkleShare/SparkleShare.cs:118 msgid "the ~/SparkleShare folder with their remote origins." msgstr "" -#: ../SparkleShare/SparkleShare.cs:126 +#: ../SparkleShare/SparkleShare.cs:120 msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..." msgstr "שימוש: sparkleshare [start|stop|restart] [אפשרויות]..." -#: ../SparkleShare/SparkleShare.cs:127 +#: ../SparkleShare/SparkleShare.cs:121 msgid "Sync SparkleShare folder with remote repositories." msgstr "סנכרן תקיית ספארקלשר עם מאגרים מרוחקים." -#: ../SparkleShare/SparkleShare.cs:129 +#: ../SparkleShare/SparkleShare.cs:123 msgid "Arguments:" msgstr "ארגומנטים:" -#: ../SparkleShare/SparkleShare.cs:139 +#: ../SparkleShare/SparkleShare.cs:133 msgid "SparkleShare " msgstr "ספארקלשר" @@ -407,11 +404,11 @@ msgstr "" msgid "Quit" msgstr "צא" -#: ../SparkleShare/SparkleUI.cs:96 +#: ../SparkleShare/SparkleUI.cs:99 msgid "Ouch! Mid-air collision!" msgstr "איה! התנגשות באמצע ההעברה!" -#: ../SparkleShare/SparkleUI.cs:97 +#: ../SparkleShare/SparkleUI.cs:100 msgid "Don't worry, SparkleShare made a copy of each conflicting file." msgstr "אל דאגה, ספארקלשר יצר העתק של כל אחד מהקבצים הסותרים (השונים)" diff --git a/po/hu.po b/po/hu.po index 1de9fe70..c098780f 100644 --- a/po/hu.po +++ b/po/hu.po @@ -9,31 +9,32 @@ msgid "" msgstr "" "Project-Id-Version: SparkleShare\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-17 12:09+0200\n" -"PO-Revision-Date: 2011-06-17 10:13+0000\n" +"POT-Creation-Date: 2011-06-29 11:38+0200\n" +"PO-Revision-Date: 2011-06-26 09:22+0000\n" "Last-Translator: deejay1 \n" +"Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: hu\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:338 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:337 #: ../SparkleShare/SparkleIntro.cs:67 ../SparkleShare/SparkleStatusIcon.cs:345 msgid "Welcome to SparkleShare!" msgstr "Üdvözli a SparkleShare!" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:349 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:348 #: ../SparkleShare/SparkleStatusIcon.cs:357 msgid "Not everything is synced" msgstr "Nincs minden szinkronizálva" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:359 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:358 #: ../SparkleShare/SparkleStatusIcon.cs:367 msgid "Up to date" msgstr "Naprakész" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:375 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:374 #: ../SparkleShare/SparkleStatusIcon.cs:383 msgid "Syncing…" msgstr "Szinkronizálás..." @@ -83,42 +84,42 @@ msgstr "Szerzői névsor megjelenítése" msgid "_Visit Website" msgstr "Weboldal meglátogatása" -#: ../SparkleShare/SparkleController.cs:422 +#: ../SparkleShare/SparkleController.cs:455 msgid "ddd MMM d, yyyy" msgstr "ddd MMM d, yyyy" -#: ../SparkleShare/SparkleController.cs:427 +#: ../SparkleShare/SparkleController.cs:460 msgid "ddd MMM d" msgstr "ddd MMM d" -#: ../SparkleShare/SparkleController.cs:629 +#: ../SparkleShare/SparkleController.cs:661 #, csharp-format msgid "added ‘{0}’" msgstr "hozzáadva '{0}'" -#: ../SparkleShare/SparkleController.cs:634 +#: ../SparkleShare/SparkleController.cs:666 #, csharp-format msgid "moved ‘{0}’" msgstr "elmozgatva '{0}'" -#: ../SparkleShare/SparkleController.cs:639 +#: ../SparkleShare/SparkleController.cs:671 #, csharp-format msgid "edited ‘{0}’" msgstr "szerkesztve '{0}'" -#: ../SparkleShare/SparkleController.cs:644 +#: ../SparkleShare/SparkleController.cs:676 #, csharp-format msgid "deleted ‘{0}’" msgstr "törölve '{0}'" -#: ../SparkleShare/SparkleController.cs:653 +#: ../SparkleShare/SparkleController.cs:685 #, csharp-format msgid "and {0} more" msgid_plural "and {0} more" msgstr[0] "és {0} további" msgstr[1] "és {0} továbbiak" -#: ../SparkleShare/SparkleController.cs:657 +#: ../SparkleShare/SparkleController.cs:689 msgid "did something magical" msgstr "valami varázslatosat tett" @@ -321,75 +322,71 @@ msgstr "Ismerje meg, hogyan tarthat saját SparkleServer-t" #: ../SparkleShare/SparkleEventLog.cs:61 msgid "Recent Events" -msgstr "" +msgstr "Utóbbi események" -#: ../SparkleShare/SparkleEventLog.cs:131 -#: ../SparkleShare/SparkleEventLog.cs:150 +#: ../SparkleShare/SparkleEventLog.cs:148 +#: ../SparkleShare/SparkleEventLog.cs:173 msgid "All Folders" -msgstr "" +msgstr "MInden mappa" -#: ../SparkleShare/SparkleShare.cs:56 +#: ../SparkleShare/SparkleShare.cs:53 msgid "Sorry, you can't run SparkleShare with these permissions." msgstr "Elnézést, nem tudja futtatni SparkleShare ezekkel a jogosultságokkal." -#: ../SparkleShare/SparkleShare.cs:57 +#: ../SparkleShare/SparkleShare.cs:54 msgid "Things would go utterly wrong." msgstr "A dolgok teljesen rossz irányt vehetnek." -#: ../SparkleShare/SparkleShare.cs:66 -msgid "Don't show the notification icon" -msgstr "Ne jelenjen meg az értesítési ikon" - -#: ../SparkleShare/SparkleShare.cs:67 +#: ../SparkleShare/SparkleShare.cs:61 msgid "Print version information" msgstr "Verzió információk nyomtatása" -#: ../SparkleShare/SparkleShare.cs:68 +#: ../SparkleShare/SparkleShare.cs:62 msgid "Show this help text" msgstr "Ezt a súgó segítséget jeleníti meg" -#: ../SparkleShare/SparkleShare.cs:115 +#: ../SparkleShare/SparkleShare.cs:109 msgid "SparkleShare, a collaboration and sharing tool." msgstr "SparkleShare, az együttműködés és megosztás eszköze." -#: ../SparkleShare/SparkleShare.cs:116 +#: ../SparkleShare/SparkleShare.cs:110 msgid "Copyright (C) 2010 Hylke Bons" msgstr "Copyright (C) 2010 Hylke Bons" -#: ../SparkleShare/SparkleShare.cs:118 +#: ../SparkleShare/SparkleShare.cs:112 msgid "This program comes with ABSOLUTELY NO WARRANTY." msgstr "Erre a programra nincs SEMMIFÉLE GARANCIA." -#: ../SparkleShare/SparkleShare.cs:120 +#: ../SparkleShare/SparkleShare.cs:114 msgid "This is free software, and you are welcome to redistribute it " msgstr "Ez egy szabad szoftver, és mindig örülünk, ha terjesztik " -#: ../SparkleShare/SparkleShare.cs:121 +#: ../SparkleShare/SparkleShare.cs:115 msgid "under certain conditions. Please read the GNU GPLv3 for details." msgstr "" "bizonyos feltételek mellett. Kérjük, olvassa el a GNU GPLv3 a részletekért." -#: ../SparkleShare/SparkleShare.cs:123 +#: ../SparkleShare/SparkleShare.cs:117 msgid "SparkleShare automatically syncs Git repositories in " msgstr "SparkleShare automatikusan szinkronizálja Git adattárakat a" -#: ../SparkleShare/SparkleShare.cs:124 +#: ../SparkleShare/SparkleShare.cs:118 msgid "the ~/SparkleShare folder with their remote origins." msgstr "a ~/SparkleShare mappával a távoli eredetükkel." -#: ../SparkleShare/SparkleShare.cs:126 +#: ../SparkleShare/SparkleShare.cs:120 msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..." msgstr "Használat: sparkleshare [start | stop | újraindítás] [OPCIÓK] ..." -#: ../SparkleShare/SparkleShare.cs:127 +#: ../SparkleShare/SparkleShare.cs:121 msgid "Sync SparkleShare folder with remote repositories." msgstr "A SparkleShare mappa szinkronizálása a távoli tárolókkal." -#: ../SparkleShare/SparkleShare.cs:129 +#: ../SparkleShare/SparkleShare.cs:123 msgid "Arguments:" msgstr "Paraméterek:" -#: ../SparkleShare/SparkleShare.cs:139 +#: ../SparkleShare/SparkleShare.cs:133 msgid "SparkleShare " msgstr "SparkleShare " @@ -404,7 +401,7 @@ msgstr "Távoli mappa hozzáadása..." #: ../SparkleShare/SparkleStatusIcon.cs:242 msgid "Show Recent Events" -msgstr "" +msgstr "Utolsó események megjelenítése" #: ../SparkleShare/SparkleStatusIcon.cs:262 msgid "Turn Notifications Off" @@ -419,11 +416,11 @@ msgstr "Értesítések bekapcsolása" msgid "Quit" msgstr "Kilépés" -#: ../SparkleShare/SparkleUI.cs:96 +#: ../SparkleShare/SparkleUI.cs:99 msgid "Ouch! Mid-air collision!" msgstr "Jaj! Ütközés a forgalomban!" -#: ../SparkleShare/SparkleUI.cs:97 +#: ../SparkleShare/SparkleUI.cs:100 msgid "Don't worry, SparkleShare made a copy of each conflicting file." msgstr "" "Nincs ok az aggodalomra, SparkleShare minden ütköző fájlról készít " diff --git a/po/it.po b/po/it.po index f5d8cd52..43ecf2c3 100644 --- a/po/it.po +++ b/po/it.po @@ -10,31 +10,32 @@ msgid "" msgstr "" "Project-Id-Version: SparkleShare\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-17 12:09+0200\n" -"PO-Revision-Date: 2011-06-17 10:13+0000\n" +"POT-Creation-Date: 2011-06-29 11:38+0200\n" +"PO-Revision-Date: 2011-06-26 09:22+0000\n" "Last-Translator: deejay1 \n" +"Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:338 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:337 #: ../SparkleShare/SparkleIntro.cs:67 ../SparkleShare/SparkleStatusIcon.cs:345 msgid "Welcome to SparkleShare!" msgstr "Benvenuto in SparkleShare!" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:349 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:348 #: ../SparkleShare/SparkleStatusIcon.cs:357 msgid "Not everything is synced" msgstr "Non tutto è sincronizzato" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:359 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:358 #: ../SparkleShare/SparkleStatusIcon.cs:367 msgid "Up to date" msgstr "Aggiornato" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:375 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:374 #: ../SparkleShare/SparkleStatusIcon.cs:383 msgid "Syncing…" msgstr "Sincronizzazione in corso..." @@ -84,42 +85,42 @@ msgstr "_Mostra Crediti" msgid "_Visit Website" msgstr "_Visita il sito web" -#: ../SparkleShare/SparkleController.cs:422 +#: ../SparkleShare/SparkleController.cs:455 msgid "ddd MMM d, yyyy" msgstr "ddd MMM d, yyyy" -#: ../SparkleShare/SparkleController.cs:427 +#: ../SparkleShare/SparkleController.cs:460 msgid "ddd MMM d" msgstr "ddd MMM d" -#: ../SparkleShare/SparkleController.cs:629 +#: ../SparkleShare/SparkleController.cs:661 #, csharp-format msgid "added ‘{0}’" msgstr "aggiunti '{0}'" -#: ../SparkleShare/SparkleController.cs:634 +#: ../SparkleShare/SparkleController.cs:666 #, csharp-format msgid "moved ‘{0}’" msgstr "" -#: ../SparkleShare/SparkleController.cs:639 +#: ../SparkleShare/SparkleController.cs:671 #, csharp-format msgid "edited ‘{0}’" msgstr "modificati '{0}'" -#: ../SparkleShare/SparkleController.cs:644 +#: ../SparkleShare/SparkleController.cs:676 #, csharp-format msgid "deleted ‘{0}’" msgstr "eliminati '{0}'" -#: ../SparkleShare/SparkleController.cs:653 +#: ../SparkleShare/SparkleController.cs:685 #, csharp-format msgid "and {0} more" msgid_plural "and {0} more" msgstr[0] "" msgstr[1] "" -#: ../SparkleShare/SparkleController.cs:657 +#: ../SparkleShare/SparkleController.cs:689 msgid "did something magical" msgstr "" @@ -323,73 +324,69 @@ msgstr "Impara come installare il tuo SparkleServer personale" msgid "Recent Events" msgstr "" -#: ../SparkleShare/SparkleEventLog.cs:131 -#: ../SparkleShare/SparkleEventLog.cs:150 +#: ../SparkleShare/SparkleEventLog.cs:148 +#: ../SparkleShare/SparkleEventLog.cs:173 msgid "All Folders" msgstr "" -#: ../SparkleShare/SparkleShare.cs:56 +#: ../SparkleShare/SparkleShare.cs:53 msgid "Sorry, you can't run SparkleShare with these permissions." msgstr "Spiacente, non è possibile eseguire SparkleShare con questi permessi." -#: ../SparkleShare/SparkleShare.cs:57 +#: ../SparkleShare/SparkleShare.cs:54 msgid "Things would go utterly wrong." msgstr "Le cose potrebbero andare estremamente male." -#: ../SparkleShare/SparkleShare.cs:66 -msgid "Don't show the notification icon" -msgstr "Non mostrare l'icona di notifica" - -#: ../SparkleShare/SparkleShare.cs:67 +#: ../SparkleShare/SparkleShare.cs:61 msgid "Print version information" msgstr "Stampa informazioni sulla versione" -#: ../SparkleShare/SparkleShare.cs:68 +#: ../SparkleShare/SparkleShare.cs:62 msgid "Show this help text" msgstr "Mostra questo messaggio di aiuto" -#: ../SparkleShare/SparkleShare.cs:115 +#: ../SparkleShare/SparkleShare.cs:109 msgid "SparkleShare, a collaboration and sharing tool." msgstr "" -#: ../SparkleShare/SparkleShare.cs:116 +#: ../SparkleShare/SparkleShare.cs:110 msgid "Copyright (C) 2010 Hylke Bons" msgstr "Copyright (C) 2010 Hylke Bons" -#: ../SparkleShare/SparkleShare.cs:118 +#: ../SparkleShare/SparkleShare.cs:112 msgid "This program comes with ABSOLUTELY NO WARRANTY." msgstr "Questo programma viene fornito ASSOLUTAMENTE SENZA NESSUNA GARANZIA." -#: ../SparkleShare/SparkleShare.cs:120 +#: ../SparkleShare/SparkleShare.cs:114 msgid "This is free software, and you are welcome to redistribute it " msgstr "Questo è software libero e sei invitato a redistribuirlo" -#: ../SparkleShare/SparkleShare.cs:121 +#: ../SparkleShare/SparkleShare.cs:115 msgid "under certain conditions. Please read the GNU GPLv3 for details." msgstr "" "rispettando alcune restrizioni. Leggi la licenza GNU GPLv3 per i dettagli" -#: ../SparkleShare/SparkleShare.cs:123 +#: ../SparkleShare/SparkleShare.cs:117 msgid "SparkleShare automatically syncs Git repositories in " msgstr "SparkleShare sincronizza automaticamente i repository Git nella" -#: ../SparkleShare/SparkleShare.cs:124 +#: ../SparkleShare/SparkleShare.cs:118 msgid "the ~/SparkleShare folder with their remote origins." msgstr "cartella ~/.SparkleShare con le loro origini." -#: ../SparkleShare/SparkleShare.cs:126 +#: ../SparkleShare/SparkleShare.cs:120 msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..." msgstr "Utilizzo: sparkleshare [start|stop|restart] [OPTION]..." -#: ../SparkleShare/SparkleShare.cs:127 +#: ../SparkleShare/SparkleShare.cs:121 msgid "Sync SparkleShare folder with remote repositories." msgstr "Sincronizza cartella SparkleShare con repository remoti." -#: ../SparkleShare/SparkleShare.cs:129 +#: ../SparkleShare/SparkleShare.cs:123 msgid "Arguments:" msgstr "Argomenti" -#: ../SparkleShare/SparkleShare.cs:139 +#: ../SparkleShare/SparkleShare.cs:133 msgid "SparkleShare " msgstr "SparkleShare " @@ -419,11 +416,11 @@ msgstr "Accendi le notifiche" msgid "Quit" msgstr "Esci" -#: ../SparkleShare/SparkleUI.cs:96 +#: ../SparkleShare/SparkleUI.cs:99 msgid "Ouch! Mid-air collision!" msgstr "Ahi! Una collisione in volo!" -#: ../SparkleShare/SparkleUI.cs:97 +#: ../SparkleShare/SparkleUI.cs:100 msgid "Don't worry, SparkleShare made a copy of each conflicting file." msgstr "" "Non ti preoccupare, SparkleShare ha eseguito una copia di ogni file in " diff --git a/po/ja.po b/po/ja.po index 7933db28..2768e0f5 100644 --- a/po/ja.po +++ b/po/ja.po @@ -10,31 +10,32 @@ msgid "" msgstr "" "Project-Id-Version: SparkleShare\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-17 12:09+0200\n" -"PO-Revision-Date: 2011-06-17 10:13+0000\n" +"POT-Creation-Date: 2011-06-29 11:38+0200\n" +"PO-Revision-Date: 2011-06-26 09:22+0000\n" "Last-Translator: deejay1 \n" +"Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ja\n" "Plural-Forms: nplurals=1; plural=0\n" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:338 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:337 #: ../SparkleShare/SparkleIntro.cs:67 ../SparkleShare/SparkleStatusIcon.cs:345 msgid "Welcome to SparkleShare!" msgstr "SparkleShareへようこそ！" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:349 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:348 #: ../SparkleShare/SparkleStatusIcon.cs:357 msgid "Not everything is synced" msgstr "すべてが同期されていません" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:359 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:358 #: ../SparkleShare/SparkleStatusIcon.cs:367 msgid "Up to date" msgstr "最新の状態です。" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:375 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:374 #: ../SparkleShare/SparkleStatusIcon.cs:383 msgid "Syncing…" msgstr "同期中..." @@ -84,41 +85,41 @@ msgstr "クレジットを表示する(_S)" msgid "_Visit Website" msgstr "Webサイトにアクセスする(_V)" -#: ../SparkleShare/SparkleController.cs:422 +#: ../SparkleShare/SparkleController.cs:455 msgid "ddd MMM d, yyyy" msgstr "ddd MMM d, yyyy" -#: ../SparkleShare/SparkleController.cs:427 +#: ../SparkleShare/SparkleController.cs:460 msgid "ddd MMM d" msgstr "ddd MMM d" -#: ../SparkleShare/SparkleController.cs:629 +#: ../SparkleShare/SparkleController.cs:661 #, csharp-format msgid "added ‘{0}’" msgstr "'{0}'を追加しました" -#: ../SparkleShare/SparkleController.cs:634 +#: ../SparkleShare/SparkleController.cs:666 #, csharp-format msgid "moved ‘{0}’" msgstr "'{0}'を移動しました" -#: ../SparkleShare/SparkleController.cs:639 +#: ../SparkleShare/SparkleController.cs:671 #, csharp-format msgid "edited ‘{0}’" msgstr "'{0}'を編集しました" -#: ../SparkleShare/SparkleController.cs:644 +#: ../SparkleShare/SparkleController.cs:676 #, csharp-format msgid "deleted ‘{0}’" msgstr "'{0}'を削除しました" -#: ../SparkleShare/SparkleController.cs:653 +#: ../SparkleShare/SparkleController.cs:685 #, csharp-format msgid "and {0} more" msgid_plural "and {0} more" msgstr[0] "、{0}詳細" -#: ../SparkleShare/SparkleController.cs:657 +#: ../SparkleShare/SparkleController.cs:689 msgid "did something magical" msgstr "何か摩訶不思議なことをしました" @@ -314,72 +315,68 @@ msgstr "個人でSparkleServerを立ち上げる方法" msgid "Recent Events" msgstr "" -#: ../SparkleShare/SparkleEventLog.cs:131 -#: ../SparkleShare/SparkleEventLog.cs:150 +#: ../SparkleShare/SparkleEventLog.cs:148 +#: ../SparkleShare/SparkleEventLog.cs:173 msgid "All Folders" msgstr "" -#: ../SparkleShare/SparkleShare.cs:56 +#: ../SparkleShare/SparkleShare.cs:53 msgid "Sorry, you can't run SparkleShare with these permissions." msgstr "申し訳ありませんが、SparkleShareを実行する権限がありません。パーミッションの設定を見直してください。" -#: ../SparkleShare/SparkleShare.cs:57 +#: ../SparkleShare/SparkleShare.cs:54 msgid "Things would go utterly wrong." msgstr "全く予期しないことになるかもしれません。" -#: ../SparkleShare/SparkleShare.cs:66 -msgid "Don't show the notification icon" -msgstr "通知アイコンを表示しない" - -#: ../SparkleShare/SparkleShare.cs:67 +#: ../SparkleShare/SparkleShare.cs:61 msgid "Print version information" msgstr "バージョン情報の表示" -#: ../SparkleShare/SparkleShare.cs:68 +#: ../SparkleShare/SparkleShare.cs:62 msgid "Show this help text" msgstr "このヘルプテキストを表示" -#: ../SparkleShare/SparkleShare.cs:115 +#: ../SparkleShare/SparkleShare.cs:109 msgid "SparkleShare, a collaboration and sharing tool." msgstr "SparkleShare、コラボレーションと共有のためのツールです。" -#: ../SparkleShare/SparkleShare.cs:116 +#: ../SparkleShare/SparkleShare.cs:110 msgid "Copyright (C) 2010 Hylke Bons" msgstr "Copyright (C)2010 Hylke Bons" -#: ../SparkleShare/SparkleShare.cs:118 +#: ../SparkleShare/SparkleShare.cs:112 msgid "This program comes with ABSOLUTELY NO WARRANTY." msgstr "このプログラムは完全無保証です。" -#: ../SparkleShare/SparkleShare.cs:120 +#: ../SparkleShare/SparkleShare.cs:114 msgid "This is free software, and you are welcome to redistribute it " msgstr "これはフリーソフトウェアであり、再配布を歓迎します。" -#: ../SparkleShare/SparkleShare.cs:121 +#: ../SparkleShare/SparkleShare.cs:115 msgid "under certain conditions. Please read the GNU GPLv3 for details." msgstr "一定の条件の下で。詳細については、GNUのGPLv3をお読みください。" -#: ../SparkleShare/SparkleShare.cs:123 +#: ../SparkleShare/SparkleShare.cs:117 msgid "SparkleShare automatically syncs Git repositories in " msgstr "SparkleShareは自動的に..のGitリポジトリと同期します" -#: ../SparkleShare/SparkleShare.cs:124 +#: ../SparkleShare/SparkleShare.cs:118 msgid "the ~/SparkleShare folder with their remote origins." msgstr "リモートの元フォルダを含んだ~/SparkleShareフォルダ" -#: ../SparkleShare/SparkleShare.cs:126 +#: ../SparkleShare/SparkleShare.cs:120 msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..." msgstr "使用法: sparkleshare [start|stop|restart] [オプション]..." -#: ../SparkleShare/SparkleShare.cs:127 +#: ../SparkleShare/SparkleShare.cs:121 msgid "Sync SparkleShare folder with remote repositories." msgstr "SparkleShareフォルダをリモートのリポジトリと同期。" -#: ../SparkleShare/SparkleShare.cs:129 +#: ../SparkleShare/SparkleShare.cs:123 msgid "Arguments:" msgstr "引数：" -#: ../SparkleShare/SparkleShare.cs:139 +#: ../SparkleShare/SparkleShare.cs:133 msgid "SparkleShare " msgstr "SparkleShare" @@ -409,11 +406,11 @@ msgstr "通知をオン" msgid "Quit" msgstr "終了" -#: ../SparkleShare/SparkleUI.cs:96 +#: ../SparkleShare/SparkleUI.cs:99 msgid "Ouch! Mid-air collision!" msgstr "イテテ！空中衝突だ！" -#: ../SparkleShare/SparkleUI.cs:97 +#: ../SparkleShare/SparkleUI.cs:100 msgid "Don't worry, SparkleShare made a copy of each conflicting file." msgstr "心配しないでください。SparkleShareは、各競合しているファイルのコピーを作成しました。" diff --git a/po/nl.po b/po/nl.po index e217d0bf..317b22bc 100644 --- a/po/nl.po +++ b/po/nl.po @@ -4,37 +4,40 @@ # we apologise for any incovenience this may have caused and we hope to bring them # back in the future. # +# , 2011. +# , 2011. # smeagiel , 2011. # Łukasz Jernaś , 2011. msgid "" msgstr "" "Project-Id-Version: SparkleShare\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-17 12:09+0200\n" -"PO-Revision-Date: 2011-06-17 10:13+0000\n" -"Last-Translator: deejay1 \n" +"POT-Creation-Date: 2011-06-29 11:38+0200\n" +"PO-Revision-Date: 2011-07-12 21:12+0000\n" +"Last-Translator: tzwenn \n" +"Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:338 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:337 #: ../SparkleShare/SparkleIntro.cs:67 ../SparkleShare/SparkleStatusIcon.cs:345 msgid "Welcome to SparkleShare!" msgstr "Welkom bij SparkleShare!" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:349 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:348 #: ../SparkleShare/SparkleStatusIcon.cs:357 msgid "Not everything is synced" msgstr "Niet alles is gesynchroniseerd" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:359 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:358 #: ../SparkleShare/SparkleStatusIcon.cs:367 msgid "Up to date" msgstr "Up-to-date" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:375 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:374 #: ../SparkleShare/SparkleStatusIcon.cs:383 msgid "Syncing…" msgstr "Synchroniseren…" @@ -66,15 +69,15 @@ msgstr "Over SparkleShare" #: ../SparkleShare/SparkleAbout.cs:53 msgid "A newer version is available" -msgstr "" +msgstr "Een nieuwere versie is beschikbaar" #: ../SparkleShare/SparkleAbout.cs:60 msgid "You are running the latest version." -msgstr "" +msgstr "U werkt met de nieuwste versie." #: ../SparkleShare/SparkleAbout.cs:87 msgid "Checking for updates..." -msgstr "" +msgstr "Controleren op updates ..." #: ../SparkleShare/SparkleAbout.cs:116 msgid "_Show Credits" @@ -84,42 +87,42 @@ msgstr "" msgid "_Visit Website" msgstr "_Bezoek website" -#: ../SparkleShare/SparkleController.cs:422 +#: ../SparkleShare/SparkleController.cs:455 msgid "ddd MMM d, yyyy" msgstr "" -#: ../SparkleShare/SparkleController.cs:427 +#: ../SparkleShare/SparkleController.cs:460 msgid "ddd MMM d" msgstr "" -#: ../SparkleShare/SparkleController.cs:629 +#: ../SparkleShare/SparkleController.cs:661 #, csharp-format msgid "added ‘{0}’" msgstr "voegde ‘{0}’ toe" -#: ../SparkleShare/SparkleController.cs:634 +#: ../SparkleShare/SparkleController.cs:666 #, csharp-format msgid "moved ‘{0}’" msgstr "" -#: ../SparkleShare/SparkleController.cs:639 +#: ../SparkleShare/SparkleController.cs:671 #, csharp-format msgid "edited ‘{0}’" msgstr "bewerkte ‘{0}’" -#: ../SparkleShare/SparkleController.cs:644 +#: ../SparkleShare/SparkleController.cs:676 #, csharp-format msgid "deleted ‘{0}’" msgstr "verwijderde ‘{0}’" -#: ../SparkleShare/SparkleController.cs:653 +#: ../SparkleShare/SparkleController.cs:685 #, csharp-format msgid "and {0} more" msgid_plural "and {0} more" msgstr[0] "" msgstr[1] "" -#: ../SparkleShare/SparkleController.cs:657 +#: ../SparkleShare/SparkleController.cs:689 msgid "did something magical" msgstr "" @@ -263,7 +266,7 @@ msgstr "Opnieuw proberen" #: ../SparkleShare/SparkleIntro.cs:473 #, csharp-format msgid "‘{0}’ has been successfully added" -msgstr "" +msgstr "'{0}' is met succes toegevoegd" #: ../SparkleShare/SparkleIntro.cs:482 msgid "Folder synced successfully!" @@ -318,76 +321,72 @@ msgstr "Leer hoe je je eigen SparkleServer kan opzetten" #: ../SparkleShare/SparkleEventLog.cs:61 msgid "Recent Events" -msgstr "" +msgstr "Recente gebeurtenissen" -#: ../SparkleShare/SparkleEventLog.cs:131 -#: ../SparkleShare/SparkleEventLog.cs:150 +#: ../SparkleShare/SparkleEventLog.cs:148 +#: ../SparkleShare/SparkleEventLog.cs:173 msgid "All Folders" -msgstr "" +msgstr "Alle mappen" -#: ../SparkleShare/SparkleShare.cs:56 +#: ../SparkleShare/SparkleShare.cs:53 msgid "Sorry, you can't run SparkleShare with these permissions." msgstr "Sorry, SparkleShare kan niet gedraaid worden met deze rechten." -#: ../SparkleShare/SparkleShare.cs:57 +#: ../SparkleShare/SparkleShare.cs:54 msgid "Things would go utterly wrong." msgstr "Dingen zouden vresenlijk mis gaan" -#: ../SparkleShare/SparkleShare.cs:66 -msgid "Don't show the notification icon" -msgstr "Toon het notificatiepictogram niet." - -#: ../SparkleShare/SparkleShare.cs:67 +#: ../SparkleShare/SparkleShare.cs:61 msgid "Print version information" msgstr "Druk versie-informatie af" -#: ../SparkleShare/SparkleShare.cs:68 +#: ../SparkleShare/SparkleShare.cs:62 msgid "Show this help text" msgstr "Toon deze helptekst" -#: ../SparkleShare/SparkleShare.cs:115 +#: ../SparkleShare/SparkleShare.cs:109 msgid "SparkleShare, a collaboration and sharing tool." msgstr "" -#: ../SparkleShare/SparkleShare.cs:116 +#: ../SparkleShare/SparkleShare.cs:110 msgid "Copyright (C) 2010 Hylke Bons" msgstr "Copyright (C) 2010 Hylke Bons" -#: ../SparkleShare/SparkleShare.cs:118 +#: ../SparkleShare/SparkleShare.cs:112 msgid "This program comes with ABSOLUTELY NO WARRANTY." msgstr "Er zit ABSOLUUT GEEN GARANTIE op dit programma." -#: ../SparkleShare/SparkleShare.cs:120 +#: ../SparkleShare/SparkleShare.cs:114 msgid "This is free software, and you are welcome to redistribute it " msgstr "" "Dit is vrije software en je bent van harte uitgenodigd om het te " "herdistribueren " -#: ../SparkleShare/SparkleShare.cs:121 +#: ../SparkleShare/SparkleShare.cs:115 msgid "under certain conditions. Please read the GNU GPLv3 for details." msgstr " onder bepaalde voorwaarden. Zie de GNU GPLv3 voor meer informatie." -#: ../SparkleShare/SparkleShare.cs:123 +#: ../SparkleShare/SparkleShare.cs:117 msgid "SparkleShare automatically syncs Git repositories in " msgstr "SparkleShare automatisch synchroniseerd Git repositories in " -#: ../SparkleShare/SparkleShare.cs:124 +#: ../SparkleShare/SparkleShare.cs:118 msgid "the ~/SparkleShare folder with their remote origins." msgstr "de ~/SparkleShare map met de externe bron." -#: ../SparkleShare/SparkleShare.cs:126 +#: ../SparkleShare/SparkleShare.cs:120 msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..." msgstr "Gebruik: sparkleshare [start|stop|restart] [OPTION]..." -#: ../SparkleShare/SparkleShare.cs:127 +#: ../SparkleShare/SparkleShare.cs:121 msgid "Sync SparkleShare folder with remote repositories." msgstr "Synchroniseer de SparkleShare map met externe repositories" -#: ../SparkleShare/SparkleShare.cs:129 +#: ../SparkleShare/SparkleShare.cs:123 msgid "Arguments:" -msgstr "Argumenten" +msgstr "Argumenten:" -#: ../SparkleShare/SparkleShare.cs:139 +#: ../SparkleShare/SparkleShare.cs:133 msgid "SparkleShare " msgstr "SparkleShare " @@ -402,7 +401,7 @@ msgstr "Externe map toevoegen…" #: ../SparkleShare/SparkleStatusIcon.cs:242 msgid "Show Recent Events" -msgstr "" +msgstr "Toon recente gebeurtenissen" #: ../SparkleShare/SparkleStatusIcon.cs:262 msgid "Turn Notifications Off" @@ -417,11 +416,11 @@ msgstr "Zet mededelingen aan" msgid "Quit" msgstr "Afsluiten" -#: ../SparkleShare/SparkleUI.cs:96 +#: ../SparkleShare/SparkleUI.cs:99 msgid "Ouch! Mid-air collision!" msgstr "Ouw! Botsing!" -#: ../SparkleShare/SparkleUI.cs:97 +#: ../SparkleShare/SparkleUI.cs:100 msgid "Don't worry, SparkleShare made a copy of each conflicting file." msgstr "" "Geen zorgen, SparkleShare heeft een kopie van elk conflicterend bestand " @@ -429,6 +428,6 @@ msgstr "" #: ../SparkleShare/SparkleWindow.cs:41 msgid "SparkleShare Setup" -msgstr "" +msgstr "SparkleShare Setup" diff --git a/po/no_NO.po b/po/no_NO.po index be8309d6..17720c69 100644 --- a/po/no_NO.po +++ b/po/no_NO.po @@ -4,36 +4,38 @@ # we apologise for any incovenience this may have caused and we hope to bring them # back in the future. # +# , 2011. # habakke , 2011. msgid "" msgstr "" "Project-Id-Version: SparkleShare\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-17 12:09+0200\n" -"PO-Revision-Date: 2011-06-17 10:13+0000\n" -"Last-Translator: deejay1 \n" +"POT-Creation-Date: 2011-06-29 11:38+0200\n" +"PO-Revision-Date: 2011-07-05 10:29+0000\n" +"Last-Translator: VegardAa \n" +"Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: no_NO\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:338 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:337 #: ../SparkleShare/SparkleIntro.cs:67 ../SparkleShare/SparkleStatusIcon.cs:345 msgid "Welcome to SparkleShare!" msgstr "Velkommen til SparkleShare!" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:349 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:348 #: ../SparkleShare/SparkleStatusIcon.cs:357 msgid "Not everything is synced" msgstr "Ikke alt er synkronisert" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:359 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:358 #: ../SparkleShare/SparkleStatusIcon.cs:367 msgid "Up to date" msgstr "Oppdatert" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:375 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:374 #: ../SparkleShare/SparkleStatusIcon.cs:383 msgid "Syncing…" msgstr "Synkroniserer..." @@ -61,66 +63,66 @@ msgstr "Vel for å få en kopi av denne versjonen." #. A menu item that takes the user to http://www.sparkleshare.org/ #: ../SparkleShare/SparkleAbout.cs:46 ../SparkleShare/SparkleStatusIcon.cs:275 msgid "About SparkleShare" -msgstr "" +msgstr "Om SparkleShare" #: ../SparkleShare/SparkleAbout.cs:53 msgid "A newer version is available" -msgstr "" +msgstr "En nyere versjon er tilgjengelig" #: ../SparkleShare/SparkleAbout.cs:60 msgid "You are running the latest version." -msgstr "" +msgstr "Du kjører siste versjon" #: ../SparkleShare/SparkleAbout.cs:87 msgid "Checking for updates..." -msgstr "" +msgstr "Ser etter oppdateringer..." #: ../SparkleShare/SparkleAbout.cs:116 msgid "_Show Credits" -msgstr "" +msgstr "_Vis ...." #: ../SparkleShare/SparkleAbout.cs:129 msgid "_Visit Website" msgstr "_Besøk webside" -#: ../SparkleShare/SparkleController.cs:422 +#: ../SparkleShare/SparkleController.cs:455 msgid "ddd MMM d, yyyy" msgstr "" -#: ../SparkleShare/SparkleController.cs:427 +#: ../SparkleShare/SparkleController.cs:460 msgid "ddd MMM d" msgstr "" -#: ../SparkleShare/SparkleController.cs:629 +#: ../SparkleShare/SparkleController.cs:661 #, csharp-format msgid "added ‘{0}’" msgstr "la til '{0}'" -#: ../SparkleShare/SparkleController.cs:634 +#: ../SparkleShare/SparkleController.cs:666 #, csharp-format msgid "moved ‘{0}’" -msgstr "" +msgstr "Flyttet ‘{0}’" -#: ../SparkleShare/SparkleController.cs:639 +#: ../SparkleShare/SparkleController.cs:671 #, csharp-format msgid "edited ‘{0}’" msgstr "redigerte '{0}'" -#: ../SparkleShare/SparkleController.cs:644 +#: ../SparkleShare/SparkleController.cs:676 #, csharp-format msgid "deleted ‘{0}’" msgstr "slettet '{0}'" -#: ../SparkleShare/SparkleController.cs:653 +#: ../SparkleShare/SparkleController.cs:685 #, csharp-format msgid "and {0} more" msgid_plural "and {0} more" msgstr[0] "" msgstr[1] "" -#: ../SparkleShare/SparkleController.cs:657 +#: ../SparkleShare/SparkleController.cs:689 msgid "did something magical" -msgstr "" +msgstr "Gjorde noe magisk" #: ../SparkleShare/SparkleIntro.cs:73 msgid "" @@ -148,7 +150,7 @@ msgstr "Konfigurerer..." #: ../SparkleShare/SparkleIntro.cs:161 msgid "Where is your remote folder?" -msgstr "Hvor er din eksterne mappen?" +msgstr "Hvor er din eksterne mappe?" #: ../SparkleShare/SparkleIntro.cs:174 msgid "address-to-server.com" @@ -160,7 +162,7 @@ msgstr "På min egen server:" #: ../SparkleShare/SparkleIntro.cs:186 msgid "Free hosting for Free and Open Source Software projects." -msgstr "Gratis hosting for Free og Åpne Kildekode prosjekter" +msgstr "Gratis hosting for gratis og Åpen Kildekode prosjekter" #: ../SparkleShare/SparkleIntro.cs:187 msgid "Also has paid accounts for extra private space and bandwidth." @@ -215,7 +217,7 @@ msgstr "Mappe Navn:" #: ../SparkleShare/SparkleIntro.cs:269 msgid "Sync" -msgstr "Synk" +msgstr "Synkroniser" #: ../SparkleShare/SparkleIntro.cs:312 msgid "Cancel" @@ -243,7 +245,7 @@ msgstr "Aksepterer du denne invitasjonen?" #: ../SparkleShare/SparkleIntro.cs:368 msgid "Server Address:" -msgstr "Server Adresse:" +msgstr "Tjener Adresse:" #: ../SparkleShare/SparkleIntro.cs:391 msgid "Reject" @@ -251,7 +253,7 @@ msgstr "Avvis" #: ../SparkleShare/SparkleIntro.cs:392 msgid "Accept and Sync" -msgstr "Godta og Synk" +msgstr "Godta og Synkroniser" #: ../SparkleShare/SparkleIntro.cs:442 msgid "Something went wrong…" @@ -264,7 +266,7 @@ msgstr "Forsøk igjen" #: ../SparkleShare/SparkleIntro.cs:473 #, csharp-format msgid "‘{0}’ has been successfully added" -msgstr "" +msgstr "‘{0}’ har blitt lagt til" #: ../SparkleShare/SparkleIntro.cs:482 msgid "Folder synced successfully!" @@ -319,75 +321,71 @@ msgstr "Lær hvordan du kan være vert for din egen SparkleServer" #: ../SparkleShare/SparkleEventLog.cs:61 msgid "Recent Events" -msgstr "" +msgstr "Nylige hendelser" -#: ../SparkleShare/SparkleEventLog.cs:131 -#: ../SparkleShare/SparkleEventLog.cs:150 +#: ../SparkleShare/SparkleEventLog.cs:148 +#: ../SparkleShare/SparkleEventLog.cs:173 msgid "All Folders" -msgstr "" +msgstr "Alle mapper" -#: ../SparkleShare/SparkleShare.cs:56 +#: ../SparkleShare/SparkleShare.cs:53 msgid "Sorry, you can't run SparkleShare with these permissions." msgstr "Beklager, du kan ikke kjøre SparkleShare med disse tillatelsene." -#: ../SparkleShare/SparkleShare.cs:57 +#: ../SparkleShare/SparkleShare.cs:54 msgid "Things would go utterly wrong." msgstr "Ting ville gå helt galt." -#: ../SparkleShare/SparkleShare.cs:66 -msgid "Don't show the notification icon" -msgstr "Ikke vis varslingsikonet" - -#: ../SparkleShare/SparkleShare.cs:67 +#: ../SparkleShare/SparkleShare.cs:61 msgid "Print version information" msgstr "Print versjons informasjon" -#: ../SparkleShare/SparkleShare.cs:68 +#: ../SparkleShare/SparkleShare.cs:62 msgid "Show this help text" msgstr "Vis denne hjelpeteksten" -#: ../SparkleShare/SparkleShare.cs:115 +#: ../SparkleShare/SparkleShare.cs:109 msgid "SparkleShare, a collaboration and sharing tool." msgstr "" -#: ../SparkleShare/SparkleShare.cs:116 +#: ../SparkleShare/SparkleShare.cs:110 msgid "Copyright (C) 2010 Hylke Bons" msgstr "Copyright (C) 2010 Hylke Bons" -#: ../SparkleShare/SparkleShare.cs:118 +#: ../SparkleShare/SparkleShare.cs:112 msgid "This program comes with ABSOLUTELY NO WARRANTY." msgstr "Dette programmet kommer med ABSOLUTT INGEN GARANTI." -#: ../SparkleShare/SparkleShare.cs:120 +#: ../SparkleShare/SparkleShare.cs:114 msgid "This is free software, and you are welcome to redistribute it " msgstr "" "Dette er fri programvare, og du er velkommen til å videredistribuere det" -#: ../SparkleShare/SparkleShare.cs:121 +#: ../SparkleShare/SparkleShare.cs:115 msgid "under certain conditions. Please read the GNU GPLv3 for details." msgstr "under visse vilkår. Vennligst les GNU GPLv3 for detaljer." -#: ../SparkleShare/SparkleShare.cs:123 +#: ../SparkleShare/SparkleShare.cs:117 msgid "SparkleShare automatically syncs Git repositories in " msgstr "SparkleShare synkroniserer automatisk Git repositories i" -#: ../SparkleShare/SparkleShare.cs:124 +#: ../SparkleShare/SparkleShare.cs:118 msgid "the ~/SparkleShare folder with their remote origins." msgstr "på ~ / SparkleShare mappe med deres eksterne opprinnelse." -#: ../SparkleShare/SparkleShare.cs:126 +#: ../SparkleShare/SparkleShare.cs:120 msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..." msgstr "Bruk: sparkleshare [start | stop | restart] [VALG] ..." -#: ../SparkleShare/SparkleShare.cs:127 +#: ../SparkleShare/SparkleShare.cs:121 msgid "Sync SparkleShare folder with remote repositories." msgstr "Synkroniser SparkleShare mappe med eksterne repositories." -#: ../SparkleShare/SparkleShare.cs:129 +#: ../SparkleShare/SparkleShare.cs:123 msgid "Arguments:" msgstr "Argumenter:" -#: ../SparkleShare/SparkleShare.cs:139 +#: ../SparkleShare/SparkleShare.cs:133 msgid "SparkleShare " msgstr "SparkleShare" @@ -398,30 +396,30 @@ msgstr "Ingen Eksterne Mapper Ennå" #. Opens the wizard to add a new remote folder #: ../SparkleShare/SparkleStatusIcon.cs:218 msgid "Add Remote Folder…" -msgstr "" +msgstr "Legg til esktern mappe..." #: ../SparkleShare/SparkleStatusIcon.cs:242 msgid "Show Recent Events" -msgstr "" +msgstr "Vis nylige hendelser" #: ../SparkleShare/SparkleStatusIcon.cs:262 msgid "Turn Notifications Off" -msgstr "" +msgstr "Slå av varslinger" #: ../SparkleShare/SparkleStatusIcon.cs:264 msgid "Turn Notifications On" -msgstr "" +msgstr "Slå på varslinger" #. A menu item that quits the application #: ../SparkleShare/SparkleStatusIcon.cs:286 msgid "Quit" msgstr "Avslutt" -#: ../SparkleShare/SparkleUI.cs:96 +#: ../SparkleShare/SparkleUI.cs:99 msgid "Ouch! Mid-air collision!" msgstr "Au! Kollisjon midt i luften!" -#: ../SparkleShare/SparkleUI.cs:97 +#: ../SparkleShare/SparkleUI.cs:100 msgid "Don't worry, SparkleShare made a copy of each conflicting file." msgstr "" "Ikke bekymre deg, SparkleShare laget en kopi av hver motstridende fil." diff --git a/po/pl.po b/po/pl.po index 299de305..9339a685 100644 --- a/po/pl.po +++ b/po/pl.po @@ -9,31 +9,32 @@ msgid "" msgstr "" "Project-Id-Version: SparkleShare\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-17 12:09+0200\n" -"PO-Revision-Date: 2011-06-17 10:13+0000\n" +"POT-Creation-Date: 2011-06-29 11:38+0200\n" +"PO-Revision-Date: 2011-07-02 16:58+0000\n" "Last-Translator: deejay1 \n" +"Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: pl\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:338 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:337 #: ../SparkleShare/SparkleIntro.cs:67 ../SparkleShare/SparkleStatusIcon.cs:345 msgid "Welcome to SparkleShare!" msgstr "Witamy w programie SparkleShare!" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:349 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:348 #: ../SparkleShare/SparkleStatusIcon.cs:357 msgid "Not everything is synced" msgstr "Nie wszystko zostało zsynchronizowane" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:359 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:358 #: ../SparkleShare/SparkleStatusIcon.cs:367 msgid "Up to date" msgstr "Wszystko jest aktualne" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:375 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:374 #: ../SparkleShare/SparkleStatusIcon.cs:383 msgid "Syncing…" msgstr "Synchronizowanie…" @@ -65,15 +66,15 @@ msgstr "Informacje o" #: ../SparkleShare/SparkleAbout.cs:53 msgid "A newer version is available" -msgstr "" +msgstr "Dostępna jest nowsza wersja" #: ../SparkleShare/SparkleAbout.cs:60 msgid "You are running the latest version." -msgstr "" +msgstr "Korzystasz z najnowszej wersji." #: ../SparkleShare/SparkleAbout.cs:87 msgid "Checking for updates..." -msgstr "" +msgstr "Wyszukiwanie aktualizacji" #: ../SparkleShare/SparkleAbout.cs:116 msgid "_Show Credits" @@ -83,35 +84,35 @@ msgstr "Za_sługi" msgid "_Visit Website" msgstr "_Odwiedź stronę domową" -#: ../SparkleShare/SparkleController.cs:422 +#: ../SparkleShare/SparkleController.cs:455 msgid "ddd MMM d, yyyy" msgstr "ddd, d MMM yyyy" -#: ../SparkleShare/SparkleController.cs:427 +#: ../SparkleShare/SparkleController.cs:460 msgid "ddd MMM d" msgstr "ddd, d MMM" -#: ../SparkleShare/SparkleController.cs:629 +#: ../SparkleShare/SparkleController.cs:661 #, csharp-format msgid "added ‘{0}’" msgstr "dodano „{0}”" -#: ../SparkleShare/SparkleController.cs:634 +#: ../SparkleShare/SparkleController.cs:666 #, csharp-format msgid "moved ‘{0}’" msgstr "przesunięto \"{0}\"" -#: ../SparkleShare/SparkleController.cs:639 +#: ../SparkleShare/SparkleController.cs:671 #, csharp-format msgid "edited ‘{0}’" msgstr "edytowano „{0}”" -#: ../SparkleShare/SparkleController.cs:644 +#: ../SparkleShare/SparkleController.cs:676 #, csharp-format msgid "deleted ‘{0}’" msgstr "usunięto „{0}”" -#: ../SparkleShare/SparkleController.cs:653 +#: ../SparkleShare/SparkleController.cs:685 #, csharp-format msgid "and {0} more" msgid_plural "and {0} more" @@ -119,7 +120,7 @@ msgstr[0] "oraz {0} więcej" msgstr[1] "oraz {0} więcej" msgstr[2] "oraz {0} więcej" -#: ../SparkleShare/SparkleController.cs:657 +#: ../SparkleShare/SparkleController.cs:689 msgid "did something magical" msgstr "wydarzyło się coś magicznego" @@ -318,83 +319,79 @@ msgstr "Dowiedz się, jak postawić własny SparkleServer" #: ../SparkleShare/SparkleEventLog.cs:61 msgid "Recent Events" -msgstr "" +msgstr "Ostatnie zdarzenia" -#: ../SparkleShare/SparkleEventLog.cs:131 -#: ../SparkleShare/SparkleEventLog.cs:150 +#: ../SparkleShare/SparkleEventLog.cs:148 +#: ../SparkleShare/SparkleEventLog.cs:173 msgid "All Folders" -msgstr "" +msgstr "Wszystkie katalogi" -#: ../SparkleShare/SparkleShare.cs:56 +#: ../SparkleShare/SparkleShare.cs:53 msgid "Sorry, you can't run SparkleShare with these permissions." msgstr "" "Przepraszamy, nie można uruchomić programu SparkleShare z bieżącymi " "uprawnieniami." -#: ../SparkleShare/SparkleShare.cs:57 +#: ../SparkleShare/SparkleShare.cs:54 msgid "Things would go utterly wrong." msgstr "Może to spowodować nieprzewidziane skutki." -#: ../SparkleShare/SparkleShare.cs:66 -msgid "Don't show the notification icon" -msgstr "Wyłącza wyświetlanie ikony w obszarze powiadamiania" - -#: ../SparkleShare/SparkleShare.cs:67 +#: ../SparkleShare/SparkleShare.cs:61 msgid "Print version information" msgstr "Wyświetla informacje o wersji" -#: ../SparkleShare/SparkleShare.cs:68 +#: ../SparkleShare/SparkleShare.cs:62 msgid "Show this help text" msgstr "Wyświetla opcje pomocy" -#: ../SparkleShare/SparkleShare.cs:115 +#: ../SparkleShare/SparkleShare.cs:109 msgid "SparkleShare, a collaboration and sharing tool." msgstr "SparkleShare ‒ narzędzie wspomagające współpracę." -#: ../SparkleShare/SparkleShare.cs:116 +#: ../SparkleShare/SparkleShare.cs:110 msgid "Copyright (C) 2010 Hylke Bons" msgstr "Copyright (C) 2010 Hylke Bons" -#: ../SparkleShare/SparkleShare.cs:118 +#: ../SparkleShare/SparkleShare.cs:112 msgid "This program comes with ABSOLUTELY NO WARRANTY." msgstr "Niniejszy program dostarczany jest BEZ JAKIEJKOLWIEK GWARANCJI." -#: ../SparkleShare/SparkleShare.cs:120 +#: ../SparkleShare/SparkleShare.cs:114 msgid "This is free software, and you are welcome to redistribute it " msgstr "" "Niniejszy program jest wolnym oprogramowanie, można go rozprowadzać dalej " "pod pewnymi warunkami." -#: ../SparkleShare/SparkleShare.cs:121 +#: ../SparkleShare/SparkleShare.cs:115 msgid "under certain conditions. Please read the GNU GPLv3 for details." msgstr "" "Aby uzyskać więcej informacji, proszę zapoznać się z tekstem licencji GNU " "GPLv3." -#: ../SparkleShare/SparkleShare.cs:123 +#: ../SparkleShare/SparkleShare.cs:117 msgid "SparkleShare automatically syncs Git repositories in " msgstr "" "Program SparkleShare automatycznie synchronizuje reozytoria Git znajdujące " "się" -#: ../SparkleShare/SparkleShare.cs:124 +#: ../SparkleShare/SparkleShare.cs:118 msgid "the ~/SparkleShare folder with their remote origins." msgstr "w katalogu ~/SparkleShare z ich zdalnymi gałęziami." -#: ../SparkleShare/SparkleShare.cs:126 +#: ../SparkleShare/SparkleShare.cs:120 msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..." msgstr "Użycie: sparkleshare [start|stop|restart] [OPCJA]..." -#: ../SparkleShare/SparkleShare.cs:127 +#: ../SparkleShare/SparkleShare.cs:121 msgid "Sync SparkleShare folder with remote repositories." msgstr "" "Synchronizuj zawartość katalogu SparkleShare ze zdalnymi repozytoriami." -#: ../SparkleShare/SparkleShare.cs:129 +#: ../SparkleShare/SparkleShare.cs:123 msgid "Arguments:" msgstr "Parametry:" -#: ../SparkleShare/SparkleShare.cs:139 +#: ../SparkleShare/SparkleShare.cs:133 msgid "SparkleShare " msgstr "SparkleShare" @@ -409,7 +406,7 @@ msgstr "Dodaj zdalny katalog" #: ../SparkleShare/SparkleStatusIcon.cs:242 msgid "Show Recent Events" -msgstr "" +msgstr "Wyświetl ostatnie zdarzenia" #: ../SparkleShare/SparkleStatusIcon.cs:262 msgid "Turn Notifications Off" @@ -424,16 +421,16 @@ msgstr "Włącz powiadomienia" msgid "Quit" msgstr "Zakończ" -#: ../SparkleShare/SparkleUI.cs:96 +#: ../SparkleShare/SparkleUI.cs:99 msgid "Ouch! Mid-air collision!" msgstr "Ups! Nastąpiło czołowe zderzenie! " -#: ../SparkleShare/SparkleUI.cs:97 +#: ../SparkleShare/SparkleUI.cs:100 msgid "Don't worry, SparkleShare made a copy of each conflicting file." msgstr "Bez obaw, program SparkleShare wykonał kopię skonfliktowanych plików." #: ../SparkleShare/SparkleWindow.cs:41 msgid "SparkleShare Setup" -msgstr "" +msgstr "Ustawienia programu SparkleShare" diff --git a/po/pt_BR.po b/po/pt_BR.po index e4faa863..0e7c7923 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -10,31 +10,32 @@ msgid "" msgstr "" "Project-Id-Version: SparkleShare\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-17 12:09+0200\n" -"PO-Revision-Date: 2011-06-17 10:13+0000\n" +"POT-Creation-Date: 2011-06-29 11:38+0200\n" +"PO-Revision-Date: 2011-06-26 09:22+0000\n" "Last-Translator: deejay1 \n" +"Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:338 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:337 #: ../SparkleShare/SparkleIntro.cs:67 ../SparkleShare/SparkleStatusIcon.cs:345 msgid "Welcome to SparkleShare!" msgstr "Bem-vindo ao SparkleShare!" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:349 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:348 #: ../SparkleShare/SparkleStatusIcon.cs:357 msgid "Not everything is synced" msgstr "Nem tudo foi sincronizado" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:359 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:358 #: ../SparkleShare/SparkleStatusIcon.cs:367 msgid "Up to date" msgstr "Atualizado" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:375 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:374 #: ../SparkleShare/SparkleStatusIcon.cs:383 msgid "Syncing…" msgstr "Sincronizando…" @@ -84,42 +85,42 @@ msgstr "_Exibir os Créditos" msgid "_Visit Website" msgstr "Visite o site" -#: ../SparkleShare/SparkleController.cs:422 +#: ../SparkleShare/SparkleController.cs:455 msgid "ddd MMM d, yyyy" msgstr "ddd d MMM yyyy" -#: ../SparkleShare/SparkleController.cs:427 +#: ../SparkleShare/SparkleController.cs:460 msgid "ddd MMM d" msgstr "ddd d MMM" -#: ../SparkleShare/SparkleController.cs:629 +#: ../SparkleShare/SparkleController.cs:661 #, csharp-format msgid "added ‘{0}’" msgstr "incluído '{0}'" -#: ../SparkleShare/SparkleController.cs:634 +#: ../SparkleShare/SparkleController.cs:666 #, csharp-format msgid "moved ‘{0}’" msgstr "'{0}' movida" -#: ../SparkleShare/SparkleController.cs:639 +#: ../SparkleShare/SparkleController.cs:671 #, csharp-format msgid "edited ‘{0}’" msgstr "editado '{0}'" -#: ../SparkleShare/SparkleController.cs:644 +#: ../SparkleShare/SparkleController.cs:676 #, csharp-format msgid "deleted ‘{0}’" msgstr "excluído '{0}'" -#: ../SparkleShare/SparkleController.cs:653 +#: ../SparkleShare/SparkleController.cs:685 #, csharp-format msgid "and {0} more" msgid_plural "and {0} more" msgstr[0] "e {0} mais" msgstr[1] "e {0} mais" -#: ../SparkleShare/SparkleController.cs:657 +#: ../SparkleShare/SparkleController.cs:689 msgid "did something magical" msgstr "Algo mágico aconteceu" @@ -321,73 +322,69 @@ msgstr "Aprenda a hospedar o seu próprio SparkleServer" msgid "Recent Events" msgstr "" -#: ../SparkleShare/SparkleEventLog.cs:131 -#: ../SparkleShare/SparkleEventLog.cs:150 +#: ../SparkleShare/SparkleEventLog.cs:148 +#: ../SparkleShare/SparkleEventLog.cs:173 msgid "All Folders" msgstr "" -#: ../SparkleShare/SparkleShare.cs:56 +#: ../SparkleShare/SparkleShare.cs:53 msgid "Sorry, you can't run SparkleShare with these permissions." msgstr "Descuple, você não pode rodar o SparkleShare sem essas permissões." -#: ../SparkleShare/SparkleShare.cs:57 +#: ../SparkleShare/SparkleShare.cs:54 msgid "Things would go utterly wrong." msgstr "Algo vai dar muito errado." -#: ../SparkleShare/SparkleShare.cs:66 -msgid "Don't show the notification icon" -msgstr "Não exibir o ícone de notificação" - -#: ../SparkleShare/SparkleShare.cs:67 +#: ../SparkleShare/SparkleShare.cs:61 msgid "Print version information" msgstr "Imprimir informações da versão" -#: ../SparkleShare/SparkleShare.cs:68 +#: ../SparkleShare/SparkleShare.cs:62 msgid "Show this help text" msgstr "Exibir esse texto de ajuda" -#: ../SparkleShare/SparkleShare.cs:115 +#: ../SparkleShare/SparkleShare.cs:109 msgid "SparkleShare, a collaboration and sharing tool." msgstr "SparkleShare, uma ferramenta de colaboração e compartilhamento" -#: ../SparkleShare/SparkleShare.cs:116 +#: ../SparkleShare/SparkleShare.cs:110 msgid "Copyright (C) 2010 Hylke Bons" msgstr "Copyright (C) 2010 Hylke Bons - Todos os direitos reservados" -#: ../SparkleShare/SparkleShare.cs:118 +#: ../SparkleShare/SparkleShare.cs:112 msgid "This program comes with ABSOLUTELY NO WARRANTY." msgstr "Este programa vem com ABSOLUTAMENTE NENHUMA GARANTIA." -#: ../SparkleShare/SparkleShare.cs:120 +#: ../SparkleShare/SparkleShare.cs:114 msgid "This is free software, and you are welcome to redistribute it " msgstr "Este é um software livre, e você está convidado a distribuí-lo" -#: ../SparkleShare/SparkleShare.cs:121 +#: ../SparkleShare/SparkleShare.cs:115 msgid "under certain conditions. Please read the GNU GPLv3 for details." msgstr "" "sob certas condições. Por favor leia a licença GNU GPLv3 para mais detalhes." -#: ../SparkleShare/SparkleShare.cs:123 +#: ../SparkleShare/SparkleShare.cs:117 msgid "SparkleShare automatically syncs Git repositories in " msgstr "O SparkleShare sincroniza os repositórios do Git automaticamente" -#: ../SparkleShare/SparkleShare.cs:124 +#: ../SparkleShare/SparkleShare.cs:118 msgid "the ~/SparkleShare folder with their remote origins." msgstr "a pasta ~/SparkleShare com suas origens remotas" -#: ../SparkleShare/SparkleShare.cs:126 +#: ../SparkleShare/SparkleShare.cs:120 msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..." msgstr "Utilização: sparkleshare [start|stop|restart] [OPÇÕES]..." -#: ../SparkleShare/SparkleShare.cs:127 +#: ../SparkleShare/SparkleShare.cs:121 msgid "Sync SparkleShare folder with remote repositories." msgstr "Sincroniza a pasta SparkleShare com repositórios remotos." -#: ../SparkleShare/SparkleShare.cs:129 +#: ../SparkleShare/SparkleShare.cs:123 msgid "Arguments:" msgstr "Argumentos:" -#: ../SparkleShare/SparkleShare.cs:139 +#: ../SparkleShare/SparkleShare.cs:133 msgid "SparkleShare " msgstr "SparkleShare" @@ -417,11 +414,11 @@ msgstr "Ligar as notificações" msgid "Quit" msgstr "Sair" -#: ../SparkleShare/SparkleUI.cs:96 +#: ../SparkleShare/SparkleUI.cs:99 msgid "Ouch! Mid-air collision!" msgstr "Ops! Colisão em pleno vôo!" -#: ../SparkleShare/SparkleUI.cs:97 +#: ../SparkleShare/SparkleUI.cs:100 msgid "Don't worry, SparkleShare made a copy of each conflicting file." msgstr "" "Não se preocupe, SparkleShare fez uma cópia de cada arquivo conflitante." diff --git a/po/ru.po b/po/ru.po index 81f40922..82201bb8 100644 --- a/po/ru.po +++ b/po/ru.po @@ -4,54 +4,56 @@ # we apologise for any incovenience this may have caused and we hope to bring them # back in the future. # +# Dmitry Golubkov , 2011. msgid "" msgstr "" "Project-Id-Version: SparkleShare\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-17 12:09+0200\n" -"PO-Revision-Date: 2011-06-17 10:13+0000\n" -"Last-Translator: deejay1 \n" +"POT-Creation-Date: 2011-06-29 11:38+0200\n" +"PO-Revision-Date: 2011-06-30 10:25+0000\n" +"Last-Translator: herclogon \n" +"Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ru\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:338 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:337 #: ../SparkleShare/SparkleIntro.cs:67 ../SparkleShare/SparkleStatusIcon.cs:345 msgid "Welcome to SparkleShare!" msgstr "Добро пожаловать в SparkleShare!" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:349 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:348 #: ../SparkleShare/SparkleStatusIcon.cs:357 msgid "Not everything is synced" msgstr "" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:359 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:358 #: ../SparkleShare/SparkleStatusIcon.cs:367 msgid "Up to date" msgstr "" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:375 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:374 #: ../SparkleShare/SparkleStatusIcon.cs:383 msgid "Syncing…" msgstr "Синхронизация…" #: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113 msgid "Copy Web Link" -msgstr "" +msgstr "Копировать ссылку" #: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:114 msgid "Copy the web address of this file to the clipboard" -msgstr "" +msgstr "Копировать ссылку в буфер обмена" #: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:147 msgid "Get Earlier Version" -msgstr "" +msgstr "Получить более раннюю версию" #: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:148 msgid "Make a copy of an earlier version in this folder" -msgstr "" +msgstr "Сделать копию более ранней версии в этой папке" #: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:161 msgid "Select to get a copy of this version" @@ -80,37 +82,37 @@ msgstr "" #: ../SparkleShare/SparkleAbout.cs:129 msgid "_Visit Website" -msgstr "" +msgstr "Посетить сайт" -#: ../SparkleShare/SparkleController.cs:422 +#: ../SparkleShare/SparkleController.cs:455 msgid "ddd MMM d, yyyy" msgstr "" -#: ../SparkleShare/SparkleController.cs:427 +#: ../SparkleShare/SparkleController.cs:460 msgid "ddd MMM d" msgstr "" -#: ../SparkleShare/SparkleController.cs:629 +#: ../SparkleShare/SparkleController.cs:661 #, csharp-format msgid "added ‘{0}’" msgstr "" -#: ../SparkleShare/SparkleController.cs:634 +#: ../SparkleShare/SparkleController.cs:666 #, csharp-format msgid "moved ‘{0}’" msgstr "" -#: ../SparkleShare/SparkleController.cs:639 +#: ../SparkleShare/SparkleController.cs:671 #, csharp-format msgid "edited ‘{0}’" msgstr "" -#: ../SparkleShare/SparkleController.cs:644 +#: ../SparkleShare/SparkleController.cs:676 #, csharp-format msgid "deleted ‘{0}’" msgstr "" -#: ../SparkleShare/SparkleController.cs:653 +#: ../SparkleShare/SparkleController.cs:685 #, csharp-format msgid "and {0} more" msgid_plural "and {0} more" @@ -118,31 +120,33 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../SparkleShare/SparkleController.cs:657 +#: ../SparkleShare/SparkleController.cs:689 msgid "did something magical" -msgstr "" +msgstr "сделал что-то магическое" #: ../SparkleShare/SparkleIntro.cs:73 msgid "" "Before we can create a SparkleShare folder on this computer, we need a few " "bits of information from you." msgstr "" +"Прежде чем мы сможем создать папку SparkleShare на этом компьютере, нам " +"нужно от вас немного информации." #: ../SparkleShare/SparkleIntro.cs:83 msgid "Full Name:" -msgstr "" +msgstr "Полное имя:" #: ../SparkleShare/SparkleIntro.cs:98 msgid "Email:" -msgstr "" +msgstr "Эл. почта:" #: ../SparkleShare/SparkleIntro.cs:109 msgid "Next" -msgstr "" +msgstr "Следующий" #: ../SparkleShare/SparkleIntro.cs:115 msgid "Configuring…" -msgstr "" +msgstr "Настройка ..." #: ../SparkleShare/SparkleIntro.cs:161 msgid "Where is your remote folder?" @@ -150,11 +154,11 @@ msgstr "" #: ../SparkleShare/SparkleIntro.cs:174 msgid "address-to-server.com" -msgstr "" +msgstr "address-to-server.com" #: ../SparkleShare/SparkleIntro.cs:179 msgid "On my own server:" -msgstr "" +msgstr "На моем собственном сервере:" #: ../SparkleShare/SparkleIntro.cs:186 msgid "Free hosting for Free and Open Source Software projects." @@ -166,7 +170,7 @@ msgstr "" #: ../SparkleShare/SparkleIntro.cs:195 msgid "The GNOME Project" -msgstr "" +msgstr "The GNOME Project" #: ../SparkleShare/SparkleIntro.cs:197 msgid "GNOME is an easy to understand interface to your computer." @@ -178,7 +182,7 @@ msgstr "" #: ../SparkleShare/SparkleIntro.cs:206 msgid "Gitorious" -msgstr "" +msgstr "Gitorious" #: ../SparkleShare/SparkleIntro.cs:208 msgid "Completely Free as in Freedom infrastructure." @@ -190,7 +194,7 @@ msgstr "" #: ../SparkleShare/SparkleIntro.cs:220 msgid "Username/Folder" -msgstr "" +msgstr "Пользователь/Папка" #: ../SparkleShare/SparkleIntro.cs:225 msgid "Project/Folder" @@ -198,27 +202,27 @@ msgstr "" #: ../SparkleShare/SparkleIntro.cs:230 msgid "Project" -msgstr "" +msgstr "Проект" #: ../SparkleShare/SparkleIntro.cs:235 ../SparkleShare/SparkleIntro.cs:254 msgid "Folder" -msgstr "" +msgstr "Папка" #: ../SparkleShare/SparkleIntro.cs:259 ../SparkleShare/SparkleIntro.cs:377 msgid "Folder Name:" -msgstr "" +msgstr "Имя папки:" #: ../SparkleShare/SparkleIntro.cs:269 msgid "Sync" -msgstr "" +msgstr "Синхронизировать" #: ../SparkleShare/SparkleIntro.cs:312 msgid "Cancel" -msgstr "" +msgstr "Отменить" #: ../SparkleShare/SparkleIntro.cs:320 msgid "Skip" -msgstr "" +msgstr "Пропустить" #: ../SparkleShare/SparkleIntro.cs:347 msgid "Invitation received!" @@ -232,15 +236,15 @@ msgstr "" #: ../SparkleShare/SparkleIntro.cs:359 msgid "Do you accept this invitation?" -msgstr "" +msgstr "Вы принимаете это приглашение?" #: ../SparkleShare/SparkleIntro.cs:368 msgid "Server Address:" -msgstr "" +msgstr "Адрес сервера:" #: ../SparkleShare/SparkleIntro.cs:391 msgid "Reject" -msgstr "" +msgstr "Отказать" #: ../SparkleShare/SparkleIntro.cs:392 msgid "Accept and Sync" @@ -248,11 +252,11 @@ msgstr "" #: ../SparkleShare/SparkleIntro.cs:442 msgid "Something went wrong…" -msgstr "" +msgstr "Что-то пошло не так ..." #: ../SparkleShare/SparkleIntro.cs:448 msgid "Try Again" -msgstr "" +msgstr "Попробуйте еще раз" #: ../SparkleShare/SparkleIntro.cs:473 #, csharp-format @@ -261,7 +265,7 @@ msgstr "" #: ../SparkleShare/SparkleIntro.cs:482 msgid "Folder synced successfully!" -msgstr "" +msgstr "Папка синхронизирована успешно!" #: ../SparkleShare/SparkleIntro.cs:489 #, csharp-format @@ -277,7 +281,7 @@ msgstr "Открыть папку" #: ../SparkleShare/SparkleIntro.cs:503 ../SparkleShare/SparkleIntro.cs:543 #: ../SparkleShare/SparkleIntro.cs:604 msgid "Finish" -msgstr "" +msgstr "Завершить" #: ../SparkleShare/SparkleIntro.cs:528 #, csharp-format @@ -294,7 +298,7 @@ msgstr "" #: ../SparkleShare/SparkleIntro.cs:579 msgid "SparkleShare is ready to go!" -msgstr "" +msgstr "SparkleShare готов к работе!" #: ../SparkleShare/SparkleIntro.cs:585 msgid "" @@ -310,73 +314,69 @@ msgstr "" msgid "Recent Events" msgstr "" -#: ../SparkleShare/SparkleEventLog.cs:131 -#: ../SparkleShare/SparkleEventLog.cs:150 +#: ../SparkleShare/SparkleEventLog.cs:148 +#: ../SparkleShare/SparkleEventLog.cs:173 msgid "All Folders" -msgstr "" +msgstr "Все папки" -#: ../SparkleShare/SparkleShare.cs:56 +#: ../SparkleShare/SparkleShare.cs:53 msgid "Sorry, you can't run SparkleShare with these permissions." msgstr "" "К сожалению, запускать SparkleShare с такими системными правами нельзя." -#: ../SparkleShare/SparkleShare.cs:57 +#: ../SparkleShare/SparkleShare.cs:54 msgid "Things would go utterly wrong." msgstr "" -#: ../SparkleShare/SparkleShare.cs:66 -msgid "Don't show the notification icon" -msgstr "" - -#: ../SparkleShare/SparkleShare.cs:67 +#: ../SparkleShare/SparkleShare.cs:61 msgid "Print version information" msgstr "" -#: ../SparkleShare/SparkleShare.cs:68 +#: ../SparkleShare/SparkleShare.cs:62 msgid "Show this help text" msgstr "" -#: ../SparkleShare/SparkleShare.cs:115 +#: ../SparkleShare/SparkleShare.cs:109 msgid "SparkleShare, a collaboration and sharing tool." msgstr "" -#: ../SparkleShare/SparkleShare.cs:116 +#: ../SparkleShare/SparkleShare.cs:110 msgid "Copyright (C) 2010 Hylke Bons" msgstr "" -#: ../SparkleShare/SparkleShare.cs:118 +#: ../SparkleShare/SparkleShare.cs:112 msgid "This program comes with ABSOLUTELY NO WARRANTY." msgstr "Эта программа поставляется БЕЗ КАКИХ-ЛИБО ГАРАНТИЙ." -#: ../SparkleShare/SparkleShare.cs:120 +#: ../SparkleShare/SparkleShare.cs:114 msgid "This is free software, and you are welcome to redistribute it " msgstr "Эта программа является свободной, ее распространение разрешено " -#: ../SparkleShare/SparkleShare.cs:121 +#: ../SparkleShare/SparkleShare.cs:115 msgid "under certain conditions. Please read the GNU GPLv3 for details." msgstr "при соблюдении требований лицензии GNU GPLv3." -#: ../SparkleShare/SparkleShare.cs:123 +#: ../SparkleShare/SparkleShare.cs:117 msgid "SparkleShare automatically syncs Git repositories in " msgstr "" -#: ../SparkleShare/SparkleShare.cs:124 +#: ../SparkleShare/SparkleShare.cs:118 msgid "the ~/SparkleShare folder with their remote origins." msgstr "" -#: ../SparkleShare/SparkleShare.cs:126 +#: ../SparkleShare/SparkleShare.cs:120 msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..." msgstr "Синтаксис: sparkleshare [start|stop|restart] [КЛЮЧ]..." -#: ../SparkleShare/SparkleShare.cs:127 +#: ../SparkleShare/SparkleShare.cs:121 msgid "Sync SparkleShare folder with remote repositories." msgstr "Синхронизировать папку SparkleShare с удаленными источниками." -#: ../SparkleShare/SparkleShare.cs:129 +#: ../SparkleShare/SparkleShare.cs:123 msgid "Arguments:" msgstr "Параметры:" -#: ../SparkleShare/SparkleShare.cs:139 +#: ../SparkleShare/SparkleShare.cs:133 msgid "SparkleShare " msgstr "" @@ -399,18 +399,18 @@ msgstr "" #: ../SparkleShare/SparkleStatusIcon.cs:264 msgid "Turn Notifications On" -msgstr "" +msgstr "Уведомления включены" #. A menu item that quits the application #: ../SparkleShare/SparkleStatusIcon.cs:286 msgid "Quit" msgstr "Выход" -#: ../SparkleShare/SparkleUI.cs:96 +#: ../SparkleShare/SparkleUI.cs:99 msgid "Ouch! Mid-air collision!" msgstr "" -#: ../SparkleShare/SparkleUI.cs:97 +#: ../SparkleShare/SparkleUI.cs:100 msgid "Don't worry, SparkleShare made a copy of each conflicting file." msgstr "" diff --git a/po/sv.po b/po/sv.po index 5c9e5ae7..8367981a 100644 --- a/po/sv.po +++ b/po/sv.po @@ -5,37 +5,39 @@ # back in the future. # # , 2011. +# , 2011. # , 2011. # smygrokarn , 2011. msgid "" msgstr "" "Project-Id-Version: SparkleShare\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-17 12:09+0200\n" -"PO-Revision-Date: 2011-06-17 10:13+0000\n" -"Last-Translator: deejay1 \n" +"POT-Creation-Date: 2011-06-29 11:38+0200\n" +"PO-Revision-Date: 2011-07-07 18:57+0000\n" +"Last-Translator: janerictobias \n" +"Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:338 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:337 #: ../SparkleShare/SparkleIntro.cs:67 ../SparkleShare/SparkleStatusIcon.cs:345 msgid "Welcome to SparkleShare!" msgstr "Välkommen till SparkleShare!" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:349 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:348 #: ../SparkleShare/SparkleStatusIcon.cs:357 msgid "Not everything is synced" msgstr "Inte allt har synkroniserats" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:359 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:358 #: ../SparkleShare/SparkleStatusIcon.cs:367 msgid "Up to date" msgstr "Aktuell" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:375 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:374 #: ../SparkleShare/SparkleStatusIcon.cs:383 msgid "Syncing…" msgstr "Synkroniserar…" @@ -85,42 +87,42 @@ msgstr "_Visa erkännande" msgid "_Visit Website" msgstr "_Besök Webbsida" -#: ../SparkleShare/SparkleController.cs:422 +#: ../SparkleShare/SparkleController.cs:455 msgid "ddd MMM d, yyyy" msgstr "ddd MMM d, åååå" -#: ../SparkleShare/SparkleController.cs:427 +#: ../SparkleShare/SparkleController.cs:460 msgid "ddd MMM d" msgstr "ddd MMM d" -#: ../SparkleShare/SparkleController.cs:629 +#: ../SparkleShare/SparkleController.cs:661 #, csharp-format msgid "added ‘{0}’" msgstr "la till '{0}'" -#: ../SparkleShare/SparkleController.cs:634 +#: ../SparkleShare/SparkleController.cs:666 #, csharp-format msgid "moved ‘{0}’" msgstr "flyttat '{0}'" -#: ../SparkleShare/SparkleController.cs:639 +#: ../SparkleShare/SparkleController.cs:671 #, csharp-format msgid "edited ‘{0}’" msgstr "redigerade '{0}'" -#: ../SparkleShare/SparkleController.cs:644 +#: ../SparkleShare/SparkleController.cs:676 #, csharp-format msgid "deleted ‘{0}’" msgstr "tog bort '{0}'" -#: ../SparkleShare/SparkleController.cs:653 +#: ../SparkleShare/SparkleController.cs:685 #, csharp-format msgid "and {0} more" msgid_plural "and {0} more" msgstr[0] "och {0} fler" msgstr[1] "och {0} fler" -#: ../SparkleShare/SparkleController.cs:657 +#: ../SparkleShare/SparkleController.cs:689 msgid "did something magical" msgstr "gjorde något magiskt" @@ -319,74 +321,70 @@ msgstr "Lär dig hur du sätter upp en egen SparkleServer" #: ../SparkleShare/SparkleEventLog.cs:61 msgid "Recent Events" -msgstr "" +msgstr "Senaste händelser" -#: ../SparkleShare/SparkleEventLog.cs:131 -#: ../SparkleShare/SparkleEventLog.cs:150 +#: ../SparkleShare/SparkleEventLog.cs:148 +#: ../SparkleShare/SparkleEventLog.cs:173 msgid "All Folders" -msgstr "" +msgstr "Alla kataloger" -#: ../SparkleShare/SparkleShare.cs:56 +#: ../SparkleShare/SparkleShare.cs:53 msgid "Sorry, you can't run SparkleShare with these permissions." msgstr "Ledsen, men du kan inte köra SparkleShare med dessa rättigheter." -#: ../SparkleShare/SparkleShare.cs:57 +#: ../SparkleShare/SparkleShare.cs:54 msgid "Things would go utterly wrong." msgstr "Detta kan gå helt fel." -#: ../SparkleShare/SparkleShare.cs:66 -msgid "Don't show the notification icon" -msgstr "Visa inte " - -#: ../SparkleShare/SparkleShare.cs:67 +#: ../SparkleShare/SparkleShare.cs:61 msgid "Print version information" msgstr "Skriv ut versionsinformation" -#: ../SparkleShare/SparkleShare.cs:68 +#: ../SparkleShare/SparkleShare.cs:62 msgid "Show this help text" msgstr "Visa denna hjälp-text" -#: ../SparkleShare/SparkleShare.cs:115 +#: ../SparkleShare/SparkleShare.cs:109 msgid "SparkleShare, a collaboration and sharing tool." msgstr "SparkleShare, ett verktyg för samarbete och delning" -#: ../SparkleShare/SparkleShare.cs:116 +#: ../SparkleShare/SparkleShare.cs:110 msgid "Copyright (C) 2010 Hylke Bons" msgstr "Copyright (C) 2010 Hylke Bons" -#: ../SparkleShare/SparkleShare.cs:118 +#: ../SparkleShare/SparkleShare.cs:112 msgid "This program comes with ABSOLUTELY NO WARRANTY." msgstr "Detta program kommer utan några som helst garantier." -#: ../SparkleShare/SparkleShare.cs:120 +#: ../SparkleShare/SparkleShare.cs:114 msgid "This is free software, and you are welcome to redistribute it " msgstr "Detta är fri programvara och du är välkommen att distribuera det " -#: ../SparkleShare/SparkleShare.cs:121 +#: ../SparkleShare/SparkleShare.cs:115 msgid "under certain conditions. Please read the GNU GPLv3 for details." msgstr "under vissa förhållanden. Vänligen läs GNU GPL v3 för detaljer." -#: ../SparkleShare/SparkleShare.cs:123 +#: ../SparkleShare/SparkleShare.cs:117 msgid "SparkleShare automatically syncs Git repositories in " msgstr "SparkleShare synkroniserar automatiskt Git-källor i " -#: ../SparkleShare/SparkleShare.cs:124 +#: ../SparkleShare/SparkleShare.cs:118 msgid "the ~/SparkleShare folder with their remote origins." msgstr "katalogen ~/SparkleShare med deras fjärrkällor." -#: ../SparkleShare/SparkleShare.cs:126 +#: ../SparkleShare/SparkleShare.cs:120 msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..." msgstr "Användning: sparkleshare [start|stop|restart] [VÄXEL]" -#: ../SparkleShare/SparkleShare.cs:127 +#: ../SparkleShare/SparkleShare.cs:121 msgid "Sync SparkleShare folder with remote repositories." msgstr "Synkronisera SparkleShare mappen med fjärrkällor." -#: ../SparkleShare/SparkleShare.cs:129 +#: ../SparkleShare/SparkleShare.cs:123 msgid "Arguments:" msgstr "Argument:" -#: ../SparkleShare/SparkleShare.cs:139 +#: ../SparkleShare/SparkleShare.cs:133 msgid "SparkleShare " msgstr "SparkleShare" @@ -401,7 +399,7 @@ msgstr "Lägg till fjärrkatalog" #: ../SparkleShare/SparkleStatusIcon.cs:242 msgid "Show Recent Events" -msgstr "" +msgstr "Visa senaste händelser" #: ../SparkleShare/SparkleStatusIcon.cs:262 msgid "Turn Notifications Off" @@ -416,11 +414,11 @@ msgstr "Sätt på notifieringar" msgid "Quit" msgstr "Avsluta" -#: ../SparkleShare/SparkleUI.cs:96 +#: ../SparkleShare/SparkleUI.cs:99 msgid "Ouch! Mid-air collision!" msgstr "Ouch! Kollision mitt i luften!" -#: ../SparkleShare/SparkleUI.cs:97 +#: ../SparkleShare/SparkleUI.cs:100 msgid "Don't worry, SparkleShare made a copy of each conflicting file." msgstr "Oroa dig inte, SparkleShare gjorde en kopia av konflikt-filen." diff --git a/po/te.po b/po/te.po index 353835be..8b1e0052 100644 --- a/po/te.po +++ b/po/te.po @@ -8,31 +8,32 @@ msgid "" msgstr "" "Project-Id-Version: SparkleShare\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-17 12:09+0200\n" -"PO-Revision-Date: 2011-06-17 10:13+0000\n" +"POT-Creation-Date: 2011-06-29 11:38+0200\n" +"PO-Revision-Date: 2011-06-26 09:22+0000\n" "Last-Translator: deejay1 \n" +"Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: te\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:338 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:337 #: ../SparkleShare/SparkleIntro.cs:67 ../SparkleShare/SparkleStatusIcon.cs:345 msgid "Welcome to SparkleShare!" msgstr "స్పార్కిల్‌షేర్‌కి స్వాగతం!" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:349 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:348 #: ../SparkleShare/SparkleStatusIcon.cs:357 msgid "Not everything is synced" msgstr "" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:359 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:358 #: ../SparkleShare/SparkleStatusIcon.cs:367 msgid "Up to date" msgstr "" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:375 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:374 #: ../SparkleShare/SparkleStatusIcon.cs:383 msgid "Syncing…" msgstr "" @@ -82,42 +83,42 @@ msgstr "" msgid "_Visit Website" msgstr "" -#: ../SparkleShare/SparkleController.cs:422 +#: ../SparkleShare/SparkleController.cs:455 msgid "ddd MMM d, yyyy" msgstr "" -#: ../SparkleShare/SparkleController.cs:427 +#: ../SparkleShare/SparkleController.cs:460 msgid "ddd MMM d" msgstr "" -#: ../SparkleShare/SparkleController.cs:629 +#: ../SparkleShare/SparkleController.cs:661 #, csharp-format msgid "added ‘{0}’" msgstr "" -#: ../SparkleShare/SparkleController.cs:634 +#: ../SparkleShare/SparkleController.cs:666 #, csharp-format msgid "moved ‘{0}’" msgstr "" -#: ../SparkleShare/SparkleController.cs:639 +#: ../SparkleShare/SparkleController.cs:671 #, csharp-format msgid "edited ‘{0}’" msgstr "" -#: ../SparkleShare/SparkleController.cs:644 +#: ../SparkleShare/SparkleController.cs:676 #, csharp-format msgid "deleted ‘{0}’" msgstr "" -#: ../SparkleShare/SparkleController.cs:653 +#: ../SparkleShare/SparkleController.cs:685 #, csharp-format msgid "and {0} more" msgid_plural "and {0} more" msgstr[0] "" msgstr[1] "" -#: ../SparkleShare/SparkleController.cs:657 +#: ../SparkleShare/SparkleController.cs:689 msgid "did something magical" msgstr "" @@ -309,72 +310,68 @@ msgstr "" msgid "Recent Events" msgstr "" -#: ../SparkleShare/SparkleEventLog.cs:131 -#: ../SparkleShare/SparkleEventLog.cs:150 +#: ../SparkleShare/SparkleEventLog.cs:148 +#: ../SparkleShare/SparkleEventLog.cs:173 msgid "All Folders" msgstr "" -#: ../SparkleShare/SparkleShare.cs:56 +#: ../SparkleShare/SparkleShare.cs:53 msgid "Sorry, you can't run SparkleShare with these permissions." msgstr "" -#: ../SparkleShare/SparkleShare.cs:57 +#: ../SparkleShare/SparkleShare.cs:54 msgid "Things would go utterly wrong." msgstr "" -#: ../SparkleShare/SparkleShare.cs:66 -msgid "Don't show the notification icon" -msgstr "" - -#: ../SparkleShare/SparkleShare.cs:67 +#: ../SparkleShare/SparkleShare.cs:61 msgid "Print version information" msgstr "" -#: ../SparkleShare/SparkleShare.cs:68 +#: ../SparkleShare/SparkleShare.cs:62 msgid "Show this help text" msgstr "" -#: ../SparkleShare/SparkleShare.cs:115 +#: ../SparkleShare/SparkleShare.cs:109 msgid "SparkleShare, a collaboration and sharing tool." msgstr "" -#: ../SparkleShare/SparkleShare.cs:116 +#: ../SparkleShare/SparkleShare.cs:110 msgid "Copyright (C) 2010 Hylke Bons" msgstr "" -#: ../SparkleShare/SparkleShare.cs:118 +#: ../SparkleShare/SparkleShare.cs:112 msgid "This program comes with ABSOLUTELY NO WARRANTY." msgstr "" -#: ../SparkleShare/SparkleShare.cs:120 +#: ../SparkleShare/SparkleShare.cs:114 msgid "This is free software, and you are welcome to redistribute it " msgstr "" -#: ../SparkleShare/SparkleShare.cs:121 +#: ../SparkleShare/SparkleShare.cs:115 msgid "under certain conditions. Please read the GNU GPLv3 for details." msgstr "" -#: ../SparkleShare/SparkleShare.cs:123 +#: ../SparkleShare/SparkleShare.cs:117 msgid "SparkleShare automatically syncs Git repositories in " msgstr "" -#: ../SparkleShare/SparkleShare.cs:124 +#: ../SparkleShare/SparkleShare.cs:118 msgid "the ~/SparkleShare folder with their remote origins." msgstr "" -#: ../SparkleShare/SparkleShare.cs:126 +#: ../SparkleShare/SparkleShare.cs:120 msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..." msgstr "" -#: ../SparkleShare/SparkleShare.cs:127 +#: ../SparkleShare/SparkleShare.cs:121 msgid "Sync SparkleShare folder with remote repositories." msgstr "" -#: ../SparkleShare/SparkleShare.cs:129 +#: ../SparkleShare/SparkleShare.cs:123 msgid "Arguments:" msgstr "" -#: ../SparkleShare/SparkleShare.cs:139 +#: ../SparkleShare/SparkleShare.cs:133 msgid "SparkleShare " msgstr "" @@ -404,11 +401,11 @@ msgstr "" msgid "Quit" msgstr "చాలించు" -#: ../SparkleShare/SparkleUI.cs:96 +#: ../SparkleShare/SparkleUI.cs:99 msgid "Ouch! Mid-air collision!" msgstr "" -#: ../SparkleShare/SparkleUI.cs:97 +#: ../SparkleShare/SparkleUI.cs:100 msgid "Don't worry, SparkleShare made a copy of each conflicting file." msgstr "" diff --git a/po/uk.po b/po/uk.po index 981092a1..86b5f54b 100644 --- a/po/uk.po +++ b/po/uk.po @@ -9,31 +9,32 @@ msgid "" msgstr "" "Project-Id-Version: SparkleShare\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-17 12:09+0200\n" -"PO-Revision-Date: 2011-06-17 10:13+0000\n" +"POT-Creation-Date: 2011-06-29 11:38+0200\n" +"PO-Revision-Date: 2011-06-26 09:22+0000\n" "Last-Translator: deejay1 \n" +"Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: uk\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:338 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:337 #: ../SparkleShare/SparkleIntro.cs:67 ../SparkleShare/SparkleStatusIcon.cs:345 msgid "Welcome to SparkleShare!" msgstr "Ласкаво просимо до SparkleShare!" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:349 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:348 #: ../SparkleShare/SparkleStatusIcon.cs:357 msgid "Not everything is synced" msgstr "Ще не все синхронізовано" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:359 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:358 #: ../SparkleShare/SparkleStatusIcon.cs:367 msgid "Up to date" msgstr "Оновлено" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:375 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:374 #: ../SparkleShare/SparkleStatusIcon.cs:383 msgid "Syncing…" msgstr "Синхронізація..." @@ -83,35 +84,35 @@ msgstr "_Показати авторів" msgid "_Visit Website" msgstr "_Відвідати веб-сайт" -#: ../SparkleShare/SparkleController.cs:422 +#: ../SparkleShare/SparkleController.cs:455 msgid "ddd MMM d, yyyy" msgstr "ddd d MMM yyyy" -#: ../SparkleShare/SparkleController.cs:427 +#: ../SparkleShare/SparkleController.cs:460 msgid "ddd MMM d" msgstr "ddd d MMM" -#: ../SparkleShare/SparkleController.cs:629 +#: ../SparkleShare/SparkleController.cs:661 #, csharp-format msgid "added ‘{0}’" msgstr "додано «{0}»" -#: ../SparkleShare/SparkleController.cs:634 +#: ../SparkleShare/SparkleController.cs:666 #, csharp-format msgid "moved ‘{0}’" msgstr "" -#: ../SparkleShare/SparkleController.cs:639 +#: ../SparkleShare/SparkleController.cs:671 #, csharp-format msgid "edited ‘{0}’" msgstr "змінено «{0}»" -#: ../SparkleShare/SparkleController.cs:644 +#: ../SparkleShare/SparkleController.cs:676 #, csharp-format msgid "deleted ‘{0}’" msgstr "вилучено «{0}»" -#: ../SparkleShare/SparkleController.cs:653 +#: ../SparkleShare/SparkleController.cs:685 #, csharp-format msgid "and {0} more" msgid_plural "and {0} more" @@ -119,7 +120,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../SparkleShare/SparkleController.cs:657 +#: ../SparkleShare/SparkleController.cs:689 msgid "did something magical" msgstr "" @@ -322,73 +323,69 @@ msgstr "Дізнайтеся, як створити свій власний се msgid "Recent Events" msgstr "" -#: ../SparkleShare/SparkleEventLog.cs:131 -#: ../SparkleShare/SparkleEventLog.cs:150 +#: ../SparkleShare/SparkleEventLog.cs:148 +#: ../SparkleShare/SparkleEventLog.cs:173 msgid "All Folders" msgstr "" -#: ../SparkleShare/SparkleShare.cs:56 +#: ../SparkleShare/SparkleShare.cs:53 msgid "Sorry, you can't run SparkleShare with these permissions." msgstr "" "На жаль, ви не можете запустити SparkleShare з такими правами доступу." -#: ../SparkleShare/SparkleShare.cs:57 +#: ../SparkleShare/SparkleShare.cs:54 msgid "Things would go utterly wrong." msgstr "Все могло піти дуже неправильно." -#: ../SparkleShare/SparkleShare.cs:66 -msgid "Don't show the notification icon" -msgstr "Не показувати значок сповіщення" - -#: ../SparkleShare/SparkleShare.cs:67 +#: ../SparkleShare/SparkleShare.cs:61 msgid "Print version information" msgstr "Вивести дані про версію" -#: ../SparkleShare/SparkleShare.cs:68 +#: ../SparkleShare/SparkleShare.cs:62 msgid "Show this help text" msgstr "Показати текст цієї довідки" -#: ../SparkleShare/SparkleShare.cs:115 +#: ../SparkleShare/SparkleShare.cs:109 msgid "SparkleShare, a collaboration and sharing tool." msgstr "" -#: ../SparkleShare/SparkleShare.cs:116 +#: ../SparkleShare/SparkleShare.cs:110 msgid "Copyright (C) 2010 Hylke Bons" msgstr "Авторське право (C) 2010 Hylke Bons" -#: ../SparkleShare/SparkleShare.cs:118 +#: ../SparkleShare/SparkleShare.cs:112 msgid "This program comes with ABSOLUTELY NO WARRANTY." msgstr "Ця програма розповсюджується БЕЗ ВСЯКОЇ ГАРАНТІЇ." -#: ../SparkleShare/SparkleShare.cs:120 +#: ../SparkleShare/SparkleShare.cs:114 msgid "This is free software, and you are welcome to redistribute it " msgstr "Це вільна програма і ви можете поширювати її " -#: ../SparkleShare/SparkleShare.cs:121 +#: ../SparkleShare/SparkleShare.cs:115 msgid "under certain conditions. Please read the GNU GPLv3 for details." msgstr "за певних умов. Детальніше читайте ліцензію GNU GPLv3." -#: ../SparkleShare/SparkleShare.cs:123 +#: ../SparkleShare/SparkleShare.cs:117 msgid "SparkleShare automatically syncs Git repositories in " msgstr "SparkleShare автоматично синхронізує сховища Git в " -#: ../SparkleShare/SparkleShare.cs:124 +#: ../SparkleShare/SparkleShare.cs:118 msgid "the ~/SparkleShare folder with their remote origins." msgstr "теці ~/SparkleShare з її віддаленими походженнями." -#: ../SparkleShare/SparkleShare.cs:126 +#: ../SparkleShare/SparkleShare.cs:120 msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..." msgstr "Використання: sparkleshare [start|stop|restart] [OPTION]..." -#: ../SparkleShare/SparkleShare.cs:127 +#: ../SparkleShare/SparkleShare.cs:121 msgid "Sync SparkleShare folder with remote repositories." msgstr "Синхронізація теки SparkleShare з віддаленими сховищами." -#: ../SparkleShare/SparkleShare.cs:129 +#: ../SparkleShare/SparkleShare.cs:123 msgid "Arguments:" msgstr "Аргументи:" -#: ../SparkleShare/SparkleShare.cs:139 +#: ../SparkleShare/SparkleShare.cs:133 msgid "SparkleShare " msgstr "SparkleShare " @@ -418,11 +415,11 @@ msgstr "Увімкнути сповіщення" msgid "Quit" msgstr "Вийти" -#: ../SparkleShare/SparkleUI.cs:96 +#: ../SparkleShare/SparkleUI.cs:99 msgid "Ouch! Mid-air collision!" msgstr "Отакої! Зіткнення в повітрі!" -#: ../SparkleShare/SparkleUI.cs:97 +#: ../SparkleShare/SparkleUI.cs:100 msgid "Don't worry, SparkleShare made a copy of each conflicting file." msgstr "" "Не хвилюйтесь, SparkleShare створює копію кожного суперечливого файла." diff --git a/po/zh_CN.po b/po/zh_CN.po index 3db65fc6..cae11497 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -9,31 +9,32 @@ msgid "" msgstr "" "Project-Id-Version: SparkleShare\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-17 12:09+0200\n" -"PO-Revision-Date: 2011-06-17 10:13+0000\n" +"POT-Creation-Date: 2011-06-29 11:38+0200\n" +"PO-Revision-Date: 2011-06-26 09:22+0000\n" "Last-Translator: deejay1 \n" +"Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0\n" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:338 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:337 #: ../SparkleShare/SparkleIntro.cs:67 ../SparkleShare/SparkleStatusIcon.cs:345 msgid "Welcome to SparkleShare!" msgstr "欢迎使用 SparkleShare！" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:349 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:348 #: ../SparkleShare/SparkleStatusIcon.cs:357 msgid "Not everything is synced" msgstr "" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:359 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:358 #: ../SparkleShare/SparkleStatusIcon.cs:367 msgid "Up to date" msgstr "" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:375 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:374 #: ../SparkleShare/SparkleStatusIcon.cs:383 msgid "Syncing…" msgstr "同步中..." @@ -83,41 +84,41 @@ msgstr "" msgid "_Visit Website" msgstr "" -#: ../SparkleShare/SparkleController.cs:422 +#: ../SparkleShare/SparkleController.cs:455 msgid "ddd MMM d, yyyy" msgstr "" -#: ../SparkleShare/SparkleController.cs:427 +#: ../SparkleShare/SparkleController.cs:460 msgid "ddd MMM d" msgstr "" -#: ../SparkleShare/SparkleController.cs:629 +#: ../SparkleShare/SparkleController.cs:661 #, csharp-format msgid "added ‘{0}’" msgstr "" -#: ../SparkleShare/SparkleController.cs:634 +#: ../SparkleShare/SparkleController.cs:666 #, csharp-format msgid "moved ‘{0}’" msgstr "" -#: ../SparkleShare/SparkleController.cs:639 +#: ../SparkleShare/SparkleController.cs:671 #, csharp-format msgid "edited ‘{0}’" msgstr "" -#: ../SparkleShare/SparkleController.cs:644 +#: ../SparkleShare/SparkleController.cs:676 #, csharp-format msgid "deleted ‘{0}’" msgstr "" -#: ../SparkleShare/SparkleController.cs:653 +#: ../SparkleShare/SparkleController.cs:685 #, csharp-format msgid "and {0} more" msgid_plural "and {0} more" msgstr[0] "" -#: ../SparkleShare/SparkleController.cs:657 +#: ../SparkleShare/SparkleController.cs:689 msgid "did something magical" msgstr "" @@ -309,72 +310,68 @@ msgstr "学习如何设置自己的SparkleServer" msgid "Recent Events" msgstr "" -#: ../SparkleShare/SparkleEventLog.cs:131 -#: ../SparkleShare/SparkleEventLog.cs:150 +#: ../SparkleShare/SparkleEventLog.cs:148 +#: ../SparkleShare/SparkleEventLog.cs:173 msgid "All Folders" msgstr "" -#: ../SparkleShare/SparkleShare.cs:56 +#: ../SparkleShare/SparkleShare.cs:53 msgid "Sorry, you can't run SparkleShare with these permissions." msgstr "对不起，您不能在这些许可下运行 SparkleShare。" -#: ../SparkleShare/SparkleShare.cs:57 +#: ../SparkleShare/SparkleShare.cs:54 msgid "Things would go utterly wrong." msgstr "出现严重错误" -#: ../SparkleShare/SparkleShare.cs:66 -msgid "Don't show the notification icon" -msgstr "" - -#: ../SparkleShare/SparkleShare.cs:67 +#: ../SparkleShare/SparkleShare.cs:61 msgid "Print version information" msgstr "" -#: ../SparkleShare/SparkleShare.cs:68 +#: ../SparkleShare/SparkleShare.cs:62 msgid "Show this help text" msgstr "" -#: ../SparkleShare/SparkleShare.cs:115 +#: ../SparkleShare/SparkleShare.cs:109 msgid "SparkleShare, a collaboration and sharing tool." msgstr "" -#: ../SparkleShare/SparkleShare.cs:116 +#: ../SparkleShare/SparkleShare.cs:110 msgid "Copyright (C) 2010 Hylke Bons" msgstr "" -#: ../SparkleShare/SparkleShare.cs:118 +#: ../SparkleShare/SparkleShare.cs:112 msgid "This program comes with ABSOLUTELY NO WARRANTY." msgstr "本程序不提供任何质量保证" -#: ../SparkleShare/SparkleShare.cs:120 +#: ../SparkleShare/SparkleShare.cs:114 msgid "This is free software, and you are welcome to redistribute it " msgstr "这是自由软件，欢迎您再次分发。" -#: ../SparkleShare/SparkleShare.cs:121 +#: ../SparkleShare/SparkleShare.cs:115 msgid "under certain conditions. Please read the GNU GPLv3 for details." msgstr "在某种条件下。详情请参见 GNU GPLv3。" -#: ../SparkleShare/SparkleShare.cs:123 +#: ../SparkleShare/SparkleShare.cs:117 msgid "SparkleShare automatically syncs Git repositories in " msgstr "" -#: ../SparkleShare/SparkleShare.cs:124 +#: ../SparkleShare/SparkleShare.cs:118 msgid "the ~/SparkleShare folder with their remote origins." msgstr "" -#: ../SparkleShare/SparkleShare.cs:126 +#: ../SparkleShare/SparkleShare.cs:120 msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..." msgstr "用法：sparkleshare [start|stop|restart] [OPTION]..." -#: ../SparkleShare/SparkleShare.cs:127 +#: ../SparkleShare/SparkleShare.cs:121 msgid "Sync SparkleShare folder with remote repositories." msgstr "" -#: ../SparkleShare/SparkleShare.cs:129 +#: ../SparkleShare/SparkleShare.cs:123 msgid "Arguments:" msgstr "参数：" -#: ../SparkleShare/SparkleShare.cs:139 +#: ../SparkleShare/SparkleShare.cs:133 msgid "SparkleShare " msgstr "SparkleShare" @@ -404,11 +401,11 @@ msgstr "" msgid "Quit" msgstr "退出" -#: ../SparkleShare/SparkleUI.cs:96 +#: ../SparkleShare/SparkleUI.cs:99 msgid "Ouch! Mid-air collision!" msgstr "" -#: ../SparkleShare/SparkleUI.cs:97 +#: ../SparkleShare/SparkleUI.cs:100 msgid "Don't worry, SparkleShare made a copy of each conflicting file." msgstr "" diff --git a/po/zh_TW.po b/po/zh_TW.po index bdef5093..4d5d83cc 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -8,31 +8,32 @@ msgid "" msgstr "" "Project-Id-Version: SparkleShare\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-17 12:09+0200\n" -"PO-Revision-Date: 2011-06-17 10:13+0000\n" +"POT-Creation-Date: 2011-06-29 11:38+0200\n" +"PO-Revision-Date: 2011-06-26 09:22+0000\n" "Last-Translator: deejay1 \n" +"Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: zh_TW\n" "Plural-Forms: nplurals=1; plural=0\n" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:338 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:337 #: ../SparkleShare/SparkleIntro.cs:67 ../SparkleShare/SparkleStatusIcon.cs:345 msgid "Welcome to SparkleShare!" msgstr "歡迎使用 SparkleShare！" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:349 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:348 #: ../SparkleShare/SparkleStatusIcon.cs:357 msgid "Not everything is synced" msgstr "" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:359 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:358 #: ../SparkleShare/SparkleStatusIcon.cs:367 msgid "Up to date" msgstr "更新" -#: ../SparkleShare/Mac/SparkleStatusIcon.cs:375 +#: ../SparkleShare/Mac/SparkleStatusIcon.cs:374 #: ../SparkleShare/SparkleStatusIcon.cs:383 msgid "Syncing…" msgstr "同步中…" @@ -82,41 +83,41 @@ msgstr "" msgid "_Visit Website" msgstr "" -#: ../SparkleShare/SparkleController.cs:422 +#: ../SparkleShare/SparkleController.cs:455 msgid "ddd MMM d, yyyy" msgstr "" -#: ../SparkleShare/SparkleController.cs:427 +#: ../SparkleShare/SparkleController.cs:460 msgid "ddd MMM d" msgstr "" -#: ../SparkleShare/SparkleController.cs:629 +#: ../SparkleShare/SparkleController.cs:661 #, csharp-format msgid "added ‘{0}’" msgstr "" -#: ../SparkleShare/SparkleController.cs:634 +#: ../SparkleShare/SparkleController.cs:666 #, csharp-format msgid "moved ‘{0}’" msgstr "" -#: ../SparkleShare/SparkleController.cs:639 +#: ../SparkleShare/SparkleController.cs:671 #, csharp-format msgid "edited ‘{0}’" msgstr "" -#: ../SparkleShare/SparkleController.cs:644 +#: ../SparkleShare/SparkleController.cs:676 #, csharp-format msgid "deleted ‘{0}’" msgstr "" -#: ../SparkleShare/SparkleController.cs:653 +#: ../SparkleShare/SparkleController.cs:685 #, csharp-format msgid "and {0} more" msgid_plural "and {0} more" msgstr[0] "" -#: ../SparkleShare/SparkleController.cs:657 +#: ../SparkleShare/SparkleController.cs:689 msgid "did something magical" msgstr "" @@ -312,72 +313,68 @@ msgstr "學習如何照料自己的 SparkleServer" msgid "Recent Events" msgstr "" -#: ../SparkleShare/SparkleEventLog.cs:131 -#: ../SparkleShare/SparkleEventLog.cs:150 +#: ../SparkleShare/SparkleEventLog.cs:148 +#: ../SparkleShare/SparkleEventLog.cs:173 msgid "All Folders" msgstr "" -#: ../SparkleShare/SparkleShare.cs:56 +#: ../SparkleShare/SparkleShare.cs:53 msgid "Sorry, you can't run SparkleShare with these permissions." msgstr "抱歉，您不能以此權限執行 SparkleShare。" -#: ../SparkleShare/SparkleShare.cs:57 +#: ../SparkleShare/SparkleShare.cs:54 msgid "Things would go utterly wrong." msgstr "會出現嚴重錯誤" -#: ../SparkleShare/SparkleShare.cs:66 -msgid "Don't show the notification icon" -msgstr "不顯示通知圖示" - -#: ../SparkleShare/SparkleShare.cs:67 +#: ../SparkleShare/SparkleShare.cs:61 msgid "Print version information" msgstr "列印版本資訊" -#: ../SparkleShare/SparkleShare.cs:68 +#: ../SparkleShare/SparkleShare.cs:62 msgid "Show this help text" msgstr "顯示這份說明文字" -#: ../SparkleShare/SparkleShare.cs:115 +#: ../SparkleShare/SparkleShare.cs:109 msgid "SparkleShare, a collaboration and sharing tool." msgstr "" -#: ../SparkleShare/SparkleShare.cs:116 +#: ../SparkleShare/SparkleShare.cs:110 msgid "Copyright (C) 2010 Hylke Bons" msgstr "著作權©2010 Hylke Bons" -#: ../SparkleShare/SparkleShare.cs:118 +#: ../SparkleShare/SparkleShare.cs:112 msgid "This program comes with ABSOLUTELY NO WARRANTY." msgstr "本程式不提供任何擔保" -#: ../SparkleShare/SparkleShare.cs:120 +#: ../SparkleShare/SparkleShare.cs:114 msgid "This is free software, and you are welcome to redistribute it " msgstr "這是自由軟體，歡迎您在某些條件之下" -#: ../SparkleShare/SparkleShare.cs:121 +#: ../SparkleShare/SparkleShare.cs:115 msgid "under certain conditions. Please read the GNU GPLv3 for details." msgstr "繼續散布它。詳情請參見 GNU GPLv3。" -#: ../SparkleShare/SparkleShare.cs:123 +#: ../SparkleShare/SparkleShare.cs:117 msgid "SparkleShare automatically syncs Git repositories in " msgstr "SparkleShare 自動同步 Git 儲存庫於 " -#: ../SparkleShare/SparkleShare.cs:124 +#: ../SparkleShare/SparkleShare.cs:118 msgid "the ~/SparkleShare folder with their remote origins." msgstr "~/SparkleShare 資料夾與它們的遠端來源。" -#: ../SparkleShare/SparkleShare.cs:126 +#: ../SparkleShare/SparkleShare.cs:120 msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..." msgstr "用法：sparkleshare [start|stop|restart] [選項]…" -#: ../SparkleShare/SparkleShare.cs:127 +#: ../SparkleShare/SparkleShare.cs:121 msgid "Sync SparkleShare folder with remote repositories." msgstr "同步 SparkleShare 資料夾與遠端儲存庫。" -#: ../SparkleShare/SparkleShare.cs:129 +#: ../SparkleShare/SparkleShare.cs:123 msgid "Arguments:" msgstr "引數：" -#: ../SparkleShare/SparkleShare.cs:139 +#: ../SparkleShare/SparkleShare.cs:133 msgid "SparkleShare " msgstr "SparkleShare " @@ -407,11 +404,11 @@ msgstr "" msgid "Quit" msgstr "離開" -#: ../SparkleShare/SparkleUI.cs:96 +#: ../SparkleShare/SparkleUI.cs:99 msgid "Ouch! Mid-air collision!" msgstr "噢！半空中相撞！" -#: ../SparkleShare/SparkleUI.cs:97 +#: ../SparkleShare/SparkleUI.cs:100 msgid "Don't worry, SparkleShare made a copy of each conflicting file." msgstr "別擔心，SparkleShare 對每個衝突檔案都會製作複本。"