From 3c452c4ae6f1166f85c34f860868ee1284816439 Mon Sep 17 00:00:00 2001 From: Hylke Date: Tue, 28 Jun 2011 17:02:27 +0100 Subject: [PATCH 01/19] update NEWS --- NEWS | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index a5509d93..e8cbe3b3 100644 --- a/NEWS +++ b/NEWS @@ -1,8 +1,10 @@ -0.2.3 for Linux and Mac (Sun Jun 26, 2011): +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): From 561e5ec71c644e030daee2baef2e7dc4b58bb1e4 Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Tue, 28 Jun 2011 17:33:49 +0100 Subject: [PATCH 02/19] bagdger: fix compile errors --- SparkleShare/Mac/SparkleBadger.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/SparkleShare/Mac/SparkleBadger.cs b/SparkleShare/Mac/SparkleBadger.cs index 4ee0845b..f59c3d8f 100644 --- a/SparkleShare/Mac/SparkleBadger.cs +++ b/SparkleShare/Mac/SparkleBadger.cs @@ -16,7 +16,9 @@ using System; +using System.Drawing; using System.IO; +using System.Collections.Generic; using MonoMac.AppKit; using MonoMac.Foundation; @@ -33,7 +35,7 @@ namespace SparkleShare { public SparkleBadger (string [] paths) { - Paths = paths; + this.paths = paths; } From 87d0e206780e9eb326b362102d5fbdde2e8f254b Mon Sep 17 00:00:00 2001 From: Alex Hudson Date: Tue, 28 Jun 2011 18:09:34 +0100 Subject: [PATCH 03/19] Simplify some config functions, add a notification server entry --- SparkleLib/SparkleConfig.cs | 58 +++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 31 deletions(-) diff --git a/SparkleLib/SparkleConfig.cs b/SparkleLib/SparkleConfig.cs index 88f99835..ffc493ed 100644 --- a/SparkleLib/SparkleConfig.cs +++ b/SparkleLib/SparkleConfig.cs @@ -131,7 +131,6 @@ namespace SparkleLib { } } - public void AddFolder (string name, string url, string backend) { XmlNode node_name = CreateElement ("name"); @@ -165,53 +164,50 @@ namespace SparkleLib { Save (); } + 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; + } 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 null; + return this.GetFolderValue(name, "url"); } - 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 GetNotificationUrlForFolder (string name) + { + // examples? + // tcp://localhost:9999/ + // xmpp:someuser@somexmppserver?canhavefunnybits + // irc://hbons/#somechatroom + return this.GetFolderValue(name, "notificationurl"); + } public string GetConfigOption (string name) { From e49992a1da4a1c99c7db20d54860b7de9e63028a Mon Sep 17 00:00:00 2001 From: Alex Hudson Date: Tue, 28 Jun 2011 19:36:47 +0100 Subject: [PATCH 04/19] Make listener type configurable from config file --- SparkleLib/SparkleConfig.cs | 14 ++++++++++ SparkleLib/SparkleListenerBase.cs | 46 ++++++++++++++++--------------- SparkleLib/SparkleListenerIrc.cs | 11 ++++---- SparkleLib/SparkleListenerTcp.cs | 11 ++++---- SparkleLib/SparkleRepoBase.cs | 7 ++--- SparkleShare/SparkleController.cs | 15 +++++++++- 6 files changed, 65 insertions(+), 39 deletions(-) diff --git a/SparkleLib/SparkleConfig.cs b/SparkleLib/SparkleConfig.cs index ffc493ed..87276474 100644 --- a/SparkleLib/SparkleConfig.cs +++ b/SparkleLib/SparkleConfig.cs @@ -153,6 +153,20 @@ 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) { diff --git a/SparkleLib/SparkleListenerBase.cs b/SparkleLib/SparkleListenerBase.cs index bcf12c93..c502978c 100644 --- a/SparkleLib/SparkleListenerBase.cs +++ b/SparkleLib/SparkleListenerBase.cs @@ -39,31 +39,32 @@ namespace SparkleLib { private static List listeners; - public static SparkleListenerIrc CreateIrcListener (string server, string folder_identifier, - string announcements) + public static SparkleListenerBase CreateListener (string uri, string folder_identifier) { if (listeners == null) listeners = new List (); - // 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; - + Uri listen_on = new Uri(uri); + foreach (SparkleListenerBase listener in listeners) { - if (listener.Server.Equals (server)) { - SparkleHelpers.DebugInfo ("ListenerFactory", "Refered to existing listener for " + server); + if (listener.Server.Equals (uri)) { + SparkleHelpers.DebugInfo ("ListenerFactory", "Refered to existing listener for " + 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)); + SparkleHelpers.DebugInfo ("ListenerFactory", "Issued new listener for " + 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; + } + return (SparkleListenerIrc) listeners [listeners.Count - 1]; } } @@ -97,16 +98,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 +187,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..6f72f221 100644 --- a/SparkleLib/SparkleListenerTcp.cs +++ b/SparkleLib/SparkleListenerTcp.cs @@ -28,10 +28,9 @@ namespace SparkleLib { private Thread thread; private Socket socket; - 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); /* @@ -69,7 +68,7 @@ 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; @@ -78,7 +77,9 @@ namespace SparkleLib { try { // Connect and subscribe to the channel - this.socket.Connect (Server, 9999); + int port = Server.Port; + if (port < 0) port = 9999; + this.socket.Connect (Server.Host, port); base.is_connecting = false; foreach (string channel in base.channels) { diff --git a/SparkleLib/SparkleRepoBase.cs b/SparkleLib/SparkleRepoBase.cs index d2cace77..e87b7d93 100644 --- a/SparkleLib/SparkleRepoBase.cs +++ b/SparkleLib/SparkleRepoBase.cs @@ -91,8 +91,6 @@ namespace SparkleLib { if (CurrentRevision == null) CreateInitialChangeSet (); - CreateListener (); - this.local_timer.Elapsed += delegate (object o, ElapsedEventArgs args) { CheckForChanges (); }; @@ -219,10 +217,9 @@ namespace SparkleLib { } - private void CreateListener () + public void CreateListener (string uri, string folder_name) { - this.listener = SparkleListenerFactory.CreateIrcListener (Domain, Identifier, - SparkleConfig.DefaultConfig.GetAnnouncementsForFolder (Name)); + this.listener = SparkleListenerFactory.CreateListener(uri, this.Identifier); // Stop polling when the connection to the irc channel is succesful this.listener.Connected += delegate { diff --git a/SparkleShare/SparkleController.cs b/SparkleShare/SparkleController.cs index 31670bfb..7d2e9fff 100644 --- a/SparkleShare/SparkleController.cs +++ b/SparkleShare/SparkleController.cs @@ -530,7 +530,6 @@ namespace SparkleShare { if (backend == null) return; - SparkleRepoBase repo = null; @@ -543,6 +542,20 @@ namespace SparkleShare { else repo = new SparkleRepoGit (folder_path, SparkleBackend.DefaultBackend); + + string notify_uri = SparkleConfig.DefaultConfig.GetNotificationUrlForFolder (folder_name); + if (notify_uri == null) { + string announcements = SparkleConfig.DefaultConfig.GetAnnouncementsForFolder (folder_name); + if (announcements == 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 + announcements = "204.62.14.135"; + + notify_uri = String.Format("irc://{0}/", announcements); + } + repo.CreateListener(notify_uri, folder_name); repo.NewChangeSet += delegate (SparkleChangeSet change_set, string repository_path) { string message = FormatMessage (change_set); From 8160e5efcd00d15e1f020854a466ca2b61a15240 Mon Sep 17 00:00:00 2001 From: Alex Hudson Date: Tue, 28 Jun 2011 19:52:47 +0100 Subject: [PATCH 05/19] Change 'notification' language to 'announcement' --- SparkleLib/SparkleConfig.cs | 4 ++-- SparkleShare/SparkleController.cs | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/SparkleLib/SparkleConfig.cs b/SparkleLib/SparkleConfig.cs index 87276474..90b882dd 100644 --- a/SparkleLib/SparkleConfig.cs +++ b/SparkleLib/SparkleConfig.cs @@ -214,13 +214,13 @@ namespace SparkleLib { return this.GetFolderValue(name, "announcements"); } - public string GetNotificationUrlForFolder (string name) + public string GetAnnouncementUrlForFolder (string name) { // examples? // tcp://localhost:9999/ // xmpp:someuser@somexmppserver?canhavefunnybits // irc://hbons/#somechatroom - return this.GetFolderValue(name, "notificationurl"); + return this.GetFolderValue(name, "announcements_url"); } public string GetConfigOption (string name) diff --git a/SparkleShare/SparkleController.cs b/SparkleShare/SparkleController.cs index 7d2e9fff..8c5cd44b 100644 --- a/SparkleShare/SparkleController.cs +++ b/SparkleShare/SparkleController.cs @@ -543,8 +543,8 @@ namespace SparkleShare { repo = new SparkleRepoGit (folder_path, SparkleBackend.DefaultBackend); - string notify_uri = SparkleConfig.DefaultConfig.GetNotificationUrlForFolder (folder_name); - if (notify_uri == null) { + string announce_uri = SparkleConfig.DefaultConfig.GetAnnouncementUrlForFolder (folder_name); + if (announce_uri == null) { string announcements = SparkleConfig.DefaultConfig.GetAnnouncementsForFolder (folder_name); if (announcements == null) // This is SparkleShare's centralized notification service. @@ -553,9 +553,9 @@ namespace SparkleShare { // we don't store any personal information ever announcements = "204.62.14.135"; - notify_uri = String.Format("irc://{0}/", announcements); + announce_uri = String.Format("irc://{0}/", announcements); } - repo.CreateListener(notify_uri, folder_name); + repo.CreateListener(announce_uri, folder_name); repo.NewChangeSet += delegate (SparkleChangeSet change_set, string repository_path) { string message = FormatMessage (change_set); From 3d8c124e740b1e2fcf0aa38bdff94e3d512b0cd7 Mon Sep 17 00:00:00 2001 From: Hylke Date: Tue, 28 Jun 2011 20:02:48 +0100 Subject: [PATCH 06/19] repo git: sync up initial commit --- SparkleLib/Git/SparkleRepoGit.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/SparkleLib/Git/SparkleRepoGit.cs b/SparkleLib/Git/SparkleRepoGit.cs index 4a1e23ee..3f5fe3c5 100644 --- a/SparkleLib/Git/SparkleRepoGit.cs +++ b/SparkleLib/Git/SparkleRepoGit.cs @@ -616,6 +616,13 @@ namespace SparkleLib { } + public override void CreateInitialChangeSet () + { + base.CreateInitialChangeSet (); + SyncUp (); + } + + // Creates a SHA-1 hash of input private string SHA1 (string s) { From f4c2a3e951b395aed2baba6cc5d37f50f2ad093a Mon Sep 17 00:00:00 2001 From: Hylke Date: Tue, 28 Jun 2011 20:06:04 +0100 Subject: [PATCH 07/19] repo: create watch after initial change set --- SparkleLib/SparkleRepoBase.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SparkleLib/SparkleRepoBase.cs b/SparkleLib/SparkleRepoBase.cs index e87b7d93..8f75578f 100644 --- a/SparkleLib/SparkleRepoBase.cs +++ b/SparkleLib/SparkleRepoBase.cs @@ -86,11 +86,11 @@ namespace SparkleLib { this.status = status; }; - CreateWatcher (); - if (CurrentRevision == null) CreateInitialChangeSet (); + CreateWatcher (); + this.local_timer.Elapsed += delegate (object o, ElapsedEventArgs args) { CheckForChanges (); }; From 6af7fdf1e81e5a21d2fe2948412ceee6551f5018 Mon Sep 17 00:00:00 2001 From: Hylke Date: Tue, 28 Jun 2011 20:54:47 +0100 Subject: [PATCH 08/19] Fix nullreference exception when adding new files before starting sparkleshare --- SparkleLib/SparkleListenerBase.cs | 26 +++++++++++++++++--------- SparkleLib/SparkleRepoBase.cs | 11 ++++++----- SparkleShare/SparkleController.cs | 15 --------------- 3 files changed, 23 insertions(+), 29 deletions(-) diff --git a/SparkleLib/SparkleListenerBase.cs b/SparkleLib/SparkleListenerBase.cs index c502978c..1f0e262e 100644 --- a/SparkleLib/SparkleListenerBase.cs +++ b/SparkleLib/SparkleListenerBase.cs @@ -37,24 +37,31 @@ namespace SparkleLib { public static class SparkleListenerFactory { - private static List listeners; + private static List listeners = new List (); - public static SparkleListenerBase CreateListener (string uri, string folder_identifier) + public static SparkleListenerBase CreateListener (string folder_name, string folder_identifier) { - if (listeners == null) - listeners = new List (); + string announce_uri = SparkleConfig.DefaultConfig.GetAnnouncementUrlForFolder (folder_name); + + 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/"; + } - Uri listen_on = new Uri(uri); - foreach (SparkleListenerBase listener in listeners) { - if (listener.Server.Equals (uri)) { - SparkleHelpers.DebugInfo ("ListenerFactory", "Refered to existing listener for " + uri); + if (listener.Server.Equals (announce_uri)) { + SparkleHelpers.DebugInfo ("ListenerFactory", "Refered to existing listener for " + announce_uri); listener.AlsoListenTo (folder_identifier); return (SparkleListenerBase) listener; } } - SparkleHelpers.DebugInfo ("ListenerFactory", "Issued new listener for " + uri); + Uri listen_on = new Uri (announce_uri); + switch (listen_on.Scheme) { case "tcp": listeners.Add (new SparkleListenerTcp (listen_on, folder_identifier)); @@ -65,6 +72,7 @@ namespace SparkleLib { break; } + SparkleHelpers.DebugInfo ("ListenerFactory", "Issued new listener for " + announce_uri); return (SparkleListenerIrc) listeners [listeners.Count - 1]; } } diff --git a/SparkleLib/SparkleRepoBase.cs b/SparkleLib/SparkleRepoBase.cs index 8f75578f..7c18583c 100644 --- a/SparkleLib/SparkleRepoBase.cs +++ b/SparkleLib/SparkleRepoBase.cs @@ -90,6 +90,7 @@ namespace SparkleLib { CreateInitialChangeSet (); CreateWatcher (); + CreateListener (); this.local_timer.Elapsed += delegate (object o, ElapsedEventArgs args) { CheckForChanges (); @@ -114,9 +115,6 @@ namespace SparkleLib { } }; - this.remote_timer.Start (); - this.local_timer.Start (); - // Sync up everything that changed // since we've been offline if (AnyDifferences) { @@ -127,6 +125,9 @@ namespace SparkleLib { SyncUpBase (); EnableWatching (); } + + this.remote_timer.Start (); + this.local_timer.Start (); } @@ -217,9 +218,9 @@ namespace SparkleLib { } - public void CreateListener (string uri, string folder_name) + public void CreateListener () { - this.listener = SparkleListenerFactory.CreateListener(uri, this.Identifier); + this.listener = SparkleListenerFactory.CreateListener (Name, Identifier); // Stop polling when the connection to the irc channel is succesful this.listener.Connected += delegate { diff --git a/SparkleShare/SparkleController.cs b/SparkleShare/SparkleController.cs index 8c5cd44b..caa03e93 100644 --- a/SparkleShare/SparkleController.cs +++ b/SparkleShare/SparkleController.cs @@ -542,21 +542,6 @@ namespace SparkleShare { else repo = new SparkleRepoGit (folder_path, SparkleBackend.DefaultBackend); - - string announce_uri = SparkleConfig.DefaultConfig.GetAnnouncementUrlForFolder (folder_name); - if (announce_uri == null) { - string announcements = SparkleConfig.DefaultConfig.GetAnnouncementsForFolder (folder_name); - if (announcements == 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 - announcements = "204.62.14.135"; - - announce_uri = String.Format("irc://{0}/", announcements); - } - repo.CreateListener(announce_uri, folder_name); - repo.NewChangeSet += delegate (SparkleChangeSet change_set, string repository_path) { string message = FormatMessage (change_set); From 4410856917582146decd3e68a7129e36bc0bd5f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Jerna=C5=9B?= Date: Wed, 29 Jun 2011 12:04:49 +0200 Subject: [PATCH 09/19] Update translations from Transifex --- po/ar.po | 73 ++++++++++++++++++++++++-------------------------- po/bg.po | 71 +++++++++++++++++++++++------------------------- po/ca.po | 71 +++++++++++++++++++++++------------------------- po/cs_CZ.po | 71 +++++++++++++++++++++++------------------------- po/da.po | 71 +++++++++++++++++++++++------------------------- po/de.po | 74 +++++++++++++++++++++++++------------------------- po/el.po | 71 +++++++++++++++++++++++------------------------- po/eo.po | 71 +++++++++++++++++++++++------------------------- po/es.po | 70 +++++++++++++++++++++++------------------------- po/fi.po | 71 +++++++++++++++++++++++------------------------- po/fr.po | 73 ++++++++++++++++++++++++-------------------------- po/he.po | 71 +++++++++++++++++++++++------------------------- po/hu.po | 77 +++++++++++++++++++++++++---------------------------- po/it.po | 71 +++++++++++++++++++++++------------------------- po/ja.po | 71 +++++++++++++++++++++++------------------------- po/nl.po | 71 +++++++++++++++++++++++------------------------- po/no_NO.po | 71 +++++++++++++++++++++++------------------------- po/pl.po | 71 +++++++++++++++++++++++------------------------- po/pt_BR.po | 71 +++++++++++++++++++++++------------------------- po/ru.po | 71 +++++++++++++++++++++++------------------------- po/sv.po | 71 +++++++++++++++++++++++------------------------- po/te.po | 71 +++++++++++++++++++++++------------------------- po/uk.po | 71 +++++++++++++++++++++++------------------------- po/zh_CN.po | 71 +++++++++++++++++++++++------------------------- po/zh_TW.po | 71 +++++++++++++++++++++++------------------------- 25 files changed, 857 insertions(+), 930 deletions(-) diff --git a/po/ar.po b/po/ar.po index 7109b0ea..395bc656 100644 --- a/po/ar.po +++ b/po/ar.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 14:36+0000\n" -"Last-Translator: usb333 \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..a3636f56 100644 --- a/po/ca.po +++ b/po/ca.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: 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 +86,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 "" -#: ../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 "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" @@ -325,74 +326,70 @@ msgstr "Apren com gestionar el teu propi servidor SparkleShare" 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 "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" @@ -422,11 +419,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..06709e94 100644 --- a/po/cs_CZ.po +++ b/po/cs_CZ.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: 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…" @@ -83,35 +84,35 @@ 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 "" -#: ../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" @@ -119,7 +120,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../SparkleShare/SparkleController.cs:657 +#: ../SparkleShare/SparkleController.cs:689 msgid "did something magical" msgstr "" @@ -321,74 +322,70 @@ msgstr "Zjistěte jak připravit svůj vlastní 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 "" "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 "" -#: ../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 " @@ -418,11 +415,11 @@ 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." 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 3face3f2..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" @@ -327,76 +329,72 @@ msgstr "Lernen Sie, wie Sie Ihren eigenen SparkleServer betreiben können" msgid "Recent Events" msgstr "Letzte Ereignisse" -#: ../SparkleShare/SparkleEventLog.cs:131 -#: ../SparkleShare/SparkleEventLog.cs:150 +#: ../SparkleShare/SparkleEventLog.cs:148 +#: ../SparkleShare/SparkleEventLog.cs:173 msgid "All Folders" 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" @@ -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 " @@ -439,3 +437,5 @@ msgstr "" #: ../SparkleShare/SparkleWindow.cs:41 msgid "SparkleShare Setup" msgstr "SparkleShare Konfiguration" + + diff --git a/po/el.po b/po/el.po index 537c84c7..c1ea5755 100644 --- a/po/el.po +++ b/po/el.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: 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 "" @@ -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/eo.po b/po/eo.po index c124a822..925a5146 100644 --- a/po/eo.po +++ b/po/eo.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: 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 +84,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 "" @@ -310,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 "" @@ -405,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/es.po b/po/es.po index 39206733..ac9f2d48 100644 --- a/po/es.po +++ b/po/es.po @@ -11,8 +11,8 @@ 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: Spanish (Castilian) (http://www.transifex.net/projects/p/sparkleshare/team/es/)\n" "MIME-Version: 1.0\n" @@ -21,22 +21,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 +86,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ó" @@ -326,73 +326,69 @@ msgstr "Aprenda como hospedar su propio 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 "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" @@ -422,11 +418,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..22f1b5ff 100644 --- a/po/nl.po +++ b/po/nl.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: 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…" @@ -84,42 +85,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 "" @@ -320,74 +321,70 @@ msgstr "Leer hoe je je eigen SparkleServer kan opzetten" 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 "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" -#: ../SparkleShare/SparkleShare.cs:139 +#: ../SparkleShare/SparkleShare.cs:133 msgid "SparkleShare " msgstr "SparkleShare " @@ -417,11 +414,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 " diff --git a/po/no_NO.po b/po/no_NO.po index be8309d6..a322524a 100644 --- a/po/no_NO.po +++ b/po/no_NO.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: 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..." @@ -83,42 +84,42 @@ msgstr "" 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 "" -#: ../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 "" @@ -321,73 +322,69 @@ msgstr "Lær hvordan du kan være vert for 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 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" @@ -417,11 +414,11 @@ msgstr "" 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..7f2c5db3 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-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: 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…" @@ -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" @@ -320,81 +321,77 @@ msgstr "Dowiedz się, jak postawić własny 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 "" "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" @@ -424,11 +421,11 @@ 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." 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..4066d937 100644 --- a/po/ru.po +++ b/po/ru.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: 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 "Синхронизация…" @@ -82,35 +83,35 @@ 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" @@ -118,7 +119,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../SparkleShare/SparkleController.cs:657 +#: ../SparkleShare/SparkleController.cs:689 msgid "did something magical" msgstr "" @@ -310,73 +311,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 "" -#: ../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 "" @@ -406,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/sv.po b/po/sv.po index 5c9e5ae7..ca63a864 100644 --- a/po/sv.po +++ b/po/sv.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: 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 +86,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" @@ -321,72 +322,68 @@ msgstr "Lär dig hur du sätter upp en 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 "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" @@ -416,11 +413,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 對每個衝突檔案都會製作複本。" From 0b56e55067f72f3d9b750a04bdfad3f38f5bd2f6 Mon Sep 17 00:00:00 2001 From: Hylke Date: Wed, 29 Jun 2011 16:34:34 +0100 Subject: [PATCH 10/19] update NEWS --- NEWS | 5 +++++ configure.ac | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index e8cbe3b3..df789ab0 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,8 @@ +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 diff --git a/configure.ac b/configure.ac index d958b0f1..223e7613 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.3]) + [0.2.4]) m4_define([sparkleshare_asm_version], - [0.2.3]) + [0.2.4]) AC_PREREQ([2.54]) AC_INIT([SparkleShare], sparkleshare_version) From c49834793126850cf67108b1b6df6c834b5097ae Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Wed, 29 Jun 2011 20:28:49 +0100 Subject: [PATCH 11/19] repo: add a property that shows the currenly unsynced paths (to hook up with the badger) --- SparkleLib/Git/SparkleRepoGit.cs | 28 ++++++++++++++++++++++++++++ SparkleLib/SparkleRepoBase.cs | 7 +++++++ SparkleShare/SparkleController.cs | 5 +++++ 3 files changed, 40 insertions(+) diff --git a/SparkleLib/Git/SparkleRepoGit.cs b/SparkleLib/Git/SparkleRepoGit.cs index 3f5fe3c5..f0ae14d0 100644 --- a/SparkleLib/Git/SparkleRepoGit.cs +++ b/SparkleLib/Git/SparkleRepoGit.cs @@ -52,6 +52,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 { diff --git a/SparkleLib/SparkleRepoBase.cs b/SparkleLib/SparkleRepoBase.cs index 7c18583c..056b4cb3 100644 --- a/SparkleLib/SparkleRepoBase.cs +++ b/SparkleLib/SparkleRepoBase.cs @@ -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\.-]+)(/|:)"); diff --git a/SparkleShare/SparkleController.cs b/SparkleShare/SparkleController.cs index caa03e93..2efea66c 100644 --- a/SparkleShare/SparkleController.cs +++ b/SparkleShare/SparkleController.cs @@ -555,6 +555,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 || From 0944efe992cc3779ff3a6975afbd42b9930907db Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Wed, 29 Jun 2011 20:45:37 +0100 Subject: [PATCH 12/19] repo git: don't hang on huge command outputs --- SparkleLib/Git/SparkleRepoGit.cs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/SparkleLib/Git/SparkleRepoGit.cs b/SparkleLib/Git/SparkleRepoGit.cs index f0ae14d0..ef90cd3a 100644 --- a/SparkleLib/Git/SparkleRepoGit.cs +++ b/SparkleLib/Git/SparkleRepoGit.cs @@ -137,7 +137,6 @@ namespace SparkleLib { Commit (message); SparkleGit git = new SparkleGit (LocalPath, "push origin master"); - git.Start (); git.WaitForExit (); @@ -168,9 +167,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) { @@ -300,9 +302,12 @@ namespace SparkleLib { SparkleGit git_status = new SparkleGit (LocalPath, "status --porcelain"); git_status.Start (); - git_status.WaitForExit (); - string output = git_status.StandardOutput.ReadToEnd ().TrimEnd (); + // 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.WaitForExit (); + string [] lines = output.Split ("\n".ToCharArray ()); foreach (string line in lines) { From 051214f4f059a69621adf779fc0ecf9e5659f74c Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Wed, 29 Jun 2011 21:55:58 +0100 Subject: [PATCH 13/19] mac: terminate the cocoa way --- SparkleShare/Mac/SparkleMacController.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/SparkleShare/Mac/SparkleMacController.cs b/SparkleShare/Mac/SparkleMacController.cs index 5c0d462a..9e1a1080 100644 --- a/SparkleShare/Mac/SparkleMacController.cs +++ b/SparkleShare/Mac/SparkleMacController.cs @@ -180,6 +180,7 @@ namespace SparkleShare { new public void Quit () { this.watcher.Dispose (); + NSApplication.SharedApplication.Terminate (new NSObject ()); base.Quit (); } } From 52f19c36eabdcb3785e8beba94e20e2beffafd75 Mon Sep 17 00:00:00 2001 From: Alex Hudson Date: Wed, 29 Jun 2011 22:00:15 +0100 Subject: [PATCH 14/19] Error out in configure if webkit-sharp-devel or notify-sharp-devel are not available --- configure.ac | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/configure.ac b/configure.ac index 223e7613..194a9bf4 100644 --- a/configure.ac +++ b/configure.ac @@ -101,8 +101,18 @@ 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) +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) + SHAMROCK_CHECK_NUNIT APPINDICATOR_REQUIRED=0.0.7 From a4bb32f607cd0cf79e6c55d6374e8949eb512cfc Mon Sep 17 00:00:00 2001 From: Alex Hudson Date: Wed, 29 Jun 2011 22:40:34 +0100 Subject: [PATCH 15/19] Fix bpbb on git callout --- SparkleLib/Git/SparkleRepoGit.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SparkleLib/Git/SparkleRepoGit.cs b/SparkleLib/Git/SparkleRepoGit.cs index ef90cd3a..78c6218b 100644 --- a/SparkleLib/Git/SparkleRepoGit.cs +++ b/SparkleLib/Git/SparkleRepoGit.cs @@ -306,7 +306,7 @@ namespace SparkleLib { // 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.WaitForExit (); + git_status.WaitForExit (); string [] lines = output.Split ("\n".ToCharArray ()); From 6f07272fdaff3bb02bf220637c67b345458db564 Mon Sep 17 00:00:00 2001 From: Alex Hudson Date: Tue, 28 Jun 2011 22:13:28 +0100 Subject: [PATCH 16/19] Make tcp listener startup-able --- SparkleLib/SparkleListenerBase.cs | 2 +- SparkleLib/SparkleListenerTcp.cs | 35 +++++++++++++++++++++---------- 2 files changed, 25 insertions(+), 12 deletions(-) diff --git a/SparkleLib/SparkleListenerBase.cs b/SparkleLib/SparkleListenerBase.cs index 1f0e262e..e35e036f 100644 --- a/SparkleLib/SparkleListenerBase.cs +++ b/SparkleLib/SparkleListenerBase.cs @@ -73,7 +73,7 @@ namespace SparkleLib { } SparkleHelpers.DebugInfo ("ListenerFactory", "Issued new listener for " + announce_uri); - return (SparkleListenerIrc) listeners [listeners.Count - 1]; + return (SparkleListenerBase) listeners [listeners.Count - 1]; } } diff --git a/SparkleLib/SparkleListenerTcp.cs b/SparkleLib/SparkleListenerTcp.cs index 6f72f221..ef5364eb 100644 --- a/SparkleLib/SparkleListenerTcp.cs +++ b/SparkleLib/SparkleListenerTcp.cs @@ -26,13 +26,18 @@ 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 (Uri server, string folder_identifier) : base (server, folder_identifier) { base.channels.Add (folder_identifier); this.socket = new Socket (AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); + this.connected = false; /* this.client.OnConnected += delegate { base.is_connecting = false; @@ -59,8 +64,12 @@ namespace SparkleLib { 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; } } @@ -75,18 +84,20 @@ namespace SparkleLib { this.thread = new Thread ( new ThreadStart (delegate { try { - // Connect and subscribe to the channel int port = Server.Port; if (port < 0) port = 9999; this.socket.Connect (Server.Host, port); - base.is_connecting = false; + 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\"}"); + "{\"repo\": \"" + channel + "\", \"command\": \"subscribe\"}"); this.socket.Send (message); } @@ -94,19 +105,21 @@ namespace SparkleLib { // List to the channels, this blocks the thread while (this.socket.Connected) { - this.socket.Receive (bytes); - if (bytes != null && bytes.Length > 0) { + int bytes_read = this.socket.Receive (bytes); + if (bytes_read > 0) { Console.WriteLine (Encoding.UTF8.GetString (bytes)); string received_message = bytes.ToString ().Trim (); string folder_id = ""; // TODO: parse message, use XML OnAnnouncement (new SparkleAnnouncement (folder_id, received_message)); + } else { + lock (this.mutex) { + this.socket.Close(); + this.connected = false; + } } } - - // Disconnect when we time out - this.socket.Close (); - + // TODO: attempt to reconnect..? } catch (SocketException e) { SparkleHelpers.DebugInfo ("ListenerTcp", "Could not connect to " + Server + ": " + e.Message); } From 889eac6aaf424f8b85ebdad2b70a1724e8e8ec22 Mon Sep 17 00:00:00 2001 From: Alex Hudson Date: Tue, 28 Jun 2011 22:14:42 +0100 Subject: [PATCH 17/19] Remove IRC listener code from TCP version --- SparkleLib/SparkleListenerTcp.cs | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/SparkleLib/SparkleListenerTcp.cs b/SparkleLib/SparkleListenerTcp.cs index ef5364eb..c5cdbf1b 100644 --- a/SparkleLib/SparkleListenerTcp.cs +++ b/SparkleLib/SparkleListenerTcp.cs @@ -38,27 +38,6 @@ namespace SparkleLib { base.channels.Add (folder_identifier); this.socket = new Socket (AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); this.connected = false; -/* - 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)); - };*/ } From 995f39fdb70a72189cdd7698a2bbd6b59d7c0166 Mon Sep 17 00:00:00 2001 From: Alex Hudson Date: Tue, 28 Jun 2011 22:58:04 +0100 Subject: [PATCH 18/19] Convert JSON commands to TCP server into XML fragments. --- SparkleLib/SparkleListenerTcp.cs | 52 ++++++++++++++++++++++++++------ 1 file changed, 42 insertions(+), 10 deletions(-) diff --git a/SparkleLib/SparkleListenerTcp.cs b/SparkleLib/SparkleListenerTcp.cs index c5cdbf1b..0fc6570a 100644 --- a/SparkleLib/SparkleListenerTcp.cs +++ b/SparkleLib/SparkleListenerTcp.cs @@ -16,10 +16,14 @@ using System; +using System.IO; +using System.Xml; using System.Text; using System.Threading; using System.Net.Sockets; using System.Security.Cryptography; +using System.Collections.Generic; +using System.Xml.Serialization; namespace SparkleLib { @@ -52,6 +56,23 @@ namespace SparkleLib { } } + private void SendCommand(TcpMessagePacket pkt) + { + XmlSerializer serializer = new XmlSerializer(typeof(TcpMessagePacket)); + + XmlSerializerNamespaces emptyNamespace = new XmlSerializerNamespaces(); + emptyNamespace.Add(String.Empty, String.Empty); + + StringBuilder output = new StringBuilder(); + + XmlWriter writer = XmlWriter.Create(output, + new XmlWriterSettings { OmitXmlDeclaration = true }); + serializer.Serialize(writer, pkt, emptyNamespace); + + lock (this.mutex) { + this.socket.Send(Encoding.UTF8.GetBytes(output.ToString())); + } + } // Starts a new thread and listens to the channel public override void Connect () @@ -75,9 +96,7 @@ namespace SparkleLib { foreach (string channel in base.channels) { SparkleHelpers.DebugInfo ("ListenerTcp", "Subscribing to channel " + channel); - byte [] message = Encoding.UTF8.GetBytes ( - "{\"repo\": \"" + channel + "\", \"command\": \"subscribe\"}"); - this.socket.Send (message); + this.SendCommand(new TcpMessagePacket(channel, "subscribe")); } byte [] bytes = new byte [4096]; @@ -118,9 +137,7 @@ namespace SparkleLib { if (IsConnected) { SparkleHelpers.DebugInfo ("ListenerTcp", "Subscribing to channel " + channel); - byte [] message = Encoding.UTF8.GetBytes ( - "{\"folder\": \"" + channel + "\", \"command\": \"subscribe\"}"); - this.socket.Send (message); + this.SendCommand(new TcpMessagePacket(channel, "subscribe")); } } } @@ -128,10 +145,7 @@ 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); + this.SendCommand(new TcpMessagePacket(announcement.FolderIdentifier, "publish")); // Also announce to ourselves for debugging purposes // base.OnAnnouncement (announcement); @@ -145,4 +159,22 @@ namespace SparkleLib { base.Dispose (); } } + + [Serializable,XmlRoot("packet")] + public class TcpMessagePacket + { + public string repo { get; set; } + public string command { get; set; } + public string readable { get; set; } + + public TcpMessagePacket(string repo, string command) { + this.repo = repo; + this.command = command; + } + + public TcpMessagePacket() { + this.repo = "none"; + this.command = "invalid"; + } + } } From 8028736858bd5d1073b5a25029a743c6e7ab50dc Mon Sep 17 00:00:00 2001 From: Alex Hudson Date: Tue, 28 Jun 2011 23:38:32 +0100 Subject: [PATCH 19/19] Put in XML fragment parsing - listener now basically works over tcp --- SparkleLib/SparkleListenerTcp.cs | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/SparkleLib/SparkleListenerTcp.cs b/SparkleLib/SparkleListenerTcp.cs index 0fc6570a..ae7aefce 100644 --- a/SparkleLib/SparkleListenerTcp.cs +++ b/SparkleLib/SparkleListenerTcp.cs @@ -74,6 +74,16 @@ namespace SparkleLib { } } + private TcpMessagePacket ReceiveCommand(byte[] input) + { + XmlSerializer serializer = new XmlSerializer(typeof(TcpMessagePacket)); + + MemoryStream ms = new MemoryStream(input); + + TcpMessagePacket ret = (TcpMessagePacket) serializer.Deserialize(ms); + return ret; + } + // Starts a new thread and listens to the channel public override void Connect () { @@ -95,8 +105,7 @@ namespace SparkleLib { foreach (string channel in base.channels) { SparkleHelpers.DebugInfo ("ListenerTcp", "Subscribing to channel " + channel); - - this.SendCommand(new TcpMessagePacket(channel, "subscribe")); + this.SendCommand(new TcpMessagePacket(channel, "register")); } byte [] bytes = new byte [4096]; @@ -105,18 +114,20 @@ namespace SparkleLib { while (this.socket.Connected) { int bytes_read = this.socket.Receive (bytes); if (bytes_read > 0) { - Console.WriteLine (Encoding.UTF8.GetString (bytes)); - - string received_message = bytes.ToString ().Trim (); - string folder_id = ""; // TODO: parse message, use XML - OnAnnouncement (new SparkleAnnouncement (folder_id, received_message)); + TcpMessagePacket message = this.ReceiveCommand(bytes); + SparkleHelpers.DebugInfo ("ListenerTcp", "Update for folder " + message.repo); + OnAnnouncement (new SparkleAnnouncement (message.repo, message.readable)); } else { + SparkleHelpers.DebugInfo ("ListenerTcp", "Error on socket"); lock (this.mutex) { this.socket.Close(); this.connected = false; } } } + + SparkleHelpers.DebugInfo ("ListenerTcp", "Disconnected from " + Server.Host); + // TODO: attempt to reconnect..? } catch (SocketException e) { SparkleHelpers.DebugInfo ("ListenerTcp", "Could not connect to " + Server + ": " + e.Message); @@ -137,7 +148,7 @@ namespace SparkleLib { if (IsConnected) { SparkleHelpers.DebugInfo ("ListenerTcp", "Subscribing to channel " + channel); - this.SendCommand(new TcpMessagePacket(channel, "subscribe")); + this.SendCommand(new TcpMessagePacket(channel, "register")); } } } @@ -145,7 +156,7 @@ namespace SparkleLib { public override void Announce (SparkleAnnouncement announcement) { - this.SendCommand(new TcpMessagePacket(announcement.FolderIdentifier, "publish")); + this.SendCommand(new TcpMessagePacket(announcement.FolderIdentifier, "new_version")); // Also announce to ourselves for debugging purposes // base.OnAnnouncement (announcement);