diff --git a/FriendFace/IconProvider.cs b/FriendFace/IconProvider.cs index c4717c4b..4f16fefb 100644 --- a/FriendFace/IconProvider.cs +++ b/FriendFace/IconProvider.cs @@ -41,7 +41,8 @@ namespace FriendFace { if (XDG_CACHE_HOME != null) SetTargetFolderPath (CombineMore (XDG_CACHE_HOME, "friendface")); else - SetTargetFolderPath (CombineMore (System.IO.Path.DirectorySeparatorChar.ToString (), "tmp", "friendface")); + SetTargetFolderPath (CombineMore (System.IO.Path.DirectorySeparatorChar.ToString (), + "tmp", "friendface")); string file_name = "avatar-default-" + Identifier; TargetFilePath = CombineMore (TargetFolderPath, file_name); diff --git a/PublicKeyOnly.xml b/PublicKeyOnly.xml new file mode 100644 index 00000000..fb77bdd0 --- /dev/null +++ b/PublicKeyOnly.xml @@ -0,0 +1 @@ +oQj45pN1dw2wemY0G8OtqxKqOeiaczy6R9Uy5eD5Ldfx3m3c48zSgzPFFYW8EQM94TcG//4uPZIiJVA9GnrlINOsmUJvqJTAepep8itjlY/MyeQUxqyfYNW1vecz/X8sgmAbWk2XBZM8Enf3UqtYvWP7+zOt4sqCLpWnm+7nzy0=EQ== \ No newline at end of file diff --git a/PublicPrivate.xml b/PublicPrivate.xml new file mode 100644 index 00000000..69eb8f03 --- /dev/null +++ b/PublicPrivate.xml @@ -0,0 +1 @@ +oQj45pN1dw2wemY0G8OtqxKqOeiaczy6R9Uy5eD5Ldfx3m3c48zSgzPFFYW8EQM94TcG//4uPZIiJVA9GnrlINOsmUJvqJTAepep8itjlY/MyeQUxqyfYNW1vecz/X8sgmAbWk2XBZM8Enf3UqtYvWP7+zOt4sqCLpWnm+7nzy0=EQ==

sIQ90D2XsEXpxLDmUnzISsHrcDS4+cmhRq8Jb91Kd/Kk+CPEVthIvUeYmCoNnWP3BdccaeDK6PFz0Db06r/nqw==

6YwdeMA0LL4wEFBMT7BfC7PFXyA1w5q1+9jEXb9/QWlI177B2Sb0CHQ5XbifeZws5p+XMWo/4vNqXcVWn2nshw==fJmVC3bFbV6G5TGThYVCFqcAi3CCkjP5XxIkx28HY7pWVM30AREkSV+3Af+RI84Xx+MjHY+eShPZR65Sh5aFaQ==Um2wDIASaiUB56Pesra4Ij9y1keagUWppC5jbGG0cXB0D+j5H3co8+zI8+bO36CIUWWAqAdh16E0mZDxZXCt1Q==TAlt1Bz3uoh20LyceZ2tvXBP+qkeR2iny0YA8IZPNeXYK9J+/grFJx4fBS7Y9h6zgWTJyDfv7ocLpGctJd+rgg==eyT6kjSHALAdisagUXeEzh1U/xtI7rX33JP5vtk3BPBtqhfHCI2R69xLas+t7uRcfwv2S0nnIAZWWMTjbpo2vYZoa6CiXX1x76PqdFneVEn3T2o4WdUPB1JubE/N+moX+SL+R9plAveAMVRqJERDwKaxNr/THaSWaqmhH1wYzv0= \ No newline at end of file diff --git a/SparkleShare/SparkleRepo.cs b/SparkleShare/SparkleRepo.cs index 291142ba..39171b5d 100644 --- a/SparkleShare/SparkleRepo.cs +++ b/SparkleShare/SparkleRepo.cs @@ -35,6 +35,7 @@ namespace SparkleShare { private FileSystemWatcher Watcher; private bool HasChanged = false; private DateTime LastChange; + private System.Object ChangeLock = new System.Object(); public string Name; public string Domain; @@ -126,14 +127,16 @@ namespace SparkleShare { BufferTimer.Elapsed += delegate (object o, ElapsedEventArgs args) { SparkleHelpers.DebugInfo ("Buffer", "[" + Name + "] Checking for changes."); - if (HasChanged) { - SparkleHelpers.DebugInfo ("Buffer", "[" + Name + "] Changes found, checking if settled."); - DateTime now = DateTime.UtcNow; - TimeSpan changed = new TimeSpan (now.Ticks - LastChange.Ticks); - if (changed.TotalMilliseconds > 5000) { - HasChanged = false; - SparkleHelpers.DebugInfo ("Buffer", "[" + Name + "] Changes have settled, adding."); - AddCommitAndPush (); + lock(ChangeLock) { + if (HasChanged) { + SparkleHelpers.DebugInfo ("Buffer", "[" + Name + "] Changes found, checking if settled."); + DateTime now = DateTime.UtcNow; + TimeSpan changed = new TimeSpan (now.Ticks - LastChange.Ticks); + if (changed.TotalMilliseconds > 5000) { + HasChanged = false; + SparkleHelpers.DebugInfo ("Buffer", "[" + Name + "] Changes have settled, adding."); + AddCommitAndPush (); + } } } }; @@ -156,8 +159,10 @@ namespace SparkleShare { if (!ShouldIgnore (args.Name)) { SparkleHelpers.DebugInfo ("Event", "[" + Name + "] " + wct.ToString () + " '" + args.Name + "'"); FetchTimer.Stop (); - LastChange = DateTime.UtcNow; - HasChanged = true; + lock(ChangeLock) { + LastChange = DateTime.UtcNow; + HasChanged = true; + } } } @@ -165,21 +170,23 @@ namespace SparkleShare { // so this method does them all with appropriate timers, etc switched off public void AddCommitAndPush () { - BufferTimer.Stop (); - FetchTimer.Stop (); - - Add (); - string Message = FormatCommitMessage (); - if (!Message.Equals ("")) { - Commit (Message); - Fetch (); - Push (); + try { + BufferTimer.Stop (); + FetchTimer.Stop (); + + Add (); + string Message = FormatCommitMessage (); + if (!Message.Equals ("")) { + Commit (Message); + Fetch (); + Push (); +// SparkleHelpers.CheckForUnicorns (Message); + } + } + finally { + FetchTimer.Start (); + BufferTimer.Start (); } - - FetchTimer.Start (); - BufferTimer.Start (); - - CheckForUnicorns (Message); } @@ -207,18 +214,22 @@ namespace SparkleShare { // Fetches changes from the remote repo public void Fetch () { - FetchTimer.Stop (); -// SparkleUI.NotificationIcon.SetSyncingState (); - SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Fetching changes..."); - Process.StartInfo.Arguments = "fetch -v"; - Process.Start (); - string Output = Process.StandardOutput.ReadToEnd ().Trim (); // TODO: This doesn't work :( - Process.WaitForExit (); - SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Changes fetched."); - if (!Output.Contains ("up to date")) - Rebase (); -// SparkleUI.NotificationIcon.SetIdleState (); - FetchTimer.Start (); + try { + FetchTimer.Stop (); +// SparkleUI.NotificationIcon.SetSyncingState (); + SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Fetching changes..."); + Process.StartInfo.Arguments = "fetch -v"; + Process.Start (); + string Output = Process.StandardOutput.ReadToEnd ().Trim (); // TODO: This doesn't work :( + Process.WaitForExit (); + SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Changes fetched."); + if (!Output.Contains ("up to date")) + Rebase (); +// SparkleUI.NotificationIcon.SetIdleState (); + } + finally { + FetchTimer.Start (); + } } // Merges the fetched changes @@ -270,10 +281,10 @@ namespace SparkleShare { string ConflictTitle = "A mid-air collision happened!\n"; string ConflictSubtext = "Don't worry, SparkleShare made\na copy of the conflicting files."; - SparkleBubble ConflictBubble = - new SparkleBubble(_(ConflictTitle), _(ConflictSubtext)); +// SparkleBubble ConflictBubble = + // new SparkleBubble(_(ConflictTitle), _(ConflictSubtext)); - ConflictBubble.Show (); + // ConflictBubble.Show (); } @@ -312,11 +323,11 @@ namespace SparkleShare { SparkleHelpers.DebugInfo ("Notification", "[" + Name + "] Showing message..."); - SparkleBubble StuffChangedBubble = new SparkleBubble (LastCommitUserName, LastCommitMessage); - StuffChangedBubble.Icon = SparkleHelpers.GetAvatar (LastCommitEmail, 32); +// SparkleBubble StuffChangedBubble = new SparkleBubble (LastCommitUserName, LastCommitMessage); + // StuffChangedBubble.Icon = SparkleHelpers.GetAvatar (LastCommitEmail, 32); // Add a button to open the folder where the changed file is - StuffChangedBubble.AddAction ("", _("Open Folder"), + /* StuffChangedBubble.AddAction ("", _("Open Folder"), delegate { switch (SparklePlatform.Name) { case "GNOME": @@ -332,7 +343,7 @@ namespace SparkleShare { } ); StuffChangedBubble.Show (); - +*/ } } @@ -467,8 +478,8 @@ namespace SparkleShare { string subtext = _("SparkleShare is known to be insanely fast with \n" + "pictures of unicorns. Please make sure your internets\n" + "are upgraded to the latest version to avoid problems."); - SparkleBubble unicorn_bubble = new SparkleBubble (title, subtext); - unicorn_bubble.Show (); +// SparkleBubble unicorn_bubble = new SparkleBubble (title, subtext); + // unicorn_bubble.Show (); } } diff --git a/po/de.po b/po/de.po index 9490e11d..63b7e533 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: SparkleShare 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-05 06:00+0000\n" +"POT-Creation-Date: 2010-07-12 05:53+0000\n" "PO-Revision-Date: 2010-06-21 16:26+0100\n" "Last-Translator: Martin Lettner \n" "Language-Team: \n" @@ -18,62 +18,74 @@ msgstr "" "X-Poedit-Language: German\n" "X-Poedit-Country: GERMANY\n" -#: ../SparkleDiff/SparkleDiff.cs:47 ../SparkleShare/SparkleShare.cs:50 +#: ../SparkleDiff/SparkleDiff.cs:77 ../SparkleShare/SparkleShare.cs:50 msgid "Git wasn't found." msgstr "Git konnte nicht gefunden werden." -#: ../SparkleDiff/SparkleDiff.cs:48 ../SparkleShare/SparkleShare.cs:51 +#: ../SparkleDiff/SparkleDiff.cs:78 ../SparkleShare/SparkleShare.cs:51 msgid "You can get Git from http://git-scm.com/." msgstr "Sie können Git auf http://git-scm.com/ herunterladen." -#: ../SparkleDiff/SparkleDiff.cs:55 ../SparkleShare/SparkleShare.cs:58 +#: ../SparkleDiff/SparkleDiff.cs:86 ../SparkleShare/SparkleShare.cs:58 msgid "Sorry, you can't run SparkleShare with these permissions." msgstr "Entschuldigung, SparkleShare kann mit diesen Rechten nicht ausgeführt werden." -#: ../SparkleDiff/SparkleDiff.cs:56 ../SparkleShare/SparkleShare.cs:59 +#: ../SparkleDiff/SparkleDiff.cs:87 ../SparkleShare/SparkleShare.cs:59 #, fuzzy msgid "Things would go utterly wrong." msgstr "Vieles würde nicht richtig funktionieren." -#: ../SparkleDiff/SparkleDiff.cs:93 -#, fuzzy +#: ../SparkleDiff/SparkleDiff.cs:157 msgid "SparkleDiff Copyright (C) 2010 Hylke Bons" msgstr "SparkleShare Copyright (C) 2010 Hylke Bons" -#: ../SparkleDiff/SparkleDiff.cs:95 ../SparkleShare/SparkleShare.cs:90 +#: ../SparkleDiff/SparkleDiff.cs:159 ../SparkleShare/SparkleShare.cs:90 msgid "This program comes with ABSOLUTELY NO WARRANTY." msgstr "Diese Anwendung wird OHNE IRGENDEINE GARANTIE veröffentlicht." -#: ../SparkleDiff/SparkleDiff.cs:96 ../SparkleShare/SparkleShare.cs:91 +#: ../SparkleDiff/SparkleDiff.cs:160 ../SparkleShare/SparkleShare.cs:91 msgid "This is free software, and you are welcome to redistribute it " msgstr "Dies ist freie Software. Sie können es weitergeben und/oder modifizieren" -#: ../SparkleDiff/SparkleDiff.cs:97 ../SparkleShare/SparkleShare.cs:92 +#: ../SparkleDiff/SparkleDiff.cs:161 ../SparkleShare/SparkleShare.cs:92 msgid "under certain conditions. Please read the GNU GPLv3 for details." msgstr "unter bestimmten Bedingungen. Bitte lesen Sie dazu die GNU GPLv3 für weitere Details." -#: ../SparkleDiff/SparkleDiff.cs:99 -#, fuzzy +#: ../SparkleDiff/SparkleDiff.cs:163 msgid "SparkleDiff let's you compare revisions of an image file side by side." -msgstr "SparkleDiff lässt Sie Versionen einer Bilddatei nebeneinander vergleichen." +msgstr "SparkleDiff lässt dich Versionen einer Bilddatei nebeneinander vergleichen." -#: ../SparkleDiff/SparkleDiff.cs:101 -#, fuzzy +#: ../SparkleDiff/SparkleDiff.cs:165 msgid "Usage: sparklediff [FILE]" -msgstr "Verwendung: sparklediff [Datei]" +msgstr "Verwendung: sparklediff [DATEI]" -#: ../SparkleDiff/SparkleDiff.cs:102 -#, fuzzy +#: ../SparkleDiff/SparkleDiff.cs:166 msgid "Open an image file to show its revisions" -msgstr "Öffnet eine Bilddatei um ihre Versionen anzuzeigen" +msgstr "Öffnet eine Bilddatei zur Anzeige ihrer Versionen" -#: ../SparkleDiff/SparkleDiff.cs:104 ../SparkleShare/SparkleShare.cs:99 +#: ../SparkleDiff/SparkleDiff.cs:168 ../SparkleShare/SparkleShare.cs:99 msgid "Arguments:" msgstr "Parameter:" -#: ../SparkleDiff/SparkleDiff.cs:105 ../SparkleShare/SparkleShare.cs:101 +#: ../SparkleDiff/SparkleDiff.cs:169 ../SparkleShare/SparkleShare.cs:101 msgid "\t -h, --help\t\tDisplay this help text." -msgstr "\t -h, --help\t\tDiesen Hilfe-Text nicht anzeigen." +msgstr "\t -h, --help\t\tDiesen Hilfe-Text anzeigen." + +#. TRANSLATORS: The parameter is a filename +#: ../SparkleDiff/SparkleDiffWindow.cs:53 +#, csharp-format +msgid "Comparing Revisions of ‘{0}’" +msgstr "Versionen von »{0}« vergleichen" + +#: ../SparkleDiff/SparkleDiffWindow.cs:81 +msgid "Current Revision" +msgstr "Aktuelle Version" + +#. TRANSLATORS: This is a format specifier according to +#. System.Globalization.DateTimeFormatInfo +#: ../SparkleDiff/SparkleDiffWindow.cs:85 +msgid "d MMM\tH:mm" +msgstr "d MMM\tH:mm" #: ../SparkleShare/SparkleDialog.cs:50 msgid "Address of remote SparkleShare folder:" @@ -113,7 +125,7 @@ msgstr "Verzeichnis »{0}« erfolgreich abgeglichen" #: ../SparkleShare/SparkleDialog.cs:198 #, fuzzy msgid "Now make great stuff happen!" -msgstr "Und jetzt, tu etwas großartiges!" +msgstr "Und jetzt, tue etwas großartiges!" #. Add a button to open the folder where the changed file is #: ../SparkleShare/SparkleDialog.cs:200 ../SparkleShare/SparkleRepo.cs:319 @@ -121,66 +133,61 @@ msgstr "Und jetzt, tu etwas großartiges!" msgid "Open Folder" msgstr "Verzeichnis öffnen" -#: ../SparkleShare/SparkleHelpers.cs:159 +#: ../SparkleShare/SparkleHelpers.cs:164 #, csharp-format msgid "a second ago" msgid_plural "{0} seconds ago" msgstr[0] "vor einer Sekunde" msgstr[1] "vor {0} Sekunden" -#: ../SparkleShare/SparkleHelpers.cs:165 +#: ../SparkleShare/SparkleHelpers.cs:170 #, csharp-format msgid "a minute ago" msgid_plural "about {0} minutes ago" msgstr[0] "vor einer Minute" msgstr[1] "vor {0} Minuten" -#: ../SparkleShare/SparkleHelpers.cs:171 +#: ../SparkleShare/SparkleHelpers.cs:176 #, csharp-format msgid "about an hour ago" msgid_plural "about {0} hours ago" msgstr[0] "vor einer Stunde" msgstr[1] "vor {0} Stunden" -#: ../SparkleShare/SparkleHelpers.cs:177 +#: ../SparkleShare/SparkleHelpers.cs:182 #, csharp-format msgid "yesterday" msgid_plural "{0} days ago" msgstr[0] "gestern" msgstr[1] "vor {0} Tagen" -#: ../SparkleShare/SparkleHelpers.cs:183 +#: ../SparkleShare/SparkleHelpers.cs:188 #, csharp-format msgid "a month ago" msgid_plural "{0} months ago" msgstr[0] "vor einem Monat" msgstr[1] "vor {0} Monaten" -#: ../SparkleShare/SparkleHelpers.cs:188 +#: ../SparkleShare/SparkleHelpers.cs:193 #, csharp-format msgid "a year ago" msgid_plural "{0} years ago" msgstr[0] "vor einem Jahr" msgstr[1] "vor {0} Jahren" -#: ../SparkleShare/SparkleHelpers.cs:197 -#, fuzzy +#: ../SparkleShare/SparkleHelpers.cs:205 msgid "Hold your ponies!" msgstr "Immer langsam mit den jungen Pferden!" -#: ../SparkleShare/SparkleHelpers.cs:198 -#, fuzzy +#: ../SparkleShare/SparkleHelpers.cs:206 msgid "" "SparkleShare is known to be insanely fast with \n" "pictures of unicorns. Please make sure your internets\n" "are upgraded to the latest version to avoid problems." msgstr "" "SparkleShare ist bekannt dafür, Bilder von Einhörnern\n" -"\r\n" "wahnsinnig schnell zu bearbeiten. Bitte stellen Sie sicher,\n" -"\r\n" -"dass Sie die neuest Version des Internets installiert haben,\n" -"\r\n" +"dass Sie die neueste Version des Internets installiert haben,\n" "um Probleme zu vermeiden." #: ../SparkleShare/SparkleShare.cs:88 @@ -231,15 +238,15 @@ msgstr "Website besuchen" msgid "Quit" msgstr "Beenden" -#: ../SparkleShare/SparkleUI.cs:134 +#: ../SparkleShare/SparkleUI.cs:145 msgid "Welcome to SparkleShare!" msgstr "Wilkommen bei SparkleShare!" -#: ../SparkleShare/SparkleUI.cs:135 +#: ../SparkleShare/SparkleUI.cs:146 msgid "You don't have any folders set up yet." msgstr "Sie haben noch keine Verzeichnisse konfiguriert." -#: ../SparkleShare/SparkleUI.cs:138 +#: ../SparkleShare/SparkleUI.cs:149 msgid "Add a Folder…" msgstr "Ein Verzeichnis hinzufügen …" diff --git a/po/fr_FR.po b/po/fr_FR.po index b4d5e338..8a66f26d 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -6,82 +6,91 @@ msgid "" msgstr "" "Project-Id-Version: SparkleShare\n" -"Report-Msgid-Bugs-To: Yann HERMANS \n" -"POT-Creation-Date: 2010-07-07 06:00+0000\n" -"PO-Revision-Date: 2010-07-07 16:55+0100\n" -"Last-Translator: Yann HERMANS \n" -"Language-Team: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-07-13 06:01+0000\n" +"PO-Revision-Date: 2010-07-13 16:07+0800\n" +"Last-Translator: Fabien Basmaison \n" +"Language-Team: French (France)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: fr_FR\n" "Plural-Forms: nplurals=2; plural=(n>1);\n" +"X-Poedit-Language: French\n" "X-Poedit-SourceCharset: utf-8\n" +"X-Poedit-Country: FRANCE\n" -#: ../SparkleDiff/SparkleDiff.cs:75 -#: ../SparkleShare/SparkleShare.cs:50 + +#: ../SparkleDiff/SparkleDiff.cs:77 ../SparkleShare/SparkleShare.cs:50 msgid "Git wasn't found." -msgstr "Le logiciel Git n'a pas été détecté." +msgstr "Git n’a pas été détecté." -#: ../SparkleDiff/SparkleDiff.cs:76 -#: ../SparkleShare/SparkleShare.cs:51 +#: ../SparkleDiff/SparkleDiff.cs:78 ../SparkleShare/SparkleShare.cs:51 msgid "You can get Git from http://git-scm.com/." msgstr "Vous pouvez récupérer Git sur http://git-scm.com/." -#: ../SparkleDiff/SparkleDiff.cs:83 -#: ../SparkleShare/SparkleShare.cs:58 +#: ../SparkleDiff/SparkleDiff.cs:86 ../SparkleShare/SparkleShare.cs:58 msgid "Sorry, you can't run SparkleShare with these permissions." msgstr "Désolé, vous ne disposez pas des autorisations nécessaires pour lancer SparkleShare." -#: ../SparkleDiff/SparkleDiff.cs:84 -#: ../SparkleShare/SparkleShare.cs:59 +#: ../SparkleDiff/SparkleDiff.cs:87 ../SparkleShare/SparkleShare.cs:59 msgid "Things would go utterly wrong." -msgstr "Il se peut que les choses se passent très mal." +msgstr "Les choses pourraient très mal tourner." -#: ../SparkleDiff/SparkleDiff.cs:156 +#: ../SparkleDiff/SparkleDiff.cs:157 msgid "SparkleDiff Copyright (C) 2010 Hylke Bons" msgstr "Copyright (C) SparkleDiff 2010 Hylke Bons" -#: ../SparkleDiff/SparkleDiff.cs:158 -#: ../SparkleShare/SparkleShare.cs:90 +#: ../SparkleDiff/SparkleDiff.cs:159 ../SparkleShare/SparkleShare.cs:90 msgid "This program comes with ABSOLUTELY NO WARRANTY." msgstr "Ce logiciel est diffusé sans AUCUNE GARANTIE." -#: ../SparkleDiff/SparkleDiff.cs:159 -#: ../SparkleShare/SparkleShare.cs:91 +#: ../SparkleDiff/SparkleDiff.cs:160 ../SparkleShare/SparkleShare.cs:91 msgid "This is free software, and you are welcome to redistribute it " -msgstr "Ce logiciel étant libre, vous pouvez le distribuer librement" +msgstr "Ce logiciel est libre, et vous êtes invité à le re‑distribuer " -#: ../SparkleDiff/SparkleDiff.cs:160 -#: ../SparkleShare/SparkleShare.cs:92 +#: ../SparkleDiff/SparkleDiff.cs:161 ../SparkleShare/SparkleShare.cs:92 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." -#: ../SparkleDiff/SparkleDiff.cs:162 +#: ../SparkleDiff/SparkleDiff.cs:163 msgid "SparkleDiff let's you compare revisions of an image file side by side." -msgstr "SparkleDiff vous permet de comparer les versions d'un fichier image point par point." - -#: ../SparkleDiff/SparkleDiff.cs:164 -msgid "Usage: sparklediff [FILE]" -msgstr "Usage: sparklediff [FICHIER]" +msgstr "SparkleDiff vous permet de comparer les versions d’une image côte à côte." #: ../SparkleDiff/SparkleDiff.cs:165 +msgid "Usage: sparklediff [FILE]" +msgstr "Utilisation : sparklediff [FICHIER]" + +#: ../SparkleDiff/SparkleDiff.cs:166 msgid "Open an image file to show its revisions" -msgstr "Ouvrir un fichier image pour en afficher les versions" +msgstr "Ouvrir une image pour en afficher les versions" -#: ../SparkleDiff/SparkleDiff.cs:167 -#: ../SparkleShare/SparkleShare.cs:99 +#: ../SparkleDiff/SparkleDiff.cs:168 ../SparkleShare/SparkleShare.cs:99 msgid "Arguments:" -msgstr "Paramètres:" +msgstr "Paramètres :" -#: ../SparkleDiff/SparkleDiff.cs:168 -#: ../SparkleShare/SparkleShare.cs:101 +#: ../SparkleDiff/SparkleDiff.cs:169 ../SparkleShare/SparkleShare.cs:101 msgid "\t -h, --help\t\tDisplay this help text." -msgstr "\t -h, --help\t\tAffiche ce texte d'aide." +msgstr "\t -h, --help\t\tAffiche ce texte d’aide." + +#. TRANSLATORS: The parameter is a filename +#: ../SparkleDiff/SparkleDiffWindow.cs:53 +#, csharp-format +msgid "Comparing Revisions of ‘{0}’" +msgstr "Compare les versions de « {0} »" + +#: ../SparkleDiff/SparkleDiffWindow.cs:81 +msgid "Current Revision" +msgstr "Version actuelle" + +#. TRANSLATORS: This is a format specifier according to System.Globalization.DateTimeFormatInfo +#: ../SparkleDiff/SparkleDiffWindow.cs:85 +msgid "d MMM\tH:mm" +msgstr "d MMM\tH:mm" #: ../SparkleShare/SparkleDialog.cs:50 msgid "Address of remote SparkleShare folder:" -msgstr "Adresse du dossier distant SparkleShare:" +msgstr "Adresse du dossier distant SparkleShare :" #: ../SparkleShare/SparkleDialog.cs:81 msgid "Add Folder" @@ -89,12 +98,12 @@ msgstr "Ajouter un dossier" #: ../SparkleShare/SparkleDialog.cs:126 #, csharp-format -msgid "Syncing folder ‚Äò{0}‚Äô" -msgstr "Synchroniser un dossier ‚Äò{0}‚Äô" +msgid "Syncing folder ‘{0}’" +msgstr "Synchronise le dossier « {0} »" #: ../SparkleShare/SparkleDialog.cs:127 msgid "SparkleShare will notify you when this is done." -msgstr "SparkleShare vous préviendra lorsque l'opération sera achevée." +msgstr "SparkleShare vous signalera la fin de l’opération." #: ../SparkleShare/SparkleDialog.cs:129 msgid "Dismiss" @@ -102,28 +111,27 @@ msgstr "Abandonner" #: ../SparkleShare/SparkleDialog.cs:157 #, csharp-format -msgid "Something went wrong while syncing ‚Äò{0}‚Äô" -msgstr "Une erreur est survenue lors de la synchronisation ‚Äò{0}‚Äô" +msgid "Something went wrong while syncing ‘{0}’" +msgstr "Une erreur est survenue lors de la synchronisation de « {0} »" #: ../SparkleShare/SparkleDialog.cs:167 -msgid "Try Again‚Ķ" -msgstr "Réessayer‚Ķ" +msgid "Try Again…" +msgstr "Essayer de nouveau…" #: ../SparkleShare/SparkleDialog.cs:197 #, csharp-format -msgid "Successfully synced folder ‚Äò{0}‚Äô" -msgstr "Le dossier à été synchronisé ‚Äò{0}‚Äô" +msgid "Successfully synced folder ‘{0}’" +msgstr "Le dossier « {0} » a été synchronisé avec succès" #: ../SparkleShare/SparkleDialog.cs:198 msgid "Now make great stuff happen!" -msgstr "Maintenant la magie peut opérer!" +msgstr "Maintenant, la magie peut opérer !" #. Add a button to open the folder where the changed file is -#: ../SparkleShare/SparkleDialog.cs:200 -#: ../SparkleShare/SparkleRepo.cs:319 +#: ../SparkleShare/SparkleDialog.cs:200 ../SparkleShare/SparkleRepo.cs:319 #: ../SparkleShare/SparkleWindow.cs:63 msgid "Open Folder" -msgstr "Ouvrir un dossier" +msgstr "Ouvrir le dossier" #: ../SparkleShare/SparkleHelpers.cs:164 #, csharp-format @@ -165,11 +173,11 @@ msgstr[1] "il y a {0} mois" msgid "a year ago" msgid_plural "{0} years ago" msgstr[0] "il y a un an" -msgstr[1] "il y a {0} années" +msgstr[1] "il y a {0} ans" #: ../SparkleShare/SparkleHelpers.cs:205 msgid "Hold your ponies!" -msgstr "Du calme!" +msgstr "Restons calme !" #: ../SparkleShare/SparkleHelpers.cs:206 msgid "" @@ -177,8 +185,8 @@ msgid "" "pictures of unicorns. Please make sure your internets\n" "are upgraded to the latest version to avoid problems." msgstr "" -"SparkleShare est réputé pour sa rapidité malseine\n" -"avec les images de licornes. Merci de vérifier que\n" +"SparkleShare est réputé pour son hallucinante rapidité\n" +"concernant les images de licornes. Merci de vérifier que\n" "votre navigateur est à jour pour éviter tout problème." #: ../SparkleShare/SparkleShare.cs:88 @@ -191,15 +199,15 @@ msgstr "SparkleShare synchronize le dossier ~/SparkleShare avec les dépôts dis #: ../SparkleShare/SparkleShare.cs:96 msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..." -msgstr "Usage: sparkleshare [start|stop|restart] [OPTION]..." +msgstr "Utilisation : sparkleshare [start|stop|restart] [OPTION]…" #: ../SparkleShare/SparkleShare.cs:97 msgid "Sync SparkleShare folder with remote repositories." -msgstr "Synchronise le dossier SparkleShare avec les dépôts distants." +msgstr "Synchroniser le dossier SparkleShare avec les dépôts distants." #: ../SparkleShare/SparkleShare.cs:100 msgid "\t -d, --disable-gui\tDon't show the notification icon." -msgstr "\t -d, --disable-gui\tMasquer l'icone de notification." +msgstr "\t -d, --disable-gui\tMasquer l’icône de notification." #: ../SparkleShare/SparkleStatusIcon.cs:69 msgid "Error syncing" @@ -210,12 +218,12 @@ msgid "Everything is up to date" msgstr "Tout est à jour" #: ../SparkleShare/SparkleStatusIcon.cs:75 -msgid "Syncing‚Ķ" -msgstr "Synchronisation en cours‚Ķ" +msgid "Syncing…" +msgstr "Synchronisation en cours…" #: ../SparkleShare/SparkleStatusIcon.cs:116 -msgid "Add a Remote Folder‚Ķ" -msgstr "Ajouter un dossier distant‚Ķ" +msgid "Add a Remote Folder…" +msgstr "Ajouter un dossier distant…" #: ../SparkleShare/SparkleStatusIcon.cs:124 msgid "Show Notifications" @@ -223,27 +231,26 @@ msgstr "Montrer les notifications" #: ../SparkleShare/SparkleStatusIcon.cs:142 msgid "Visit Website" -msgstr "Visiter le site Internet" +msgstr "Visiter le site web" #: ../SparkleShare/SparkleStatusIcon.cs:159 msgid "Quit" msgstr "Quitter" -#: ../SparkleShare/SparkleUI.cs:134 +#: ../SparkleShare/SparkleUI.cs:145 msgid "Welcome to SparkleShare!" -msgstr "Bienvenue sur SparkleShare!" +msgstr "Bienvenue sur SparkleShare !" -#: ../SparkleShare/SparkleUI.cs:135 +#: ../SparkleShare/SparkleUI.cs:146 msgid "You don't have any folders set up yet." -msgstr "Vous n'avez encore configuré aucun dossier." +msgstr "Vous n’avez encore configuré aucun dossier." -#: ../SparkleShare/SparkleUI.cs:138 -msgid "Add a Folder‚Ķ" -msgstr "Ajouter un dossier‚Ķ" +#: ../SparkleShare/SparkleUI.cs:149 +msgid "Add a Folder…" +msgstr "Ajouter un dossier…" #. TRANSLATORS: {0} is a folder name, and {1} is a server address #: ../SparkleShare/SparkleWindow.cs:51 #, csharp-format -msgid "‚Äò{0}‚Äô on {1}" -msgstr "‚Äò{0}‚Äô sur {1}" - +msgid "‘{0}’ on {1}" +msgstr "« {0} » sur {1}" diff --git a/po/pl.po b/po/pl.po index 8e71f442..6f86041f 100644 --- a/po/pl.po +++ b/po/pl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-03 19:41+0000\n" +"POT-Creation-Date: 2010-07-07 17:44+0000\n" "PO-Revision-Date: 2010-06-11 21:59+0200\n" "Last-Translator: Łukasz Jernaś \n" "Language-Team: Polish \n" @@ -23,21 +23,73 @@ msgstr "" "X-Poedit-Country: Poland\n" "X-Generator: Virtaal 0.5.2\n" +#: ../SparkleDiff/SparkleDiff.cs:77 ../SparkleShare/SparkleShare.cs:50 +msgid "Git wasn't found." +msgstr "Nie znaleziono programu Git." + +#: ../SparkleDiff/SparkleDiff.cs:78 ../SparkleShare/SparkleShare.cs:51 +msgid "You can get Git from http://git-scm.com/." +msgstr "Można go pobrać ze strony http://git-scm.com/." + +#: ../SparkleDiff/SparkleDiff.cs:86 ../SparkleShare/SparkleShare.cs:58 +msgid "Sorry, you can't run SparkleShare with these permissions." +msgstr "Przepraszamy, nie można uruchomić programu SparkleShare z bieżącymi uprawnieniami." + +#: ../SparkleDiff/SparkleDiff.cs:87 ../SparkleShare/SparkleShare.cs:59 +msgid "Things would go utterly wrong." +msgstr "Może to spowodować nieprzewidziane skutki." + +#: ../SparkleDiff/SparkleDiff.cs:157 +msgid "SparkleDiff Copyright (C) 2010 Hylke Bons" +msgstr "SparkleDiff Copyright (C) 2010 Hylke Bons" + +#: ../SparkleDiff/SparkleDiff.cs:159 ../SparkleShare/SparkleShare.cs:90 +msgid "This program comes with ABSOLUTELY NO WARRANTY." +msgstr "Niniejszy program dostarczany jest BEZ JAKIEJKOLWIEK GWARANCJI." + +#: ../SparkleDiff/SparkleDiff.cs:160 ../SparkleShare/SparkleShare.cs:91 +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." + +#: ../SparkleDiff/SparkleDiff.cs:161 ../SparkleShare/SparkleShare.cs:92 +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." + +#: ../SparkleDiff/SparkleDiff.cs:163 +msgid "SparkleDiff let's you compare revisions of an image file side by side." +msgstr "Program SparkleDiff pozwala na porównywanie różnych rewizji pliku graficznego obok siebie." + +#: ../SparkleDiff/SparkleDiff.cs:165 +msgid "Usage: sparklediff [FILE]" +msgstr "Sposób użycia: sparklediff [PLIK]" + +#: ../SparkleDiff/SparkleDiff.cs:166 +msgid "Open an image file to show its revisions" +msgstr "Otwiera plik graficzny z możliwością porównywania jego rewizji" + +#: ../SparkleDiff/SparkleDiff.cs:168 ../SparkleShare/SparkleShare.cs:99 +msgid "Arguments:" +msgstr "Parametry:" + +#: ../SparkleDiff/SparkleDiff.cs:169 ../SparkleShare/SparkleShare.cs:101 +msgid "\t -h, --help\t\tDisplay this help text." +msgstr "\t -h, --help\t\tWyświetla opcje pomocy." + #. TRANSLATORS: The parameter is a filename -#: ../SparkleDiff/SparkleDiff.cs:90 +#: ../SparkleDiff/SparkleDiffWindow.cs:53 #, csharp-format msgid "Comparing Revisions of ‘{0}’" -msgstr "" +msgstr "Porównywanie rewizji pliku „{0}”" -#: ../SparkleDiff/SparkleDiff.cs:122 +#: ../SparkleDiff/SparkleDiffWindow.cs:81 msgid "Current Revision" msgstr "Bieżąca rewizja" #. TRANSLATORS: This is a format specifier according to #. System.Globalization.DateTimeFormatInfo -#: ../SparkleDiff/SparkleDiff.cs:125 +#: ../SparkleDiff/SparkleDiffWindow.cs:85 msgid "d MMM\tH:mm" -msgstr "" +msgstr "d MMM\tH:mm" #: ../SparkleShare/SparkleDialog.cs:50 msgid "Address of remote SparkleShare folder:" @@ -80,11 +132,11 @@ msgstr "Teraz możesz zacząć czynić wielkie rzeczy!" #. Add a button to open the folder where the changed file is #: ../SparkleShare/SparkleDialog.cs:200 ../SparkleShare/SparkleRepo.cs:319 -#: ../SparkleShare/SparkleWindow.cs:62 +#: ../SparkleShare/SparkleWindow.cs:63 msgid "Open Folder" msgstr "Otwórz katalog" -#: ../SparkleShare/SparkleHelpers.cs:159 +#: ../SparkleShare/SparkleHelpers.cs:164 #, csharp-format msgid "a second ago" msgid_plural "{0} seconds ago" @@ -92,7 +144,7 @@ msgstr[0] "sekundę temu" msgstr[1] "{0} sekundy temu" msgstr[2] "{0} sekund temu" -#: ../SparkleShare/SparkleHelpers.cs:165 +#: ../SparkleShare/SparkleHelpers.cs:170 #, csharp-format msgid "a minute ago" msgid_plural "about {0} minutes ago" @@ -100,7 +152,7 @@ msgstr[0] "minutę temu" msgstr[1] "około {0} minuty temu" msgstr[2] "około {0} minut temu" -#: ../SparkleShare/SparkleHelpers.cs:171 +#: ../SparkleShare/SparkleHelpers.cs:176 #, csharp-format msgid "about an hour ago" msgid_plural "about {0} hours ago" @@ -108,7 +160,7 @@ msgstr[0] "około godzinę temu" msgstr[1] "około {0} godziny temu" msgstr[2] "około {0} godzin temu" -#: ../SparkleShare/SparkleHelpers.cs:177 +#: ../SparkleShare/SparkleHelpers.cs:182 #, csharp-format msgid "yesterday" msgid_plural "{0} days ago" @@ -116,7 +168,7 @@ msgstr[0] "wczoraj" msgstr[1] "{0} dni temu" msgstr[2] "{0} dni temu" -#: ../SparkleShare/SparkleHelpers.cs:183 +#: ../SparkleShare/SparkleHelpers.cs:188 #, csharp-format msgid "a month ago" msgid_plural "{0} months ago" @@ -124,7 +176,7 @@ msgstr[0] "miesiąc temu" msgstr[1] "{0} miesiące temu" msgstr[2] "{0} miesięcy temu" -#: ../SparkleShare/SparkleHelpers.cs:188 +#: ../SparkleShare/SparkleHelpers.cs:193 #, csharp-format msgid "a year ago" msgid_plural "{0} years ago" @@ -132,11 +184,11 @@ msgstr[0] "rok temu" msgstr[1] "{0} lata temu" msgstr[2] "{0} lat temu" -#: ../SparkleShare/SparkleHelpers.cs:197 +#: ../SparkleShare/SparkleHelpers.cs:205 msgid "Hold your ponies!" msgstr "Wstrzymaj konie!" -#: ../SparkleShare/SparkleHelpers.cs:198 +#: ../SparkleShare/SparkleHelpers.cs:206 msgid "" "SparkleShare is known to be insanely fast with \n" "pictures of unicorns. Please make sure your internets\n" @@ -146,62 +198,26 @@ msgstr "" " przy wysyłaniu obrazków z jednorożcami.\n" "Dopilnuj, by Twój internet był w najnowszej wersji, aby uniknąć problemów." -#: ../SparkleShare/SparkleShare.cs:50 -msgid "Git wasn't found." -msgstr "Nie znaleziono programu Git." - -#: ../SparkleShare/SparkleShare.cs:51 -msgid "You can get Git from http://git-scm.com/." -msgstr "Można go pobrać ze strony http://git-scm.com/." - -#: ../SparkleShare/SparkleShare.cs:58 -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:59 -msgid "Things will go utterly wrong." -msgstr "Może to spowodować nieprzewidziane skutki." - -#: ../SparkleShare/SparkleShare.cs:87 +#: ../SparkleShare/SparkleShare.cs:88 msgid "SparkleShare Copyright (C) 2010 Hylke Bons" msgstr "SparkleShare Copyright (C) 2010 Hylke Bons" -#: ../SparkleShare/SparkleShare.cs:89 -msgid "This program comes with ABSOLUTELY NO WARRANTY." -msgstr "Niniejszy program dostarczany jest BEZ JAKIEJKOLWIEK GWARANCJI." - -#: ../SparkleShare/SparkleShare.cs:90 -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:91 -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:93 +#: ../SparkleShare/SparkleShare.cs:94 msgid "SparkleShare syncs the ~/SparkleShare folder with remote repositories." msgstr "Program SparkleShare synchronizuje zawartość katalogu ~/SparkleShare ze zdalnymi repozytoriami." -#: ../SparkleShare/SparkleShare.cs:95 +#: ../SparkleShare/SparkleShare.cs:96 msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..." msgstr "Użycie: sparkleshare [start|stop|restart] [OPCJA]..." -#: ../SparkleShare/SparkleShare.cs:96 +#: ../SparkleShare/SparkleShare.cs:97 msgid "Sync SparkleShare folder with remote repositories." msgstr "Synchronizuj zawartość katalogu SparkleShare ze zdalnymi repozytoriami." -#: ../SparkleShare/SparkleShare.cs:98 -msgid "Arguments:" -msgstr "Parametry:" - -#: ../SparkleShare/SparkleShare.cs:99 +#: ../SparkleShare/SparkleShare.cs:100 msgid "\t -d, --disable-gui\tDon't show the notification icon." msgstr "\t -d, --disable-gui\tWyłącza wyświetlanie ikony w obszarze powiadamiania." -#: ../SparkleShare/SparkleShare.cs:100 -msgid "\t -h, --help\t\tDisplay this help text." -msgstr "\t -h, --help\t\tWyświetla opcje pomocy." - #: ../SparkleShare/SparkleStatusIcon.cs:69 msgid "Error syncing" msgstr "Błąd w trakcie synchronizacji" @@ -230,19 +246,20 @@ msgstr "Odwiedź stronę domową" msgid "Quit" msgstr "Zakończ" -#: ../SparkleShare/SparkleUI.cs:134 +#: ../SparkleShare/SparkleUI.cs:145 msgid "Welcome to SparkleShare!" msgstr "Witamy w programie SparkleShare!" -#: ../SparkleShare/SparkleUI.cs:135 +#: ../SparkleShare/SparkleUI.cs:146 msgid "You don't have any folders set up yet." msgstr "Nie ustawiono żadnych katalogów." -#: ../SparkleShare/SparkleUI.cs:138 +#: ../SparkleShare/SparkleUI.cs:149 msgid "Add a Folder…" msgstr "Dodaj katalog…" -#: ../SparkleShare/SparkleWindow.cs:50 +#. TRANSLATORS: {0} is a folder name, and {1} is a server address +#: ../SparkleShare/SparkleWindow.cs:51 #, csharp-format msgid "‘{0}’ on {1}" msgstr "„{0}” na {1}" diff --git a/po/pt_BR.po b/po/pt_BR.po index 4ef26b19..53a8fd85 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: SparkleShare\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-06 09:20+0000\n" +"POT-Creation-Date: 2010-07-07 17:44+0000\n" "PO-Revision-Date: 2010-07-05 13:01-0300\n" "Last-Translator: Magnun Leno \n" "Language-Team: Brazilian Portuguese\n" @@ -20,58 +20,74 @@ msgstr "" "X-Poedit-SourceCharset: utf-8\n" "X-Poedit-Country: BRAZIL\n" -#: ../SparkleDiff/SparkleDiff.cs:75 ../SparkleShare/SparkleShare.cs:50 +#: ../SparkleDiff/SparkleDiff.cs:77 ../SparkleShare/SparkleShare.cs:50 msgid "Git wasn't found." msgstr "Git não foi encontrado." -#: ../SparkleDiff/SparkleDiff.cs:76 ../SparkleShare/SparkleShare.cs:51 +#: ../SparkleDiff/SparkleDiff.cs:78 ../SparkleShare/SparkleShare.cs:51 msgid "You can get Git from http://git-scm.com/." msgstr "Você pode obter o Git no site http://git-scm.com/." -#: ../SparkleDiff/SparkleDiff.cs:83 ../SparkleShare/SparkleShare.cs:58 +#: ../SparkleDiff/SparkleDiff.cs:86 ../SparkleShare/SparkleShare.cs:58 msgid "Sorry, you can't run SparkleShare with these permissions." msgstr "Descuple, você não pode rodar o SparkleShare sem essas permissões." -#: ../SparkleDiff/SparkleDiff.cs:84 ../SparkleShare/SparkleShare.cs:59 +#: ../SparkleDiff/SparkleDiff.cs:87 ../SparkleShare/SparkleShare.cs:59 msgid "Things would go utterly wrong." msgstr "As coisas vão dar completamente errado." -#: ../SparkleDiff/SparkleDiff.cs:156 +#: ../SparkleDiff/SparkleDiff.cs:157 msgid "SparkleDiff Copyright (C) 2010 Hylke Bons" msgstr "Direitos Autorais SparkleShare (C) 2010 Hylke Bons" -#: ../SparkleDiff/SparkleDiff.cs:158 ../SparkleShare/SparkleShare.cs:90 +#: ../SparkleDiff/SparkleDiff.cs:159 ../SparkleShare/SparkleShare.cs:90 msgid "This program comes with ABSOLUTELY NO WARRANTY." msgstr "Este programa vem com ABSOLUTAMENTE NENHUMA GARANTIA." -#: ../SparkleDiff/SparkleDiff.cs:159 ../SparkleShare/SparkleShare.cs:91 +#: ../SparkleDiff/SparkleDiff.cs:160 ../SparkleShare/SparkleShare.cs:91 msgid "This is free software, and you are welcome to redistribute it " msgstr "Este é um software livre, e você é incentivado a distribuí-lo " -#: ../SparkleDiff/SparkleDiff.cs:160 ../SparkleShare/SparkleShare.cs:92 +#: ../SparkleDiff/SparkleDiff.cs:161 ../SparkleShare/SparkleShare.cs:92 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." -#: ../SparkleDiff/SparkleDiff.cs:162 +#: ../SparkleDiff/SparkleDiff.cs:163 msgid "SparkleDiff let's you compare revisions of an image file side by side." msgstr "O SparkleDiff permite que você compare lado a lado revisões de uma imagem." -#: ../SparkleDiff/SparkleDiff.cs:164 +#: ../SparkleDiff/SparkleDiff.cs:165 msgid "Usage: sparklediff [FILE]" msgstr "Utilização: sparklediff [ARQUIVO]" -#: ../SparkleDiff/SparkleDiff.cs:165 +#: ../SparkleDiff/SparkleDiff.cs:166 msgid "Open an image file to show its revisions" msgstr "Abre um arquivo de imagem e mostra suas revisões" -#: ../SparkleDiff/SparkleDiff.cs:167 ../SparkleShare/SparkleShare.cs:99 +#: ../SparkleDiff/SparkleDiff.cs:168 ../SparkleShare/SparkleShare.cs:99 msgid "Arguments:" msgstr "Argumentos:" -#: ../SparkleDiff/SparkleDiff.cs:168 ../SparkleShare/SparkleShare.cs:101 +#: ../SparkleDiff/SparkleDiff.cs:169 ../SparkleShare/SparkleShare.cs:101 msgid "\t -h, --help\t\tDisplay this help text." msgstr "\t -h, --help\t\tMostra esse texto de ajuda." +#. TRANSLATORS: The parameter is a filename +#: ../SparkleDiff/SparkleDiffWindow.cs:53 +#, csharp-format +msgid "Comparing Revisions of ‘{0}’" +msgstr "Comparando revisões de '{0}'" + +#: ../SparkleDiff/SparkleDiffWindow.cs:81 +msgid "Current Revision" +msgstr "Revisão Atual" + +#. TRANSLATORS: This is a format specifier according to +#. System.Globalization.DateTimeFormatInfo +#: ../SparkleDiff/SparkleDiffWindow.cs:85 +msgid "d MMM\tH:mm" +msgstr "" + #: ../SparkleShare/SparkleDialog.cs:50 msgid "Address of remote SparkleShare folder:" msgstr "Endereço da pasta remota SparkleShare:" @@ -222,15 +238,15 @@ msgstr "Visitar o Website" msgid "Quit" msgstr "Sair" -#: ../SparkleShare/SparkleUI.cs:134 +#: ../SparkleShare/SparkleUI.cs:145 msgid "Welcome to SparkleShare!" msgstr "Bem vindo ao SparkleShare" -#: ../SparkleShare/SparkleUI.cs:135 +#: ../SparkleShare/SparkleUI.cs:146 msgid "You don't have any folders set up yet." msgstr "Você ainda não possui nenhuma pasta configurada." -#: ../SparkleShare/SparkleUI.cs:138 +#: ../SparkleShare/SparkleUI.cs:149 msgid "Add a Folder…" msgstr "Adicionar uma Pasta…"