Merge branch 'master' into about
This commit is contained in:
Hylke Bons
commit
82f49665c5
14
AUTHORS
14
AUTHORS
|
|
@ -1,15 +1,25 @@
|
|||
Maintainer:
|
||||
Points of contact:
|
||||
|
||||
Maintainer:
|
||||
Hylke Bons <hylkebons@gmail.com>
|
||||
|
||||
Marketing:
|
||||
Alexandre Saiz Verdaguer <a@alexandresaiz.com>
|
||||
|
||||
Translations:
|
||||
Łukasz Jernaś <deejay1@srem.org>
|
||||
|
||||
|
||||
Contributors:
|
||||
|
||||
Alexandre Saiz Verdaguer <a@alexandresaiz.com>
|
||||
Alex Hudson <home@alexhudson.com>
|
||||
Allan Day <allanpday@gmail.com>
|
||||
Andreas Nilsson <andreasn@gnome.org>
|
||||
Benjamin Podszun <benjamin.podszun@gmail.com>
|
||||
Bertrand Lorentz <bertrand.lorentz@gmail.com>
|
||||
Garrett LeSage <garrett@novell.com>
|
||||
Hylke Bons <hylkebons@gmail.com>
|
||||
Jakub Steiner <jimmac@redhat.com>
|
||||
Kristi Tsukida <kristi.tsukida@gmail.com>
|
||||
Lapo Calamandrei <calamandrei@gmail.com>
|
||||
|
|
@ -25,5 +35,7 @@ Contributors:
|
|||
Simon Pither <simon@pither.com>
|
||||
Steven Harms <sharms@ubuntu.com>
|
||||
Vincent Untz <vuntz@gnome.org>
|
||||
Will Thompson <will@willthompson.co.uk>
|
||||
|
||||
|
||||
Thanks very much!
|
||||
|
|
|
|||
|
|
@ -29,26 +29,15 @@ namespace SparkleLib {
|
|||
|
||||
get {
|
||||
|
||||
Process process = new Process ();
|
||||
process.StartInfo.RedirectStandardOutput = true;
|
||||
process.StartInfo.UseShellExecute = false;
|
||||
process.StartInfo.FileName = "which";
|
||||
process.StartInfo.Arguments = Backend.Name.ToLower ();
|
||||
process.Start ();
|
||||
string [] possible_git_paths = {"/usr/bin/git",
|
||||
"/usr/local/git/bin/git",
|
||||
"/usr/local/bin/git"};
|
||||
|
||||
string path = process.StandardOutput.ReadToEnd ();
|
||||
path = path.Trim ();
|
||||
foreach (string git_path in possible_git_paths)
|
||||
if (File.Exists (git_path))
|
||||
return git_path;
|
||||
|
||||
if (!string.IsNullOrEmpty (path)) {
|
||||
|
||||
return path;
|
||||
|
||||
} else {
|
||||
|
||||
Console.WriteLine ("Sorry, SparkleShare needs " + Backend.Name + " to run, but it wasn't found.");
|
||||
return null;
|
||||
|
||||
}
|
||||
return null;
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -59,17 +48,7 @@ namespace SparkleLib {
|
|||
|
||||
get {
|
||||
|
||||
Process process = new Process ();
|
||||
process.StartInfo.RedirectStandardOutput = true;
|
||||
process.StartInfo.UseShellExecute = false;
|
||||
process.StartInfo.FileName = "which";
|
||||
process.StartInfo.Arguments = Backend.Name.ToLower ();
|
||||
process.Start ();
|
||||
|
||||
string path = process.StandardOutput.ReadToEnd ();
|
||||
path = path.Trim ();
|
||||
|
||||
return !string.IsNullOrEmpty (path);
|
||||
return (Path != null);
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1018,7 +1018,7 @@ namespace SparkleLib {
|
|||
"Merge: .+ .+\n" +
|
||||
"Author: (.+) <(.+)>\n" +
|
||||
"Date: ([0-9]{4})-([0-9]{2})-([0-9]{2}) " +
|
||||
"([0-9]{2}):([0-9]{2}):([0-9]{2}) \\+([0-9]{4})\n" +
|
||||
"([0-9]{2}):([0-9]{2}):([0-9]{2}) .([0-9]{4})\n" +
|
||||
"*");
|
||||
|
||||
is_merge_commit = true;
|
||||
|
|
@ -1028,7 +1028,7 @@ namespace SparkleLib {
|
|||
regex = new Regex (@"commit ([a-z0-9]{40})\n" +
|
||||
"Author: (.+) <(.+)>\n" +
|
||||
"Date: ([0-9]{4})-([0-9]{2})-([0-9]{2}) " +
|
||||
"([0-9]{2}):([0-9]{2}):([0-9]{2}) \\+([0-9]{4})\n" +
|
||||
"([0-9]{2}):([0-9]{2}):([0-9]{2}) .([0-9]{4})\n" +
|
||||
"*");
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -76,8 +76,7 @@ namespace SparkleShare {
|
|||
UserInfoForm.IntercellSpacing = new SizeF (4, 4);
|
||||
|
||||
string full_name = new UnixUserInfo (UnixEnvironment.UserName).RealName;
|
||||
full_name.TrimEnd (",".ToCharArray());
|
||||
UserInfoForm.Cells [0].StringValue = full_name;
|
||||
UserInfoForm.Cells [0].StringValue = full_name.TrimEnd (",".ToCharArray());;
|
||||
UserInfoForm.Cells [1].StringValue = SparkleShare.Controller.UserEmail;
|
||||
|
||||
|
||||
|
|
@ -150,7 +149,7 @@ namespace SparkleShare {
|
|||
|
||||
|
||||
ServerTypeLabel = new NSTextField () {
|
||||
Alignment = (uint) NSTextAlignment.Right,
|
||||
Alignment = NSTextAlignment.Right,
|
||||
BackgroundColor = NSColor.WindowBackground,
|
||||
Bordered = false,
|
||||
Editable = false,
|
||||
|
|
@ -160,7 +159,7 @@ namespace SparkleShare {
|
|||
};
|
||||
|
||||
AddressLabel = new NSTextField () {
|
||||
Alignment = (uint) NSTextAlignment.Right,
|
||||
Alignment = NSTextAlignment.Right,
|
||||
BackgroundColor = NSColor.WindowBackground,
|
||||
Bordered = false,
|
||||
Editable = false,
|
||||
|
|
@ -170,7 +169,7 @@ namespace SparkleShare {
|
|||
};
|
||||
|
||||
FolderNameLabel = new NSTextField () {
|
||||
Alignment = (uint) NSTextAlignment.Right,
|
||||
Alignment = NSTextAlignment.Right,
|
||||
BackgroundColor = NSColor.WindowBackground,
|
||||
Bordered = false,
|
||||
Editable = false,
|
||||
|
|
@ -396,7 +395,7 @@ namespace SparkleShare {
|
|||
|
||||
CancelButton.Activated += delegate {
|
||||
InvokeOnMainThread (delegate {
|
||||
Close ();
|
||||
PerformClose (this);
|
||||
});
|
||||
};
|
||||
|
||||
|
|
@ -499,7 +498,7 @@ namespace SparkleShare {
|
|||
FinishButton.Activated += delegate {
|
||||
InvokeOnMainThread (delegate {
|
||||
SparkleUI.StatusIcon.CreateMenu ();
|
||||
Close ();
|
||||
PerformClose (this);
|
||||
});
|
||||
};
|
||||
|
||||
|
|
@ -542,7 +541,7 @@ namespace SparkleShare {
|
|||
FinishButton.Activated += delegate {
|
||||
InvokeOnMainThread (delegate {
|
||||
SparkleUI.StatusIcon.CreateMenu ();
|
||||
Close ();
|
||||
PerformClose (this);
|
||||
});
|
||||
|
||||
};
|
||||
|
|
|
|||
|
|
@ -204,7 +204,7 @@ namespace SparkleShare {
|
|||
item.Image = NSImage.ImageNamed ("NSFolder");
|
||||
item.Image.Size = new SizeF (16, 16);
|
||||
|
||||
Tasks [i] = OpenEventLogDelegate(item.Title);
|
||||
Tasks [i] = OpenEventLogDelegate (path);
|
||||
|
||||
FolderMenuItems [i] = item;
|
||||
FolderMenuItems [i].Activated += Tasks [i];
|
||||
|
|
|
|||
|
|
@ -93,12 +93,15 @@ namespace SparkleShare {
|
|||
StatusIcon = new SparkleStatusIcon ();
|
||||
|
||||
|
||||
SparkleShare.Controller.NotificationRaised += delegate {
|
||||
SparkleShare.Controller.NotificationRaised += delegate (string user_name, string user_email,
|
||||
string message, string repository_path) {
|
||||
|
||||
InvokeOnMainThread (delegate {
|
||||
|
||||
foreach (SparkleLog log in SparkleUI.OpenLogs)
|
||||
log.UpdateEventLog ();
|
||||
foreach (SparkleLog log in OpenLogs) {
|
||||
if (log.LocalPath.Equals (repository_path))
|
||||
log.UpdateEventLog ();
|
||||
}
|
||||
|
||||
if (SparkleShare.Controller.NotificationsEnabled) {
|
||||
|
||||
|
|
|
|||
|
|
@ -155,7 +155,7 @@ namespace SparkleShare {
|
|||
}
|
||||
|
||||
|
||||
public override void Close ()
|
||||
public override void PerformClose (NSObject sender)
|
||||
{
|
||||
|
||||
OrderOut (this);
|
||||
|
|
|
|||
|
|
@ -635,16 +635,12 @@ namespace SparkleShare {
|
|||
// folders in the SparkleShare folder
|
||||
private void PopulateRepositories ()
|
||||
{
|
||||
|
||||
// FIXME: Opening a log from the menu whilst populating crashes SparkleShare
|
||||
|
||||
Repositories = new List <SparkleRepo> ();
|
||||
|
||||
foreach (string folder_path in Directory.GetDirectories (SparklePaths.SparklePath))
|
||||
AddRepository (folder_path);
|
||||
|
||||
if (FolderListChanged != null)
|
||||
FolderListChanged ();
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -81,14 +81,12 @@ namespace SparkleShare {
|
|||
};
|
||||
|
||||
string full_name = new UnixUserInfo (UnixEnvironment.UserName).RealName;
|
||||
full_name.TrimEnd (",".ToCharArray());
|
||||
|
||||
Label name_label = new Label ("<b>" + _("Full Name:") + "</b>") {
|
||||
UseMarkup = true,
|
||||
Xalign = 0
|
||||
};
|
||||
|
||||
NameEntry = new Entry (full_name);
|
||||
NameEntry = new Entry (full_name.TrimEnd (",".ToCharArray()));
|
||||
NameEntry.Changed += delegate {
|
||||
CheckAccountForm ();
|
||||
};
|
||||
|
|
@ -132,7 +130,7 @@ namespace SparkleShare {
|
|||
|
||||
SparkleShare.Controller.FirstRun = false;
|
||||
|
||||
Deletable = false;
|
||||
Deletable = true;
|
||||
ShowServerForm ();
|
||||
|
||||
};
|
||||
|
|
|
|||
|
|
@ -82,23 +82,18 @@ namespace SparkleShare {
|
|||
SparkleShare.Controller.NotificationRaised += delegate (string user_name, string user_email,
|
||||
string message, string repository_path) {
|
||||
|
||||
foreach (SparkleLog log in OpenLogs) {
|
||||
if (log.LocalPath.Equals (repository_path)) {
|
||||
Application.Invoke (delegate {
|
||||
log.UpdateEventLog ();
|
||||
});
|
||||
}
|
||||
}
|
||||
Application.Invoke (delegate {
|
||||
|
||||
// TODO: move to controller and do translation here
|
||||
|
||||
if (!SparkleShare.Controller.NotificationsEnabled)
|
||||
return;
|
||||
foreach (SparkleLog log in OpenLogs) {
|
||||
if (log.LocalPath.Equals (repository_path))
|
||||
log.UpdateEventLog ();
|
||||
}
|
||||
|
||||
if (!SparkleShare.Controller.NotificationsEnabled)
|
||||
return;
|
||||
|
||||
Application.Invoke (delegate {
|
||||
|
||||
SparkleBubble bubble = new SparkleBubble (user_name, message);
|
||||
|
||||
SparkleBubble bubble = new SparkleBubble (user_name, message);
|
||||
string avatar_file_path = SparkleUIHelpers.GetAvatar (user_email, 32);
|
||||
|
||||
if (avatar_file_path != null)
|
||||
|
|
|
|||
72
po/nl.po
72
po/nl.po
|
|
@ -10,7 +10,7 @@ msgstr ""
|
|||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2011-03-13 17:07+0100\n"
|
||||
"PO-Revision-Date: 2011-03-10 17:31+0000\n"
|
||||
"Last-Translator: deejay1 <deejay1@srem.org>\n"
|
||||
"Last-Translator: Hylke Bons <hylkebons@gmail.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
@ -29,7 +29,7 @@ msgstr "Welkom bij SparkleShare!"
|
|||
#: ../SparkleShare/Mac/SparkleStatusIcon.cs:375
|
||||
#: ../SparkleShare/SparkleStatusIcon.cs:354
|
||||
msgid "Not everything is synced"
|
||||
msgstr "Nog niet alles is gesynchroniseerd"
|
||||
msgstr "Niet alles is gesynchroniseerd"
|
||||
|
||||
#: ../SparkleShare/Mac/SparkleStatusIcon.cs:382
|
||||
#: ../SparkleShare/SparkleStatusIcon.cs:361
|
||||
|
|
@ -43,15 +43,15 @@ msgstr "Synchroniseren…"
|
|||
|
||||
#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
|
||||
msgid "Copy Web Link"
|
||||
msgstr "Kopieër Web Link"
|
||||
msgstr "Kopiëer weblink"
|
||||
|
||||
#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:114
|
||||
msgid "Copy the web address of this file to the clipboard"
|
||||
msgstr "Kopieer het web adres van dit bestand naar het plakbord"
|
||||
msgstr "Kopiëer het web-adres van dit bestand naar het plakbord"
|
||||
|
||||
#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:147
|
||||
msgid "Get Earlier Version"
|
||||
msgstr "Verkrijg Oudere Versie"
|
||||
msgstr "Verkrijg eerdere versie"
|
||||
|
||||
#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:148
|
||||
msgid "Make a copy of an earlier version in this folder"
|
||||
|
|
@ -63,15 +63,14 @@ msgstr "Selecteer voor een kopie van deze versie"
|
|||
|
||||
#: ../SparkleShare/SparkleDialog.cs:177
|
||||
msgid "_Visit Website"
|
||||
msgstr "_Bezoek Website"
|
||||
msgstr "_Bezoek website"
|
||||
|
||||
#: ../SparkleShare/SparkleIntro.cs:70
|
||||
msgid ""
|
||||
"Before we can create a SparkleShare folder on this computer, we need a few "
|
||||
"bits of information from you."
|
||||
msgstr ""
|
||||
"Voordat we een SparkleShare map kunnen aanmaken op deze computer, hebben we "
|
||||
"eerst wat informatie van jou nodig."
|
||||
msgstr "Voordat we een SparkleShare map op deze computer kunnen aanmaken, hebben we "
|
||||
"eerst wat informatie van je nodig."
|
||||
|
||||
#: ../SparkleShare/SparkleIntro.cs:82
|
||||
msgid "Full Name:"
|
||||
|
|
@ -107,8 +106,7 @@ msgstr "Gratis hosting voor Vrije en Open Source Software projecten."
|
|||
|
||||
#: ../SparkleShare/SparkleIntro.cs:205
|
||||
msgid "Also has paid accounts for extra private space and bandwidth."
|
||||
msgstr ""
|
||||
"Heeft ook accounts tegen betaling voor extra privéruimte en bandbreedte."
|
||||
msgstr "Heeft ook accounts tegen betaling voor extra privéruimte en bandbreedte."
|
||||
|
||||
#: ../SparkleShare/SparkleIntro.cs:213
|
||||
msgid "The GNOME Project"
|
||||
|
|
@ -116,12 +114,12 @@ msgstr "Het GNOME Project"
|
|||
|
||||
#: ../SparkleShare/SparkleIntro.cs:215
|
||||
msgid "GNOME is an easy to understand interface to your computer."
|
||||
msgstr "GNOME is een gemakkelijk te begrijpen interface voor je computer."
|
||||
msgstr "GNOME is een makkelijk te begrijpen interface voor je computer."
|
||||
|
||||
#: ../SparkleShare/SparkleIntro.cs:216
|
||||
msgid "Select this option if you’re a developer or designer working on GNOME."
|
||||
msgstr ""
|
||||
"Selecteer deze optie als je een ontwikkelaar bent die aan GNOME werkt."
|
||||
"Selecteer deze optie als je een GNOME vrijwilliger bent."
|
||||
|
||||
#: ../SparkleShare/SparkleIntro.cs:224
|
||||
msgid "Gitorious"
|
||||
|
|
@ -129,7 +127,7 @@ msgstr "Gitorious"
|
|||
|
||||
#: ../SparkleShare/SparkleIntro.cs:226
|
||||
msgid "Completely Free as in Freedom infrastructure."
|
||||
msgstr "Volledig Vrij als in Vrijheid infrastructuur."
|
||||
msgstr "Volledig Free as in Freedom infrastructuur."
|
||||
|
||||
#: ../SparkleShare/SparkleIntro.cs:227
|
||||
msgid "Free accounts for Free and Open Source projects."
|
||||
|
|
@ -177,7 +175,7 @@ msgid ""
|
|||
"We're ready to hook you up immediately if you wish."
|
||||
msgstr ""
|
||||
"Je hebt een uitnodiging ontvangen om je bij een gedeelde map aan te sluiten.\n"
|
||||
" Als je wil zorgen we ervoor dat dit meteen in orde komt."
|
||||
"Als je wilt zorgen we ervoor dat dit meteen in orde komt."
|
||||
|
||||
#: ../SparkleShare/SparkleIntro.cs:449
|
||||
msgid "Do you accept this invitation?"
|
||||
|
|
@ -212,7 +210,7 @@ msgstr "Map succesvol gesynchroniseerd!"
|
|||
msgid ""
|
||||
"Now you can access the synced files from ‘{0}’ in your SparkleShare folder."
|
||||
msgstr ""
|
||||
"Nu heb je toegang tot de gesynchoniseerde bestanden van ‘{0}’ in uw "
|
||||
"Nu heb je toegang tot de gesynchoniseerde bestanden van ‘{0}’ in je "
|
||||
"SparkleShare map."
|
||||
|
||||
#. A button that opens the synced folder
|
||||
|
|
@ -228,7 +226,7 @@ msgstr "Voltooien"
|
|||
#: ../SparkleShare/SparkleIntro.cs:628
|
||||
#, csharp-format
|
||||
msgid "Syncing folder ‘{0}’…"
|
||||
msgstr "Synchroniseren van map ‘{0}’…"
|
||||
msgstr "Map ‘{0}’ aan het synchroniseren…"
|
||||
|
||||
#: ../SparkleShare/SparkleIntro.cs:635
|
||||
msgid "This may take a while.\n"
|
||||
|
|
@ -236,7 +234,7 @@ msgstr "Dit kan even duren.\n"
|
|||
|
||||
#: ../SparkleShare/SparkleIntro.cs:636
|
||||
msgid "Are you sure it’s not coffee o'clock?"
|
||||
msgstr ""
|
||||
msgstr "Tijd voor een Cup-a-Soup?"
|
||||
|
||||
#: ../SparkleShare/SparkleIntro.cs:687
|
||||
msgid "SparkleShare is ready to go!"
|
||||
|
|
@ -258,7 +256,7 @@ msgstr "Leer hoe je je eigen SparkleServer kan opzetten"
|
|||
#: ../SparkleShare/SparkleLog.cs:54
|
||||
#, csharp-format
|
||||
msgid "Events in ‘{0}’"
|
||||
msgstr ""
|
||||
msgstr "Gebeurtenissen in ‘{0}’"
|
||||
|
||||
#: ../SparkleShare/SparkleLog.cs:109
|
||||
msgid "_Open Folder"
|
||||
|
|
@ -266,15 +264,15 @@ msgstr "Map _openen"
|
|||
|
||||
#: ../SparkleShare/SparkleLog.cs:222
|
||||
msgid "This folder has unsynced changes"
|
||||
msgstr "Deze map heeft niet gesynchroniseerde veranderingen"
|
||||
msgstr "Deze map heeft veranderingen die niet gesynchroniseerd zijn"
|
||||
|
||||
#: ../SparkleShare/SparkleLog.cs:223
|
||||
msgid "We will sync these once we’re connected again"
|
||||
msgstr "We gaan door met synchroniseren als we weer verbonden zijn."
|
||||
msgstr "We gaan door met synchroniseren als we weer verbonden zijn"
|
||||
|
||||
#: ../SparkleShare/SparkleLog.cs:236
|
||||
msgid "Could not sync with the remote folder"
|
||||
msgstr "Kan niet synchroniseren met externe map"
|
||||
msgstr "Kon niet synchroniseren met de externe map"
|
||||
|
||||
#: ../SparkleShare/SparkleLog.cs:237
|
||||
msgid "Is the you and the server online?"
|
||||
|
|
@ -282,11 +280,11 @@ msgstr "Ben jij en de server online?"
|
|||
|
||||
#: ../SparkleShare/SparkleLog.cs:383
|
||||
msgid "Edited"
|
||||
msgstr "Veranderd"
|
||||
msgstr "Bewerkt"
|
||||
|
||||
#: ../SparkleShare/SparkleLog.cs:397
|
||||
msgid "Added"
|
||||
msgstr "Toegevoerd"
|
||||
msgstr "Toegevoegd"
|
||||
|
||||
#: ../SparkleShare/SparkleLog.cs:411
|
||||
msgid "Deleted"
|
||||
|
|
@ -310,7 +308,7 @@ msgstr "Toon het notificatiepictogram niet."
|
|||
|
||||
#: ../SparkleShare/SparkleShare.cs:69
|
||||
msgid "Print version information"
|
||||
msgstr "Druk versie informatie af"
|
||||
msgstr "Druk versie-informatie af"
|
||||
|
||||
#: ../SparkleShare/SparkleShare.cs:70
|
||||
msgid "Show this help text"
|
||||
|
|
@ -318,7 +316,7 @@ msgstr "Toon deze helptekst"
|
|||
|
||||
#: ../SparkleShare/SparkleShare.cs:133
|
||||
msgid "SparkleShare, an instant update workflow to Git."
|
||||
msgstr "SparkleShare, een direct geüpdatet workflow met Git."
|
||||
msgstr ""
|
||||
|
||||
#: ../SparkleShare/SparkleShare.cs:134
|
||||
msgid "Copyright (C) 2010 Hylke Bons"
|
||||
|
|
@ -364,25 +362,25 @@ msgstr "SparkleShare "
|
|||
|
||||
#: ../SparkleShare/SparkleStatusIcon.cs:187
|
||||
msgid "No Remote Folders Yet"
|
||||
msgstr "Geen externe mappen"
|
||||
msgstr "Nog geen externe mappen"
|
||||
|
||||
#. Opens the wizard to add a new remote folder
|
||||
#: ../SparkleShare/SparkleStatusIcon.cs:196
|
||||
msgid "Add Remote Folder…"
|
||||
msgstr ""
|
||||
msgstr "Externe map toevoegen…"
|
||||
|
||||
#: ../SparkleShare/SparkleStatusIcon.cs:216
|
||||
msgid "Turn Notifications Off"
|
||||
msgstr ""
|
||||
msgstr "Zet mededelingen uit"
|
||||
|
||||
#: ../SparkleShare/SparkleStatusIcon.cs:218
|
||||
msgid "Turn Notifications On"
|
||||
msgstr ""
|
||||
msgstr "Zet mededelingen aan"
|
||||
|
||||
#. A menu item that takes the user to http://www.sparkleshare.org/
|
||||
#: ../SparkleShare/SparkleStatusIcon.cs:231
|
||||
msgid "About SparkleShare"
|
||||
msgstr ""
|
||||
msgstr "Over SparkleShare"
|
||||
|
||||
#. A menu item that quits the application
|
||||
#: ../SparkleShare/SparkleStatusIcon.cs:244
|
||||
|
|
@ -392,24 +390,22 @@ msgstr "Afsluiten"
|
|||
#: ../SparkleShare/SparkleUI.cs:91
|
||||
#, csharp-format
|
||||
msgid "added ‘{0}’"
|
||||
msgstr "toegevoegd ‘{0}’"
|
||||
msgstr "voegde ‘{0}’ toe"
|
||||
|
||||
#: ../SparkleShare/SparkleUI.cs:102
|
||||
#, csharp-format
|
||||
msgid "edited ‘{0}’"
|
||||
msgstr "veranderd ‘{0}’"
|
||||
msgstr "bewerkte ‘{0}’"
|
||||
|
||||
#: ../SparkleShare/SparkleUI.cs:113
|
||||
#, csharp-format
|
||||
msgid "deleted ‘{0}’"
|
||||
msgstr "verwijderd ‘{0}’"
|
||||
msgstr "verwijderde ‘{0}’"
|
||||
|
||||
#: ../SparkleShare/SparkleUI.cs:157
|
||||
msgid "Ouch! Mid-air collision!"
|
||||
msgstr "Ouw! "
|
||||
msgstr "Ouw! Botsing!"
|
||||
|
||||
#: ../SparkleShare/SparkleUI.cs:158
|
||||
msgid "Don't worry, SparkleShare made a copy of each conflicting file."
|
||||
msgstr ""
|
||||
"Geen zorgen, SparkleShare heeft een kopie van elk conflicterend bestand "
|
||||
"gemaakt."
|
||||
msgstr "Geen zorgen, SparkleShare heeft een kopie van elk conflicterend bestand gemaakt."
|
||||
|
|
|
|||
Loading…
Reference in a new issue