diff --git a/AUTHORS b/AUTHORS
old mode 100644
new mode 100755
diff --git a/LICENSE b/LICENSE
old mode 100644
new mode 100755
diff --git a/Makefile.am b/Makefile.am
old mode 100644
new mode 100755
diff --git a/NEWS b/NEWS
old mode 100644
new mode 100755
index 220610ff..40c7541c
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-0.2.5 for Linux and Mac (...):
+0.2.5 for Linux and Mac (Mon Jul 25 2011):
Hylke: Reimplement notes to be less buggy and backend independent. Polish
about dialog and event log html. Fix a bug where large collections of files
diff --git a/README b/README
deleted file mode 100644
index 065e718b..00000000
--- a/README
+++ /dev/null
@@ -1,194 +0,0 @@
-SparkleShare
-============
-
-SparkleShare is a collaboration and sharing tool that is designed to keep
-things simple and to stay out of your way. It allows you to instantly sync
-with any Git repository you have access to.
-
-Though SparkleShare is not made to be a graphical frontend
-for git or a backup tool, it may be useful for other kinds of purposes as well,
-like backing up small files or monitoring your favourite project. In contrast
-to the projects name, we will very likely refuse to implement your personal
-ponies.
-
-SparkleShare currently works on Linux and Mac. A Windows port and mobile
-device support are planned for the future.
-
-
-License
-=======
-
-SparkleShare is free software and licensed under the GNU GPLv3 or later. You
-are welcome to change and redistribute it under certain conditions. For more
-information see the LICENSE file or visit http://www.gnu.org/licenses/gpl-3.0.html
-
-
-Run on Linux:
-=============
-
-SparkleShare currently requires:
-
- - git >= 1.7.1
- - gtk-sharp2 >= 2.12.7
- - mono-core >= 2.2
- - ndesk-dbus >= 0.6
- - openssh
- - gvfs >= 1.3
- - intltool
- - libnotify
- - nautilus-python
- - pygtk
- - webkitgtk
- - webkit-sharp
-
-Run the service, either click the SparkleShare launcher or:
-
- $ sparkleshare start
-
-You can stop the service via the graphical interface or by typing:
-
- $ sparkleshare stop
-
-For help:
-
- $ sparkleshare --help
-
-Note:
-
- SparkleShare creates its own RSA keypair in ~/config/sparkleshare/ and uses
- that for authentication. Please mind this if you're planning to set up your
- own server by hand.
-
-
-Build on Linux:
-===============
-
-Installing the build dependencies on Debian or Ubuntu:
-
- $ sudo apt-get install gtk-sharp2 mono-runtime mono-devel monodevelop \
- libndesk-dbus1.0-cil-dev nant libnotify-cil-dev libgtk2.0-cil-dev \
- libwebkit-cil-dev intltool libtool python-nautilus libndesk-dbus-glib1.0-cil-dev
-
-For Ubuntu libappindicator support, run the following before building:
-
- $ sudo apt-get install libappindicator0.1-cil-dev
-
-
-On Fedora:
-
- $ sudo yum install gtk-sharp2-devel mono-core mono-devel monodevelop \
- ndesk-dbus-devel ndesk-dbus-glib-devel nautilus-python-devel nant \
- notify-sharp-devel webkit-sharp-devel webkitgtk-devel libtool intltool \
- gnome-doc-utils
-
-
-You can build and install SparkleShare like this:
-
- $ ./configure --prefix=/usr (or ./autogen.sh if you build from the repository)
- $ make
- $ sudo make install
-
-Note:
-
- Use '--prefix=/usr' if you want the Nautilus extension to work.
-
-
-Run on Mac:
-===========
-
-Just double-click the SparkleShare.app.
-
-
-Build on Mac:
-=============
-
-Install the Mono Framework, MonoDevelop and the MonoMac plugin (you find it in Add-in Manager).
-
-You may need to adjust some environment variables to let the build environment tools find mono:
-
- $ export PATH=/Library/Frameworks/Mono.framework/Versions/Current/bin:$PATH
- $ export PKG_CONFIG=/Library/Frameworks/Mono.framework/Versions/Current/bin/pkg-config
- $ export PKG_CONFIG_PATH=/Library/Frameworks/Mono.framework/Versions/Current/lib/pkgconfig
-
-Then you need either MacPorts or Homebrew. Go on and choose one of the next two sections.
-
-
-Using MacPorts
---------------
-
-Install git, automake, and intltool:
-
- $ sudo port install git-core automake intltool
-
-Start the first part of the build:
-
- $ ./autogen.sh
- $ make
-
-The last step will give you some errors in SparkleShare.exe, ignore these and go on to the
-MonoDevelop section.
-
-
-Using Homebrew
---------------
-
-Because there are old versions of autoconf and automake installed on OS X, they are not in
-the official master branch. It's easy to create the formulas:
-
- $ brew create $url
-
-Now install the formulas.
-
-You can have a look at this branch for the created Formulas:
-https://github.com/toabi/homebrew/commits/sparkleshare
-
-You also have to comment out the 'keg_only' in gettext and remove it if you already
-installed it. If you created the formulas install them:
-
- $ brew install git autoconf automake intltool gettext
-
-Now start the first part of the build:
-
- $ export ACLOCAL_FLAGS="-I /usr/local/share/aclocal"
- $ cd SmartIrc4net
- $ ./autogen.sh
- $ cd ..
- $ ./autogen.sh
- $ make
-
-Ignore the error and continue to the MonoDevelop-part.
-
-
-Building the Cocoa UI MonoDevelop
----------------------------------
-
-Now that you have compiled the libraries, open 'SparkleShare/Mac/SparkleShare.sln' in
-MonoDevelop and start the build.
-
-To create the SparkleShare.app, select Project from the menu bar and click "Create Mac Installer..."
-
-
-Info
-====
-
-Official website:
-http://www.sparkleshare.org/
-
-Source code:
-http://github.com/SparkleShare/
-
-IRC Channel:
-#sparkleshare on irc.gnome.org
-
-Wiki:
-http://github.com/hbons/SparkleShare/wiki/
-
-Report issues:
-http://github.com/hbons/SparkleShare/issues/
-
-Translation project:
-http://www.transifex.net/projects/p/sparkleshare/
-
-
-Now have fun and create cool things together! :)
-
diff --git a/README.rst b/README.rst
new file mode 100755
index 00000000..8a0c1228
--- /dev/null
+++ b/README.rst
@@ -0,0 +1,198 @@
+SparkleShare
+============
+
+`SparkleShare`_ is a collaboration and sharing tool that is designed to keep
+things simple and to stay out of your way. It allows you to instantly sync
+with any Git repository you have access to.
+
+Though SparkleShare is not made to be a graphical frontend
+for git or a backup tool, it may be useful for other kinds of purposes as well,
+like backing up small files or monitoring your favourite project. In contrast
+to the projects name, we will very likely refuse to implement your personal
+ponies.
+
+SparkleShare currently works on Linux and Mac. A Windows port and mobile
+device support are planned for the future.
+
+
+License
+~~~~~~~
+SparkleShare is free software and licensed under the GNU GPLv3 or later. You
+are welcome to change and redistribute it under certain conditions. For more
+information see the LICENSE file or visit http://www.gnu.org/licenses/gpl-3.0.html
+
+
+Run on Linux:
+~~~~~~~~~~~~~
+Requirements:
+
+* git >= 1.7.0
+* gtk-sharp2
+* gvfs
+* intltool
+* libnotify
+* mono-core >= 2.8
+* notify-sharp
+* nautilus-python
+* openssh
+* pygtk
+* webkitgtk
+* webkit-sharp
+
+
+Run the service, either click the SparkleShare launcher or::
+
+ sparkleshare start
+
+You can stop the service via the graphical interface or by typing::
+
+ sparkleshare stop
+
+For help::
+
+ sparkleshare --help
+
+Note:
+-----
+SparkleShare creates its own RSA keypair in ~/config/sparkleshare/ and uses
+that for authentication. Please mind this if you're planning to set up your
+own server by hand.
+
+
+Build on Linux:
+~~~~~~~~~~~~~~~
+Installing the build dependencies on Debian or Ubuntu::
+
+ sudo apt-get install gtk-sharp2 mono-runtime mono-devel monodevelop \
+ libndesk-dbus1.0-cil-dev nant libnotify-cil-dev libgtk2.0-cil-dev \
+ libwebkit-cil-dev intltool libtool python-nautilus libndesk-dbus-glib1.0-cil-dev
+
+For Ubuntu libappindicator support, run the following before building::
+
+ sudo apt-get install libappindicator0.1-cil-dev
+
+
+On Fedora::
+
+ sudo yum install gtk-sharp2-devel mono-core mono-devel monodevelop \
+ ndesk-dbus-devel ndesk-dbus-glib-devel nautilus-python-devel nant \
+ notify-sharp-devel webkit-sharp-devel webkitgtk-devel libtool intltool \
+ gnome-doc-utils
+
+
+You can build and install SparkleShare like this::
+
+ ./configure --prefix=/usr (or ./autogen.sh if you build from the repository)
+ make
+ sudo make install
+
+Note
+----
+Use ``--prefix=/usr`` if you want the Nautilus extension to work.
+
+
+Run on Mac:
+~~~~~~~~~~~
+Just double-click the SparkleShare.app.
+
+
+Build on Mac:
+~~~~~~~~~~~~~
+Install the Mono Framework, MonoDevelop and the MonoMac plugin (you find it in Add-in Manager).
+
+You may need to adjust some environment variables to let the build environment tools find mono::
+
+ export PATH=/Library/Frameworks/Mono.framework/Versions/Current/bin:$PATH
+ export PKG_CONFIG=/Library/Frameworks/Mono.framework/Versions/Current/bin/pkg-config
+ export PKG_CONFIG_PATH=/Library/Frameworks/Mono.framework/Versions/Current/lib/pkgconfig
+
+Then you need either MacPorts or Homebrew. Go on and choose one of the next two sections.
+
+
+Using MacPorts
+--------------
+Install git, automake, and intltool::
+
+ sudo port install git-core automake intltool
+
+Start the first part of the build::
+
+ ./autogen.sh --enable-gtkui=no
+ make
+
+The last step will give you some errors in SparkleShare.exe, ignore these and go on to the
+MonoDevelop section.
+
+
+Using Homebrew
+--------------
+Because there are old versions of autoconf and automake installed on OS X, they are not in
+the official master branch. It's easy to create the formulas::
+
+ brew create $url
+
+Now install the formulas.
+
+You can have a look at this branch for the created Formulas:
+https://github.com/toabi/homebrew/commits/sparkleshare
+
+You also have to comment out the ``keg_only`` in gettext and remove it if you already
+installed it. If you created the formulas install them::
+
+ brew install git autoconf automake intltool gettext
+
+Now start the first part of the build::
+
+ export ACLOCAL_FLAGS="-I /usr/local/share/aclocal"
+ cd SmartIrc4net
+ ./autogen.sh
+ cd ..
+ ./autogen.sh --enable-gtkui=no
+ make
+
+Ignore the error and continue to the MonoDevelop-part.
+
+
+Building the Mac UI
+-------------------
+Now that you have compiled the libraries, open ``SparkleShare/Mac/SparkleShare.sln`` in
+MonoDevelop and start the build.
+
+To create the SparkleShare.app, select Project from the menu bar
+and click "Create Mac Installer..." Save the SparkleShare.app somewhere.
+
+Paste the contents of `this file`_ the following file in ``SparkleShare.app/Contents/MonoBundle/config``.
+
+Copy ``/Library/Frameworks/Mono.framework/Versions/Current/lib/libintl.dylib``
+to ``SparkleShare.app/Contents/Resources``
+
+Now you should have a working .app that you can run.
+
+
+Info
+~~~~
+
+`Official website`_
+
+`Source code`_
+
+IRC Channel:
+#sparkleshare on irc.gnome.org
+
+Wiki_
+
+`Report issues`_
+
+`Translation project`_
+
+
+Now have fun and create cool things together! :)
+
+
+.. _`Official website`: http://www.sparkleshare.org/
+.. _`SparkleShare`: http://www.sparkleshare.org/
+.. _`Source code`: http://github.com/hbons/SparkleShare/
+.. _Wiki: http://github.com/hbons/SparkleShare/wiki/
+.. _`Report issues`: http://github.com/hbons/SparkleShare/issues/
+.. _`Translation project`: http://www.transifex.net/projects/p/sparkleshare
+.. _`this file`: https://raw.github.com/gist/1aeffa61bac73fc08eca/0c0f09ef9e36864c35f34fd5e8bf4f99886be193/gistfile1.txt
diff --git a/SparkleLib/AssemblyInfo.cs.in b/SparkleLib/AssemblyInfo.cs.in
old mode 100644
new mode 100755
diff --git a/SparkleLib/Defines.cs.in b/SparkleLib/Defines.cs.in
old mode 100644
new mode 100755
diff --git a/SparkleLib/Git/SparkleFetcherGit.cs b/SparkleLib/Git/SparkleFetcherGit.cs
old mode 100644
new mode 100755
diff --git a/SparkleLib/Hg/SparkleFetcherHg.cs b/SparkleLib/Hg/SparkleFetcherHg.cs
old mode 100644
new mode 100755
diff --git a/SparkleLib/Hg/SparkleRepoHg.cs b/SparkleLib/Hg/SparkleRepoHg.cs
old mode 100644
new mode 100755
diff --git a/SparkleLib/Makefile.am b/SparkleLib/Makefile.am
old mode 100644
new mode 100755
diff --git a/SparkleLib/SparkleBackend.cs b/SparkleLib/SparkleBackend.cs
old mode 100644
new mode 100755
diff --git a/SparkleLib/SparkleChangeSet.cs b/SparkleLib/SparkleChangeSet.cs
old mode 100644
new mode 100755
diff --git a/SparkleLib/SparkleConfig.cs b/SparkleLib/SparkleConfig.cs
old mode 100644
new mode 100755
diff --git a/SparkleLib/SparkleFetcherBase.cs b/SparkleLib/SparkleFetcherBase.cs
old mode 100644
new mode 100755
diff --git a/SparkleLib/SparkleHelpers.cs b/SparkleLib/SparkleHelpers.cs
old mode 100644
new mode 100755
diff --git a/SparkleLib/SparkleLib.csproj b/SparkleLib/SparkleLib.csproj
old mode 100644
new mode 100755
diff --git a/SparkleLib/SparkleLib.sln b/SparkleLib/SparkleLib.sln
old mode 100644
new mode 100755
diff --git a/SparkleLib/SparkleListenerBase.cs b/SparkleLib/SparkleListenerBase.cs
old mode 100644
new mode 100755
diff --git a/SparkleLib/SparkleListenerTcp.cs b/SparkleLib/SparkleListenerTcp.cs
old mode 100644
new mode 100755
diff --git a/SparkleLib/SparkleOptions.cs b/SparkleLib/SparkleOptions.cs
old mode 100644
new mode 100755
diff --git a/SparkleLib/SparklePaths.cs b/SparkleLib/SparklePath.cs
similarity index 99%
rename from SparkleLib/SparklePaths.cs
rename to SparkleLib/SparklePath.cs
index 3c550973..6529008a 100644
--- a/SparkleLib/SparklePaths.cs
+++ b/SparkleLib/SparklePath.cs
@@ -34,3 +34,4 @@ namespace SparkleLib {
}
}
+
diff --git a/SparkleLib/SparkleRepoBase.cs b/SparkleLib/SparkleRepoBase.cs
old mode 100644
new mode 100755
diff --git a/SparkleLib/SparkleWatcher.cs b/SparkleLib/SparkleWatcher.cs
old mode 100644
new mode 100755
diff --git a/SparkleLib/windows/SparkleLib.csproj b/SparkleLib/windows/SparkleLib.csproj
index 3bb20808..0aec68a9 100644
--- a/SparkleLib/windows/SparkleLib.csproj
+++ b/SparkleLib/windows/SparkleLib.csproj
@@ -72,18 +72,11 @@
SparkleRepoGit.cs
-
- SparkleFetcherHg.cs
- Component
-
-
- SparkleRepoHg.cs
-
SparkleConfig.cs
-
- SparklePaths.cs
+
+ SparklePath.cs
SparkleRepoBase.cs
diff --git a/SparkleShare/Mac/AppDelegate.cs b/SparkleShare/Mac/AppDelegate.cs
old mode 100644
new mode 100755
diff --git a/SparkleShare/Mac/Growl.framework/Versions/A/Headers/Growl.h b/SparkleShare/Mac/Growl.framework/Versions/A/Headers/Growl.h
old mode 100644
new mode 100755
diff --git a/SparkleShare/Mac/Growl.framework/Versions/A/Headers/GrowlApplicationBridge-Carbon.h b/SparkleShare/Mac/Growl.framework/Versions/A/Headers/GrowlApplicationBridge-Carbon.h
old mode 100644
new mode 100755
diff --git a/SparkleShare/Mac/Growl.framework/Versions/A/Headers/GrowlApplicationBridge.h b/SparkleShare/Mac/Growl.framework/Versions/A/Headers/GrowlApplicationBridge.h
old mode 100644
new mode 100755
diff --git a/SparkleShare/Mac/Growl.framework/Versions/A/Headers/GrowlDefines.h b/SparkleShare/Mac/Growl.framework/Versions/A/Headers/GrowlDefines.h
old mode 100644
new mode 100755
diff --git a/SparkleShare/Mac/Growl.framework/Versions/A/Resources/Info.plist b/SparkleShare/Mac/Growl.framework/Versions/A/Resources/Info.plist
old mode 100644
new mode 100755
diff --git a/SparkleShare/Mac/Growl.plist b/SparkleShare/Mac/Growl.plist
old mode 100644
new mode 100755
diff --git a/SparkleShare/Mac/Info.plist b/SparkleShare/Mac/Info.plist
old mode 100644
new mode 100755
index 8117ef38..97d1ab96
--- a/SparkleShare/Mac/Info.plist
+++ b/SparkleShare/Mac/Info.plist
@@ -2,8 +2,6 @@
- CFBundleExecutable
-
CFBundleIconFile
sparkleshare
CFBundleIdentifier
@@ -12,6 +10,8 @@
SparkleShare
LSMinimumSystemVersion
10.6
+ CFBundleVersion
+ 1
NSMainNibFile
MainMenu
NSPrincipalClass
diff --git a/SparkleShare/Mac/MainMenu.xib b/SparkleShare/Mac/MainMenu.xib
old mode 100644
new mode 100755
diff --git a/SparkleShare/Mac/MainMenu.xib.designer.cs b/SparkleShare/Mac/MainMenu.xib.designer.cs
old mode 100644
new mode 100755
index 01952cd1..1ce6227d
--- a/SparkleShare/Mac/MainMenu.xib.designer.cs
+++ b/SparkleShare/Mac/MainMenu.xib.designer.cs
@@ -1,7 +1,7 @@
// ------------------------------------------------------------------------------
//
// This code was generated by a tool.
-// Mono Runtime Version: 2.0.50727.1433
+// Mono Runtime Version: 4.0.30319.1
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
diff --git a/SparkleShare/Mac/Makefile.am b/SparkleShare/Mac/Makefile.am
old mode 100644
new mode 100755
index 0783574a..4313776a
--- a/SparkleShare/Mac/Makefile.am
+++ b/SparkleShare/Mac/Makefile.am
@@ -5,11 +5,12 @@ EXTRA_DIST = \
MainMenu.xib.designer.cs \
SparkleAbout.cs \
SparkleAlert.cs \
- SparkleIntro.cs \
+ SparkleSetup.cs \
SparkleEventLog.cs \
SparkleMacController.cs \
+ SparkleMacWatcher.cs \
SparkleShare.csproj \
SparkleShare.sln \
SparkleStatusIcon.cs \
SparkleUI.cs \
- SparkleWindow.cs
+ SparkleSetupWindow.cs
diff --git a/SparkleShare/Mac/SparkleAbout.cs b/SparkleShare/Mac/SparkleAbout.cs
old mode 100644
new mode 100755
diff --git a/SparkleShare/Mac/SparkleAlert.cs b/SparkleShare/Mac/SparkleAlert.cs
old mode 100644
new mode 100755
diff --git a/SparkleShare/Mac/SparkleBadger.cs b/SparkleShare/Mac/SparkleBadger.cs
old mode 100644
new mode 100755
diff --git a/SparkleShare/Mac/SparkleBubbles.cs b/SparkleShare/Mac/SparkleBubbles.cs
old mode 100644
new mode 100755
diff --git a/SparkleShare/Mac/SparkleMacController.cs b/SparkleShare/Mac/SparkleController.cs
old mode 100644
new mode 100755
similarity index 88%
rename from SparkleShare/Mac/SparkleMacController.cs
rename to SparkleShare/Mac/SparkleController.cs
index 9e1a1080..15fa3da1
--- a/SparkleShare/Mac/SparkleMacController.cs
+++ b/SparkleShare/Mac/SparkleController.cs
@@ -26,13 +26,17 @@ using SparkleLib;
namespace SparkleShare {
- public class SparkleMacController : SparkleController {
+ public class SparkleController : SparkleControllerBase {
// We have to use our own custom made folder watcher, as
// System.IO.FileSystemWatcher fails watching subfolders on Mac
- private SparkleMacWatcher watcher = new SparkleMacWatcher (SparklePaths.SparklePath);
+ private SparkleMacWatcher watcher;
+
+
+ public SparkleController () : base ()
+ {
+ }
- public SparkleMacController () : base () { }
public override void Initialize ()
{
@@ -53,7 +57,7 @@ namespace SparkleShare {
repo_name = repo_name.Trim ("/".ToCharArray ());
FileSystemEventArgs args = new FileSystemEventArgs (WatcherChangeTypes.Changed,
- Path.Combine (SparklePaths.SparklePath, path), Path.GetFileName (path));
+ Path.Combine (SparkleConfig.DefaultConfig.FoldersPath, path), Path.GetFileName (path));
foreach (SparkleRepoBase repo in Repositories) {
if (repo.Name.Equals (repo_name))
@@ -109,20 +113,22 @@ namespace SparkleShare {
// Creates the SparkleShare folder in the user's home folder
public override bool CreateSparkleShareFolder ()
{
- if (!Directory.Exists (SparklePaths.SparklePath)) {
- Directory.CreateDirectory (SparklePaths.SparklePath);
- return true;
+ this.watcher = new SparkleMacWatcher (SparkleConfig.DefaultConfig.FoldersPath);
- } else {
- return false;
- }
+ if (!Directory.Exists (SparkleConfig.DefaultConfig.FoldersPath)) {
+ Directory.CreateDirectory (SparkleConfig.DefaultConfig.FoldersPath);
+ return true;
+
+ } else {
+ return false;
+ }
}
// Opens the SparkleShare folder or an (optional) subfolder
public override void OpenSparkleShareFolder (string subfolder)
{
- string folder = Path.Combine (SparklePaths.SparklePath, subfolder);
+ string folder = Path.Combine (SparkleConfig.DefaultConfig.FoldersPath, subfolder);
folder.Replace (" ", "\\ "); // Escape space-characters
NSWorkspace.SharedWorkspace.OpenFile (folder);
diff --git a/SparkleShare/Mac/SparkleEventLog.cs b/SparkleShare/Mac/SparkleEventLog.cs
old mode 100644
new mode 100755
index d4e3acc3..fc6660ec
--- a/SparkleShare/Mac/SparkleEventLog.cs
+++ b/SparkleShare/Mac/SparkleEventLog.cs
@@ -168,7 +168,6 @@ namespace SparkleShare {
if (this.progress_indicator.Superview == ContentView)
this.progress_indicator.RemoveFromSuperview ();
- // TODO: still causes some flashes
this.web_view.MainFrame.LoadHtmlString (html, new NSUrl (""));
ContentView.AddSubview (this.web_view);
});
@@ -213,7 +212,7 @@ namespace SparkleShare {
string note = match.Groups [3].Value;
Thread thread = new Thread (new ThreadStart (delegate {
- SparkleShare.Controller.AddNoteToFolder (folder_name, revision, note);
+ Program.Controller.AddNoteToFolder (folder_name, revision, note);
}));
thread.Start ();
diff --git a/SparkleShare/Mac/SparkleMacWatcher.cs b/SparkleShare/Mac/SparkleMacWatcher.cs
old mode 100644
new mode 100755
diff --git a/SparkleShare/Mac/SparkleSetup.cs b/SparkleShare/Mac/SparkleSetup.cs
old mode 100644
new mode 100755
index 126ce302..51570dd3
--- a/SparkleShare/Mac/SparkleSetup.cs
+++ b/SparkleShare/Mac/SparkleSetup.cs
@@ -28,44 +28,49 @@ using MonoMac.WebKit;
namespace SparkleShare {
- public class SparkleSetup : SparkleSetupWindow {
+ public class SparkleSetup : SparkleSetupWindow {
public SparkleSetupController Controller = new SparkleSetupController ();
- private NSButton ContinueButton;
- private NSButton SyncButton;
- private NSButton TryAgainButton;
- private NSButton CancelButton;
- private NSButton OpenFolderButton;
- private NSButton FinishButton;
- private NSForm UserInfoForm;
- private NSProgressIndicator ProgressIndicator;
- private NSTextField AddressTextField;
- private NSTextField FolderNameTextField;
- private NSTextField ServerTypeLabel;
- private NSTextField AddressLabel;
- private NSTextField FolderNameLabel;
- private NSTextField FolderNameHelpLabel;
- private NSButtonCell ButtonCellProto;
- private NSMatrix Matrix;
- private int ServerType;
- private Timer timer;
+ private NSButton ContinueButton;
+ private NSButton SyncButton;
+ private NSButton TryAgainButton;
+ private NSButton CancelButton;
+ private NSButton SkipTutorialButton;
+ private NSButton OpenFolderButton;
+ private NSButton FinishButton;
+ private NSButton AddProjectButton;
+ private NSImage SlideImage;
+ private NSImageView SlideImageView;
+ private NSForm UserInfoForm;
+ private NSProgressIndicator ProgressIndicator;
+ private NSTextField AddressTextField;
+ private NSTextField FolderNameTextField;
+ private NSTextField ServerTypeLabel;
+ private NSTextField AddressLabel;
+ private NSTextField FolderNameLabel;
+ private NSTextField FolderNameHelpLabel;
+ private NSTextField AddProjectTextField;
+ private NSButtonCell ButtonCellProto;
+ private NSMatrix Matrix;
+ private int ServerType;
+ private Timer timer;
-
- public SparkleSetup () : base ()
- {
+
+ public SparkleSetup () : base ()
+ {
Controller.ChangePageEvent += delegate (PageType type) {
InvokeOnMainThread (delegate {
Reset ();
switch (type) {
- case PageType.Setup:
+ case PageType.Setup: {
Header = "Welcome to SparkleShare!";
Description = "Before we can create a SparkleShare folder on this " +
"computer, we need some information from you.";
- UserInfoForm = new NSForm (new RectangleF (250, 115, 350, 64));
+ UserInfoForm = new NSForm (new RectangleF (250, Frame.Height - 280, 350, 64));
UserInfoForm.AddEntry ("Full Name:");
UserInfoForm.AddEntry ("Email Address:");
@@ -75,8 +80,8 @@ namespace SparkleShare {
UserInfoForm.Cells [0].LineBreakMode = NSLineBreakMode.TruncatingTail;
UserInfoForm.Cells [1].LineBreakMode = NSLineBreakMode.TruncatingTail;
- UserInfoForm.Cells [0].StringValue = SparkleShare.Controller.UserName;
- UserInfoForm.Cells [1].StringValue = SparkleShare.Controller.UserEmail;
+ UserInfoForm.Cells [0].StringValue = Controller.GuessedUserName;
+ UserInfoForm.Cells [1].StringValue = Controller.GuessedUserEmail;
// TODO: Ugly hack, do properly with events
timer = new Timer () {
@@ -102,7 +107,7 @@ namespace SparkleShare {
InvokeOnMainThread (delegate {
bool name_is_valid = !UserInfoForm.Cells [0].StringValue.Trim ().Equals ("");
- bool email_is_valid = SparkleShare.Controller.IsValidEmail (
+ bool email_is_valid = Program.Controller.IsValidEmail (
UserInfoForm.Cells [1].StringValue.Trim ());
ContinueButton.Enabled = (name_is_valid && email_is_valid);
@@ -115,10 +120,11 @@ namespace SparkleShare {
Buttons.Add (ContinueButton);
break;
+ }
- case PageType.Add:
+ case PageType.Add: {
- Header = "Where is your remote folder?";
+ Header = "Where is your project?";
Description = "";
ServerTypeLabel = new NSTextField () {
@@ -126,8 +132,8 @@ namespace SparkleShare {
BackgroundColor = NSColor.WindowBackground,
Bordered = false,
Editable = false,
- Frame = new RectangleF (150, Frame.Height - 139 , 160, 17),
- StringValue = "Server Type:",
+ Frame = new RectangleF (150, Frame.Height - 159 , 160, 17),
+ StringValue = "Host Type:",
Font = SparkleUI.Font
};
@@ -136,7 +142,7 @@ namespace SparkleShare {
BackgroundColor = NSColor.WindowBackground,
Bordered = false,
Editable = false,
- Frame = new RectangleF (150, Frame.Height - 237 , 160, 17),
+ Frame = new RectangleF (150, Frame.Height - 257 , 160, 17),
StringValue = "Address:",
Font = SparkleUI.Font
};
@@ -146,14 +152,14 @@ namespace SparkleShare {
BackgroundColor = NSColor.WindowBackground,
Bordered = false,
Editable = false,
- Frame = new RectangleF (150, Frame.Height - 264 , 160, 17),
+ Frame = new RectangleF (150, Frame.Height - 284 , 160, 17),
StringValue = "Folder Name:",
Font = SparkleUI.Font
};
AddressTextField = new NSTextField () {
- Frame = new RectangleF (320, Frame.Height - 240 , 256, 22),
+ Frame = new RectangleF (320, Frame.Height - 260 , 256, 22),
Font = SparkleUI.Font,
StringValue = Controller.PreviousServer
};
@@ -161,7 +167,7 @@ namespace SparkleShare {
AddressTextField.Cell.LineBreakMode = NSLineBreakMode.TruncatingTail;
FolderNameTextField = new NSTextField () {
- Frame = new RectangleF (320, Frame.Height - (240 + 22 + 4) , 256, 22),
+ Frame = new RectangleF (320, Frame.Height - (260 + 22 + 4) , 256, 22),
StringValue = Controller.PreviousFolder
};
@@ -172,7 +178,7 @@ namespace SparkleShare {
Bordered = false,
TextColor = NSColor.DisabledControlText,
Editable = false,
- Frame = new RectangleF (320, Frame.Height - 285 , 200, 17),
+ Frame = new RectangleF (320, Frame.Height - 305 , 200, 17),
StringValue = "e.g. ‘rupert/website-design’"
};
@@ -181,7 +187,7 @@ namespace SparkleShare {
ButtonCellProto = new NSButtonCell ();
ButtonCellProto.SetButtonType (NSButtonType.Radio) ;
- Matrix = new NSMatrix (new RectangleF (315, 180, 256, 78),
+ Matrix = new NSMatrix (new RectangleF (315, Frame.Height - 220, 256, 78),
NSMatrixMode.Radio, ButtonCellProto, 4, 1);
Matrix.CellSize = new SizeF (256, 18);
@@ -257,7 +263,7 @@ namespace SparkleShare {
ContentView.AddSubview (FolderNameHelpLabel);
SyncButton = new NSButton () {
- Title = "Sync",
+ Title = "Add",
Enabled = false
};
@@ -285,19 +291,31 @@ namespace SparkleShare {
Buttons.Add (CancelButton);
break;
+ }
- case PageType.Syncing:
+ case PageType.Syncing: {
- Header = "Syncing folder ‘" + Controller.SyncingFolder + "’…";
+ Header = "Adding project ‘" + Controller.SyncingFolder + "’…";
Description = "This may take a while.\n" +
"Are you sure it’s not coffee o'clock?";
ProgressIndicator = new NSProgressIndicator () {
- Frame = new RectangleF (190, Frame.Height - 200, 640 - 150 - 80, 20),
- Style = NSProgressIndicatorStyle.Bar
+ Frame = new RectangleF (190, Frame.Height - 200, 640 - 150 - 80, 20),
+ Style = NSProgressIndicatorStyle.Bar,
+ MinValue = 0.0,
+ MaxValue = 100.0,
+ Indeterminate = false,
+ DoubleValue = 1.0
};
-
+
ProgressIndicator.StartAnimation (this);
+
+ Controller.UpdateProgressBarEvent += delegate (double percentage) {
+ InvokeOnMainThread (delegate {
+ ProgressIndicator.DoubleValue = percentage;
+ });
+ };
+
ContentView.AddSubview (ProgressIndicator);
FinishButton = new NSButton () {
@@ -305,11 +323,21 @@ namespace SparkleShare {
Enabled = false
};
+ CancelButton = new NSButton () {
+ Title = "Cancel"
+ };
+
+ CancelButton.Activated += delegate {
+ Controller.SyncingCancelled ();
+ };
+
Buttons.Add (FinishButton);
+ Buttons.Add (CancelButton);
break;
+ }
- case PageType.Error:
+ case PageType.Error: {
Header = "Something went wrong…";
Description = "";
@@ -325,11 +353,12 @@ namespace SparkleShare {
Buttons.Add (TryAgainButton);
break;
+ }
- case PageType.Finished:
+ case PageType.Finished: {
- Header = "Folder synced succesfully!";
- Description = "Now you can access the synced files from " +
+ Header = "Project succesfully added!";
+ Description = "Now you can access the files from " +
"‘" + Controller.SyncingFolder + "’ in " +
"your SparkleShare folder.";
@@ -339,6 +368,7 @@ namespace SparkleShare {
FinishButton.Activated += delegate {
InvokeOnMainThread (delegate {
+ Controller.FinishedPageCompleted ();
PerformClose (this);
});
};
@@ -348,7 +378,7 @@ namespace SparkleShare {
};
OpenFolderButton.Activated += delegate {
- SparkleShare.Controller.OpenSparkleShareFolder (Controller.SyncingFolder);
+ Program.Controller.OpenSparkleShareFolder (Controller.SyncingFolder);
};
Buttons.Add (FinishButton);
@@ -357,12 +387,177 @@ namespace SparkleShare {
NSApplication.SharedApplication.RequestUserAttention
(NSRequestUserAttentionType.CriticalRequest);
+ NSSound.FromName ("Glass").Play ();
+
break;
}
+ case PageType.Tutorial: {
+
+ switch (Controller.TutorialPageNumber) {
+ case 1: {
+ Header = "What's happening next?";
+ Description = "SparkleShare creates a special folder in your personal folder " +
+ "that will keep track of your projects.";
+
+ SkipTutorialButton = new NSButton () {
+ Title = "Skip Tutorial"
+ };
+
+ SkipTutorialButton.Activated += delegate {
+ Controller.TutorialSkipped ();
+ };
+
+ ContinueButton = new NSButton () {
+ Title = "Continue"
+ };
+
+ ContinueButton.Activated += delegate {
+ Controller.TutorialPageCompleted ();
+ };
+
+ string slide_image_path = Path.Combine (NSBundle.MainBundle.ResourcePath,
+ "Pixmaps", "tutorial-slide-1.png");
+
+ SlideImage = new NSImage (slide_image_path) {
+ Size = new SizeF (350, 200)
+ };
+
+ SlideImageView = new NSImageView () {
+ Image = SlideImage,
+ Frame = new RectangleF (215, Frame.Height - 350, 350, 200)
+ };
+
+ ContentView.AddSubview (SlideImageView);
+ Buttons.Add (ContinueButton);
+ Buttons.Add (SkipTutorialButton);
+
+ break;
+ }
+
+ case 2: {
+ Header = "Sharing files with others";
+ Description = "All files added to your project folders are synced with the host " +
+ "automatically, as well as with your collaborators.";
+
+ ContinueButton = new NSButton () {
+ Title = "Continue"
+ };
+
+ ContinueButton.Activated += delegate {
+ Controller.TutorialPageCompleted ();
+ };
+
+ string slide_image_path = Path.Combine (NSBundle.MainBundle.ResourcePath,
+ "Pixmaps", "tutorial-slide-2.png");
+
+ SlideImage = new NSImage (slide_image_path) {
+ Size = new SizeF (350, 200)
+ };
+
+ SlideImageView = new NSImageView () {
+ Image = SlideImage,
+ Frame = new RectangleF (215, Frame.Height - 350, 350, 200)
+ };
+
+ ContentView.AddSubview (SlideImageView);
+ Buttons.Add (ContinueButton);
+
+ break;
+ }
+
+ case 3: {
+ Header = "The status icon is here to help";
+ Description = "It shows the syncing process status, " +
+ "and contains links to your projects and the event log.";
+
+ ContinueButton = new NSButton () {
+ Title = "Continue"
+ };
+
+ ContinueButton.Activated += delegate {
+ Controller.TutorialPageCompleted ();
+ };
+
+ string slide_image_path = Path.Combine (NSBundle.MainBundle.ResourcePath,
+ "Pixmaps", "tutorial-slide-3.png");
+
+ SlideImage = new NSImage (slide_image_path) {
+ Size = new SizeF (350, 200)
+ };
+
+ SlideImageView = new NSImageView () {
+ Image = SlideImage,
+ Frame = new RectangleF (215, Frame.Height - 350, 350, 200)
+ };
+
+ ContentView.AddSubview (SlideImageView);
+ Buttons.Add (ContinueButton);
+
+ break;
+ }
+
+ case 4: {
+ Header = "Adding projects to SparkleShare";
+ Description = "Just click this button when you see it on the web, and " +
+ "the project will be automatically added:";
+
+ AddProjectTextField = new NSTextField () {
+ Frame = new RectangleF (190, Frame.Height - 290, 640 - 240, 44),
+ BackgroundColor = NSColor.WindowBackground,
+ Bordered = false,
+ Editable = false,
+ Font = SparkleUI.Font,
+ StringValue = "…or select ‘Add Project…’ from the status icon menu " +
+ "to add one by hand."
+ };
+
+ AddProjectButton = new NSButton () {
+ Title = "Add Project…"
+ };
+
+ AddProjectButton.Activated += delegate {
+ Controller.TutorialPageCompleted ();
+ };
+
+ FinishButton = new NSButton () {
+ Title = "Finish"
+ };
+
+ FinishButton.Activated += delegate {
+ InvokeOnMainThread (delegate {
+ PerformClose (this);
+ });
+ };
+
+ string slide_image_path = Path.Combine (NSBundle.MainBundle.ResourcePath,
+ "Pixmaps", "tutorial-slide-4.png");
+
+ SlideImage = new NSImage (slide_image_path) {
+ Size = new SizeF (350, 64)
+ };
+
+ SlideImageView = new NSImageView () {
+ Image = SlideImage,
+ Frame = new RectangleF (215, Frame.Height - 215, 350, 64)
+ };
+
+ ContentView.AddSubview (SlideImageView);
+ ContentView.AddSubview (AddProjectTextField);
+ Buttons.Add (FinishButton);
+ Buttons.Add (AddProjectButton);
+
+ break;
+ }
+ }
+
+ break;
+ }
+ }
+
ShowAll ();
});
};
}
- }
+ }
}
diff --git a/SparkleShare/Mac/SparkleSetupWindow.cs b/SparkleShare/Mac/SparkleSetupWindow.cs
old mode 100644
new mode 100755
index 08ef66ef..1da66c27
--- a/SparkleShare/Mac/SparkleSetupWindow.cs
+++ b/SparkleShare/Mac/SparkleSetupWindow.cs
@@ -42,11 +42,11 @@ namespace SparkleShare {
public SparkleSetupWindow () : base ()
{
- SetFrame (new RectangleF (0, 0, 640, 380), true);
+ SetFrame (new RectangleF (0, 0, 640, 420), true);
StyleMask = NSWindowStyle.Titled;
- MaxSize = new SizeF (640, 380);
- MinSize = new SizeF (640, 380);
+ MaxSize = new SizeF (640, 420);
+ MinSize = new SizeF (640, 420);
HasShadow = true;
BackingType = NSBackingStore.Buffered;
@@ -76,7 +76,7 @@ namespace SparkleShare {
};
DescriptionTextField = new NSTextField () {
- Frame = new RectangleF (190, Frame.Height - 155 , 640 - 240, 64),
+ Frame = new RectangleF (190, Frame.Height - 130, 640 - 240, 44),
BackgroundColor = NSColor.WindowBackground,
Bordered = false,
Editable = false,
diff --git a/SparkleShare/Mac/SparkleShare.csproj b/SparkleShare/Mac/SparkleShare.csproj
old mode 100644
new mode 100755
index e24b9224..078dfbf0
--- a/SparkleShare/Mac/SparkleShare.csproj
+++ b/SparkleShare/Mac/SparkleShare.csproj
@@ -62,7 +62,7 @@
False
..\..\bin\Meebey.SmartIrc4net.dll
-
+
False
..\..\bin\SparkleLib.dll
@@ -74,14 +74,13 @@
MainMenu.xib
-
- SparkleController.cs
+
+ SparkleControllerBase.cs
-
-
- SparkleShare.cs
+
+ Program.cs
@@ -106,12 +105,19 @@
SparkleAboutController.cs
+
+ SparkleExtensions.cs
+
+
+
+ Pixmaps\avatar-default.png
+
@@ -128,9 +134,6 @@
Pixmaps\side-splash.png
-
- Pixmaps\avatar-default.png
-
sparkleshare-mac.icns
@@ -267,6 +270,18 @@
HTML\jquery.js
+
+ Pixmaps\tutorial-slide-1.png
+
+
+ Pixmaps\tutorial-slide-2.png
+
+
+ Pixmaps\tutorial-slide-3.png
+
+
+ Pixmaps\tutorial-slide-4.png
+
diff --git a/SparkleShare/Mac/SparkleShare.sln b/SparkleShare/Mac/SparkleShare.sln
old mode 100644
new mode 100755
diff --git a/SparkleShare/Mac/SparkleStatusIcon.cs b/SparkleShare/Mac/SparkleStatusIcon.cs
old mode 100644
new mode 100755
index e68c9de9..14da59bc
--- a/SparkleShare/Mac/SparkleStatusIcon.cs
+++ b/SparkleShare/Mac/SparkleStatusIcon.cs
@@ -66,7 +66,11 @@ namespace SparkleShare {
StatusItem = NSStatusBar.SystemStatusBar.CreateStatusItem (28);
StatusItem.HighlightMode = true;
- StateText = _("Up to date") + " (" + Controller.FolderSize + ")";
+ if (Controller.Folders.Length == 0)
+ StateText = _("Welcome to SparkleShare!");
+ else
+ StateText = _("Up to date") + " — " + Controller.FolderSize;
+
CreateMenu ();
Menu.Delegate = new SparkleStatusIconMenuDelegate ();
@@ -79,11 +83,11 @@ namespace SparkleShare {
case IconState.Idle:
Animation.Stop ();
-
+
if (Controller.Folders.Length == 0)
StateText = _("Welcome to SparkleShare!");
else
- StateText = _("Up to date") + " (" + Controller.FolderSize + ")";
+ StateText = _("Up to date") + " — " + Controller.FolderSize;
StateMenuItem.Title = StateText;
CreateMenu ();
@@ -117,9 +121,6 @@ namespace SparkleShare {
}
});
};
-
-
-
}
@@ -145,30 +146,29 @@ namespace SparkleShare {
};
FolderMenuItem.Activated += delegate {
- SparkleShare.Controller.OpenSparkleShareFolder ();
+ Program.Controller.OpenSparkleShareFolder ();
};
FolderMenuItem.Image = NSImage.ImageNamed ("sparkleshare-mac");
- FolderMenuItem.Image.Size = new SizeF (16, 16);
+ FolderMenuItem.Image.Size = new SizeF (16, 16);
Menu.AddItem (FolderMenuItem);
- FolderMenuItems = new NSMenuItem [SparkleShare.Controller.Folders.Count];
+ FolderMenuItems = new NSMenuItem [Program.Controller.Folders.Count];
if (Controller.Folders.Length > 0) {
- Tasks = new EventHandler [SparkleShare.Controller.Folders.Count];
+ Tasks = new EventHandler [Program.Controller.Folders.Count];
int i = 0;
- foreach (string folder_name in SparkleShare.Controller.Folders) {
+ foreach (string folder_name in Program.Controller.Folders) {
NSMenuItem item = new NSMenuItem ();
item.Title = folder_name;
- if (SparkleShare.Controller.UnsyncedFolders.Contains (folder_name))
+ if (Program.Controller.UnsyncedFolders.Contains (folder_name))
item.Image = NSImage.ImageNamed ("NSCaution");
else
item.Image = NSImage.ImageNamed ("NSFolder");
-
item.Image.Size = new SizeF (16, 16);
Tasks [i] = OpenFolderDelegate (folder_name);
@@ -182,7 +182,7 @@ namespace SparkleShare {
FolderMenuItems = new NSMenuItem [1];
FolderMenuItems [0] = new NSMenuItem () {
- Title = "No Remote Folders Yet"
+ Title = "No projects yet"
};
}
@@ -192,10 +192,10 @@ namespace SparkleShare {
Menu.AddItem (NSMenuItem.SeparatorItem);
SyncMenuItem = new NSMenuItem () {
- Title = "Add Remote Folder…"
+ Title = "Add Project…"
};
- if (!SparkleShare.Controller.FirstRun) {
+ if (!Program.Controller.FirstRun) {
SyncMenuItem.Activated += delegate {
InvokeOnMainThread (delegate {
NSApplication.SharedApplication.ActivateIgnoringOtherApps (true);
@@ -239,16 +239,16 @@ namespace SparkleShare {
NotificationsMenuItem = new NSMenuItem ();
- if (SparkleShare.Controller.NotificationsEnabled)
+ if (Program.Controller.NotificationsEnabled)
NotificationsMenuItem.Title = "Turn Notifications Off";
else
NotificationsMenuItem.Title = "Turn Notifications On";
NotificationsMenuItem.Activated += delegate {
- SparkleShare.Controller.ToggleNotifications ();
+ Program.Controller.ToggleNotifications ();
InvokeOnMainThread (delegate {
- if (SparkleShare.Controller.NotificationsEnabled)
+ if (Program.Controller.NotificationsEnabled)
NotificationsMenuItem.Title = "Turn Notifications Off";
else
NotificationsMenuItem.Title = "Turn Notifications On";
@@ -268,6 +268,9 @@ namespace SparkleShare {
if (SparkleUI.About == null)
SparkleUI.About = new SparkleAbout ();
+ else
+ SparkleUI.About.OrderFrontRegardless ();
+
});
};
@@ -285,7 +288,7 @@ namespace SparkleShare {
private EventHandler OpenFolderDelegate (string name)
{
return delegate {
- SparkleShare.Controller.OpenSparkleShareFolder (name);
+ Program.Controller.OpenSparkleShareFolder (name);
};
}
diff --git a/SparkleShare/Mac/SparkleUI.cs b/SparkleShare/Mac/SparkleUI.cs
old mode 100644
new mode 100755
index eb3721aa..2f53d0da
--- a/SparkleShare/Mac/SparkleUI.cs
+++ b/SparkleShare/Mac/SparkleUI.cs
@@ -65,7 +65,7 @@ namespace SparkleShare {
NSApplication.SharedApplication.ApplicationIconImage
= NSImage.ImageNamed ("sparkleshare.icns");
- if (!SparkleShare.Controller.BackendIsPresent) {
+ if (!Program.Controller.BackendIsPresent) {
this.alert = new SparkleAlert ();
this.alert.RunModal ();
return;
@@ -79,7 +79,7 @@ namespace SparkleShare {
StatusIcon = new SparkleStatusIcon ();
Bubbles = new SparkleBubbles ();
- if (SparkleShare.Controller.FirstRun) {
+ if (Program.Controller.FirstRun) {
Setup = new SparkleSetup ();
Setup.Controller.ShowSetupPage ();
}
@@ -95,7 +95,7 @@ namespace SparkleShare {
NSImage folder_icon = new NSImage (folder_icon_path);
NSWorkspace.SharedWorkspace.SetIconforFile (folder_icon,
- SparkleShare.Controller.SparklePath, 0);
+ Program.Controller.SparklePath, 0);
}
@@ -123,7 +123,7 @@ namespace SparkleShare {
public override void WillTerminate (NSNotification notification)
{
- SparkleShare.Controller.Quit ();
+ Program.Controller.Quit ();
}
}
}
diff --git a/SparkleShare/Makefile.am b/SparkleShare/Makefile.am
old mode 100644
new mode 100755
diff --git a/SparkleShare/Nautilus/Makefile.am b/SparkleShare/Nautilus/Makefile.am
old mode 100644
new mode 100755
diff --git a/SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in b/SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in
old mode 100644
new mode 100755
index e7a157ef..a43d761a
--- a/SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in
+++ b/SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in
@@ -121,13 +121,13 @@ class SparkleShareExtension (nautilus.MenuProvider):
os.chdir (file_reference.get_parent ().get_path ())
- time_command = os.popen ("git log -10 --format='%at' " + file_reference.get_path ()
+ time_command = os.popen ("git log -10 --format='%at' " + file_reference.get_basename ()
.replace (" ", "\ ").replace ("(", "\(").replace (")", "\)"))
- author_command = os.popen ("git log -10 --format='%an' " + file_reference.get_path ()
+ author_command = os.popen ("git log -10 --format='%an' " + file_reference.get_basename ()
.replace (" ", "\ ").replace ("(", "\(").replace (")", "\)"))
- hash_command = os.popen ("git log -10 --format='%H' " + file_reference.get_path ()
+ hash_command = os.popen ("git log -10 --format='%H' " + file_reference.get_basename ()
.replace (" ", "\ ").replace ("(", "\(").replace (")", "\)"))
i = 0
diff --git a/SparkleShare/Program.cs b/SparkleShare/Program.cs
index 8d5f7697..9910ffa8 100644
--- a/SparkleShare/Program.cs
+++ b/SparkleShare/Program.cs
@@ -39,10 +39,10 @@ namespace SparkleShare {
// Short alias for the translations
public static string _ (string s)
{
- return Catalog.GetString (s);
+ return s;
}
-
+ [STAThread]
public static void Main (string [] args)
{
// Parse the command line options
diff --git a/SparkleShare/SparkleAbout.cs b/SparkleShare/SparkleAbout.cs
old mode 100644
new mode 100755
diff --git a/SparkleShare/SparkleAboutController.cs b/SparkleShare/SparkleAboutController.cs
old mode 100644
new mode 100755
diff --git a/SparkleShare/SparkleBubbles.cs b/SparkleShare/SparkleBubbles.cs
old mode 100644
new mode 100755
diff --git a/SparkleShare/SparkleBubblesController.cs b/SparkleShare/SparkleBubblesController.cs
old mode 100644
new mode 100755
diff --git a/SparkleShare/SparkleController.cs b/SparkleShare/SparkleController.cs
old mode 100644
new mode 100755
diff --git a/SparkleShare/SparkleEntry.cs b/SparkleShare/SparkleEntry.cs
old mode 100644
new mode 100755
diff --git a/SparkleShare/SparkleEventLog.cs b/SparkleShare/SparkleEventLog.cs
old mode 100644
new mode 100755
diff --git a/SparkleShare/SparkleEventLogController.cs b/SparkleShare/SparkleEventLogController.cs
old mode 100644
new mode 100755
diff --git a/SparkleShare/SparkleLinController.cs b/SparkleShare/SparkleLinController.cs
deleted file mode 100644
index 0cc2168e..00000000
--- a/SparkleShare/SparkleLinController.cs
+++ /dev/null
@@ -1,214 +0,0 @@
-// SparkleShare, a collaboration and sharing tool.
-// Copyright (C) 2010 Hylke Bons
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see .
-
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading;
-
-using Mono.Unix;
-using SparkleLib;
-
-namespace SparkleShare {
-
- public class SparkleLinController : SparkleController {
-
- public SparkleLinController () : base ()
- {
-
- }
-
-
- // Creates a .desktop entry in autostart folder to
- // start SparkleShare automatically at login
- public override void EnableSystemAutostart ()
- {
- string autostart_path = Path.Combine (Environment.GetFolderPath (
- Environment.SpecialFolder.ApplicationData), "autostart");
-
- string desktopfile_path = Path.Combine (autostart_path, "sparkleshare.desktop");
-
- if (!Directory.Exists (autostart_path))
- Directory.CreateDirectory (autostart_path);
-
- if (!File.Exists (desktopfile_path)) {
- TextWriter writer = new StreamWriter (desktopfile_path);
- writer.WriteLine ("[Desktop Entry]\n" +
- "Type=Application\n" +
- "Name=SparkleShare\n" +
- "Exec=sparkleshare start\n" +
- "Icon=folder-sparkleshare\n" +
- "Terminal=false\n" +
- "X-GNOME-Autostart-enabled=true\n" +
- "Categories=Network");
- writer.Close ();
-
- // Give the launcher the right permissions so it can be launched by the user
- UnixFileInfo file_info = new UnixFileInfo (desktopfile_path);
- file_info.Create (FileAccessPermissions.UserReadWriteExecute);
-
- SparkleHelpers.DebugInfo ("Controller", "Enabled autostart on login");
- }
- }
-
-
- // Installs a launcher so the user can launch SparkleShare
- // from the Internet category if needed
- public override void InstallLauncher ()
- {
- string apps_path =
- new string [] {SparkleConfig.DefaultConfig.HomePath,
- ".local", "share", "applications"}.Combine ();
-
- string desktopfile_path = Path.Combine (apps_path, "sparkleshare.desktop");
-
- if (!File.Exists (desktopfile_path)) {
- if (!Directory.Exists (apps_path))
- Directory.CreateDirectory (apps_path);
-
- TextWriter writer = new StreamWriter (desktopfile_path);
- writer.WriteLine ("[Desktop Entry]\n" +
- "Type=Application\n" +
- "Name=SparkleShare\n" +
- "Comment=Share documents\n" +
- "Exec=sparkleshare start\n" +
- "Icon=folder-sparkleshare\n" +
- "Terminal=false\n" +
- "Categories=Network;");
- writer.Close ();
-
- // Give the launcher the right permissions so it can be launched by the user
- UnixFileInfo file_info = new UnixFileInfo (desktopfile_path);
- file_info.FileAccessPermissions = FileAccessPermissions.UserReadWriteExecute;
-
- SparkleHelpers.DebugInfo ("Controller", "Created '" + desktopfile_path + "'");
- }
- }
-
-
- // Adds the SparkleShare folder to the user's
- // list of bookmarked places
- public override void AddToBookmarks ()
- {
- string bookmarks_file_path = Path.Combine (SparkleConfig.DefaultConfig.HomePath, ".gtk-bookmarks");
- string sparkleshare_bookmark = "file://" + SparkleConfig.DefaultConfig.FoldersPath + " SparkleShare";
-
- if (File.Exists (bookmarks_file_path)) {
- StreamReader reader = new StreamReader (bookmarks_file_path);
- string bookmarks = reader.ReadToEnd ();
- reader.Close ();
-
- if (!bookmarks.Contains (sparkleshare_bookmark)) {
- TextWriter writer = File.AppendText (bookmarks_file_path);
- writer.WriteLine ("file://" + SparkleConfig.DefaultConfig.FoldersPath + " SparkleShare");
- writer.Close ();
- }
- } else {
- StreamWriter writer = new StreamWriter (bookmarks_file_path);
- writer.WriteLine ("file://" + SparkleConfig.DefaultConfig.FoldersPath + " SparkleShare");
- writer.Close ();
- }
- }
-
-
- // Creates the SparkleShare folder in the user's home folder
- public override bool CreateSparkleShareFolder ()
- {
- if (!Directory.Exists (SparkleConfig.DefaultConfig.FoldersPath)) {
-
- Directory.CreateDirectory (SparkleConfig.DefaultConfig.FoldersPath);
- SparkleHelpers.DebugInfo ("Controller", "Created '" + SparkleConfig.DefaultConfig.FoldersPath + "'");
-
- string gvfs_command_path =
- new string [] {Path.VolumeSeparatorChar.ToString (),
- "usr", "bin", "gvfs-set-attribute"}.Combine ();
-
- // Add a special icon to the SparkleShare folder
- if (File.Exists (gvfs_command_path)) {
- Process process = new Process ();
-
- process.StartInfo.RedirectStandardOutput = true;
- process.StartInfo.UseShellExecute = false;
- process.StartInfo.FileName = "gvfs-set-attribute";
-
- // Clear the custom (legacy) icon path
- process.StartInfo.Arguments = "-t unset " + SparkleConfig.DefaultConfig.FoldersPath + " metadata::custom-icon";
- process.Start ();
- process.WaitForExit ();
-
- // Give the SparkleShare folder an icon name, so that it scales
- process.StartInfo.Arguments = SparkleConfig.DefaultConfig.FoldersPath + " metadata::custom-icon-name 'folder-sparkleshare'";
- process.Start ();
- process.WaitForExit ();
- }
-
- return true;
- }
-
- return false;
- }
-
-
- public override string EventLogHTML {
- get {
- string path = new string [] {Defines.PREFIX,
- "share", "sparkleshare", "html", "event-log.html"}.Combine ();
-
- string html = String.Join (Environment.NewLine, File.ReadAllLines (path));
-
- html = html.Replace ("", "file://" +
- new string [] {Defines.PREFIX, "share", "sparkleshare", "html", "jquery.js"}.Combine ());
-
- return html;
- }
- }
-
-
- public override string DayEntryHTML {
- get {
- string path = new string [] {Defines.PREFIX,
- "share", "sparkleshare", "html", "day-entry.html"}.Combine ();
-
- return String.Join (Environment.NewLine, File.ReadAllLines (path));
- }
- }
-
-
- public override string EventEntryHTML {
- get {
- string path = new string [] {Defines.PREFIX,
- "share", "sparkleshare", "html", "event-entry.html"}.Combine ();
-
- return String.Join (Environment.NewLine, File.ReadAllLines (path));
- }
- }
-
-
- public override void OpenSparkleShareFolder (string subfolder)
- {
- string folder = Path.Combine (SparkleConfig.DefaultConfig.FoldersPath, subfolder);
-
- Process process = new Process ();
- process.StartInfo.FileName = "xdg-open";
- process.StartInfo.Arguments = "\"" + folder + "\"";
- process.Start ();
- }
- }
-}
diff --git a/SparkleShare/SparkleSetup.cs b/SparkleShare/SparkleSetup.cs
old mode 100644
new mode 100755
diff --git a/SparkleShare/SparkleSetupController.cs b/SparkleShare/SparkleSetupController.cs
old mode 100644
new mode 100755
diff --git a/SparkleShare/SparkleSetupWindow.cs b/SparkleShare/SparkleSetupWindow.cs
old mode 100644
new mode 100755
diff --git a/SparkleShare/SparkleShare.cs b/SparkleShare/SparkleShare.cs
deleted file mode 100644
index fc2d8eab..00000000
--- a/SparkleShare/SparkleShare.cs
+++ /dev/null
@@ -1,154 +0,0 @@
-// SparkleShare, a collaboration and sharing tool.
-// Copyright (C) 2010 Hylke Bons
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see .
-
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Runtime.InteropServices;
-using System.Text;
-
-using SparkleLib;
-using SparkleLib.Options;
-
-namespace SparkleShare {
-
- // This is SparkleShare!
- public class SparkleShare {
-
- public static SparkleController Controller;
- public static SparkleUI UI;
-
-
- // Short alias for the translations
- public static string _ (string s)
- {
- return s;
- }
-
- [STAThread]
- public static void Main (string [] args)
- {
- // Don't allow running as root on Linux or Mac
- if ((SparkleBackend.Platform == PlatformID.Unix ||
- SparkleBackend.Platform == PlatformID.MacOSX) &&
- new Mono.Unix.UnixUserInfo (Mono.Unix.UnixEnvironment.UserName).UserId == 0) {
-
- Console.WriteLine (_("Sorry, you can't run SparkleShare with these permissions."));
- Console.WriteLine (_("Things would go utterly wrong."));
- Environment.Exit (-1);
- }
-
- // Parse the command line options
- bool show_help = false;
- OptionSet option_set = new OptionSet () {
- { "v|version", _("Print version information"), v => { PrintVersion (); } },
- { "h|help", _("Show this help text"), v => show_help = v != null }
- };
-
- try {
- option_set.Parse (args);
-
- } catch (OptionException e) {
- Console.Write ("SparkleShare: ");
- Console.WriteLine (e.Message);
- Console.WriteLine ("Try `sparkleshare --help' for more information.");
- }
-
- if (show_help)
- ShowHelp (option_set);
-
- // Load the right controller for the OS
- string controller_name = "Lin";
- switch (SparkleBackend.Platform) {
- case PlatformID.Unix:
- SetProcessName ("sparkleshare");
- break;
- case PlatformID.MacOSX:
- controller_name = "Mac";
- break;
- case PlatformID.Win32NT:
- controller_name = "Win";
- break;
- }
-
- // Initialize the controller this way so that
- // there aren't any exceptions in the OS specific UI's
- Controller = (SparkleController) Activator.CreateInstance (
- Type.GetType ("SparkleShare.Sparkle" + controller_name + "Controller"));
-
- Controller.Initialize ();
-
- if (Controller != null) {
- UI = new SparkleUI ();
- UI.Run ();
- }
- }
-
-
- // Prints the help output
- public static void ShowHelp (OptionSet option_set)
- {
- Console.WriteLine (" ");
- Console.WriteLine (_("SparkleShare, a collaboration and sharing tool."));
- Console.WriteLine (_("Copyright (C) 2010 Hylke Bons"));
- Console.WriteLine (" ");
- Console.WriteLine (_("This program comes with ABSOLUTELY NO WARRANTY."));
- Console.WriteLine (" ");
- Console.WriteLine (_("This is free software, and you are welcome to redistribute it "));
- Console.WriteLine (_("under certain conditions. Please read the GNU GPLv3 for details."));
- Console.WriteLine (" ");
- Console.WriteLine (_("SparkleShare automatically syncs Git repositories in "));
- Console.WriteLine (_("the ~/SparkleShare folder with their remote origins."));
- Console.WriteLine (" ");
- Console.WriteLine (_("Usage: sparkleshare [start|stop|restart] [OPTION]..."));
- Console.WriteLine (_("Sync SparkleShare folder with remote repositories."));
- Console.WriteLine (" ");
- Console.WriteLine (_("Arguments:"));
-
- option_set.WriteOptionDescriptions (Console.Out);
- Environment.Exit (0);
- }
-
-
- // Prints the version information
- public static void PrintVersion ()
- {
- Console.WriteLine (_("SparkleShare " + Defines.VERSION));
- Environment.Exit (0);
- }
-
-
- // Strange magic needed by SetProcessName ()
- [DllImport ("libc")]
- private static extern int prctl (int option, byte [] arg2, IntPtr arg3, IntPtr arg4, IntPtr arg5);
-
-
- // Sets the Unix process name to 'sparkleshare' instead of 'mono'
- private static void SetProcessName (string name)
- {
- try {
- if (prctl (15, Encoding.ASCII.GetBytes (name + "\0"), IntPtr.Zero, IntPtr.Zero, IntPtr.Zero) != 0)
- throw new ApplicationException ("Error setting process name: " +
- Mono.Unix.Native.Stdlib.GetLastError ());
-
- } catch (EntryPointNotFoundException) {
- Console.WriteLine ("SetProcessName: Entry point not found");
- }
- }
- }
-}
diff --git a/SparkleShare/SparkleShare.csproj b/SparkleShare/SparkleShare.csproj
old mode 100644
new mode 100755
diff --git a/SparkleShare/SparkleSpinner.cs b/SparkleShare/SparkleSpinner.cs
old mode 100644
new mode 100755
diff --git a/SparkleShare/SparkleStatusIconController.cs b/SparkleShare/SparkleStatusIconController.cs
old mode 100644
new mode 100755
diff --git a/SparkleShare/SparkleUI.cs b/SparkleShare/SparkleUI.cs
index f552a530..d27f7bd9 100644
--- a/SparkleShare/SparkleUI.cs
+++ b/SparkleShare/SparkleUI.cs
@@ -36,8 +36,11 @@ namespace SparkleShare {
public static SparkleStatusIcon StatusIcon;
public static SparkleEventLog EventLog;
+ public static SparkleBubbles Bubbles;
public static SparkleSetup Setup;
public static SparkleAbout About;
+ public static string AssetsPath =
+ new string [] {Defines.PREFIX, "share", "sparkleshare"}.Combine ();
// Short alias for the translations
@@ -60,22 +63,9 @@ namespace SparkleShare {
"Unhandled Exception!\n" + UnhandledException.GetType ().ToString ());
ExceptionDialog.Title = "ERROR";
- while (UnhandledException != null) {
- Console.WriteLine ("\n\n"
- + "Unhandled exception\n"
- + "-------------------\n"
- + UnhandledException.Message + "\n\n"
- + UnhandledException.StackTrace);
- UnhandledException = UnhandledException.InnerException;
- }
-
- ExceptionDialog.Run ();
- ExceptionDialog.Destroy ();
-
- };
#endif
- // Create the statusicon
StatusIcon = new SparkleStatusIcon ();
+ Bubbles = new SparkleBubbles ();
if (Program.Controller.FirstRun) {
Setup = new SparkleSetup ();
diff --git a/SparkleShare/SparkleUIHelpers.cs b/SparkleShare/SparkleUIHelpers.cs
old mode 100644
new mode 100755
diff --git a/SparkleShare/Windows/Icons.Designer.cs b/SparkleShare/Windows/Icons.Designer.cs
index 66e3856d..6dc550b0 100644
--- a/SparkleShare/Windows/Icons.Designer.cs
+++ b/SparkleShare/Windows/Icons.Designer.cs
@@ -277,6 +277,13 @@ namespace SparkleShare {
}
}
+ internal static System.Drawing.Bitmap list_point_16 {
+ get {
+ object obj = ResourceManager.GetObject("list_point_16", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
internal static System.Drawing.Bitmap process_syncing_sparkleshare_24 {
get {
object obj = ResourceManager.GetObject("process_syncing_sparkleshare_24", resourceCulture);
@@ -353,5 +360,33 @@ namespace SparkleShare {
return ((System.Drawing.Bitmap)(obj));
}
}
+
+ internal static System.Drawing.Bitmap tutorial_slide_1 {
+ get {
+ object obj = ResourceManager.GetObject("tutorial_slide_1", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ internal static System.Drawing.Bitmap tutorial_slide_2 {
+ get {
+ object obj = ResourceManager.GetObject("tutorial_slide_2", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ internal static System.Drawing.Bitmap tutorial_slide_3 {
+ get {
+ object obj = ResourceManager.GetObject("tutorial_slide_3", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ internal static System.Drawing.Bitmap tutorial_slide_4 {
+ get {
+ object obj = ResourceManager.GetObject("tutorial_slide_4", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
}
}
diff --git a/SparkleShare/Windows/Icons.resx b/SparkleShare/Windows/Icons.resx
index 283d9193..cefaf212 100644
--- a/SparkleShare/Windows/Icons.resx
+++ b/SparkleShare/Windows/Icons.resx
@@ -132,6 +132,9 @@
..\..\data\icons\avatar-default-48.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\..\data\icons\avatar-default.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\..\data\icons\dialog-error-16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -204,6 +207,9 @@
..\..\data\icons\idle4.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\..\data\icons\list-point-16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\..\data\icons\process-syncing-sparkleshare-24.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -237,11 +243,20 @@
..\..\data\about.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\..\data\avatar-default.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\..\data\side-splash.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\..\data\tutorial-slide-1.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\..\data\tutorial-slide-2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\..\data\tutorial-slide-3.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\..\data\tutorial-slide-4.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
diff --git a/SparkleShare/Windows/SparkleBubbles.cs b/SparkleShare/Windows/SparkleBubbles.cs
new file mode 100644
index 00000000..c6be2784
--- /dev/null
+++ b/SparkleShare/Windows/SparkleBubbles.cs
@@ -0,0 +1,36 @@
+// SparkleShare, a collaboration and sharing tool.
+// Copyright (C) 2010 Hylke Bons
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+
+
+using System;
+using System.Windows.Forms;
+
+namespace SparkleShare {
+
+ public class SparkleBubbles {
+
+ public SparkleBubblesController Controller = new SparkleBubblesController ();
+
+
+ public SparkleBubbles ()
+ {
+ Controller.ShowBubbleEvent += delegate (string title, string subtext, string image_path) {
+ SparkleUI.StatusIcon.ShowBalloon(title, subtext, image_path);
+ };
+ }
+ }
+}
+
diff --git a/SparkleShare/Windows/SparkleShare.csproj b/SparkleShare/Windows/SparkleShare.csproj
index 1a53f228..aa14867a 100644
--- a/SparkleShare/Windows/SparkleShare.csproj
+++ b/SparkleShare/Windows/SparkleShare.csproj
@@ -71,6 +71,9 @@
True
GlobalAssemblyInfo.tt
+
+ SparkleBubblesController.cs
+
SparkleControllerBase.cs
@@ -111,6 +114,7 @@
+
Form
@@ -212,6 +216,7 @@
SparkleSetup.cs
+ Designer
diff --git a/SparkleShare/Windows/SparkleStatusIcon.cs b/SparkleShare/Windows/SparkleStatusIcon.cs
index e7be9945..02c1ea3e 100644
--- a/SparkleShare/Windows/SparkleStatusIcon.cs
+++ b/SparkleShare/Windows/SparkleStatusIcon.cs
@@ -262,6 +262,15 @@ namespace SparkleShare {
status_icon.ContextMenuStrip = Menu;
}
+ public void ShowBalloon (string title, string subtext, string image_path)
+ {
+ status_icon.BalloonTipText = title;
+ status_icon.BalloonTipText = subtext;
+ // TODO: Use the image pointed to by image_path
+ status_icon.BalloonTipIcon = ToolTipIcon.None;
+ status_icon.ShowBalloonTip (2 * 1000);
+ }
+
// A method reference that makes sure that opening the
// event log for each repository works correctly
diff --git a/SparkleShare/sparkleshare.desktop b/SparkleShare/sparkleshare.desktop
old mode 100644
new mode 100755
diff --git a/SparkleShare/sparkleshare.in b/SparkleShare/sparkleshare.in
old mode 100644
new mode 100755
diff --git a/build/Makefile.am b/build/Makefile.am
old mode 100644
new mode 100755
diff --git a/build/build.environment.mk b/build/build.environment.mk
old mode 100644
new mode 100755
diff --git a/build/build.mk b/build/build.mk
old mode 100644
new mode 100755
diff --git a/build/build.rules.mk b/build/build.rules.mk
old mode 100644
new mode 100755
diff --git a/build/m4/Makefile.am b/build/m4/Makefile.am
old mode 100644
new mode 100755
diff --git a/build/m4/shamrock/expansions.m4 b/build/m4/shamrock/expansions.m4
old mode 100644
new mode 100755
diff --git a/build/m4/shamrock/gnome-doc.m4 b/build/m4/shamrock/gnome-doc.m4
old mode 100644
new mode 100755
diff --git a/build/m4/shamrock/i18n.m4 b/build/m4/shamrock/i18n.m4
old mode 100644
new mode 100755
diff --git a/build/m4/shamrock/mono.m4 b/build/m4/shamrock/mono.m4
old mode 100644
new mode 100755
diff --git a/build/m4/shamrock/monodoc.m4 b/build/m4/shamrock/monodoc.m4
old mode 100644
new mode 100755
diff --git a/build/m4/shamrock/nunit.m4 b/build/m4/shamrock/nunit.m4
old mode 100644
new mode 100755
diff --git a/build/m4/shamrock/programs.m4 b/build/m4/shamrock/programs.m4
old mode 100644
new mode 100755
diff --git a/build/m4/shamrock/util.m4 b/build/m4/shamrock/util.m4
old mode 100644
new mode 100755
diff --git a/build/m4/shave/shave-libtool.in b/build/m4/shave/shave-libtool.in
old mode 100644
new mode 100755
diff --git a/build/m4/shave/shave.in b/build/m4/shave/shave.in
old mode 100644
new mode 100755
diff --git a/build/m4/shave/shave.m4 b/build/m4/shave/shave.m4
old mode 100644
new mode 100755
diff --git a/build/m4/sparkleshare/gtk-sharp.m4 b/build/m4/sparkleshare/gtk-sharp.m4
old mode 100644
new mode 100755
diff --git a/build/m4/sparkleshare/nautilus-python.m4 b/build/m4/sparkleshare/nautilus-python.m4
old mode 100644
new mode 100755
diff --git a/build/m4/sparkleshare/notify-sharp.m4 b/build/m4/sparkleshare/notify-sharp.m4
old mode 100644
new mode 100755
diff --git a/build/m4/sparkleshare/smartirc4net.m4 b/build/m4/sparkleshare/smartirc4net.m4
old mode 100644
new mode 100755
diff --git a/configure.ac b/configure.ac
old mode 100644
new mode 100755
diff --git a/data/Makefile.am b/data/Makefile.am
old mode 100644
new mode 100755
index 6f452209..5fe40d9c
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -4,6 +4,10 @@ SUBDIRS = \
dist_pixmaps_DATA = \
side-splash.png \
+ tutorial-slide-1.png \
+ tutorial-slide-2.png \
+ tutorial-slide-3.png \
+ tutorial-slide-4.png \
about.png
pixmapsdir = $(pkgdatadir)/pixmaps/
diff --git a/data/about.png b/data/about.png
old mode 100644
new mode 100755
index 89f7d71f..c1cd2236
Binary files a/data/about.png and b/data/about.png differ
diff --git a/data/html/Makefile.am b/data/html/Makefile.am
old mode 100644
new mode 100755
diff --git a/data/html/day-entry.html b/data/html/day-entry.html
old mode 100644
new mode 100755
diff --git a/data/html/event-entry.html b/data/html/event-entry.html
old mode 100644
new mode 100755
diff --git a/data/html/event-log.html b/data/html/event-log.html
old mode 100644
new mode 100755
diff --git a/data/html/jquery.js b/data/html/jquery.js
old mode 100644
new mode 100755
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
old mode 100644
new mode 100755
index 79026af3..d09cc805
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -35,6 +35,7 @@ app_theme_icons = \
status,document-deleted-12.png \
status,document-moved-12.png \
status,dialog-error-16.png \
+ status,list-point-16.png \
status,dialog-error-24.png
install_icon_exec = $(top_srcdir)/build/icon-theme-installer \
diff --git a/data/icons/avatar-default-16.png b/data/icons/avatar-default-16.png
old mode 100644
new mode 100755
diff --git a/data/icons/avatar-default-22.png b/data/icons/avatar-default-22.png
old mode 100644
new mode 100755
diff --git a/data/icons/avatar-default-24.png b/data/icons/avatar-default-24.png
old mode 100644
new mode 100755
diff --git a/data/icons/avatar-default-32.png b/data/icons/avatar-default-32.png
old mode 100644
new mode 100755
diff --git a/data/icons/avatar-default-48.png b/data/icons/avatar-default-48.png
old mode 100644
new mode 100755
diff --git a/data/avatar-default.png b/data/icons/avatar-default.png
old mode 100644
new mode 100755
similarity index 100%
rename from data/avatar-default.png
rename to data/icons/avatar-default.png
diff --git a/data/icons/dialog-error-16.png b/data/icons/dialog-error-16.png
old mode 100644
new mode 100755
diff --git a/data/icons/dialog-error-24.png b/data/icons/dialog-error-24.png
old mode 100644
new mode 100755
diff --git a/data/icons/document-added-12.png b/data/icons/document-added-12.png
old mode 100644
new mode 100755
diff --git a/data/icons/document-deleted-12.png b/data/icons/document-deleted-12.png
old mode 100644
new mode 100755
diff --git a/data/icons/document-edited-12.png b/data/icons/document-edited-12.png
old mode 100644
new mode 100755
diff --git a/data/icons/document-moved-12.png b/data/icons/document-moved-12.png
old mode 100644
new mode 100755
diff --git a/data/icons/error-active.png b/data/icons/error-active.png
old mode 100644
new mode 100755
diff --git a/data/icons/error.png b/data/icons/error.png
old mode 100644
new mode 100755
diff --git a/data/icons/folder-sparkleshare-16.png b/data/icons/folder-sparkleshare-16.png
old mode 100644
new mode 100755
diff --git a/data/icons/folder-sparkleshare-22.png b/data/icons/folder-sparkleshare-22.png
old mode 100644
new mode 100755
diff --git a/data/icons/folder-sparkleshare-24.png b/data/icons/folder-sparkleshare-24.png
old mode 100644
new mode 100755
diff --git a/data/icons/folder-sparkleshare-256.png b/data/icons/folder-sparkleshare-256.png
old mode 100644
new mode 100755
diff --git a/data/icons/folder-sparkleshare-32.png b/data/icons/folder-sparkleshare-32.png
old mode 100644
new mode 100755
diff --git a/data/icons/folder-sparkleshare-48.png b/data/icons/folder-sparkleshare-48.png
old mode 100644
new mode 100755
diff --git a/data/icons/idle0-active.png b/data/icons/idle0-active.png
old mode 100644
new mode 100755
diff --git a/data/icons/idle0.png b/data/icons/idle0.png
old mode 100644
new mode 100755
diff --git a/data/icons/idle1-active.png b/data/icons/idle1-active.png
old mode 100644
new mode 100755
diff --git a/data/icons/idle1.png b/data/icons/idle1.png
old mode 100644
new mode 100755
diff --git a/data/icons/idle2-active.png b/data/icons/idle2-active.png
old mode 100644
new mode 100755
diff --git a/data/icons/idle2.png b/data/icons/idle2.png
old mode 100644
new mode 100755
diff --git a/data/icons/idle3-active.png b/data/icons/idle3-active.png
old mode 100644
new mode 100755
diff --git a/data/icons/idle3.png b/data/icons/idle3.png
old mode 100644
new mode 100755
diff --git a/data/icons/idle4-active.png b/data/icons/idle4-active.png
old mode 100644
new mode 100755
diff --git a/data/icons/idle4.png b/data/icons/idle4.png
old mode 100644
new mode 100755
diff --git a/data/icons/list-point-16.png b/data/icons/list-point-16.png
new file mode 100755
index 00000000..6ef8de76
Binary files /dev/null and b/data/icons/list-point-16.png differ
diff --git a/data/icons/process-syncing-sparkleshare-24.png b/data/icons/process-syncing-sparkleshare-24.png
old mode 100644
new mode 100755
diff --git a/data/icons/process-syncing-sparkleshare-i-24.png b/data/icons/process-syncing-sparkleshare-i-24.png
old mode 100644
new mode 100755
diff --git a/data/icons/process-syncing-sparkleshare-ii-24.png b/data/icons/process-syncing-sparkleshare-ii-24.png
old mode 100644
new mode 100755
diff --git a/data/icons/process-syncing-sparkleshare-iii-24.png b/data/icons/process-syncing-sparkleshare-iii-24.png
old mode 100644
new mode 100755
diff --git a/data/icons/process-syncing-sparkleshare-iiii-24.png b/data/icons/process-syncing-sparkleshare-iiii-24.png
old mode 100644
new mode 100755
diff --git a/data/icons/process-syncing-sparkleshare-iiiii-24.png b/data/icons/process-syncing-sparkleshare-iiiii-24.png
old mode 100644
new mode 100755
diff --git a/data/icons/process-working-22.png b/data/icons/process-working-22.png
old mode 100644
new mode 100755
diff --git a/data/icons/sparkleshare-syncing-error-24.png b/data/icons/sparkleshare-syncing-error-24.png
old mode 100644
new mode 100755
diff --git a/data/icons/sparkleshare-windows-status.png b/data/icons/sparkleshare-windows-status.png
old mode 100644
new mode 100755
diff --git a/data/side-splash.png b/data/side-splash.png
old mode 100644
new mode 100755
index bbc815e3..32b3b832
Binary files a/data/side-splash.png and b/data/side-splash.png differ
diff --git a/data/sparkleshare-mac.icns b/data/sparkleshare-mac.icns
old mode 100644
new mode 100755
diff --git a/data/sparkleshare-osx-start b/data/sparkleshare-osx-start
deleted file mode 100644
index ac44f13a..00000000
--- a/data/sparkleshare-osx-start
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh
-
-#get the bundle's MacOS directory full path
-DIR=$(cd "$(dirname "$0")"; pwd)
-
-#change these values to match your app
-EXE_PATH="$DIR\SparkleShare.exe"
-PROCESS_NAME=sparkleshare-osx-start
-APPNAME="SparkleShare"
-
-#set up environment
-MONO_FRAMEWORK_PATH=/Library/Frameworks/Mono.framework/Versions/Current
-export DYLD_FALLBACK_LIBRARY_PATH="$DIR:$MONO_FRAMEWORK_PATH/lib:/lib:/usr/lib"
-export PATH="$MONO_FRAMEWORK_PATH/bin:$PATH"
-
-#mono version check
-REQUIRED_MAJOR=2
-REQUIRED_MINOR=4
-
-VERSION_TITLE="Cannot launch $APPNAME"
-VERSION_MSG="$APPNAME requires the Mono Framework version $REQUIRED_MAJOR.$REQUIRED_MINOR or later."
-DOWNLOAD_URL="http://www.go-mono.com/mono-downloads/download.html"
-
-MONO_VERSION="$(mono --version | grep 'Mono JIT compiler version ' | cut -f5 -d\ )"
-MONO_VERSION_MAJOR="$(echo $MONO_VERSION | cut -f1 -d.)"
-MONO_VERSION_MINOR="$(echo $MONO_VERSION | cut -f2 -d.)"
-if [ -z "$MONO_VERSION" ] \
- || [ $MONO_VERSION_MAJOR -lt $REQUIRED_MAJOR ] \
- || [ $MONO_VERSION_MAJOR -eq $REQUIRED_MAJOR -a $MONO_VERSION_MINOR -lt $REQUIRED_MINOR ]
-then
- osascript \
- -e "set question to display dialog \"$VERSION_MSG\" with title \"$VERSION_TITLE\" buttons {\"Cancel\", \"Download...\"} default button 2" \
- -e "if button returned of question is equal to \"Download...\" then open location \"$DOWNLOAD_URL\""
- echo "$VERSION_TITLE"
- echo "$VERSION_MSG"
- exit 1
-fi
-
-#get an exec command that will work on the current OS version
-OSX_VERSION=$(uname -r | cut -f1 -d.)
-if [ $OSX_VERSION -lt 9 ]; then # If OSX version is 10.4
- MONO_EXEC="exec mono"
-else
- MONO_EXEC="exec -a \"$PROCESS_NAME\" mono"
-fi
-
-#create log file directory if it doesn't exist
-LOG_FILE="$HOME/Library/Logs/$APPNAME/$APPNAME.log"
-mkdir -p "`dirname \"$LOG_FILE\"`"
-
-#run app using mono
-$MONO_EXEC $MONO_OPTIONS "$EXE_PATH" $* 2>&1 1> "$LOG_FILE"
diff --git a/data/sparkleshare.icns b/data/sparkleshare.icns
old mode 100644
new mode 100755
diff --git a/data/src/about-dialog.svg b/data/src/about-dialog.svg
new file mode 100755
index 00000000..88ab5a97
--- /dev/null
+++ b/data/src/about-dialog.svg
@@ -0,0 +1,1076 @@
+
+
+
+
diff --git a/data/src/actions.svg b/data/src/actions.svg
old mode 100644
new mode 100755
diff --git a/data/src/side-splash.svg b/data/src/side-splash.svg
old mode 100644
new mode 100755
index a72730ef..0b22f522
--- a/data/src/side-splash.svg
+++ b/data/src/side-splash.svg
@@ -14,7 +14,7 @@
height="480"
id="svg8763"
version="1.1"
- inkscape:version="0.47 r22583"
+ inkscape:version="0.48.0 r9654"
sodipodi:docname="side-splash.svg"
inkscape:export-filename="/home/hbons/github/SparkleShare/data/side-splash.png"
inkscape:export-xdpi="90"
@@ -27,16 +27,16 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1"
- inkscape:cx="276.72576"
+ inkscape:cx="19.72576"
inkscape:cy="237.36832"
inkscape:document-units="px"
inkscape:current-layer="g8506"
showgrid="false"
- inkscape:window-width="1440"
- inkscape:window-height="841"
+ inkscape:window-width="1276"
+ inkscape:window-height="756"
inkscape:window-x="0"
inkscape:window-y="0"
- inkscape:window-maximized="1" />
+ inkscape:window-maximized="0" />
+ style="stop-color:#5c5c5c;stop-opacity:1" />
+ style="stop-color:#000000;stop-opacity:1" />
image/svg+xml
-
+
@@ -833,7 +833,7 @@
inkscape:flatsided="false"
inkscape:rounded="0"
inkscape:randomized="0"
- d="m 206.67379,217.35364 -40.25404,-8.01083 -22.18276,34.4648 -4.82043,-40.75934 -39.632833,-10.44685 37.274853,-17.17984 -2.31168,-40.92131 27.85756,30.14162 38.20413,-14.84391 -20.05793,35.80838 25.92313,31.74728 z"
+ d="m 206.67379,217.35364 -40.25404,-8.01083 -22.18276,34.4648 -4.82043,-40.75934 -39.632833,-10.44685 37.274853,-17.17984 -2.31168,-40.92131 27.85756,30.14162 38.20413,-14.84391 -20.05793,35.80838 z"
inkscape:transform-center-x="0.042578782"
inkscape:transform-center-y="-4.4264044"
transform="matrix(0.795516,0.351305,-0.351384,0.795695,88.379148,-256.9333)" />
diff --git a/data/src/sparkleshare-gnome.svg b/data/src/sparkleshare-gnome.svg
old mode 100644
new mode 100755
diff --git a/data/src/sparkleshare-mac.svg b/data/src/sparkleshare-mac.svg
old mode 100644
new mode 100755
diff --git a/data/src/sparkleshare-mist.svg b/data/src/sparkleshare-mist.svg
old mode 100644
new mode 100755
diff --git a/data/src/tutorial.svg b/data/src/tutorial.svg
new file mode 100755
index 00000000..157eda75
--- /dev/null
+++ b/data/src/tutorial.svg
@@ -0,0 +1,9938 @@
+
+
+
+
diff --git a/data/tutorial-slide-1.png b/data/tutorial-slide-1.png
new file mode 100755
index 00000000..7defc574
Binary files /dev/null and b/data/tutorial-slide-1.png differ
diff --git a/data/tutorial-slide-2.png b/data/tutorial-slide-2.png
new file mode 100755
index 00000000..565b6ecb
Binary files /dev/null and b/data/tutorial-slide-2.png differ
diff --git a/data/tutorial-slide-3.png b/data/tutorial-slide-3.png
new file mode 100755
index 00000000..05078b57
Binary files /dev/null and b/data/tutorial-slide-3.png differ
diff --git a/data/tutorial-slide-4.png b/data/tutorial-slide-4.png
new file mode 100755
index 00000000..fe95f230
Binary files /dev/null and b/data/tutorial-slide-4.png differ
diff --git a/help/C/account-creation.page b/help/C/account-creation.page
old mode 100644
new mode 100755
diff --git a/help/C/advanced.page b/help/C/advanced.page
old mode 100644
new mode 100755
diff --git a/help/C/index.page b/help/C/index.page
old mode 100644
new mode 100755
diff --git a/help/C/introduction.page b/help/C/introduction.page
old mode 100644
new mode 100755
diff --git a/help/C/legal.xml b/help/C/legal.xml
old mode 100644
new mode 100755
diff --git a/help/C/share.page b/help/C/share.page
old mode 100644
new mode 100755
diff --git a/help/Makefile.am b/help/Makefile.am
old mode 100644
new mode 100755
diff --git a/lib/TODO b/lib/TODO
old mode 100644
new mode 100755
diff --git a/man/sparkleshare.1 b/man/sparkleshare.1
old mode 100644
new mode 100755
diff --git a/po/LINGUAS b/po/LINGUAS
old mode 100644
new mode 100755
index 57ba3cb1..ff3644cc
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -15,9 +15,12 @@ it
ja
nl
no_NO
+nn_NO
pl
pt_BR
ru
+sl
+sr_RS
sv
te
uk
diff --git a/po/POTFILES.in b/po/POTFILES.in
old mode 100644
new mode 100755
index e812dd25..a059d4a7
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -5,12 +5,12 @@
SparkleShare/Mac/SparkleStatusIcon.cs
SparkleShare/Mac/SparkleUI.cs
SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in
+SparkleShare/Program.cs
SparkleShare/SparkleAbout.cs
SparkleShare/SparkleController.cs
SparkleShare/SparkleEventLog.cs
SparkleShare/SparkleSetup.cs
SparkleShare/SparkleSetupWindow.cs
-SparkleShare/SparkleShare.cs
SparkleShare/SparkleSpinner.cs
SparkleShare/SparkleStatusIcon.cs
SparkleShare/SparkleUI.cs
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
old mode 100644
new mode 100755
diff --git a/po/README.transifex b/po/README.transifex
old mode 100644
new mode 100755
diff --git a/po/ar.po b/po/ar.po
old mode 100644
new mode 100755
index 395bc656..a63d7854
--- a/po/ar.po
+++ b/po/ar.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: SparkleShare\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-29 11:38+0200\n"
-"PO-Revision-Date: 2011-06-26 09:22+0000\n"
+"POT-Creation-Date: 2011-07-19 07:04+0200\n"
+"PO-Revision-Date: 2011-07-19 05:10+0000\n"
"Last-Translator: deejay1 \n"
"Language-Team: LANGUAGE \n"
"MIME-Version: 1.0\n"
@@ -19,26 +19,27 @@ msgstr ""
"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:337
-#: ../SparkleShare/SparkleIntro.cs:67 ../SparkleShare/SparkleStatusIcon.cs:345
-msgid "Welcome to SparkleShare!"
-msgstr "مرحبًا بك في سباركلشير!"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:348
-#: ../SparkleShare/SparkleStatusIcon.cs:357
-msgid "Not everything is synced"
-msgstr "ليس كل شيء مزامَنًا"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:358
-#: ../SparkleShare/SparkleStatusIcon.cs:367
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:69
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:86
+#: ../SparkleShare/SparkleStatusIcon.cs:372
msgid "Up to date"
msgstr "محدَّث"
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:374
-#: ../SparkleShare/SparkleStatusIcon.cs:383
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:84
+#: ../SparkleShare/SparkleSetup.cs:69 ../SparkleShare/SparkleStatusIcon.cs:350
+msgid "Welcome to SparkleShare!"
+msgstr "مرحبًا بك في سباركلشير!"
+
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:95
+#: ../SparkleShare/SparkleStatusIcon.cs:388
msgid "Syncing…"
msgstr "يزامن..."
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:105
+#: ../SparkleShare/SparkleStatusIcon.cs:362
+msgid "Not everything is synced"
+msgstr "ليس كل شيء مزامَنًا"
+
#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
msgid "Copy Web Link"
msgstr "انسخ رابط الملف"
@@ -60,59 +61,52 @@ msgid "Select to get a copy of this version"
msgstr "اختر لتحصل على نسخة من هذه الإصدارة"
#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:46 ../SparkleShare/SparkleStatusIcon.cs:275
+#: ../SparkleShare/SparkleAbout.cs:54 ../SparkleShare/SparkleStatusIcon.cs:275
msgid "About SparkleShare"
msgstr "حوْل سباركلشير"
-#: ../SparkleShare/SparkleAbout.cs:53
-msgid "A newer version is available"
-msgstr "توجد إصدارة أحدث"
+#: ../SparkleShare/SparkleAbout.cs:72
+#, csharp-format
+msgid "A newer version ({0}) is available!"
+msgstr ""
-#: ../SparkleShare/SparkleAbout.cs:60
+#: ../SparkleShare/SparkleAbout.cs:80
msgid "You are running the latest version."
msgstr "أنت تستخدم الإصدارة الأحدث."
-#: ../SparkleShare/SparkleAbout.cs:87
+#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:110
msgid "Checking for updates..."
msgstr "يبحث عن تحديثات..."
-#: ../SparkleShare/SparkleAbout.cs:116
-msgid "_Show Credits"
-msgstr "أظهر الإ_شادات"
+#: ../SparkleShare/SparkleController.cs:446
+msgid "dddd, MMMM d, yyyy"
+msgstr ""
-#: ../SparkleShare/SparkleAbout.cs:129
-msgid "_Visit Website"
-msgstr "_زر الموقع الإلكتروني"
+#: ../SparkleShare/SparkleController.cs:451
+msgid "dddd, MMMM d"
+msgstr ""
-#: ../SparkleShare/SparkleController.cs:455
-msgid "ddd MMM d, yyyy"
-msgstr "ddd MMM d, yyyy"
-
-#: ../SparkleShare/SparkleController.cs:460
-msgid "ddd MMM d"
-msgstr "ddd MMM d"
-
-#: ../SparkleShare/SparkleController.cs:661
+#: ../SparkleShare/SparkleController.cs:660
#, csharp-format
msgid "added ‘{0}’"
msgstr "أضيفَ ‘{0}’"
-#: ../SparkleShare/SparkleController.cs:666
+#: ../SparkleShare/SparkleController.cs:665
#, csharp-format
msgid "moved ‘{0}’"
msgstr "نُقل ‘{0}’"
-#: ../SparkleShare/SparkleController.cs:671
+#: ../SparkleShare/SparkleController.cs:670
#, csharp-format
msgid "edited ‘{0}’"
msgstr "حرِّر ‘{0}’"
-#: ../SparkleShare/SparkleController.cs:676
+#: ../SparkleShare/SparkleController.cs:675
#, csharp-format
msgid "deleted ‘{0}’"
msgstr "حُذف ‘{0}’"
-#: ../SparkleShare/SparkleController.cs:685
+#: ../SparkleShare/SparkleController.cs:684
#, csharp-format
msgid "and {0} more"
msgid_plural "and {0} more"
@@ -123,200 +117,10 @@ msgstr[3] "و{0} ملفات أخرى"
msgstr[4] "و{ملف آخر"
msgstr[5] "و{0} ملف آخر"
-#: ../SparkleShare/SparkleController.cs:689
+#: ../SparkleShare/SparkleController.cs:688
msgid "did something magical"
msgstr "فعلتُ شيئًا سحريًا"
-#: ../SparkleShare/SparkleIntro.cs:73
-msgid ""
-"Before we can create a SparkleShare folder on this computer, we need a few "
-"bits of information from you."
-msgstr ""
-"نحتاج بعض المعلومات منك قبل أن نتمكن من إنشاء مجلد سباركلشير في هذا "
-"الحاسوب."
-
-#: ../SparkleShare/SparkleIntro.cs:83
-msgid "Full Name:"
-msgstr "الاسم كاملًا:"
-
-#: ../SparkleShare/SparkleIntro.cs:98
-msgid "Email:"
-msgstr "البريد الإلكتروني:"
-
-#: ../SparkleShare/SparkleIntro.cs:109
-msgid "Next"
-msgstr "التالي"
-
-#: ../SparkleShare/SparkleIntro.cs:115
-msgid "Configuring…"
-msgstr "يضبط"
-
-#: ../SparkleShare/SparkleIntro.cs:161
-msgid "Where is your remote folder?"
-msgstr "أين مجلدك البعيد؟"
-
-#: ../SparkleShare/SparkleIntro.cs:174
-msgid "address-to-server.com"
-msgstr "عنوان-الخادوم.com"
-
-#: ../SparkleShare/SparkleIntro.cs:179
-msgid "On my own server:"
-msgstr "على خادومي الخاص:"
-
-#: ../SparkleShare/SparkleIntro.cs:186
-msgid "Free hosting for Free and Open Source Software projects."
-msgstr "استضافة مجانية للمشاريع الحرة مفتوحة المصدر."
-
-#: ../SparkleShare/SparkleIntro.cs:187
-msgid "Also has paid accounts for extra private space and bandwidth."
-msgstr "يوجد أيضًا حسابات مدفوعة بمساحة خاصة أكبر وتبادل أكثر للبيانات."
-
-#: ../SparkleShare/SparkleIntro.cs:195
-msgid "The GNOME Project"
-msgstr "مشروع جنوم."
-
-#: ../SparkleShare/SparkleIntro.cs:197
-msgid "GNOME is an easy to understand interface to your computer."
-msgstr "جنوم واجهة حاسوب سهلة الاستخدام."
-
-#: ../SparkleShare/SparkleIntro.cs:198
-msgid "Select this option if you’re a developer or designer working on GNOME."
-msgstr "اختر هذا الخيار إن كنت مطورًا أو مصممًا تعمل على مشروع جنوم."
-
-#: ../SparkleShare/SparkleIntro.cs:206
-msgid "Gitorious"
-msgstr "Gitorious"
-
-#: ../SparkleShare/SparkleIntro.cs:208
-msgid "Completely Free as in Freedom infrastructure."
-msgstr "بنية تحتية حرة تمامًا."
-
-#: ../SparkleShare/SparkleIntro.cs:209
-msgid "Free accounts for Free and Open Source projects."
-msgstr "حسابات مجانية للمشاريع الحرة مفتوحة المصدر."
-
-#: ../SparkleShare/SparkleIntro.cs:220
-msgid "Username/Folder"
-msgstr "اسم المستخدم/المجلد"
-
-#: ../SparkleShare/SparkleIntro.cs:225
-msgid "Project/Folder"
-msgstr "المشروع/المجلد"
-
-#: ../SparkleShare/SparkleIntro.cs:230
-msgid "Project"
-msgstr "المشروع"
-
-#: ../SparkleShare/SparkleIntro.cs:235 ../SparkleShare/SparkleIntro.cs:254
-msgid "Folder"
-msgstr "المجلد"
-
-#: ../SparkleShare/SparkleIntro.cs:259 ../SparkleShare/SparkleIntro.cs:377
-msgid "Folder Name:"
-msgstr "اسم المجلد:"
-
-#: ../SparkleShare/SparkleIntro.cs:269
-msgid "Sync"
-msgstr "زامِن"
-
-#: ../SparkleShare/SparkleIntro.cs:312
-msgid "Cancel"
-msgstr "ألغِ"
-
-#: ../SparkleShare/SparkleIntro.cs:320
-msgid "Skip"
-msgstr "تخطَّ"
-
-#: ../SparkleShare/SparkleIntro.cs:347
-msgid "Invitation received!"
-msgstr "وصلتك دعوة!"
-
-#: ../SparkleShare/SparkleIntro.cs:353
-msgid ""
-"You've received an invitation to join a shared folder.\n"
-"We're ready to hook you up immediately if you wish."
-msgstr ""
-"لقد استلمتَ دعوة لتنضم إلى مجلد مشترك.\n"
-"نحن مستعدون لتوصيلك مباشرة إذا شئت."
-
-#: ../SparkleShare/SparkleIntro.cs:359
-msgid "Do you accept this invitation?"
-msgstr "هل تقبل هذه الدعوة؟"
-
-#: ../SparkleShare/SparkleIntro.cs:368
-msgid "Server Address:"
-msgstr "عنوان الخادوم:"
-
-#: ../SparkleShare/SparkleIntro.cs:391
-msgid "Reject"
-msgstr "ارفض"
-
-#: ../SparkleShare/SparkleIntro.cs:392
-msgid "Accept and Sync"
-msgstr "اقبل وزامن"
-
-#: ../SparkleShare/SparkleIntro.cs:442
-msgid "Something went wrong…"
-msgstr "حدث خطأ ما..."
-
-#: ../SparkleShare/SparkleIntro.cs:448
-msgid "Try Again"
-msgstr "حاول مجددًا"
-
-#: ../SparkleShare/SparkleIntro.cs:473
-#, csharp-format
-msgid "‘{0}’ has been successfully added"
-msgstr "نجحت إضافة ‘{0}’"
-
-#: ../SparkleShare/SparkleIntro.cs:482
-msgid "Folder synced successfully!"
-msgstr "نجحت مزامنة المجلد!"
-
-#: ../SparkleShare/SparkleIntro.cs:489
-#, csharp-format
-msgid ""
-"Now you can access the synced files from ‘{0}’ in your SparkleShare folder."
-msgstr "بإمكانك الآن الوصول إلى الملفات المزامنة من ‘{0}’ في مجلد سباركلشير."
-
-#. A button that opens the synced folder
-#: ../SparkleShare/SparkleIntro.cs:497
-msgid "Open Folder"
-msgstr "افتح المجلد"
-
-#: ../SparkleShare/SparkleIntro.cs:503 ../SparkleShare/SparkleIntro.cs:543
-#: ../SparkleShare/SparkleIntro.cs:604
-msgid "Finish"
-msgstr "أنهِ"
-
-#: ../SparkleShare/SparkleIntro.cs:528
-#, csharp-format
-msgid "Syncing folder ‘{0}’…"
-msgstr "يزامن المجلد ‘{0}’…"
-
-#: ../SparkleShare/SparkleIntro.cs:535
-msgid "This may take a while.\n"
-msgstr "قد يستغرق هذا بعض الوقت.\n"
-
-#: ../SparkleShare/SparkleIntro.cs:536
-msgid "Are you sure it’s not coffee o'clock?"
-msgstr "أمتأكد أنه ليس وقت احتساء القهوة؟"
-
-#: ../SparkleShare/SparkleIntro.cs:579
-msgid "SparkleShare is ready to go!"
-msgstr "سباركلشير جاهز للاستخدام!"
-
-#: ../SparkleShare/SparkleIntro.cs:585
-msgid ""
-"Now you can start accepting invitations from others. \n"
-"Just click on invitations you get by email and we will take care of the rest."
-msgstr ""
-"يمكنك الآن البدء في استقبال الدعوات من الآخرين.\n"
-"كل ما عليك هو النقر على الدعوات التي تصلك بالبريد الإلكتروني وسنتكفل نحن بالبقية."
-
-#: ../SparkleShare/SparkleIntro.cs:596
-msgid "Learn how to host your own SparkleServer"
-msgstr "تعلم كيف تستضيف خادوم سباركلشير بنفسك"
-
#: ../SparkleShare/SparkleEventLog.cs:61
msgid "Recent Events"
msgstr "الأحداث الأخيرة"
@@ -326,6 +130,150 @@ msgstr "الأحداث الأخيرة"
msgid "All Folders"
msgstr "كل المجلدات"
+#: ../SparkleShare/SparkleSetup.cs:70
+msgid ""
+"Before we can create a SparkleShare folder on this computer, we need a few "
+"bits of information from you."
+msgstr ""
+"نحتاج بعض المعلومات منك قبل أن نتمكن من إنشاء مجلد سباركلشير في هذا "
+"الحاسوب."
+
+#: ../SparkleShare/SparkleSetup.cs:77
+msgid "Full Name:"
+msgstr "الاسم كاملًا:"
+
+#: ../SparkleShare/SparkleSetup.cs:92
+msgid "Email:"
+msgstr "البريد الإلكتروني:"
+
+#: ../SparkleShare/SparkleSetup.cs:102
+msgid "Next"
+msgstr "التالي"
+
+#: ../SparkleShare/SparkleSetup.cs:122
+msgid "Where is your remote folder?"
+msgstr "أين مجلدك البعيد؟"
+
+#. Own server radiobutton
+#: ../SparkleShare/SparkleSetup.cs:131
+msgid "On my own server:"
+msgstr "على خادومي الخاص:"
+
+#: ../SparkleShare/SparkleSetup.cs:136 ../SparkleShare/SparkleSetup.cs:238
+msgid "Folder"
+msgstr "المجلد"
+
+#: ../SparkleShare/SparkleSetup.cs:163
+msgid "address-to-server.com"
+msgstr "عنوان-الخادوم.com"
+
+#: ../SparkleShare/SparkleSetup.cs:178
+msgid "Free hosting for Free and Open Source Software projects."
+msgstr "استضافة مجانية للمشاريع الحرة مفتوحة المصدر."
+
+#: ../SparkleShare/SparkleSetup.cs:179
+msgid "Also has paid accounts for extra private space and bandwidth."
+msgstr "يوجد أيضًا حسابات مدفوعة بمساحة خاصة أكبر وتبادل أكثر للبيانات."
+
+#: ../SparkleShare/SparkleSetup.cs:188
+msgid "Username/Folder"
+msgstr "اسم المستخدم/المجلد"
+
+#. Gitorious radiobutton
+#: ../SparkleShare/SparkleSetup.cs:193
+msgid "Gitorious"
+msgstr "Gitorious"
+
+#: ../SparkleShare/SparkleSetup.cs:195
+msgid "Completely Free as in Freedom infrastructure."
+msgstr "بنية تحتية حرة تمامًا."
+
+#: ../SparkleShare/SparkleSetup.cs:196
+msgid "Free accounts for Free and Open Source projects."
+msgstr "حسابات مجانية للمشاريع الحرة مفتوحة المصدر."
+
+#: ../SparkleShare/SparkleSetup.cs:205
+msgid "Project/Folder"
+msgstr "المشروع/المجلد"
+
+#. GNOME radiobutton
+#: ../SparkleShare/SparkleSetup.cs:210
+msgid "The GNOME Project"
+msgstr "مشروع جنوم."
+
+#: ../SparkleShare/SparkleSetup.cs:212
+msgid "GNOME is an easy to understand interface to your computer."
+msgstr "جنوم واجهة حاسوب سهلة الاستخدام."
+
+#: ../SparkleShare/SparkleSetup.cs:213
+msgid "Select this option if you’re a developer or designer working on GNOME."
+msgstr "اختر هذا الخيار إن كنت مطورًا أو مصممًا تعمل على مشروع جنوم."
+
+#: ../SparkleShare/SparkleSetup.cs:222
+msgid "Project"
+msgstr "المشروع"
+
+#: ../SparkleShare/SparkleSetup.cs:232
+msgid "Folder Name:"
+msgstr "اسم المجلد:"
+
+#. Cancel button
+#: ../SparkleShare/SparkleSetup.cs:251
+msgid "Cancel"
+msgstr "ألغِ"
+
+#. Sync button
+#: ../SparkleShare/SparkleSetup.cs:259
+msgid "Sync"
+msgstr "زامِن"
+
+#: ../SparkleShare/SparkleSetup.cs:286
+#, csharp-format
+msgid "Syncing folder ‘{0}’…"
+msgstr "يزامن المجلد ‘{0}’…"
+
+#: ../SparkleShare/SparkleSetup.cs:287
+msgid "This may take a while."
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:288
+msgid "Are you sure it’s not coffee o'clock?"
+msgstr "أمتأكد أنه ليس وقت احتساء القهوة؟"
+
+#: ../SparkleShare/SparkleSetup.cs:292 ../SparkleShare/SparkleSetup.cs:375
+msgid "Finish"
+msgstr "أنهِ"
+
+#: ../SparkleShare/SparkleSetup.cs:321
+msgid "Something went wrong"
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:341
+msgid "Try Again"
+msgstr "حاول مجددًا"
+
+#: ../SparkleShare/SparkleSetup.cs:359
+#, csharp-format
+msgid "‘{0}’ has been successfully added"
+msgstr "نجحت إضافة ‘{0}’"
+
+#: ../SparkleShare/SparkleSetup.cs:365
+msgid "Folder synced successfully!"
+msgstr "نجحت مزامنة المجلد!"
+
+#: ../SparkleShare/SparkleSetup.cs:366
+msgid "Access the synced files from your SparkleShare folder."
+msgstr ""
+
+#. A button that opens the synced folder
+#: ../SparkleShare/SparkleSetup.cs:369
+msgid "Open Folder"
+msgstr "افتح المجلد"
+
+#: ../SparkleShare/SparkleSetupWindow.cs:45
+msgid "SparkleShare Setup"
+msgstr "إعداد سباركلشير"
+
#: ../SparkleShare/SparkleShare.cs:53
msgid "Sorry, you can't run SparkleShare with these permissions."
msgstr "المعذرة، لا يمكنك تشغيل سباركلشير بهذه الأذون."
@@ -410,20 +358,8 @@ msgid "Turn Notifications On"
msgstr "فعِّل التنبيهات"
#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:286
+#: ../SparkleShare/SparkleStatusIcon.cs:291
msgid "Quit"
msgstr "اخرج"
-#: ../SparkleShare/SparkleUI.cs:99
-msgid "Ouch! Mid-air collision!"
-msgstr "آخ! اصطدام هوائي!"
-
-#: ../SparkleShare/SparkleUI.cs:100
-msgid "Don't worry, SparkleShare made a copy of each conflicting file."
-msgstr "لا تقلق، صنع سباركلشير نسخة من كل ملف متعارض."
-
-#: ../SparkleShare/SparkleWindow.cs:41
-msgid "SparkleShare Setup"
-msgstr "إعداد سباركلشير"
-
diff --git a/po/bg.po b/po/bg.po
old mode 100644
new mode 100755
index a4ec0bf0..d139bfed
--- a/po/bg.po
+++ b/po/bg.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: SparkleShare\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-29 11:38+0200\n"
-"PO-Revision-Date: 2011-06-26 09:22+0000\n"
+"POT-Creation-Date: 2011-07-19 07:04+0200\n"
+"PO-Revision-Date: 2011-07-19 05:10+0000\n"
"Last-Translator: deejay1 \n"
"Language-Team: LANGUAGE \n"
"MIME-Version: 1.0\n"
@@ -19,26 +19,27 @@ msgstr ""
"Language: bg\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:337
-#: ../SparkleShare/SparkleIntro.cs:67 ../SparkleShare/SparkleStatusIcon.cs:345
-msgid "Welcome to SparkleShare!"
-msgstr "Здравейте в SparkleShare!"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:348
-#: ../SparkleShare/SparkleStatusIcon.cs:357
-msgid "Not everything is synced"
-msgstr "Синхронизирането не е приключило"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:358
-#: ../SparkleShare/SparkleStatusIcon.cs:367
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:69
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:86
+#: ../SparkleShare/SparkleStatusIcon.cs:372
msgid "Up to date"
msgstr "Обновено"
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:374
-#: ../SparkleShare/SparkleStatusIcon.cs:383
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:84
+#: ../SparkleShare/SparkleSetup.cs:69 ../SparkleShare/SparkleStatusIcon.cs:350
+msgid "Welcome to SparkleShare!"
+msgstr "Здравейте в SparkleShare!"
+
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:95
+#: ../SparkleShare/SparkleStatusIcon.cs:388
msgid "Syncing…"
msgstr "Синхронизиране…"
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:105
+#: ../SparkleShare/SparkleStatusIcon.cs:362
+msgid "Not everything is synced"
+msgstr "Синхронизирането не е приключило"
+
#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
msgid "Copy Web Link"
msgstr "Копиране на адреса"
@@ -60,261 +61,62 @@ msgid "Select to get a copy of this version"
msgstr "Изберете за копие на версията"
#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:46 ../SparkleShare/SparkleStatusIcon.cs:275
+#: ../SparkleShare/SparkleAbout.cs:54 ../SparkleShare/SparkleStatusIcon.cs:275
msgid "About SparkleShare"
msgstr "Относно SparkleShare"
-#: ../SparkleShare/SparkleAbout.cs:53
-msgid "A newer version is available"
+#: ../SparkleShare/SparkleAbout.cs:72
+#, csharp-format
+msgid "A newer version ({0}) is available!"
msgstr ""
-#: ../SparkleShare/SparkleAbout.cs:60
+#: ../SparkleShare/SparkleAbout.cs:80
msgid "You are running the latest version."
msgstr ""
-#: ../SparkleShare/SparkleAbout.cs:87
+#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:110
msgid "Checking for updates..."
msgstr ""
-#: ../SparkleShare/SparkleAbout.cs:116
-msgid "_Show Credits"
-msgstr "_Заслуги"
-
-#: ../SparkleShare/SparkleAbout.cs:129
-msgid "_Visit Website"
-msgstr "_Към уеб сайта"
-
-#: ../SparkleShare/SparkleController.cs:455
-msgid "ddd MMM d, yyyy"
+#: ../SparkleShare/SparkleController.cs:446
+msgid "dddd, MMMM d, yyyy"
msgstr ""
-#: ../SparkleShare/SparkleController.cs:460
-msgid "ddd MMM d"
+#: ../SparkleShare/SparkleController.cs:451
+msgid "dddd, MMMM d"
msgstr ""
-#: ../SparkleShare/SparkleController.cs:661
+#: ../SparkleShare/SparkleController.cs:660
#, csharp-format
msgid "added ‘{0}’"
msgstr "добавен е „{0}“"
-#: ../SparkleShare/SparkleController.cs:666
+#: ../SparkleShare/SparkleController.cs:665
#, csharp-format
msgid "moved ‘{0}’"
msgstr ""
-#: ../SparkleShare/SparkleController.cs:671
+#: ../SparkleShare/SparkleController.cs:670
#, csharp-format
msgid "edited ‘{0}’"
msgstr "редактиран е „{0}“"
-#: ../SparkleShare/SparkleController.cs:676
+#: ../SparkleShare/SparkleController.cs:675
#, csharp-format
msgid "deleted ‘{0}’"
msgstr "изтрит е „{0}“"
-#: ../SparkleShare/SparkleController.cs:685
+#: ../SparkleShare/SparkleController.cs:684
#, csharp-format
msgid "and {0} more"
msgid_plural "and {0} more"
msgstr[0] ""
msgstr[1] ""
-#: ../SparkleShare/SparkleController.cs:689
+#: ../SparkleShare/SparkleController.cs:688
msgid "did something magical"
msgstr ""
-#: ../SparkleShare/SparkleIntro.cs:73
-msgid ""
-"Before we can create a SparkleShare folder on this computer, we need a few "
-"bits of information from you."
-msgstr ""
-"Трябва да попълните някои данни за себе си, преди да се създаде папка на "
-"компютъра, ползваща SparkleShare."
-
-#: ../SparkleShare/SparkleIntro.cs:83
-msgid "Full Name:"
-msgstr "Лично име:"
-
-#: ../SparkleShare/SparkleIntro.cs:98
-msgid "Email:"
-msgstr "Е-поща:"
-
-#: ../SparkleShare/SparkleIntro.cs:109
-msgid "Next"
-msgstr "Нататък"
-
-#: ../SparkleShare/SparkleIntro.cs:115
-msgid "Configuring…"
-msgstr "Настройване…"
-
-#: ../SparkleShare/SparkleIntro.cs:161
-msgid "Where is your remote folder?"
-msgstr "Къде е отдалечената папка?"
-
-#: ../SparkleShare/SparkleIntro.cs:174
-msgid "address-to-server.com"
-msgstr "адрес.на.сървъра.com"
-
-#: ../SparkleShare/SparkleIntro.cs:179
-msgid "On my own server:"
-msgstr "На основния сървър:"
-
-#: ../SparkleShare/SparkleIntro.cs:186
-msgid "Free hosting for Free and Open Source Software projects."
-msgstr "Безплатен хостинг за свободни проекти и такива с отворен код."
-
-#: ../SparkleShare/SparkleIntro.cs:187
-msgid "Also has paid accounts for extra private space and bandwidth."
-msgstr "За непублично пространство и допълнителни ресурси се плаща."
-
-#: ../SparkleShare/SparkleIntro.cs:195
-msgid "The GNOME Project"
-msgstr "Проектът GNOME"
-
-#: ../SparkleShare/SparkleIntro.cs:197
-msgid "GNOME is an easy to understand interface to your computer."
-msgstr "GNOME е разбираем интерфейс за компютъра ви."
-
-#: ../SparkleShare/SparkleIntro.cs:198
-msgid "Select this option if you’re a developer or designer working on GNOME."
-msgstr "Ако работите по GNOME, изберете тази версия."
-
-#: ../SparkleShare/SparkleIntro.cs:206
-msgid "Gitorious"
-msgstr "Gitorious"
-
-#: ../SparkleShare/SparkleIntro.cs:208
-msgid "Completely Free as in Freedom infrastructure."
-msgstr "Свободен като инфраструктурата на свободата."
-
-#: ../SparkleShare/SparkleIntro.cs:209
-msgid "Free accounts for Free and Open Source projects."
-msgstr "Безплатно за свободни проекти и такива с отворен код."
-
-#: ../SparkleShare/SparkleIntro.cs:220
-msgid "Username/Folder"
-msgstr "Потребител/Папка"
-
-#: ../SparkleShare/SparkleIntro.cs:225
-msgid "Project/Folder"
-msgstr "Проект/Папка"
-
-#: ../SparkleShare/SparkleIntro.cs:230
-msgid "Project"
-msgstr "Проект"
-
-#: ../SparkleShare/SparkleIntro.cs:235 ../SparkleShare/SparkleIntro.cs:254
-msgid "Folder"
-msgstr "Папка"
-
-#: ../SparkleShare/SparkleIntro.cs:259 ../SparkleShare/SparkleIntro.cs:377
-msgid "Folder Name:"
-msgstr "Име на папка:"
-
-#: ../SparkleShare/SparkleIntro.cs:269
-msgid "Sync"
-msgstr "Синхронизиране"
-
-#: ../SparkleShare/SparkleIntro.cs:312
-msgid "Cancel"
-msgstr "Отказване"
-
-#: ../SparkleShare/SparkleIntro.cs:320
-msgid "Skip"
-msgstr "Прескачане"
-
-#: ../SparkleShare/SparkleIntro.cs:347
-msgid "Invitation received!"
-msgstr "Поканата е приета!"
-
-#: ../SparkleShare/SparkleIntro.cs:353
-msgid ""
-"You've received an invitation to join a shared folder.\n"
-"We're ready to hook you up immediately if you wish."
-msgstr ""
-"Получихте покана за споделена папка. Ако искате,\n"
-"можете да я приемете, за да започне синхронизирането."
-
-#: ../SparkleShare/SparkleIntro.cs:359
-msgid "Do you accept this invitation?"
-msgstr "Приемате ли поканата?"
-
-#: ../SparkleShare/SparkleIntro.cs:368
-msgid "Server Address:"
-msgstr "Адрес на сървър:"
-
-#: ../SparkleShare/SparkleIntro.cs:391
-msgid "Reject"
-msgstr "Отхвърляне"
-
-#: ../SparkleShare/SparkleIntro.cs:392
-msgid "Accept and Sync"
-msgstr "Приемане и синхронизиране"
-
-#: ../SparkleShare/SparkleIntro.cs:442
-msgid "Something went wrong…"
-msgstr "Получи се грешка…"
-
-#: ../SparkleShare/SparkleIntro.cs:448
-msgid "Try Again"
-msgstr "Опитайте отново"
-
-#: ../SparkleShare/SparkleIntro.cs:473
-#, csharp-format
-msgid "‘{0}’ has been successfully added"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:482
-msgid "Folder synced successfully!"
-msgstr "Папката е успешно синхронизирана!"
-
-#: ../SparkleShare/SparkleIntro.cs:489
-#, csharp-format
-msgid ""
-"Now you can access the synced files from ‘{0}’ in your SparkleShare folder."
-msgstr ""
-"Можете да достъпите синхронизираните файлове от „{0}“ в папката ви за "
-"SparkleShare."
-
-#. A button that opens the synced folder
-#: ../SparkleShare/SparkleIntro.cs:497
-msgid "Open Folder"
-msgstr "Отваряне на папката"
-
-#: ../SparkleShare/SparkleIntro.cs:503 ../SparkleShare/SparkleIntro.cs:543
-#: ../SparkleShare/SparkleIntro.cs:604
-msgid "Finish"
-msgstr "Завършване"
-
-#: ../SparkleShare/SparkleIntro.cs:528
-#, csharp-format
-msgid "Syncing folder ‘{0}’…"
-msgstr "Синхронизиране на папка „{0}“…"
-
-#: ../SparkleShare/SparkleIntro.cs:535
-msgid "This may take a while.\n"
-msgstr "Това може да отнеме малко време.\n"
-
-#: ../SparkleShare/SparkleIntro.cs:536
-msgid "Are you sure it’s not coffee o'clock?"
-msgstr "Не е ли време за кафенце?"
-
-#: ../SparkleShare/SparkleIntro.cs:579
-msgid "SparkleShare is ready to go!"
-msgstr "SparkleShare е готов!"
-
-#: ../SparkleShare/SparkleIntro.cs:585
-msgid ""
-"Now you can start accepting invitations from others. \n"
-"Just click on invitations you get by email and we will take care of the rest."
-msgstr ""
-"Можете да приемате покани от други хора. \n"
-"Когато ги получите по е-пощата, просто натиснете върху връзката. SparkleShare се грижи за останалото."
-
-#: ../SparkleShare/SparkleIntro.cs:596
-msgid "Learn how to host your own SparkleServer"
-msgstr "Научете как да създадете свой сървър за SparkleServer"
-
#: ../SparkleShare/SparkleEventLog.cs:61
msgid "Recent Events"
msgstr ""
@@ -324,6 +126,150 @@ msgstr ""
msgid "All Folders"
msgstr ""
+#: ../SparkleShare/SparkleSetup.cs:70
+msgid ""
+"Before we can create a SparkleShare folder on this computer, we need a few "
+"bits of information from you."
+msgstr ""
+"Трябва да попълните някои данни за себе си, преди да се създаде папка на "
+"компютъра, ползваща SparkleShare."
+
+#: ../SparkleShare/SparkleSetup.cs:77
+msgid "Full Name:"
+msgstr "Лично име:"
+
+#: ../SparkleShare/SparkleSetup.cs:92
+msgid "Email:"
+msgstr "Е-поща:"
+
+#: ../SparkleShare/SparkleSetup.cs:102
+msgid "Next"
+msgstr "Нататък"
+
+#: ../SparkleShare/SparkleSetup.cs:122
+msgid "Where is your remote folder?"
+msgstr "Къде е отдалечената папка?"
+
+#. Own server radiobutton
+#: ../SparkleShare/SparkleSetup.cs:131
+msgid "On my own server:"
+msgstr "На основния сървър:"
+
+#: ../SparkleShare/SparkleSetup.cs:136 ../SparkleShare/SparkleSetup.cs:238
+msgid "Folder"
+msgstr "Папка"
+
+#: ../SparkleShare/SparkleSetup.cs:163
+msgid "address-to-server.com"
+msgstr "адрес.на.сървъра.com"
+
+#: ../SparkleShare/SparkleSetup.cs:178
+msgid "Free hosting for Free and Open Source Software projects."
+msgstr "Безплатен хостинг за свободни проекти и такива с отворен код."
+
+#: ../SparkleShare/SparkleSetup.cs:179
+msgid "Also has paid accounts for extra private space and bandwidth."
+msgstr "За непублично пространство и допълнителни ресурси се плаща."
+
+#: ../SparkleShare/SparkleSetup.cs:188
+msgid "Username/Folder"
+msgstr "Потребител/Папка"
+
+#. Gitorious radiobutton
+#: ../SparkleShare/SparkleSetup.cs:193
+msgid "Gitorious"
+msgstr "Gitorious"
+
+#: ../SparkleShare/SparkleSetup.cs:195
+msgid "Completely Free as in Freedom infrastructure."
+msgstr "Свободен като инфраструктурата на свободата."
+
+#: ../SparkleShare/SparkleSetup.cs:196
+msgid "Free accounts for Free and Open Source projects."
+msgstr "Безплатно за свободни проекти и такива с отворен код."
+
+#: ../SparkleShare/SparkleSetup.cs:205
+msgid "Project/Folder"
+msgstr "Проект/Папка"
+
+#. GNOME radiobutton
+#: ../SparkleShare/SparkleSetup.cs:210
+msgid "The GNOME Project"
+msgstr "Проектът GNOME"
+
+#: ../SparkleShare/SparkleSetup.cs:212
+msgid "GNOME is an easy to understand interface to your computer."
+msgstr "GNOME е разбираем интерфейс за компютъра ви."
+
+#: ../SparkleShare/SparkleSetup.cs:213
+msgid "Select this option if you’re a developer or designer working on GNOME."
+msgstr "Ако работите по GNOME, изберете тази версия."
+
+#: ../SparkleShare/SparkleSetup.cs:222
+msgid "Project"
+msgstr "Проект"
+
+#: ../SparkleShare/SparkleSetup.cs:232
+msgid "Folder Name:"
+msgstr "Име на папка:"
+
+#. Cancel button
+#: ../SparkleShare/SparkleSetup.cs:251
+msgid "Cancel"
+msgstr "Отказване"
+
+#. Sync button
+#: ../SparkleShare/SparkleSetup.cs:259
+msgid "Sync"
+msgstr "Синхронизиране"
+
+#: ../SparkleShare/SparkleSetup.cs:286
+#, csharp-format
+msgid "Syncing folder ‘{0}’…"
+msgstr "Синхронизиране на папка „{0}“…"
+
+#: ../SparkleShare/SparkleSetup.cs:287
+msgid "This may take a while."
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:288
+msgid "Are you sure it’s not coffee o'clock?"
+msgstr "Не е ли време за кафенце?"
+
+#: ../SparkleShare/SparkleSetup.cs:292 ../SparkleShare/SparkleSetup.cs:375
+msgid "Finish"
+msgstr "Завършване"
+
+#: ../SparkleShare/SparkleSetup.cs:321
+msgid "Something went wrong"
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:341
+msgid "Try Again"
+msgstr "Опитайте отново"
+
+#: ../SparkleShare/SparkleSetup.cs:359
+#, csharp-format
+msgid "‘{0}’ has been successfully added"
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:365
+msgid "Folder synced successfully!"
+msgstr "Папката е успешно синхронизирана!"
+
+#: ../SparkleShare/SparkleSetup.cs:366
+msgid "Access the synced files from your SparkleShare folder."
+msgstr ""
+
+#. A button that opens the synced folder
+#: ../SparkleShare/SparkleSetup.cs:369
+msgid "Open Folder"
+msgstr "Отваряне на папката"
+
+#: ../SparkleShare/SparkleSetupWindow.cs:45
+msgid "SparkleShare Setup"
+msgstr ""
+
#: ../SparkleShare/SparkleShare.cs:53
msgid "Sorry, you can't run SparkleShare with these permissions."
msgstr "С настоящите права не може да стартирате SparkleShare."
@@ -409,20 +355,8 @@ msgid "Turn Notifications On"
msgstr "Включване на уведомленията"
#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:286
+#: ../SparkleShare/SparkleStatusIcon.cs:291
msgid "Quit"
msgstr "Спиране на програмата"
-#: ../SparkleShare/SparkleUI.cs:99
-msgid "Ouch! Mid-air collision!"
-msgstr "Опс, конфликт на версии!"
-
-#: ../SparkleShare/SparkleUI.cs:100
-msgid "Don't worry, SparkleShare made a copy of each conflicting file."
-msgstr "Без паника! SparkleShare е създал копие на всеки файл в конфликт."
-
-#: ../SparkleShare/SparkleWindow.cs:41
-msgid "SparkleShare Setup"
-msgstr ""
-
diff --git a/po/ca.po b/po/ca.po
old mode 100644
new mode 100755
index a8a6f8d6..cd29982f
--- a/po/ca.po
+++ b/po/ca.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: SparkleShare\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-29 11:38+0200\n"
-"PO-Revision-Date: 2011-07-02 21:33+0000\n"
+"POT-Creation-Date: 2011-07-19 07:04+0200\n"
+"PO-Revision-Date: 2011-08-11 10:56+0000\n"
"Last-Translator: alexandresaiz \n"
"Language-Team: LANGUAGE \n"
"MIME-Version: 1.0\n"
@@ -22,26 +22,27 @@ msgstr ""
"Language: ca\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: ../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:348
-#: ../SparkleShare/SparkleStatusIcon.cs:357
-msgid "Not everything is synced"
-msgstr "No està tot sincronitzat"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:358
-#: ../SparkleShare/SparkleStatusIcon.cs:367
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:69
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:86
+#: ../SparkleShare/SparkleStatusIcon.cs:372
msgid "Up to date"
msgstr "Al dia"
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:374
-#: ../SparkleShare/SparkleStatusIcon.cs:383
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:84
+#: ../SparkleShare/SparkleSetup.cs:69 ../SparkleShare/SparkleStatusIcon.cs:350
+msgid "Welcome to SparkleShare!"
+msgstr "Benvinguts a SparkleShare"
+
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:95
+#: ../SparkleShare/SparkleStatusIcon.cs:388
msgid "Syncing…"
msgstr "Sincronitzant ..."
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:105
+#: ../SparkleShare/SparkleStatusIcon.cs:362
+msgid "Not everything is synced"
+msgstr "No està tot sincronitzat"
+
#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
msgid "Copy Web Link"
msgstr "Copiar adreça web"
@@ -63,266 +64,62 @@ msgid "Select to get a copy of this version"
msgstr "Selecciona per obtenir una còpia d'aquesta versió"
#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:46 ../SparkleShare/SparkleStatusIcon.cs:275
+#: ../SparkleShare/SparkleAbout.cs:54 ../SparkleShare/SparkleStatusIcon.cs:275
msgid "About SparkleShare"
msgstr "Sobre SparkleShare"
-#: ../SparkleShare/SparkleAbout.cs:53
-msgid "A newer version is available"
-msgstr "Hi ha una versió nova"
+#: ../SparkleShare/SparkleAbout.cs:72
+#, csharp-format
+msgid "A newer version ({0}) is available!"
+msgstr "Hi ha una nova versió ({0}) disponible!"
-#: ../SparkleShare/SparkleAbout.cs:60
+#: ../SparkleShare/SparkleAbout.cs:80
msgid "You are running the latest version."
msgstr "Estas utilitzant la darrera versió"
-#: ../SparkleShare/SparkleAbout.cs:87
+#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:110
msgid "Checking for updates..."
msgstr "Comprovant actualitzacions..."
-#: ../SparkleShare/SparkleAbout.cs:116
-msgid "_Show Credits"
-msgstr "Mostra els Credits"
-
-#: ../SparkleShare/SparkleAbout.cs:129
-msgid "_Visit Website"
-msgstr "_Visitar lloc web"
-
-#: ../SparkleShare/SparkleController.cs:455
-msgid "ddd MMM d, yyyy"
+#: ../SparkleShare/SparkleController.cs:446
+msgid "dddd, MMMM d, yyyy"
msgstr "ddd MMM d, yyyy"
-#: ../SparkleShare/SparkleController.cs:460
-msgid "ddd MMM d"
-msgstr "ddd MMM d"
+#: ../SparkleShare/SparkleController.cs:451
+msgid "dddd, MMMM d"
+msgstr "dddd, MMMM d"
-#: ../SparkleShare/SparkleController.cs:661
+#: ../SparkleShare/SparkleController.cs:660
#, csharp-format
msgid "added ‘{0}’"
msgstr "afegit '{0}'"
-#: ../SparkleShare/SparkleController.cs:666
+#: ../SparkleShare/SparkleController.cs:665
#, csharp-format
msgid "moved ‘{0}’"
msgstr "mogut ’{0}’"
-#: ../SparkleShare/SparkleController.cs:671
+#: ../SparkleShare/SparkleController.cs:670
#, csharp-format
msgid "edited ‘{0}’"
msgstr "editat '{0}'"
-#: ../SparkleShare/SparkleController.cs:676
+#: ../SparkleShare/SparkleController.cs:675
#, csharp-format
msgid "deleted ‘{0}’"
msgstr "eliminat '{0}'"
-#: ../SparkleShare/SparkleController.cs:685
+#: ../SparkleShare/SparkleController.cs:684
#, 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:689
+#: ../SparkleShare/SparkleController.cs:688
msgid "did something magical"
msgstr "va fer una cosa màgica"
-#: ../SparkleShare/SparkleIntro.cs:73
-msgid ""
-"Before we can create a SparkleShare folder on this computer, we need a few "
-"bits of information from you."
-msgstr ""
-"Abans de crear una carpeta de SparkleShare en aquest ordinador, necessitem "
-"algunes informacions sobre tu"
-
-#: ../SparkleShare/SparkleIntro.cs:83
-msgid "Full Name:"
-msgstr "Nom sencer:"
-
-#: ../SparkleShare/SparkleIntro.cs:98
-msgid "Email:"
-msgstr "Correu electrònic:"
-
-#: ../SparkleShare/SparkleIntro.cs:109
-msgid "Next"
-msgstr "Següent"
-
-#: ../SparkleShare/SparkleIntro.cs:115
-msgid "Configuring…"
-msgstr "Configurant..."
-
-#: ../SparkleShare/SparkleIntro.cs:161
-msgid "Where is your remote folder?"
-msgstr "On és la teva carpeta remota?"
-
-#: ../SparkleShare/SparkleIntro.cs:174
-msgid "address-to-server.com"
-msgstr "adreça-del-servidor.com"
-
-#: ../SparkleShare/SparkleIntro.cs:179
-msgid "On my own server:"
-msgstr "En el meu propi servidor:"
-
-#: ../SparkleShare/SparkleIntro.cs:186
-msgid "Free hosting for Free and Open Source Software projects."
-msgstr "Allotjament gratuït per a projectes de programari lliure."
-
-#: ../SparkleShare/SparkleIntro.cs:187
-msgid "Also has paid accounts for extra private space and bandwidth."
-msgstr "També te comptes de pagament per espai i ample de banda addicional."
-
-#: ../SparkleShare/SparkleIntro.cs:195
-msgid "The GNOME Project"
-msgstr "El projecte GNOME"
-
-#: ../SparkleShare/SparkleIntro.cs:197
-msgid "GNOME is an easy to understand interface to your computer."
-msgstr "GNOME és una interfície fàcil d'usar i aprendre pel teu ordinador."
-
-#: ../SparkleShare/SparkleIntro.cs:198
-msgid "Select this option if you’re a developer or designer working on GNOME."
-msgstr ""
-"Escull aquesta opció si ets un desenvolupador o dissenyador treballant a "
-"GNOME."
-
-#: ../SparkleShare/SparkleIntro.cs:206
-msgid "Gitorious"
-msgstr "Gitorious"
-
-#: ../SparkleShare/SparkleIntro.cs:208
-msgid "Completely Free as in Freedom infrastructure."
-msgstr "Infrastructura totalment lliure, com en llibertat."
-
-#: ../SparkleShare/SparkleIntro.cs:209
-msgid "Free accounts for Free and Open Source projects."
-msgstr "Comptes gratuïts per a projectes lliures i de codi obert."
-
-#: ../SparkleShare/SparkleIntro.cs:220
-msgid "Username/Folder"
-msgstr "Usuari/Carpeta"
-
-#: ../SparkleShare/SparkleIntro.cs:225
-msgid "Project/Folder"
-msgstr "Projecte/Carpeta"
-
-#: ../SparkleShare/SparkleIntro.cs:230
-msgid "Project"
-msgstr "Projecte"
-
-#: ../SparkleShare/SparkleIntro.cs:235 ../SparkleShare/SparkleIntro.cs:254
-msgid "Folder"
-msgstr "Carpeta"
-
-#: ../SparkleShare/SparkleIntro.cs:259 ../SparkleShare/SparkleIntro.cs:377
-msgid "Folder Name:"
-msgstr "Nom de Carpeta:"
-
-#: ../SparkleShare/SparkleIntro.cs:269
-msgid "Sync"
-msgstr "Sincronitza"
-
-#: ../SparkleShare/SparkleIntro.cs:312
-msgid "Cancel"
-msgstr "Cancel·la"
-
-#: ../SparkleShare/SparkleIntro.cs:320
-msgid "Skip"
-msgstr "Salta"
-
-#: ../SparkleShare/SparkleIntro.cs:347
-msgid "Invitation received!"
-msgstr "Invitació rebuda!"
-
-#: ../SparkleShare/SparkleIntro.cs:353
-msgid ""
-"You've received an invitation to join a shared folder.\n"
-"We're ready to hook you up immediately if you wish."
-msgstr ""
-"Has rebut una invitació per compartir una carpeta. Estem preparats per "
-"connectar-t'hi immediatament si així ho vols."
-
-#: ../SparkleShare/SparkleIntro.cs:359
-msgid "Do you accept this invitation?"
-msgstr "Acceptes aquesta invitació?"
-
-#: ../SparkleShare/SparkleIntro.cs:368
-msgid "Server Address:"
-msgstr "Adreça del servidor:"
-
-#: ../SparkleShare/SparkleIntro.cs:391
-msgid "Reject"
-msgstr "Rebutjar"
-
-#: ../SparkleShare/SparkleIntro.cs:392
-msgid "Accept and Sync"
-msgstr "Acceptar i sincronitzar"
-
-#: ../SparkleShare/SparkleIntro.cs:442
-msgid "Something went wrong…"
-msgstr "Alguna cosa ha fallat..."
-
-#: ../SparkleShare/SparkleIntro.cs:448
-msgid "Try Again"
-msgstr "Torna-ho a provar"
-
-#: ../SparkleShare/SparkleIntro.cs:473
-#, csharp-format
-msgid "‘{0}’ has been successfully added"
-msgstr "‘{0}’ ha estat afegit satisfactoriament"
-
-#: ../SparkleShare/SparkleIntro.cs:482
-msgid "Folder synced successfully!"
-msgstr "Carpeta sincronitzada amb èxit!"
-
-#: ../SparkleShare/SparkleIntro.cs:489
-#, csharp-format
-msgid ""
-"Now you can access the synced files from ‘{0}’ in your SparkleShare folder."
-msgstr ""
-"Ja pots accedir els fitxers sincronitzas de ‘{0}’ a la teva carpeta de "
-"SparkleShare."
-
-#. A button that opens the synced folder
-#: ../SparkleShare/SparkleIntro.cs:497
-msgid "Open Folder"
-msgstr "Obrir Carpeta"
-
-#: ../SparkleShare/SparkleIntro.cs:503 ../SparkleShare/SparkleIntro.cs:543
-#: ../SparkleShare/SparkleIntro.cs:604
-msgid "Finish"
-msgstr "Finalitzar"
-
-#: ../SparkleShare/SparkleIntro.cs:528
-#, csharp-format
-msgid "Syncing folder ‘{0}’…"
-msgstr "Sincronitzant carpeta '{0}' ..."
-
-#: ../SparkleShare/SparkleIntro.cs:535
-msgid "This may take a while.\n"
-msgstr ""
-"Això pot trigar una estona.\n"
-"\n"
-
-#: ../SparkleShare/SparkleIntro.cs:536
-msgid "Are you sure it’s not coffee o'clock?"
-msgstr "Segur que no és l'hora del cafè?"
-
-#: ../SparkleShare/SparkleIntro.cs:579
-msgid "SparkleShare is ready to go!"
-msgstr "SparkleShare està llest!"
-
-#: ../SparkleShare/SparkleIntro.cs:585
-msgid ""
-"Now you can start accepting invitations from others. \n"
-"Just click on invitations you get by email and we will take care of the rest."
-msgstr ""
-"Ara pots començar a acceptar invitacions d'altres usuaris. Només cal que "
-"facis clic a les invitacions que rebràs per correu electrònic i nosaltres "
-"ens encarreguem de la resta."
-
-#: ../SparkleShare/SparkleIntro.cs:596
-msgid "Learn how to host your own SparkleServer"
-msgstr "Apren com gestionar el teu propi servidor SparkleShare"
-
#: ../SparkleShare/SparkleEventLog.cs:61
msgid "Recent Events"
msgstr "Accions recents"
@@ -332,6 +129,153 @@ msgstr "Accions recents"
msgid "All Folders"
msgstr "Totes les carpetes"
+#: ../SparkleShare/SparkleSetup.cs:70
+msgid ""
+"Before we can create a SparkleShare folder on this computer, we need a few "
+"bits of information from you."
+msgstr ""
+"Abans de crear una carpeta de SparkleShare en aquest ordinador, necessitem "
+"algunes informacions sobre tu"
+
+#: ../SparkleShare/SparkleSetup.cs:77
+msgid "Full Name:"
+msgstr "Nom sencer:"
+
+#: ../SparkleShare/SparkleSetup.cs:92
+msgid "Email:"
+msgstr "Correu electrònic:"
+
+#: ../SparkleShare/SparkleSetup.cs:102
+msgid "Next"
+msgstr "Següent"
+
+#: ../SparkleShare/SparkleSetup.cs:122
+msgid "Where is your remote folder?"
+msgstr "On és la teva carpeta remota?"
+
+#. Own server radiobutton
+#: ../SparkleShare/SparkleSetup.cs:131
+msgid "On my own server:"
+msgstr "En el meu propi servidor:"
+
+#: ../SparkleShare/SparkleSetup.cs:136 ../SparkleShare/SparkleSetup.cs:238
+msgid "Folder"
+msgstr "Carpeta"
+
+#: ../SparkleShare/SparkleSetup.cs:163
+msgid "address-to-server.com"
+msgstr "adreça-del-servidor.com"
+
+#: ../SparkleShare/SparkleSetup.cs:178
+msgid "Free hosting for Free and Open Source Software projects."
+msgstr "Allotjament gratuït per a projectes de programari lliure."
+
+#: ../SparkleShare/SparkleSetup.cs:179
+msgid "Also has paid accounts for extra private space and bandwidth."
+msgstr "També te comptes de pagament per espai i ample de banda addicional."
+
+#: ../SparkleShare/SparkleSetup.cs:188
+msgid "Username/Folder"
+msgstr "Usuari/Carpeta"
+
+#. Gitorious radiobutton
+#: ../SparkleShare/SparkleSetup.cs:193
+msgid "Gitorious"
+msgstr "Gitorious"
+
+#: ../SparkleShare/SparkleSetup.cs:195
+msgid "Completely Free as in Freedom infrastructure."
+msgstr "Infrastructura totalment lliure, com en llibertat."
+
+#: ../SparkleShare/SparkleSetup.cs:196
+msgid "Free accounts for Free and Open Source projects."
+msgstr "Comptes gratuïts per a projectes lliures i de codi obert."
+
+#: ../SparkleShare/SparkleSetup.cs:205
+msgid "Project/Folder"
+msgstr "Projecte/Carpeta"
+
+#. GNOME radiobutton
+#: ../SparkleShare/SparkleSetup.cs:210
+msgid "The GNOME Project"
+msgstr "El projecte GNOME"
+
+#: ../SparkleShare/SparkleSetup.cs:212
+msgid "GNOME is an easy to understand interface to your computer."
+msgstr "GNOME és una interfície fàcil d'usar i aprendre pel teu ordinador."
+
+#: ../SparkleShare/SparkleSetup.cs:213
+msgid "Select this option if you’re a developer or designer working on GNOME."
+msgstr ""
+"Escull aquesta opció si ets un desenvolupador o dissenyador treballant a "
+"GNOME."
+
+#: ../SparkleShare/SparkleSetup.cs:222
+msgid "Project"
+msgstr "Projecte"
+
+#: ../SparkleShare/SparkleSetup.cs:232
+msgid "Folder Name:"
+msgstr "Nom de Carpeta:"
+
+#. Cancel button
+#: ../SparkleShare/SparkleSetup.cs:251
+msgid "Cancel"
+msgstr "Cancel·la"
+
+#. Sync button
+#: ../SparkleShare/SparkleSetup.cs:259
+msgid "Sync"
+msgstr "Sincronitza"
+
+#: ../SparkleShare/SparkleSetup.cs:286
+#, csharp-format
+msgid "Syncing folder ‘{0}’…"
+msgstr "Sincronitzant carpeta '{0}' ..."
+
+#: ../SparkleShare/SparkleSetup.cs:287
+msgid "This may take a while."
+msgstr "Això pot trigar una estona."
+
+#: ../SparkleShare/SparkleSetup.cs:288
+msgid "Are you sure it’s not coffee o'clock?"
+msgstr "Segur que no és l'hora del cafè?"
+
+#: ../SparkleShare/SparkleSetup.cs:292 ../SparkleShare/SparkleSetup.cs:375
+msgid "Finish"
+msgstr "Finalitzar"
+
+#: ../SparkleShare/SparkleSetup.cs:321
+msgid "Something went wrong"
+msgstr "Quelcom ha fallat."
+
+#: ../SparkleShare/SparkleSetup.cs:341
+msgid "Try Again"
+msgstr "Torna-ho a provar"
+
+#: ../SparkleShare/SparkleSetup.cs:359
+#, csharp-format
+msgid "‘{0}’ has been successfully added"
+msgstr "‘{0}’ ha estat afegit satisfactoriament"
+
+#: ../SparkleShare/SparkleSetup.cs:365
+msgid "Folder synced successfully!"
+msgstr "Carpeta sincronitzada amb èxit!"
+
+#: ../SparkleShare/SparkleSetup.cs:366
+msgid "Access the synced files from your SparkleShare folder."
+msgstr ""
+"Accedeix als teus fitxers sincronitzats des de la teva carpeta SparkleShare."
+
+#. A button that opens the synced folder
+#: ../SparkleShare/SparkleSetup.cs:369
+msgid "Open Folder"
+msgstr "Obrir Carpeta"
+
+#: ../SparkleShare/SparkleSetupWindow.cs:45
+msgid "SparkleShare Setup"
+msgstr "Instal·lació SparkleShare"
+
#: ../SparkleShare/SparkleShare.cs:53
msgid "Sorry, you can't run SparkleShare with these permissions."
msgstr "Ho sentim, no pots executar SparkleShare amb aquests permisos."
@@ -416,21 +360,8 @@ msgid "Turn Notifications On"
msgstr "Activa les Notificacions"
#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:286
+#: ../SparkleShare/SparkleStatusIcon.cs:291
msgid "Quit"
msgstr "Sortir"
-#: ../SparkleShare/SparkleUI.cs:99
-msgid "Ouch! Mid-air collision!"
-msgstr "Ai! Col·lisió en ple vol!"
-
-#: ../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."
-
-#: ../SparkleShare/SparkleWindow.cs:41
-msgid "SparkleShare Setup"
-msgstr "Instal·lació SparkleShare"
-
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
old mode 100644
new mode 100755
diff --git a/po/da.po b/po/da.po
old mode 100644
new mode 100755
index cb2ba9ee..2329689d
--- a/po/da.po
+++ b/po/da.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: SparkleShare\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-29 11:38+0200\n"
-"PO-Revision-Date: 2011-06-26 09:22+0000\n"
+"POT-Creation-Date: 2011-07-19 07:04+0200\n"
+"PO-Revision-Date: 2011-07-19 05:10+0000\n"
"Last-Translator: deejay1 \n"
"Language-Team: LANGUAGE \n"
"MIME-Version: 1.0\n"
@@ -19,26 +19,27 @@ msgstr ""
"Language: da\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: ../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:348
-#: ../SparkleShare/SparkleStatusIcon.cs:357
-msgid "Not everything is synced"
-msgstr "Ikke alt er synkroniseret"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:358
-#: ../SparkleShare/SparkleStatusIcon.cs:367
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:69
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:86
+#: ../SparkleShare/SparkleStatusIcon.cs:372
msgid "Up to date"
msgstr "Opdateret"
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:374
-#: ../SparkleShare/SparkleStatusIcon.cs:383
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:84
+#: ../SparkleShare/SparkleSetup.cs:69 ../SparkleShare/SparkleStatusIcon.cs:350
+msgid "Welcome to SparkleShare!"
+msgstr "Velkommen til SparkleShare!"
+
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:95
+#: ../SparkleShare/SparkleStatusIcon.cs:388
msgid "Syncing…"
msgstr "Synkroniseret"
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:105
+#: ../SparkleShare/SparkleStatusIcon.cs:362
+msgid "Not everything is synced"
+msgstr "Ikke alt er synkroniseret"
+
#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
msgid "Copy Web Link"
msgstr "Kopiér web-henvisning"
@@ -60,262 +61,62 @@ msgid "Select to get a copy of this version"
msgstr "Vælg for at hente en kopi af denne version"
#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:46 ../SparkleShare/SparkleStatusIcon.cs:275
+#: ../SparkleShare/SparkleAbout.cs:54 ../SparkleShare/SparkleStatusIcon.cs:275
msgid "About SparkleShare"
msgstr ""
-#: ../SparkleShare/SparkleAbout.cs:53
-msgid "A newer version is available"
+#: ../SparkleShare/SparkleAbout.cs:72
+#, csharp-format
+msgid "A newer version ({0}) is available!"
msgstr ""
-#: ../SparkleShare/SparkleAbout.cs:60
+#: ../SparkleShare/SparkleAbout.cs:80
msgid "You are running the latest version."
msgstr ""
-#: ../SparkleShare/SparkleAbout.cs:87
+#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:110
msgid "Checking for updates..."
msgstr ""
-#: ../SparkleShare/SparkleAbout.cs:116
-msgid "_Show Credits"
+#: ../SparkleShare/SparkleController.cs:446
+msgid "dddd, MMMM d, yyyy"
msgstr ""
-#: ../SparkleShare/SparkleAbout.cs:129
-msgid "_Visit Website"
-msgstr "_Besøg hjemmeside"
-
-#: ../SparkleShare/SparkleController.cs:455
-msgid "ddd MMM d, yyyy"
+#: ../SparkleShare/SparkleController.cs:451
+msgid "dddd, MMMM d"
msgstr ""
-#: ../SparkleShare/SparkleController.cs:460
-msgid "ddd MMM d"
-msgstr ""
-
-#: ../SparkleShare/SparkleController.cs:661
+#: ../SparkleShare/SparkleController.cs:660
#, csharp-format
msgid "added ‘{0}’"
msgstr "tilføjede '{0}'"
-#: ../SparkleShare/SparkleController.cs:666
+#: ../SparkleShare/SparkleController.cs:665
#, csharp-format
msgid "moved ‘{0}’"
msgstr ""
-#: ../SparkleShare/SparkleController.cs:671
+#: ../SparkleShare/SparkleController.cs:670
#, csharp-format
msgid "edited ‘{0}’"
msgstr "redigerede '{0}'"
-#: ../SparkleShare/SparkleController.cs:676
+#: ../SparkleShare/SparkleController.cs:675
#, csharp-format
msgid "deleted ‘{0}’"
msgstr "slettede '{0}'"
-#: ../SparkleShare/SparkleController.cs:685
+#: ../SparkleShare/SparkleController.cs:684
#, csharp-format
msgid "and {0} more"
msgid_plural "and {0} more"
msgstr[0] ""
msgstr[1] ""
-#: ../SparkleShare/SparkleController.cs:689
+#: ../SparkleShare/SparkleController.cs:688
msgid "did something magical"
msgstr ""
-#: ../SparkleShare/SparkleIntro.cs:73
-msgid ""
-"Before we can create a SparkleShare folder on this computer, we need a few "
-"bits of information from you."
-msgstr ""
-"Før vi kan oprette en SparkleShare-mappe på denne maskine, så har vi brug "
-"for nogle få informationer fra dig."
-
-#: ../SparkleShare/SparkleIntro.cs:83
-msgid "Full Name:"
-msgstr "Fuldt navn:"
-
-#: ../SparkleShare/SparkleIntro.cs:98
-msgid "Email:"
-msgstr "E-post:"
-
-#: ../SparkleShare/SparkleIntro.cs:109
-msgid "Next"
-msgstr "Næste"
-
-#: ../SparkleShare/SparkleIntro.cs:115
-msgid "Configuring…"
-msgstr "Konfigurerer..."
-
-#: ../SparkleShare/SparkleIntro.cs:161
-msgid "Where is your remote folder?"
-msgstr "Hvor er din fjernmappe?"
-
-#: ../SparkleShare/SparkleIntro.cs:174
-msgid "address-to-server.com"
-msgstr "server-adresse.com"
-
-#: ../SparkleShare/SparkleIntro.cs:179
-msgid "On my own server:"
-msgstr "På min egen server:"
-
-#: ../SparkleShare/SparkleIntro.cs:186
-msgid "Free hosting for Free and Open Source Software projects."
-msgstr "Fri hosting for Fri og Open Source Software-projekter."
-
-#: ../SparkleShare/SparkleIntro.cs:187
-msgid "Also has paid accounts for extra private space and bandwidth."
-msgstr "Har også betalingskonti for ekstra privat plads og båndbredde."
-
-#: ../SparkleShare/SparkleIntro.cs:195
-msgid "The GNOME Project"
-msgstr "GNOME-projektet"
-
-#: ../SparkleShare/SparkleIntro.cs:197
-msgid "GNOME is an easy to understand interface to your computer."
-msgstr "GNOME er en letforståelig grænseflade til din computer."
-
-#: ../SparkleShare/SparkleIntro.cs:198
-msgid "Select this option if you’re a developer or designer working on GNOME."
-msgstr ""
-"Vælg denne option hvis du er en udvikler eller designer som laver arbejde "
-"for GNOME."
-
-#: ../SparkleShare/SparkleIntro.cs:206
-msgid "Gitorious"
-msgstr "Gitorious"
-
-#: ../SparkleShare/SparkleIntro.cs:208
-msgid "Completely Free as in Freedom infrastructure."
-msgstr "Fuldstændig »fri som i frihed«-infrastruktur"
-
-#: ../SparkleShare/SparkleIntro.cs:209
-msgid "Free accounts for Free and Open Source projects."
-msgstr "Frie konti for Fri og Open Source Software"
-
-#: ../SparkleShare/SparkleIntro.cs:220
-msgid "Username/Folder"
-msgstr "Brugernavn/Mappe"
-
-#: ../SparkleShare/SparkleIntro.cs:225
-msgid "Project/Folder"
-msgstr "Projekt/Mappe"
-
-#: ../SparkleShare/SparkleIntro.cs:230
-msgid "Project"
-msgstr "Projekt"
-
-#: ../SparkleShare/SparkleIntro.cs:235 ../SparkleShare/SparkleIntro.cs:254
-msgid "Folder"
-msgstr "Mappe"
-
-#: ../SparkleShare/SparkleIntro.cs:259 ../SparkleShare/SparkleIntro.cs:377
-msgid "Folder Name:"
-msgstr "Mappenavn:"
-
-#: ../SparkleShare/SparkleIntro.cs:269
-msgid "Sync"
-msgstr "Synkronisering"
-
-#: ../SparkleShare/SparkleIntro.cs:312
-msgid "Cancel"
-msgstr "Afbryd"
-
-#: ../SparkleShare/SparkleIntro.cs:320
-msgid "Skip"
-msgstr "Spring over"
-
-#: ../SparkleShare/SparkleIntro.cs:347
-msgid "Invitation received!"
-msgstr "Invitation modtaget!"
-
-#: ../SparkleShare/SparkleIntro.cs:353
-msgid ""
-"You've received an invitation to join a shared folder.\n"
-"We're ready to hook you up immediately if you wish."
-msgstr ""
-"Du er inviteret til at få adgang til en delt mappe.\n"
-"Vi er klar til straks at koble dig op, hvis du ønsker."
-
-#: ../SparkleShare/SparkleIntro.cs:359
-msgid "Do you accept this invitation?"
-msgstr "Accepterer du denne invitation?"
-
-#: ../SparkleShare/SparkleIntro.cs:368
-msgid "Server Address:"
-msgstr "Server-adresse:"
-
-#: ../SparkleShare/SparkleIntro.cs:391
-msgid "Reject"
-msgstr "Afslå"
-
-#: ../SparkleShare/SparkleIntro.cs:392
-msgid "Accept and Sync"
-msgstr "Acceptér og synkroniser"
-
-#: ../SparkleShare/SparkleIntro.cs:442
-msgid "Something went wrong…"
-msgstr "Der opstod en fejl..."
-
-#: ../SparkleShare/SparkleIntro.cs:448
-msgid "Try Again"
-msgstr "Forsøg igen"
-
-#: ../SparkleShare/SparkleIntro.cs:473
-#, csharp-format
-msgid "‘{0}’ has been successfully added"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:482
-msgid "Folder synced successfully!"
-msgstr "Mappe succesfuldt synkroniseret!"
-
-#: ../SparkleShare/SparkleIntro.cs:489
-#, csharp-format
-msgid ""
-"Now you can access the synced files from ‘{0}’ in your SparkleShare folder."
-msgstr ""
-"Nu kan du tilgå de synkroniserede filer fra '{0}' i din SparkleShare-mappe."
-
-#. A button that opens the synced folder
-#: ../SparkleShare/SparkleIntro.cs:497
-msgid "Open Folder"
-msgstr "Åbn mappe"
-
-#: ../SparkleShare/SparkleIntro.cs:503 ../SparkleShare/SparkleIntro.cs:543
-#: ../SparkleShare/SparkleIntro.cs:604
-msgid "Finish"
-msgstr "Afslut"
-
-#: ../SparkleShare/SparkleIntro.cs:528
-#, csharp-format
-msgid "Syncing folder ‘{0}’…"
-msgstr "Synkroniserer mappe '{0}'..."
-
-#: ../SparkleShare/SparkleIntro.cs:535
-msgid "This may take a while.\n"
-msgstr "Dette kan tage et stykke tid.\n"
-
-#: ../SparkleShare/SparkleIntro.cs:536
-msgid "Are you sure it’s not coffee o'clock?"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:579
-msgid "SparkleShare is ready to go!"
-msgstr "SparkleShare er klar til start!"
-
-#: ../SparkleShare/SparkleIntro.cs:585
-msgid ""
-"Now you can start accepting invitations from others. \n"
-"Just click on invitations you get by email and we will take care of the rest."
-msgstr ""
-"Nu har du mulighed for at acceptere invitationer fra andre.\n"
-"Klik blot på invitationer du modtager per e-post, og vi sørger for resten."
-
-#: ../SparkleShare/SparkleIntro.cs:596
-msgid "Learn how to host your own SparkleServer"
-msgstr "Lær hvordan du beværte din egen SparkleServer"
-
#: ../SparkleShare/SparkleEventLog.cs:61
msgid "Recent Events"
msgstr ""
@@ -325,6 +126,152 @@ msgstr ""
msgid "All Folders"
msgstr ""
+#: ../SparkleShare/SparkleSetup.cs:70
+msgid ""
+"Before we can create a SparkleShare folder on this computer, we need a few "
+"bits of information from you."
+msgstr ""
+"Før vi kan oprette en SparkleShare-mappe på denne maskine, så har vi brug "
+"for nogle få informationer fra dig."
+
+#: ../SparkleShare/SparkleSetup.cs:77
+msgid "Full Name:"
+msgstr "Fuldt navn:"
+
+#: ../SparkleShare/SparkleSetup.cs:92
+msgid "Email:"
+msgstr "E-post:"
+
+#: ../SparkleShare/SparkleSetup.cs:102
+msgid "Next"
+msgstr "Næste"
+
+#: ../SparkleShare/SparkleSetup.cs:122
+msgid "Where is your remote folder?"
+msgstr "Hvor er din fjernmappe?"
+
+#. Own server radiobutton
+#: ../SparkleShare/SparkleSetup.cs:131
+msgid "On my own server:"
+msgstr "På min egen server:"
+
+#: ../SparkleShare/SparkleSetup.cs:136 ../SparkleShare/SparkleSetup.cs:238
+msgid "Folder"
+msgstr "Mappe"
+
+#: ../SparkleShare/SparkleSetup.cs:163
+msgid "address-to-server.com"
+msgstr "server-adresse.com"
+
+#: ../SparkleShare/SparkleSetup.cs:178
+msgid "Free hosting for Free and Open Source Software projects."
+msgstr "Fri hosting for Fri og Open Source Software-projekter."
+
+#: ../SparkleShare/SparkleSetup.cs:179
+msgid "Also has paid accounts for extra private space and bandwidth."
+msgstr "Har også betalingskonti for ekstra privat plads og båndbredde."
+
+#: ../SparkleShare/SparkleSetup.cs:188
+msgid "Username/Folder"
+msgstr "Brugernavn/Mappe"
+
+#. Gitorious radiobutton
+#: ../SparkleShare/SparkleSetup.cs:193
+msgid "Gitorious"
+msgstr "Gitorious"
+
+#: ../SparkleShare/SparkleSetup.cs:195
+msgid "Completely Free as in Freedom infrastructure."
+msgstr "Fuldstændig »fri som i frihed«-infrastruktur"
+
+#: ../SparkleShare/SparkleSetup.cs:196
+msgid "Free accounts for Free and Open Source projects."
+msgstr "Frie konti for Fri og Open Source Software"
+
+#: ../SparkleShare/SparkleSetup.cs:205
+msgid "Project/Folder"
+msgstr "Projekt/Mappe"
+
+#. GNOME radiobutton
+#: ../SparkleShare/SparkleSetup.cs:210
+msgid "The GNOME Project"
+msgstr "GNOME-projektet"
+
+#: ../SparkleShare/SparkleSetup.cs:212
+msgid "GNOME is an easy to understand interface to your computer."
+msgstr "GNOME er en letforståelig grænseflade til din computer."
+
+#: ../SparkleShare/SparkleSetup.cs:213
+msgid "Select this option if you’re a developer or designer working on GNOME."
+msgstr ""
+"Vælg denne option hvis du er en udvikler eller designer som laver arbejde "
+"for GNOME."
+
+#: ../SparkleShare/SparkleSetup.cs:222
+msgid "Project"
+msgstr "Projekt"
+
+#: ../SparkleShare/SparkleSetup.cs:232
+msgid "Folder Name:"
+msgstr "Mappenavn:"
+
+#. Cancel button
+#: ../SparkleShare/SparkleSetup.cs:251
+msgid "Cancel"
+msgstr "Afbryd"
+
+#. Sync button
+#: ../SparkleShare/SparkleSetup.cs:259
+msgid "Sync"
+msgstr "Synkronisering"
+
+#: ../SparkleShare/SparkleSetup.cs:286
+#, csharp-format
+msgid "Syncing folder ‘{0}’…"
+msgstr "Synkroniserer mappe '{0}'..."
+
+#: ../SparkleShare/SparkleSetup.cs:287
+msgid "This may take a while."
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:288
+msgid "Are you sure it’s not coffee o'clock?"
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:292 ../SparkleShare/SparkleSetup.cs:375
+msgid "Finish"
+msgstr "Afslut"
+
+#: ../SparkleShare/SparkleSetup.cs:321
+msgid "Something went wrong"
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:341
+msgid "Try Again"
+msgstr "Forsøg igen"
+
+#: ../SparkleShare/SparkleSetup.cs:359
+#, csharp-format
+msgid "‘{0}’ has been successfully added"
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:365
+msgid "Folder synced successfully!"
+msgstr "Mappe succesfuldt synkroniseret!"
+
+#: ../SparkleShare/SparkleSetup.cs:366
+msgid "Access the synced files from your SparkleShare folder."
+msgstr ""
+
+#. A button that opens the synced folder
+#: ../SparkleShare/SparkleSetup.cs:369
+msgid "Open Folder"
+msgstr "Åbn mappe"
+
+#: ../SparkleShare/SparkleSetupWindow.cs:45
+msgid "SparkleShare Setup"
+msgstr ""
+
#: ../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."
@@ -407,22 +354,8 @@ msgid "Turn Notifications On"
msgstr ""
#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:286
+#: ../SparkleShare/SparkleStatusIcon.cs:291
msgid "Quit"
msgstr "Afslut"
-#: ../SparkleShare/SparkleUI.cs:99
-msgid "Ouch! Mid-air collision!"
-msgstr "Av! Luftkollision!"
-
-#: ../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 "
-"konflikt."
-
-#: ../SparkleShare/SparkleWindow.cs:41
-msgid "SparkleShare Setup"
-msgstr ""
-
diff --git a/po/de.po b/po/de.po
old mode 100644
new mode 100755
index 3757fcdf..182e0201
--- a/po/de.po
+++ b/po/de.po
@@ -1,23 +1,22 @@
# This file is distributed under the same license as the Sparkleshare package.
#
-# WARNING: Due to the nature of Transifex all translation file headers were lost
-# we apologise for any incovenience this may have caused and we hope to bring them
-# back in the future.
-#
+# Translators:
# , 2011.
-# , 2011.
-# kabum , 2011.
-# kxnop , 2011.
# , 2011.
# Heffer , 2011.
+# Jan-Christoph Borchardt , 2011.
+# kabum , 2011.
+# kxnop , 2011.
# Łukasz Jernaś , 2011.
+# , 2011.
+# , 2011.
msgid ""
msgstr ""
"Project-Id-Version: SparkleShare\n"
"Report-Msgid-Bugs-To: \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"
+"POT-Creation-Date: 2011-08-25 13:59+0200\n"
+"PO-Revision-Date: 2011-08-31 08:40+0000\n"
+"Last-Translator: ursis666 \n"
"Language-Team: LANGUAGE \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -25,29 +24,30 @@ msgstr ""
"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: ../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:348
-#: ../SparkleShare/SparkleStatusIcon.cs:357
-msgid "Not everything is synced"
-msgstr "Nicht alles ist synchronisiert"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:358
-#: ../SparkleShare/SparkleStatusIcon.cs:367
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:69
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:86
+#: ../SparkleShare/SparkleStatusIcon.cs:372
msgid "Up to date"
msgstr "Schon auf dem aktuellsten Stand."
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:374
-#: ../SparkleShare/SparkleStatusIcon.cs:383
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:84
+#: ../SparkleShare/SparkleSetup.cs:69 ../SparkleShare/SparkleStatusIcon.cs:350
+msgid "Welcome to SparkleShare!"
+msgstr "Willkommen bei SparkleShare!"
+
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:95
+#: ../SparkleShare/SparkleStatusIcon.cs:388
msgid "Syncing…"
msgstr "Abgleichen …"
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:105
+#: ../SparkleShare/SparkleStatusIcon.cs:362
+msgid "Not everything is synced"
+msgstr "Nicht alles ist synchronisiert"
+
#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
msgid "Copy Web Link"
-msgstr "Kopiere Internetverknüpfung"
+msgstr "Internetadresse kopieren"
#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:114
msgid "Copy the web address of this file to the clipboard"
@@ -66,70 +66,72 @@ msgid "Select to get a copy of this version"
msgstr "Selektieren, um eine Kopie dieser Version abzurufen"
#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:46 ../SparkleShare/SparkleStatusIcon.cs:275
+#: ../SparkleShare/SparkleAbout.cs:53 ../SparkleShare/SparkleStatusIcon.cs:275
msgid "About SparkleShare"
msgstr "Über SparkleShare"
-#: ../SparkleShare/SparkleAbout.cs:53
-msgid "A newer version is available"
-msgstr "Eine neuere Version ist verfügbar"
+#: ../SparkleShare/SparkleAbout.cs:70
+#, csharp-format
+msgid "A newer version ({0}) is available!"
+msgstr "Eine neuere Version ({0}) ist verfügbar!"
-#: ../SparkleShare/SparkleAbout.cs:60
+#: ../SparkleShare/SparkleAbout.cs:79
msgid "You are running the latest version."
msgstr "Sie verwenden die aktuelle Version."
-#: ../SparkleShare/SparkleAbout.cs:87
+#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:113
msgid "Checking for updates..."
msgstr "Suche Aktualisierungen..."
-#: ../SparkleShare/SparkleAbout.cs:116
-msgid "_Show Credits"
-msgstr "_Zeige Mitwirkende"
+#: ../SparkleShare/SparkleController.cs:483
+msgid "dddd, MMMM d, yyyy"
+msgstr "dddd, MMMM d, yyyy"
-#: ../SparkleShare/SparkleAbout.cs:129
-msgid "_Visit Website"
-msgstr "_Website besuchen"
+#: ../SparkleShare/SparkleController.cs:489
+msgid "dddd, MMMM d"
+msgstr "dddd, MMMM d"
-#: ../SparkleShare/SparkleController.cs:455
-msgid "ddd MMM d, yyyy"
-msgstr "ddd MMM d, yyyy"
-
-#: ../SparkleShare/SparkleController.cs:460
-msgid "ddd MMM d"
-msgstr "ddd MMM d"
-
-#: ../SparkleShare/SparkleController.cs:661
+#: ../SparkleShare/SparkleController.cs:706
#, csharp-format
msgid "added ‘{0}’"
msgstr "‘{0}’ hinzugefügt"
-#: ../SparkleShare/SparkleController.cs:666
+#: ../SparkleShare/SparkleController.cs:711
#, csharp-format
msgid "moved ‘{0}’"
msgstr "‘{0}’ verschoben"
-#: ../SparkleShare/SparkleController.cs:671
+#: ../SparkleShare/SparkleController.cs:716
#, csharp-format
msgid "edited ‘{0}’"
msgstr "‘{0}’ bearbeitet"
-#: ../SparkleShare/SparkleController.cs:676
+#: ../SparkleShare/SparkleController.cs:721
#, csharp-format
msgid "deleted ‘{0}’"
msgstr "‘{0}’ gelöscht"
-#: ../SparkleShare/SparkleController.cs:685
+#: ../SparkleShare/SparkleController.cs:730
#, 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:689
+#: ../SparkleShare/SparkleController.cs:734
msgid "did something magical"
msgstr "etwas magisches wurde getan"
-#: ../SparkleShare/SparkleIntro.cs:73
+#: ../SparkleShare/SparkleEventLog.cs:58
+msgid "Recent Events"
+msgstr "Letzte Ereignisse"
+
+#: ../SparkleShare/SparkleEventLog.cs:169
+#: ../SparkleShare/SparkleEventLog.cs:188
+msgid "All Folders"
+msgstr "Alle Ordner"
+
+#: ../SparkleShare/SparkleSetup.cs:70
msgid ""
"Before we can create a SparkleShare folder on this computer, we need a few "
"bits of information from you."
@@ -137,202 +139,145 @@ msgstr ""
"Bevor wir einen SparkleShare-Ordner auf diesem Computer einrichten können, "
"benötigen wir einige Informationen von Ihnen."
-#: ../SparkleShare/SparkleIntro.cs:83
+#: ../SparkleShare/SparkleSetup.cs:77
msgid "Full Name:"
msgstr "Vollständiger Name:"
-#: ../SparkleShare/SparkleIntro.cs:98
+#: ../SparkleShare/SparkleSetup.cs:92
msgid "Email:"
msgstr "E-Mail:"
-#: ../SparkleShare/SparkleIntro.cs:109
+#: ../SparkleShare/SparkleSetup.cs:102
msgid "Next"
msgstr "Weiter"
-#: ../SparkleShare/SparkleIntro.cs:115
-msgid "Configuring…"
-msgstr "Konfiguriere..."
-
-#: ../SparkleShare/SparkleIntro.cs:161
+#: ../SparkleShare/SparkleSetup.cs:123
msgid "Where is your remote folder?"
msgstr "In welchem Pfad liegt ihr Remote-Verzeichnis?"
-#: ../SparkleShare/SparkleIntro.cs:174
-msgid "address-to-server.com"
-msgstr "server-adresse.com"
-
-#: ../SparkleShare/SparkleIntro.cs:179
+#. Own server radiobutton
+#: ../SparkleShare/SparkleSetup.cs:132
msgid "On my own server:"
msgstr "Auf meinem eigenen Server"
-#: ../SparkleShare/SparkleIntro.cs:186
+#: ../SparkleShare/SparkleSetup.cs:137 ../SparkleShare/SparkleSetup.cs:239
+msgid "Folder"
+msgstr "Ordner"
+
+#: ../SparkleShare/SparkleSetup.cs:164
+msgid "address-to-server.com"
+msgstr "server-adresse.com"
+
+#: ../SparkleShare/SparkleSetup.cs:179
msgid "Free hosting for Free and Open Source Software projects."
msgstr "Kostenloses Hosting für Freie und Open Source Software Projekte."
-#: ../SparkleShare/SparkleIntro.cs:187
+#: ../SparkleShare/SparkleSetup.cs:180
msgid "Also has paid accounts for extra private space and bandwidth."
msgstr ""
"Weiter gibt es kostenpflichtige Accounts für zusätzlichen privaten "
"Speicherplatz und Bandbreite."
-#: ../SparkleShare/SparkleIntro.cs:195
+#: ../SparkleShare/SparkleSetup.cs:189
+msgid "Username/Folder"
+msgstr "Benutzername/Ordner"
+
+#. Gitorious radiobutton
+#: ../SparkleShare/SparkleSetup.cs:194
+msgid "Gitorious"
+msgstr "Gitorious"
+
+#: ../SparkleShare/SparkleSetup.cs:196
+msgid "Completely Free as in Freedom infrastructure."
+msgstr "Vollkommen frei wie in »Infrastruktur der Freiheit«."
+
+#: ../SparkleShare/SparkleSetup.cs:197
+msgid "Free accounts for Free and Open Source projects."
+msgstr "Gratis Accounts für Freie und Open Source Projekte."
+
+#: ../SparkleShare/SparkleSetup.cs:206
+msgid "Project/Folder"
+msgstr "Projekt/Ordner"
+
+#. GNOME radiobutton
+#: ../SparkleShare/SparkleSetup.cs:211
msgid "The GNOME Project"
-msgstr "Das GNOME Project"
+msgstr "Das GNOME Projekt"
-#: ../SparkleShare/SparkleIntro.cs:197
+#: ../SparkleShare/SparkleSetup.cs:213
msgid "GNOME is an easy to understand interface to your computer."
-msgstr "GNOME ist ein einfach verständliches Interface für Ihrem Computer"
+msgstr "GNOME ist ein einfach verständliches Interface für Ihren Computer"
-#: ../SparkleShare/SparkleIntro.cs:198
+#: ../SparkleShare/SparkleSetup.cs:214
msgid "Select this option if you’re a developer or designer working on GNOME."
msgstr ""
"Wählen Sie diese Option, wenn sie Entwickler oder Designer sind, der mit "
"GNOME arbeitet."
-#: ../SparkleShare/SparkleIntro.cs:206
-msgid "Gitorious"
-msgstr "Gitorious"
-
-#: ../SparkleShare/SparkleIntro.cs:208
-msgid "Completely Free as in Freedom infrastructure."
-msgstr "Vollkommen frei wie in »Infrastruktur der Freiheit«."
-
-#: ../SparkleShare/SparkleIntro.cs:209
-msgid "Free accounts for Free and Open Source projects."
-msgstr "Gratis Accounts für Freie und Open Source Projekte."
-
-#: ../SparkleShare/SparkleIntro.cs:220
-msgid "Username/Folder"
-msgstr "Benutzername/Ordner"
-
-#: ../SparkleShare/SparkleIntro.cs:225
-msgid "Project/Folder"
-msgstr "Projekt/Ordner"
-
-#: ../SparkleShare/SparkleIntro.cs:230
+#: ../SparkleShare/SparkleSetup.cs:223
msgid "Project"
msgstr "Projekt"
-#: ../SparkleShare/SparkleIntro.cs:235 ../SparkleShare/SparkleIntro.cs:254
-msgid "Folder"
-msgstr "Ordner"
-
-#: ../SparkleShare/SparkleIntro.cs:259 ../SparkleShare/SparkleIntro.cs:377
+#: ../SparkleShare/SparkleSetup.cs:233
msgid "Folder Name:"
msgstr "Verzeichnisname:"
-#: ../SparkleShare/SparkleIntro.cs:269
-msgid "Sync"
-msgstr "Synchronisation"
-
-#: ../SparkleShare/SparkleIntro.cs:312
+#. Cancel button
+#: ../SparkleShare/SparkleSetup.cs:261
msgid "Cancel"
msgstr "Abbrechen"
-#: ../SparkleShare/SparkleIntro.cs:320
-msgid "Skip"
-msgstr "Überspringen"
+#. Sync button
+#: ../SparkleShare/SparkleSetup.cs:269
+msgid "Sync"
+msgstr "Synchronisation"
-#: ../SparkleShare/SparkleIntro.cs:347
-msgid "Invitation received!"
-msgstr "Einladung erhalten!"
-
-#: ../SparkleShare/SparkleIntro.cs:353
-msgid ""
-"You've received an invitation to join a shared folder.\n"
-"We're ready to hook you up immediately if you wish."
-msgstr ""
-"Sie haben eine Einladung zu einem freigegebenen Verzeichnis erhalten. \n"
-"Wir sind bereit die Verbindung direkt herzustellen, wenn Sie das wünschen."
-
-#: ../SparkleShare/SparkleIntro.cs:359
-msgid "Do you accept this invitation?"
-msgstr "Nehmen Sie die Einladung an?"
-
-#: ../SparkleShare/SparkleIntro.cs:368
-msgid "Server Address:"
-msgstr "Serveradresse:"
-
-#: ../SparkleShare/SparkleIntro.cs:391
-msgid "Reject"
-msgstr "Ablehnen"
-
-#: ../SparkleShare/SparkleIntro.cs:392
-msgid "Accept and Sync"
-msgstr "Akzeptieren und Synchronisieren"
-
-#: ../SparkleShare/SparkleIntro.cs:442
-msgid "Something went wrong…"
-msgstr "Ein Fehler ist aufgetreten..."
-
-#: ../SparkleShare/SparkleIntro.cs:448
-msgid "Try Again"
-msgstr "Erneut versuchen"
-
-#: ../SparkleShare/SparkleIntro.cs:473
-#, csharp-format
-msgid "‘{0}’ has been successfully added"
-msgstr "»{0}« wurde erfolgreich hinzugefügt"
-
-#: ../SparkleShare/SparkleIntro.cs:482
-msgid "Folder synced successfully!"
-msgstr "Verzeichnis erfolgreich synchronisiert."
-
-#: ../SparkleShare/SparkleIntro.cs:489
-#, csharp-format
-msgid ""
-"Now you can access the synced files from ‘{0}’ in your SparkleShare folder."
-msgstr ""
-"Jetzt können Sie auf die von '{0}' synchronisierten Dateien in Ihrem "
-"SparkleShare Ordner zugreifen."
-
-#. A button that opens the synced folder
-#: ../SparkleShare/SparkleIntro.cs:497
-msgid "Open Folder"
-msgstr "Ordner öffnen"
-
-#: ../SparkleShare/SparkleIntro.cs:503 ../SparkleShare/SparkleIntro.cs:543
-#: ../SparkleShare/SparkleIntro.cs:604
-msgid "Finish"
-msgstr "Fertigstellen"
-
-#: ../SparkleShare/SparkleIntro.cs:528
+#: ../SparkleShare/SparkleSetup.cs:297
#, csharp-format
msgid "Syncing folder ‘{0}’…"
msgstr "Ordner »{0}« wird synchronisiert"
-#: ../SparkleShare/SparkleIntro.cs:535
-msgid "This may take a while.\n"
-msgstr "Dies kann eine Weile dauern.\n"
+#: ../SparkleShare/SparkleSetup.cs:298
+msgid "This may take a while."
+msgstr "Das dauert vielleicht einen Moment."
-#: ../SparkleShare/SparkleIntro.cs:536
+#: ../SparkleShare/SparkleSetup.cs:299
msgid "Are you sure it’s not coffee o'clock?"
msgstr "Meinst Du nicht, dass es Kaffeezeit ist?"
-#: ../SparkleShare/SparkleIntro.cs:579
-msgid "SparkleShare is ready to go!"
-msgstr "SparkleShare ist bereit zum Loslegen!"
+#: ../SparkleShare/SparkleSetup.cs:303 ../SparkleShare/SparkleSetup.cs:388
+msgid "Finish"
+msgstr "Fertigstellen"
-#: ../SparkleShare/SparkleIntro.cs:585
-msgid ""
-"Now you can start accepting invitations from others. \n"
-"Just click on invitations you get by email and we will take care of the rest."
-msgstr ""
-"Sie können nun Einladungen annehmen. Klicken Sie einfach auf Einladungen, "
-"die Sie per E-Mail erhalten und wir kümmern uns um den Rest."
+#: ../SparkleShare/SparkleSetup.cs:333
+msgid "Something went wrong"
+msgstr "Etwas ist schiefgelaufen"
-#: ../SparkleShare/SparkleIntro.cs:596
-msgid "Learn how to host your own SparkleServer"
-msgstr "Lernen Sie, wie Sie Ihren eigenen SparkleServer betreiben können"
+#: ../SparkleShare/SparkleSetup.cs:353
+msgid "Try Again"
+msgstr "Erneut versuchen"
-#: ../SparkleShare/SparkleEventLog.cs:61
-msgid "Recent Events"
-msgstr "Letzte Ereignisse"
+#: ../SparkleShare/SparkleSetup.cs:372
+#, csharp-format
+msgid "‘{0}’ has been successfully added"
+msgstr "»{0}« wurde erfolgreich hinzugefügt"
-#: ../SparkleShare/SparkleEventLog.cs:148
-#: ../SparkleShare/SparkleEventLog.cs:173
-msgid "All Folders"
-msgstr "Alle Ordner"
+#: ../SparkleShare/SparkleSetup.cs:378
+msgid "Folder synced successfully!"
+msgstr "Verzeichnis erfolgreich synchronisiert!"
+
+#: ../SparkleShare/SparkleSetup.cs:379
+msgid "Access the synced files from your SparkleShare folder."
+msgstr "Die synchronisierten Dateien befinden sich im Ordner SparkleShare."
+
+#. A button that opens the synced folder
+#: ../SparkleShare/SparkleSetup.cs:382
+msgid "Open Folder"
+msgstr "Ordner öffnen"
+
+#: ../SparkleShare/SparkleSetupWindow.cs:45
+msgid "SparkleShare Setup"
+msgstr "SparkleShare Konfiguration"
#: ../SparkleShare/SparkleShare.cs:53
msgid "Sorry, you can't run SparkleShare with these permissions."
@@ -420,22 +365,8 @@ msgid "Turn Notifications On"
msgstr "Benachrichtigungen aktivieren"
#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:286
+#: ../SparkleShare/SparkleStatusIcon.cs:291
msgid "Quit"
msgstr "Beenden"
-#: ../SparkleShare/SparkleUI.cs:99
-msgid "Ouch! Mid-air collision!"
-msgstr "Autsch! Kollision in der Luft!"
-
-#: ../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 "
-"angelegt."
-
-#: ../SparkleShare/SparkleWindow.cs:41
-msgid "SparkleShare Setup"
-msgstr "SparkleShare Konfiguration"
-
diff --git a/po/el.po b/po/el.po
old mode 100644
new mode 100755
diff --git a/po/eo.po b/po/eo.po
old mode 100644
new mode 100755
diff --git a/po/es.po b/po/es.po
old mode 100644
new mode 100755
index d0b40118..4547318e
--- a/po/es.po
+++ b/po/es.po
@@ -5,13 +5,13 @@
# back in the future.
#
# , 2011.
-# , 2011.
+# jamelrom , 2011.
msgid ""
msgstr ""
"Project-Id-Version: SparkleShare\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-29 11:38+0200\n"
-"PO-Revision-Date: 2011-07-01 09:30+0000\n"
+"POT-Creation-Date: 2011-07-19 07:04+0200\n"
+"PO-Revision-Date: 2011-08-03 17:43+0000\n"
"Last-Translator: jamelrom \n"
"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/sparkleshare/team/es/)\n"
"MIME-Version: 1.0\n"
@@ -20,26 +20,27 @@ msgstr ""
"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: ../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:348
-#: ../SparkleShare/SparkleStatusIcon.cs:357
-msgid "Not everything is synced"
-msgstr "Pendiente de sincronizar"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:358
-#: ../SparkleShare/SparkleStatusIcon.cs:367
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:69
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:86
+#: ../SparkleShare/SparkleStatusIcon.cs:372
msgid "Up to date"
msgstr "Actualizado"
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:374
-#: ../SparkleShare/SparkleStatusIcon.cs:383
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:84
+#: ../SparkleShare/SparkleSetup.cs:69 ../SparkleShare/SparkleStatusIcon.cs:350
+msgid "Welcome to SparkleShare!"
+msgstr "¡Bienvenido a SparkleShare!"
+
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:95
+#: ../SparkleShare/SparkleStatusIcon.cs:388
msgid "Syncing…"
msgstr "Sincronizando..."
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:105
+#: ../SparkleShare/SparkleStatusIcon.cs:362
+msgid "Not everything is synced"
+msgstr "Pendiente de sincronizar"
+
#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
msgid "Copy Web Link"
msgstr "Copiar Enlace"
@@ -61,266 +62,62 @@ msgid "Select to get a copy of this version"
msgstr "Seleccionar para obtener una copia de esta versión"
#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:46 ../SparkleShare/SparkleStatusIcon.cs:275
+#: ../SparkleShare/SparkleAbout.cs:54 ../SparkleShare/SparkleStatusIcon.cs:275
msgid "About SparkleShare"
msgstr "Acerca de SparkleShare"
-#: ../SparkleShare/SparkleAbout.cs:53
-msgid "A newer version is available"
-msgstr "Una nueva versión esta disponible"
+#: ../SparkleShare/SparkleAbout.cs:72
+#, csharp-format
+msgid "A newer version ({0}) is available!"
+msgstr "Esta disponible una nueva version ({0})"
-#: ../SparkleShare/SparkleAbout.cs:60
+#: ../SparkleShare/SparkleAbout.cs:80
msgid "You are running the latest version."
msgstr "Estas ejecutando la última versión"
-#: ../SparkleShare/SparkleAbout.cs:87
+#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:110
msgid "Checking for updates..."
msgstr "Comprobando actualizaciones..."
-#: ../SparkleShare/SparkleAbout.cs:116
-msgid "_Show Credits"
-msgstr "_Autores"
+#: ../SparkleShare/SparkleController.cs:446
+msgid "dddd, MMMM d, yyyy"
+msgstr "dddd, MMMM d, yyyy"
-#: ../SparkleShare/SparkleAbout.cs:129
-msgid "_Visit Website"
-msgstr "_Visitar Página Web"
+#: ../SparkleShare/SparkleController.cs:451
+msgid "dddd, MMMM d"
+msgstr "dddd, MMMM d"
-#: ../SparkleShare/SparkleController.cs:455
-msgid "ddd MMM d, yyyy"
-msgstr "d. ddd MMMM yyyy"
-
-#: ../SparkleShare/SparkleController.cs:460
-msgid "ddd MMM d"
-msgstr "d. ddd MMM"
-
-#: ../SparkleShare/SparkleController.cs:661
+#: ../SparkleShare/SparkleController.cs:660
#, csharp-format
msgid "added ‘{0}’"
msgstr "añadido '{0}'"
-#: ../SparkleShare/SparkleController.cs:666
+#: ../SparkleShare/SparkleController.cs:665
#, csharp-format
msgid "moved ‘{0}’"
msgstr "movido '{0}'"
-#: ../SparkleShare/SparkleController.cs:671
+#: ../SparkleShare/SparkleController.cs:670
#, csharp-format
msgid "edited ‘{0}’"
msgstr "editado '{0}'"
-#: ../SparkleShare/SparkleController.cs:676
+#: ../SparkleShare/SparkleController.cs:675
#, csharp-format
msgid "deleted ‘{0}’"
msgstr "eliminado '{0}'"
-#: ../SparkleShare/SparkleController.cs:685
+#: ../SparkleShare/SparkleController.cs:684
#, 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:689
+#: ../SparkleShare/SparkleController.cs:688
msgid "did something magical"
msgstr "algo mágico ocurrió"
-#: ../SparkleShare/SparkleIntro.cs:73
-msgid ""
-"Before we can create a SparkleShare folder on this computer, we need a few "
-"bits of information from you."
-msgstr ""
-"Antes de que podamos crear una carpeta de SparkleShare en este equipo, "
-"necesitamos un poco de información de usted."
-
-#: ../SparkleShare/SparkleIntro.cs:83
-msgid "Full Name:"
-msgstr "Nombre completo:"
-
-#: ../SparkleShare/SparkleIntro.cs:98
-msgid "Email:"
-msgstr "Correo electrónico:"
-
-#: ../SparkleShare/SparkleIntro.cs:109
-msgid "Next"
-msgstr "Siguiente"
-
-#: ../SparkleShare/SparkleIntro.cs:115
-msgid "Configuring…"
-msgstr "Configurando…"
-
-#: ../SparkleShare/SparkleIntro.cs:161
-msgid "Where is your remote folder?"
-msgstr "¿Dónde está su carpeta remota?"
-
-#: ../SparkleShare/SparkleIntro.cs:174
-msgid "address-to-server.com"
-msgstr "dirección-del-servidor.com"
-
-#: ../SparkleShare/SparkleIntro.cs:179
-msgid "On my own server:"
-msgstr "En mi propio servidor:"
-
-#: ../SparkleShare/SparkleIntro.cs:186
-msgid "Free hosting for Free and Open Source Software projects."
-msgstr ""
-"Alojamiento gratuito para proyectos de Software Libre y Código Abierto."
-
-#: ../SparkleShare/SparkleIntro.cs:187
-msgid "Also has paid accounts for extra private space and bandwidth."
-msgstr ""
-"También tiene cuentas de pago para tener más espacio y ancho de banda "
-"privado."
-
-#: ../SparkleShare/SparkleIntro.cs:195
-msgid "The GNOME Project"
-msgstr "El Proyecto GNOME"
-
-#: ../SparkleShare/SparkleIntro.cs:197
-msgid "GNOME is an easy to understand interface to your computer."
-msgstr "GNOME es una interfaz para su equipo fácil de entender."
-
-#: ../SparkleShare/SparkleIntro.cs:198
-msgid "Select this option if you’re a developer or designer working on GNOME."
-msgstr ""
-"Seleccione esta opción si usted es un desarrollador o diseñador trabajando "
-"en GNOME."
-
-#: ../SparkleShare/SparkleIntro.cs:206
-msgid "Gitorious"
-msgstr "Gitorious"
-
-#: ../SparkleShare/SparkleIntro.cs:208
-msgid "Completely Free as in Freedom infrastructure."
-msgstr "Completamente Libre como en la infraestructura de la Libertad."
-
-#: ../SparkleShare/SparkleIntro.cs:209
-msgid "Free accounts for Free and Open Source projects."
-msgstr "Cuentas gratis para proyectos Libres y de Código Abierto."
-
-#: ../SparkleShare/SparkleIntro.cs:220
-msgid "Username/Folder"
-msgstr "Usuario/Carpeta"
-
-#: ../SparkleShare/SparkleIntro.cs:225
-msgid "Project/Folder"
-msgstr "Proyecto/carpeta"
-
-#: ../SparkleShare/SparkleIntro.cs:230
-msgid "Project"
-msgstr "Proyecto"
-
-#: ../SparkleShare/SparkleIntro.cs:235 ../SparkleShare/SparkleIntro.cs:254
-msgid "Folder"
-msgstr "Carpeta"
-
-#: ../SparkleShare/SparkleIntro.cs:259 ../SparkleShare/SparkleIntro.cs:377
-msgid "Folder Name:"
-msgstr "Nombre de la carpeta:"
-
-#: ../SparkleShare/SparkleIntro.cs:269
-msgid "Sync"
-msgstr "Sincronizar"
-
-#: ../SparkleShare/SparkleIntro.cs:312
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: ../SparkleShare/SparkleIntro.cs:320
-msgid "Skip"
-msgstr "Saltar"
-
-#: ../SparkleShare/SparkleIntro.cs:347
-msgid "Invitation received!"
-msgstr "¡Invitación recibida!"
-
-#: ../SparkleShare/SparkleIntro.cs:353
-msgid ""
-"You've received an invitation to join a shared folder.\n"
-"We're ready to hook you up immediately if you wish."
-msgstr ""
-"Usted ha recibido una invitación a unirse a una carpeta compartida.\n"
-"Estamos listos para unirte en cuanto lo desees."
-
-#: ../SparkleShare/SparkleIntro.cs:359
-msgid "Do you accept this invitation?"
-msgstr "¿Acepta esta invitación?"
-
-#: ../SparkleShare/SparkleIntro.cs:368
-msgid "Server Address:"
-msgstr "Dirección del servidor:"
-
-#: ../SparkleShare/SparkleIntro.cs:391
-msgid "Reject"
-msgstr "Rechazar"
-
-#: ../SparkleShare/SparkleIntro.cs:392
-msgid "Accept and Sync"
-msgstr "Aceptar y Sincronizar"
-
-#: ../SparkleShare/SparkleIntro.cs:442
-msgid "Something went wrong…"
-msgstr "Algo salió mal..."
-
-#: ../SparkleShare/SparkleIntro.cs:448
-msgid "Try Again"
-msgstr "Intentar de nuevo"
-
-#: ../SparkleShare/SparkleIntro.cs:473
-#, csharp-format
-msgid "‘{0}’ has been successfully added"
-msgstr "'{0}' Ha sido añadido correctamente"
-
-#: ../SparkleShare/SparkleIntro.cs:482
-msgid "Folder synced successfully!"
-msgstr "¡Carpeta sincronizada con exito!"
-
-#: ../SparkleShare/SparkleIntro.cs:489
-#, csharp-format
-msgid ""
-"Now you can access the synced files from ‘{0}’ in your SparkleShare folder."
-msgstr ""
-"Ahora puedes acceder a los archivos sincronizados desde '{0}' en tu carpeta "
-"de SparkleShare."
-
-#. A button that opens the synced folder
-#: ../SparkleShare/SparkleIntro.cs:497
-msgid "Open Folder"
-msgstr "Abrir carpeta"
-
-#: ../SparkleShare/SparkleIntro.cs:503 ../SparkleShare/SparkleIntro.cs:543
-#: ../SparkleShare/SparkleIntro.cs:604
-msgid "Finish"
-msgstr "Finalizar"
-
-#: ../SparkleShare/SparkleIntro.cs:528
-#, csharp-format
-msgid "Syncing folder ‘{0}’…"
-msgstr "Sincronizando carpeta ‘{0}’…"
-
-#: ../SparkleShare/SparkleIntro.cs:535
-msgid "This may take a while.\n"
-msgstr "Esto puede tardar un rato.\n"
-
-#: ../SparkleShare/SparkleIntro.cs:536
-msgid "Are you sure it’s not coffee o'clock?"
-msgstr "¿Seguro que no es la hora del café?"
-
-#: ../SparkleShare/SparkleIntro.cs:579
-msgid "SparkleShare is ready to go!"
-msgstr "¡SparkleShare esta listo para usar!"
-
-#: ../SparkleShare/SparkleIntro.cs:585
-msgid ""
-"Now you can start accepting invitations from others. \n"
-"Just click on invitations you get by email and we will take care of the rest."
-msgstr ""
-"Ahora puede empezar a aceptar invitaciones de otros.\n"
-"Solo haga click en las invitaciones que reciba por correo electrónico y nosotros encargaremos del resto."
-
-#: ../SparkleShare/SparkleIntro.cs:596
-msgid "Learn how to host your own SparkleServer"
-msgstr "Aprenda como hospedar su propio SparkleServer"
-
#: ../SparkleShare/SparkleEventLog.cs:61
msgid "Recent Events"
msgstr "Eventos recientes"
@@ -330,6 +127,155 @@ msgstr "Eventos recientes"
msgid "All Folders"
msgstr "Todas las carpetas"
+#: ../SparkleShare/SparkleSetup.cs:70
+msgid ""
+"Before we can create a SparkleShare folder on this computer, we need a few "
+"bits of information from you."
+msgstr ""
+"Antes de que podamos crear una carpeta de SparkleShare en este equipo, "
+"necesitamos un poco de información de usted."
+
+#: ../SparkleShare/SparkleSetup.cs:77
+msgid "Full Name:"
+msgstr "Nombre completo:"
+
+#: ../SparkleShare/SparkleSetup.cs:92
+msgid "Email:"
+msgstr "Correo electrónico:"
+
+#: ../SparkleShare/SparkleSetup.cs:102
+msgid "Next"
+msgstr "Siguiente"
+
+#: ../SparkleShare/SparkleSetup.cs:122
+msgid "Where is your remote folder?"
+msgstr "¿Dónde está su carpeta remota?"
+
+#. Own server radiobutton
+#: ../SparkleShare/SparkleSetup.cs:131
+msgid "On my own server:"
+msgstr "En mi propio servidor:"
+
+#: ../SparkleShare/SparkleSetup.cs:136 ../SparkleShare/SparkleSetup.cs:238
+msgid "Folder"
+msgstr "Carpeta"
+
+#: ../SparkleShare/SparkleSetup.cs:163
+msgid "address-to-server.com"
+msgstr "dirección-del-servidor.com"
+
+#: ../SparkleShare/SparkleSetup.cs:178
+msgid "Free hosting for Free and Open Source Software projects."
+msgstr ""
+"Alojamiento gratuito para proyectos de Software Libre y Código Abierto."
+
+#: ../SparkleShare/SparkleSetup.cs:179
+msgid "Also has paid accounts for extra private space and bandwidth."
+msgstr ""
+"También tiene cuentas de pago para tener más espacio y ancho de banda "
+"privado."
+
+#: ../SparkleShare/SparkleSetup.cs:188
+msgid "Username/Folder"
+msgstr "Usuario/Carpeta"
+
+#. Gitorious radiobutton
+#: ../SparkleShare/SparkleSetup.cs:193
+msgid "Gitorious"
+msgstr "Gitorious"
+
+#: ../SparkleShare/SparkleSetup.cs:195
+msgid "Completely Free as in Freedom infrastructure."
+msgstr "Completamente Libre como en la infraestructura de la Libertad."
+
+#: ../SparkleShare/SparkleSetup.cs:196
+msgid "Free accounts for Free and Open Source projects."
+msgstr "Cuentas gratis para proyectos Libres y de Código Abierto."
+
+#: ../SparkleShare/SparkleSetup.cs:205
+msgid "Project/Folder"
+msgstr "Proyecto/carpeta"
+
+#. GNOME radiobutton
+#: ../SparkleShare/SparkleSetup.cs:210
+msgid "The GNOME Project"
+msgstr "El Proyecto GNOME"
+
+#: ../SparkleShare/SparkleSetup.cs:212
+msgid "GNOME is an easy to understand interface to your computer."
+msgstr "GNOME es una interfaz para su equipo fácil de entender."
+
+#: ../SparkleShare/SparkleSetup.cs:213
+msgid "Select this option if you’re a developer or designer working on GNOME."
+msgstr ""
+"Seleccione esta opción si usted es un desarrollador o diseñador trabajando "
+"en GNOME."
+
+#: ../SparkleShare/SparkleSetup.cs:222
+msgid "Project"
+msgstr "Proyecto"
+
+#: ../SparkleShare/SparkleSetup.cs:232
+msgid "Folder Name:"
+msgstr "Nombre de la carpeta:"
+
+#. Cancel button
+#: ../SparkleShare/SparkleSetup.cs:251
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. Sync button
+#: ../SparkleShare/SparkleSetup.cs:259
+msgid "Sync"
+msgstr "Sincronizar"
+
+#: ../SparkleShare/SparkleSetup.cs:286
+#, csharp-format
+msgid "Syncing folder ‘{0}’…"
+msgstr "Sincronizando carpeta ‘{0}’…"
+
+#: ../SparkleShare/SparkleSetup.cs:287
+msgid "This may take a while."
+msgstr "Esto tardara un poco."
+
+#: ../SparkleShare/SparkleSetup.cs:288
+msgid "Are you sure it’s not coffee o'clock?"
+msgstr "¿Seguro que no es la hora del café?"
+
+#: ../SparkleShare/SparkleSetup.cs:292 ../SparkleShare/SparkleSetup.cs:375
+msgid "Finish"
+msgstr "Finalizar"
+
+#: ../SparkleShare/SparkleSetup.cs:321
+msgid "Something went wrong"
+msgstr "Algo falló"
+
+#: ../SparkleShare/SparkleSetup.cs:341
+msgid "Try Again"
+msgstr "Intentar de nuevo"
+
+#: ../SparkleShare/SparkleSetup.cs:359
+#, csharp-format
+msgid "‘{0}’ has been successfully added"
+msgstr "'{0}' Ha sido añadido correctamente"
+
+#: ../SparkleShare/SparkleSetup.cs:365
+msgid "Folder synced successfully!"
+msgstr "¡Carpeta sincronizada con exito!"
+
+#: ../SparkleShare/SparkleSetup.cs:366
+msgid "Access the synced files from your SparkleShare folder."
+msgstr "Accede a los archivos sincronizados desde tu carpeta SparkleShare."
+
+#. A button that opens the synced folder
+#: ../SparkleShare/SparkleSetup.cs:369
+msgid "Open Folder"
+msgstr "Abrir carpeta"
+
+#: ../SparkleShare/SparkleSetupWindow.cs:45
+msgid "SparkleShare Setup"
+msgstr "Configuración de SparkleShare"
+
#: ../SparkleShare/SparkleShare.cs:53
msgid "Sorry, you can't run SparkleShare with these permissions."
msgstr "Perdón, no puede ejecutar SparkleShare con estos permisos."
@@ -413,21 +359,8 @@ msgid "Turn Notifications On"
msgstr "Activar las notificaciones"
#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:286
+#: ../SparkleShare/SparkleStatusIcon.cs:291
msgid "Quit"
msgstr "Salir"
-#: ../SparkleShare/SparkleUI.cs:99
-msgid "Ouch! Mid-air collision!"
-msgstr "¡Ohh! ¡Hay una colisión!"
-
-#: ../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."
-
-#: ../SparkleShare/SparkleWindow.cs:41
-msgid "SparkleShare Setup"
-msgstr "Configuración de SparkleShare"
-
diff --git a/po/fi.po b/po/fi.po
old mode 100644
new mode 100755
index 37e56ea9..6e5f5b36
--- a/po/fi.po
+++ b/po/fi.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: SparkleShare\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-29 11:38+0200\n"
-"PO-Revision-Date: 2011-06-26 09:22+0000\n"
+"POT-Creation-Date: 2011-07-19 07:04+0200\n"
+"PO-Revision-Date: 2011-07-19 05:10+0000\n"
"Last-Translator: deejay1 \n"
"Language-Team: LANGUAGE \n"
"MIME-Version: 1.0\n"
@@ -21,26 +21,27 @@ msgstr ""
"Language: fi\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:337
-#: ../SparkleShare/SparkleIntro.cs:67 ../SparkleShare/SparkleStatusIcon.cs:345
-msgid "Welcome to SparkleShare!"
-msgstr "Tervetuloa SparkleShareen!"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:348
-#: ../SparkleShare/SparkleStatusIcon.cs:357
-msgid "Not everything is synced"
-msgstr "Kaikkea ei ole synkronoitu"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:358
-#: ../SparkleShare/SparkleStatusIcon.cs:367
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:69
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:86
+#: ../SparkleShare/SparkleStatusIcon.cs:372
msgid "Up to date"
msgstr "Ajantasalla"
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:374
-#: ../SparkleShare/SparkleStatusIcon.cs:383
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:84
+#: ../SparkleShare/SparkleSetup.cs:69 ../SparkleShare/SparkleStatusIcon.cs:350
+msgid "Welcome to SparkleShare!"
+msgstr "Tervetuloa SparkleShareen!"
+
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:95
+#: ../SparkleShare/SparkleStatusIcon.cs:388
msgid "Syncing…"
msgstr "Synkronoidaan..."
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:105
+#: ../SparkleShare/SparkleStatusIcon.cs:362
+msgid "Not everything is synced"
+msgstr "Kaikkea ei ole synkronoitu"
+
#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
msgid "Copy Web Link"
msgstr "Kopioi web-linkki"
@@ -62,260 +63,62 @@ msgid "Select to get a copy of this version"
msgstr "Tee kopio tästä versiosta"
#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:46 ../SparkleShare/SparkleStatusIcon.cs:275
+#: ../SparkleShare/SparkleAbout.cs:54 ../SparkleShare/SparkleStatusIcon.cs:275
msgid "About SparkleShare"
msgstr "Tietoja SparkleSharesta"
-#: ../SparkleShare/SparkleAbout.cs:53
-msgid "A newer version is available"
-msgstr "Uudempi versio on saatavissa"
+#: ../SparkleShare/SparkleAbout.cs:72
+#, csharp-format
+msgid "A newer version ({0}) is available!"
+msgstr ""
-#: ../SparkleShare/SparkleAbout.cs:60
+#: ../SparkleShare/SparkleAbout.cs:80
msgid "You are running the latest version."
msgstr "Sinulla on uusin versio käytössäsi"
-#: ../SparkleShare/SparkleAbout.cs:87
+#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:110
msgid "Checking for updates..."
msgstr "Tarkistetaan päivityksiä..."
-#: ../SparkleShare/SparkleAbout.cs:116
-msgid "_Show Credits"
-msgstr "_Näytä osallistujat"
+#: ../SparkleShare/SparkleController.cs:446
+msgid "dddd, MMMM d, yyyy"
+msgstr ""
-#: ../SparkleShare/SparkleAbout.cs:129
-msgid "_Visit Website"
-msgstr "_Käy nettisivulla"
+#: ../SparkleShare/SparkleController.cs:451
+msgid "dddd, MMMM d"
+msgstr ""
-#: ../SparkleShare/SparkleController.cs:455
-msgid "ddd MMM d, yyyy"
-msgstr "ppp kkk d, vvvv"
-
-#: ../SparkleShare/SparkleController.cs:460
-msgid "ddd MMM d"
-msgstr "ppp kkk d"
-
-#: ../SparkleShare/SparkleController.cs:661
+#: ../SparkleShare/SparkleController.cs:660
#, csharp-format
msgid "added ‘{0}’"
msgstr "lisätty '{0}'"
-#: ../SparkleShare/SparkleController.cs:666
+#: ../SparkleShare/SparkleController.cs:665
#, csharp-format
msgid "moved ‘{0}’"
msgstr "siirrettiin '{0}'"
-#: ../SparkleShare/SparkleController.cs:671
+#: ../SparkleShare/SparkleController.cs:670
#, csharp-format
msgid "edited ‘{0}’"
msgstr "muokattu '{0}'"
-#: ../SparkleShare/SparkleController.cs:676
+#: ../SparkleShare/SparkleController.cs:675
#, csharp-format
msgid "deleted ‘{0}’"
msgstr "poistettu '{0}'"
-#: ../SparkleShare/SparkleController.cs:685
+#: ../SparkleShare/SparkleController.cs:684
#, csharp-format
msgid "and {0} more"
msgid_plural "and {0} more"
msgstr[0] ""
msgstr[1] ""
-#: ../SparkleShare/SparkleController.cs:689
+#: ../SparkleShare/SparkleController.cs:688
msgid "did something magical"
msgstr "teki jotain maagista"
-#: ../SparkleShare/SparkleIntro.cs:73
-msgid ""
-"Before we can create a SparkleShare folder on this computer, we need a few "
-"bits of information from you."
-msgstr ""
-"Ennen kuin voit luoda SparkleShare-kansio tälle tietokoneelle, tarvitsemme "
-"joitain tietoja sinusta."
-
-#: ../SparkleShare/SparkleIntro.cs:83
-msgid "Full Name:"
-msgstr "Koko nimi:"
-
-#: ../SparkleShare/SparkleIntro.cs:98
-msgid "Email:"
-msgstr "Sähköposti:"
-
-#: ../SparkleShare/SparkleIntro.cs:109
-msgid "Next"
-msgstr "Seuraava"
-
-#: ../SparkleShare/SparkleIntro.cs:115
-msgid "Configuring…"
-msgstr "Säädetään..."
-
-#: ../SparkleShare/SparkleIntro.cs:161
-msgid "Where is your remote folder?"
-msgstr "Missä etähakemisto on?"
-
-#: ../SparkleShare/SparkleIntro.cs:174
-msgid "address-to-server.com"
-msgstr "palvelimen-osoite.fi"
-
-#: ../SparkleShare/SparkleIntro.cs:179
-msgid "On my own server:"
-msgstr "Omalle palvelimelleni:"
-
-#: ../SparkleShare/SparkleIntro.cs:186
-msgid "Free hosting for Free and Open Source Software projects."
-msgstr "Ilmainen palvelintila vapaan lähdekoodin projekteille."
-
-#: ../SparkleShare/SparkleIntro.cs:187
-msgid "Also has paid accounts for extra private space and bandwidth."
-msgstr ""
-"Myös maksullisia tilejä ylimääräisellä tilalla ja nopeammalla yhteydellä."
-
-#: ../SparkleShare/SparkleIntro.cs:195
-msgid "The GNOME Project"
-msgstr "GNOME-projekti"
-
-#: ../SparkleShare/SparkleIntro.cs:197
-msgid "GNOME is an easy to understand interface to your computer."
-msgstr "GNOME on helppokäyttöinen käyttöliittymä tietokoneellesi."
-
-#: ../SparkleShare/SparkleIntro.cs:198
-msgid "Select this option if you’re a developer or designer working on GNOME."
-msgstr "Valitse tämä, jos olet kehittäjä tai suunnittelija GNOME-projektissa."
-
-#: ../SparkleShare/SparkleIntro.cs:206
-msgid "Gitorious"
-msgstr "Gitorious"
-
-#: ../SparkleShare/SparkleIntro.cs:208
-msgid "Completely Free as in Freedom infrastructure."
-msgstr "Täysin vapaa infrastruktuuri."
-
-#: ../SparkleShare/SparkleIntro.cs:209
-msgid "Free accounts for Free and Open Source projects."
-msgstr "Ilmainen tili vapaan lähdekoodin projekteille."
-
-#: ../SparkleShare/SparkleIntro.cs:220
-msgid "Username/Folder"
-msgstr "Käyttäjätunnus/hakemisto"
-
-#: ../SparkleShare/SparkleIntro.cs:225
-msgid "Project/Folder"
-msgstr "Projekti/hakemisto"
-
-#: ../SparkleShare/SparkleIntro.cs:230
-msgid "Project"
-msgstr "Projekt"
-
-#: ../SparkleShare/SparkleIntro.cs:235 ../SparkleShare/SparkleIntro.cs:254
-msgid "Folder"
-msgstr "Hakemisto"
-
-#: ../SparkleShare/SparkleIntro.cs:259 ../SparkleShare/SparkleIntro.cs:377
-msgid "Folder Name:"
-msgstr "Hakemiston nimi:"
-
-#: ../SparkleShare/SparkleIntro.cs:269
-msgid "Sync"
-msgstr "Synkronoi"
-
-#: ../SparkleShare/SparkleIntro.cs:312
-msgid "Cancel"
-msgstr "Peruuta"
-
-#: ../SparkleShare/SparkleIntro.cs:320
-msgid "Skip"
-msgstr "Ohita"
-
-#: ../SparkleShare/SparkleIntro.cs:347
-msgid "Invitation received!"
-msgstr "Kutsu vastaanotettu!"
-
-#: ../SparkleShare/SparkleIntro.cs:353
-msgid ""
-"You've received an invitation to join a shared folder.\n"
-"We're ready to hook you up immediately if you wish."
-msgstr ""
-"Olet saanut kutsun liittyä jaettuun kansioon.\n"
-"Olemme valmiita liittämään sinut välittömästi, jos haluat."
-
-#: ../SparkleShare/SparkleIntro.cs:359
-msgid "Do you accept this invitation?"
-msgstr "Hyväksytkö tämän kutsun?"
-
-#: ../SparkleShare/SparkleIntro.cs:368
-msgid "Server Address:"
-msgstr "Palvelimen osoite:"
-
-#: ../SparkleShare/SparkleIntro.cs:391
-msgid "Reject"
-msgstr "Hylkää"
-
-#: ../SparkleShare/SparkleIntro.cs:392
-msgid "Accept and Sync"
-msgstr "Hyväksy ja synkronoi"
-
-#: ../SparkleShare/SparkleIntro.cs:442
-msgid "Something went wrong…"
-msgstr "Jotain meni pieleen..."
-
-#: ../SparkleShare/SparkleIntro.cs:448
-msgid "Try Again"
-msgstr "Yritä uudelleen"
-
-#: ../SparkleShare/SparkleIntro.cs:473
-#, csharp-format
-msgid "‘{0}’ has been successfully added"
-msgstr "'{0}' lisättiin onnistuneesti"
-
-#: ../SparkleShare/SparkleIntro.cs:482
-msgid "Folder synced successfully!"
-msgstr "Hakemistojen synkronointi onnistui!"
-
-#: ../SparkleShare/SparkleIntro.cs:489
-#, csharp-format
-msgid ""
-"Now you can access the synced files from ‘{0}’ in your SparkleShare folder."
-msgstr "Voit käyttää '{0}' synkronoituja tiedostoja SparkleShare-kansiossasi."
-
-#. A button that opens the synced folder
-#: ../SparkleShare/SparkleIntro.cs:497
-msgid "Open Folder"
-msgstr "Avaa hakemisto"
-
-#: ../SparkleShare/SparkleIntro.cs:503 ../SparkleShare/SparkleIntro.cs:543
-#: ../SparkleShare/SparkleIntro.cs:604
-msgid "Finish"
-msgstr "Valmis"
-
-#: ../SparkleShare/SparkleIntro.cs:528
-#, csharp-format
-msgid "Syncing folder ‘{0}’…"
-msgstr "Synkronoidaan hakemistoa '{0}'..."
-
-#: ../SparkleShare/SparkleIntro.cs:535
-msgid "This may take a while.\n"
-msgstr "Tämä voi kestää hetken.\n"
-
-#: ../SparkleShare/SparkleIntro.cs:536
-msgid "Are you sure it’s not coffee o'clock?"
-msgstr "Oletko varma, että ei ole kahvitauon paikka?"
-
-#: ../SparkleShare/SparkleIntro.cs:579
-msgid "SparkleShare is ready to go!"
-msgstr "SparkleShare on valmis toimimaan!"
-
-#: ../SparkleShare/SparkleIntro.cs:585
-msgid ""
-"Now you can start accepting invitations from others. \n"
-"Just click on invitations you get by email and we will take care of the rest."
-msgstr ""
-"Nyt voit ottaa vastaan kutsuja muilta.\n"
-"Paina kutsua jonka sait sähköpostilla, ja hoidamme loput."
-
-#: ../SparkleShare/SparkleIntro.cs:596
-msgid "Learn how to host your own SparkleServer"
-msgstr "Selvitä, kuinka voit pitää omaa SparkleServer-palvelinta"
-
#: ../SparkleShare/SparkleEventLog.cs:61
msgid "Recent Events"
msgstr ""
@@ -325,6 +128,151 @@ msgstr ""
msgid "All Folders"
msgstr ""
+#: ../SparkleShare/SparkleSetup.cs:70
+msgid ""
+"Before we can create a SparkleShare folder on this computer, we need a few "
+"bits of information from you."
+msgstr ""
+"Ennen kuin voit luoda SparkleShare-kansio tälle tietokoneelle, tarvitsemme "
+"joitain tietoja sinusta."
+
+#: ../SparkleShare/SparkleSetup.cs:77
+msgid "Full Name:"
+msgstr "Koko nimi:"
+
+#: ../SparkleShare/SparkleSetup.cs:92
+msgid "Email:"
+msgstr "Sähköposti:"
+
+#: ../SparkleShare/SparkleSetup.cs:102
+msgid "Next"
+msgstr "Seuraava"
+
+#: ../SparkleShare/SparkleSetup.cs:122
+msgid "Where is your remote folder?"
+msgstr "Missä etähakemisto on?"
+
+#. Own server radiobutton
+#: ../SparkleShare/SparkleSetup.cs:131
+msgid "On my own server:"
+msgstr "Omalle palvelimelleni:"
+
+#: ../SparkleShare/SparkleSetup.cs:136 ../SparkleShare/SparkleSetup.cs:238
+msgid "Folder"
+msgstr "Hakemisto"
+
+#: ../SparkleShare/SparkleSetup.cs:163
+msgid "address-to-server.com"
+msgstr "palvelimen-osoite.fi"
+
+#: ../SparkleShare/SparkleSetup.cs:178
+msgid "Free hosting for Free and Open Source Software projects."
+msgstr "Ilmainen palvelintila vapaan lähdekoodin projekteille."
+
+#: ../SparkleShare/SparkleSetup.cs:179
+msgid "Also has paid accounts for extra private space and bandwidth."
+msgstr ""
+"Myös maksullisia tilejä ylimääräisellä tilalla ja nopeammalla yhteydellä."
+
+#: ../SparkleShare/SparkleSetup.cs:188
+msgid "Username/Folder"
+msgstr "Käyttäjätunnus/hakemisto"
+
+#. Gitorious radiobutton
+#: ../SparkleShare/SparkleSetup.cs:193
+msgid "Gitorious"
+msgstr "Gitorious"
+
+#: ../SparkleShare/SparkleSetup.cs:195
+msgid "Completely Free as in Freedom infrastructure."
+msgstr "Täysin vapaa infrastruktuuri."
+
+#: ../SparkleShare/SparkleSetup.cs:196
+msgid "Free accounts for Free and Open Source projects."
+msgstr "Ilmainen tili vapaan lähdekoodin projekteille."
+
+#: ../SparkleShare/SparkleSetup.cs:205
+msgid "Project/Folder"
+msgstr "Projekti/hakemisto"
+
+#. GNOME radiobutton
+#: ../SparkleShare/SparkleSetup.cs:210
+msgid "The GNOME Project"
+msgstr "GNOME-projekti"
+
+#: ../SparkleShare/SparkleSetup.cs:212
+msgid "GNOME is an easy to understand interface to your computer."
+msgstr "GNOME on helppokäyttöinen käyttöliittymä tietokoneellesi."
+
+#: ../SparkleShare/SparkleSetup.cs:213
+msgid "Select this option if you’re a developer or designer working on GNOME."
+msgstr "Valitse tämä, jos olet kehittäjä tai suunnittelija GNOME-projektissa."
+
+#: ../SparkleShare/SparkleSetup.cs:222
+msgid "Project"
+msgstr "Projekt"
+
+#: ../SparkleShare/SparkleSetup.cs:232
+msgid "Folder Name:"
+msgstr "Hakemiston nimi:"
+
+#. Cancel button
+#: ../SparkleShare/SparkleSetup.cs:251
+msgid "Cancel"
+msgstr "Peruuta"
+
+#. Sync button
+#: ../SparkleShare/SparkleSetup.cs:259
+msgid "Sync"
+msgstr "Synkronoi"
+
+#: ../SparkleShare/SparkleSetup.cs:286
+#, csharp-format
+msgid "Syncing folder ‘{0}’…"
+msgstr "Synkronoidaan hakemistoa '{0}'..."
+
+#: ../SparkleShare/SparkleSetup.cs:287
+msgid "This may take a while."
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:288
+msgid "Are you sure it’s not coffee o'clock?"
+msgstr "Oletko varma, että ei ole kahvitauon paikka?"
+
+#: ../SparkleShare/SparkleSetup.cs:292 ../SparkleShare/SparkleSetup.cs:375
+msgid "Finish"
+msgstr "Valmis"
+
+#: ../SparkleShare/SparkleSetup.cs:321
+msgid "Something went wrong"
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:341
+msgid "Try Again"
+msgstr "Yritä uudelleen"
+
+#: ../SparkleShare/SparkleSetup.cs:359
+#, csharp-format
+msgid "‘{0}’ has been successfully added"
+msgstr "'{0}' lisättiin onnistuneesti"
+
+#: ../SparkleShare/SparkleSetup.cs:365
+msgid "Folder synced successfully!"
+msgstr "Hakemistojen synkronointi onnistui!"
+
+#: ../SparkleShare/SparkleSetup.cs:366
+msgid "Access the synced files from your SparkleShare folder."
+msgstr ""
+
+#. A button that opens the synced folder
+#: ../SparkleShare/SparkleSetup.cs:369
+msgid "Open Folder"
+msgstr "Avaa hakemisto"
+
+#: ../SparkleShare/SparkleSetupWindow.cs:45
+msgid "SparkleShare Setup"
+msgstr "SparkleSharen asennus"
+
#: ../SparkleShare/SparkleShare.cs:53
msgid "Sorry, you can't run SparkleShare with these permissions."
msgstr "Et voi ajaa SparkleSharea näillä oikeuksilla."
@@ -407,22 +355,8 @@ msgid "Turn Notifications On"
msgstr "Ota ilmoitukset käyttöön"
#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:286
+#: ../SparkleShare/SparkleStatusIcon.cs:291
msgid "Quit"
msgstr "Lopeta"
-#: ../SparkleShare/SparkleUI.cs:99
-msgid "Ouch! Mid-air collision!"
-msgstr "Auts! Törmäys!"
-
-#: ../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 "
-"konflikti."
-
-#: ../SparkleShare/SparkleWindow.cs:41
-msgid "SparkleShare Setup"
-msgstr "SparkleSharen asennus"
-
diff --git a/po/fr.po b/po/fr.po
old mode 100644
new mode 100755
index e017cce3..87715abe
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,9 +1,7 @@
-# This file is distributed under the same license as the Sparkleshare package.
-#
-# WARNING: Due to the nature of Transifex all translation file headers were lost
-# we apologise for any incovenience this may have caused and we hope to bring them
-# back in the future.
+# This file is distributed under the same license as the SparkleShare package.
#
+# Translators:
+# angelini paa , 2011.
# , 2011.
# Bruno ARLIGUY , 2011.
# Crash , 2011.
@@ -12,36 +10,39 @@ msgid ""
msgstr ""
"Project-Id-Version: SparkleShare\n"
"Report-Msgid-Bugs-To: \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"
+"POT-Creation-Date: 2011-09-27 20:30+0200\n"
+"PO-Revision-Date: 2011-09-28 12:49+0000\n"
+"Last-Translator: paa \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:337
-#: ../SparkleShare/SparkleIntro.cs:67 ../SparkleShare/SparkleStatusIcon.cs:345
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:70
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:88
+#: ../SparkleShare/SparkleSetup.cs:67 ../SparkleShare/SparkleStatusIcon.cs:75
+#: ../SparkleShare/SparkleStatusIcon.cs:89
msgid "Welcome to SparkleShare!"
msgstr "Bienvenue sur SparkleShare !"
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:348
-#: ../SparkleShare/SparkleStatusIcon.cs:357
-msgid "Not everything is synced"
-msgstr "Tout n'est pas synchronisé"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:358
-#: ../SparkleShare/SparkleStatusIcon.cs:367
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:72
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:90
+#: ../SparkleShare/SparkleStatusIcon.cs:77
+#: ../SparkleShare/SparkleStatusIcon.cs:91
msgid "Up to date"
msgstr "À jour"
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:374
-#: ../SparkleShare/SparkleStatusIcon.cs:383
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:99
+#: ../SparkleShare/SparkleStatusIcon.cs:106
msgid "Syncing…"
msgstr "Synchronisation en cours…"
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:109
+#: ../SparkleShare/SparkleStatusIcon.cs:116
+msgid "Not everything is synced"
+msgstr "Tout n'est pas synchronisé"
+
#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
msgid "Copy Web Link"
msgstr "Copier le lien web"
@@ -62,71 +63,88 @@ msgstr "Créer une copie d'une version antérieure de ce dossier"
msgid "Select to get a copy of this version"
msgstr "Sélectionner pour obtenir une copie de cette version"
+#: ../SparkleShare/Program.cs:51
+msgid "Print version information"
+msgstr "Affiche les informations de la version"
+
+#: ../SparkleShare/Program.cs:52
+msgid "Show this help text"
+msgstr "Afficher ce texte d’aide"
+
+#: ../SparkleShare/Program.cs:84
+msgid "SparkleShare, a collaboration and sharing tool."
+msgstr "SparkleShare, outils de collaboration et de partage"
+
+#: ../SparkleShare/Program.cs:85
+msgid "Copyright (C) 2010 Hylke Bons"
+msgstr "Copyright (C) 2010 Hylke Bons"
+
+#: ../SparkleShare/Program.cs:87
+msgid "This program comes with ABSOLUTELY NO WARRANTY."
+msgstr "Ce logiciel est diffusé sans AUCUNE GARANTIE."
+
+#: ../SparkleShare/Program.cs:89
+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/Program.cs:90
+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/Program.cs:92
+msgid "SparkleShare automatically syncs Git repositories in "
+msgstr "SparkleShare synchronise automatiquement les dépôts Git dans "
+
+#: ../SparkleShare/Program.cs:93
+msgid "the ~/SparkleShare folder with their remote origins."
+msgstr "le dossier ~/SparkleShare avec leurs racines distantes."
+
+#: ../SparkleShare/Program.cs:95
+msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..."
+msgstr "Utilisation : sparkleshare [start|stop|restart] [OPTION]…"
+
+#: ../SparkleShare/Program.cs:96
+msgid "Sync SparkleShare folder with remote repositories."
+msgstr "Synchroniser le dossier SparkleShare avec les dépôts distants."
+
+#: ../SparkleShare/Program.cs:98
+msgid "Arguments:"
+msgstr "Paramètres :"
+
+#: ../SparkleShare/Program.cs:108
+msgid "SparkleShare "
+msgstr "SparkleShare"
+
#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:46 ../SparkleShare/SparkleStatusIcon.cs:275
+#: ../SparkleShare/SparkleAbout.cs:53 ../SparkleShare/SparkleStatusIcon.cs:295
msgid "About SparkleShare"
msgstr "À propos de SparkleShare"
-#: ../SparkleShare/SparkleAbout.cs:53
-msgid "A newer version is available"
-msgstr "Une nouvelle version est disponible"
+#: ../SparkleShare/SparkleAbout.cs:70
+#, csharp-format
+msgid "A newer version ({0}) is available!"
+msgstr "Une nouvelle version ({0}) est disponible!"
-#: ../SparkleShare/SparkleAbout.cs:60
+#: ../SparkleShare/SparkleAbout.cs:79
msgid "You are running the latest version."
msgstr "Vous disposez de la dernière version."
-#: ../SparkleShare/SparkleAbout.cs:87
+#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:113
msgid "Checking for updates..."
msgstr "Vérification des mises à jour…"
-#: ../SparkleShare/SparkleAbout.cs:116
-msgid "_Show Credits"
-msgstr "_Afficher les crédits"
+#: ../SparkleShare/SparkleEventLog.cs:58
+msgid "Recent Events"
+msgstr "Évènements récents"
-#: ../SparkleShare/SparkleAbout.cs:129
-msgid "_Visit Website"
-msgstr "_Visiter le site web"
+#: ../SparkleShare/SparkleEventLog.cs:169
+#: ../SparkleShare/SparkleEventLog.cs:188
+msgid "All Folders"
+msgstr "Tous les dossiers"
-#: ../SparkleShare/SparkleController.cs:455
-msgid "ddd MMM d, yyyy"
-msgstr "ddd d MMM yyyy"
-
-#: ../SparkleShare/SparkleController.cs:460
-msgid "ddd MMM d"
-msgstr "ddd d MMM"
-
-#: ../SparkleShare/SparkleController.cs:661
-#, csharp-format
-msgid "added ‘{0}’"
-msgstr "Ajouté : « {0} »"
-
-#: ../SparkleShare/SparkleController.cs:666
-#, csharp-format
-msgid "moved ‘{0}’"
-msgstr "Déplacé : « {0} »"
-
-#: ../SparkleShare/SparkleController.cs:671
-#, csharp-format
-msgid "edited ‘{0}’"
-msgstr "Edité : « {0} »"
-
-#: ../SparkleShare/SparkleController.cs:676
-#, csharp-format
-msgid "deleted ‘{0}’"
-msgstr "Supprimé : « {0} »"
-
-#: ../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:689
-msgid "did something magical"
-msgstr "quelque chose de magique s'est passé"
-
-#: ../SparkleShare/SparkleIntro.cs:73
+#: ../SparkleShare/SparkleSetup.cs:68
msgid ""
"Before we can create a SparkleShare folder on this computer, we need a few "
"bits of information from you."
@@ -134,309 +152,207 @@ msgstr ""
"Afin de pouvoir créer un dossier SparkleShare sur cet ordinateur, nous avons"
" besoin de quelques informations."
-#: ../SparkleShare/SparkleIntro.cs:83
+#: ../SparkleShare/SparkleSetup.cs:75
msgid "Full Name:"
msgstr "Nom et prénom :"
-#: ../SparkleShare/SparkleIntro.cs:98
+#: ../SparkleShare/SparkleSetup.cs:90
msgid "Email:"
msgstr "Email :"
-#: ../SparkleShare/SparkleIntro.cs:109
+#: ../SparkleShare/SparkleSetup.cs:100
msgid "Next"
msgstr "Suivant"
-#: ../SparkleShare/SparkleIntro.cs:115
-msgid "Configuring…"
-msgstr "Configuration en cours…"
+#: ../SparkleShare/SparkleSetup.cs:121
+msgid "Where is your project?"
+msgstr "Où est votre projet ?"
-#: ../SparkleShare/SparkleIntro.cs:161
-msgid "Where is your remote folder?"
-msgstr "Où se trouve votre dossier distant ?"
-
-#: ../SparkleShare/SparkleIntro.cs:174
-msgid "address-to-server.com"
-msgstr "adresse-du-serveur.com"
-
-#: ../SparkleShare/SparkleIntro.cs:179
+#. Own server radiobutton
+#: ../SparkleShare/SparkleSetup.cs:130
msgid "On my own server:"
msgstr "Sur mon serveur :"
-#: ../SparkleShare/SparkleIntro.cs:186
-msgid "Free hosting for Free and Open Source Software projects."
-msgstr ""
-"Hébergement gratuit pour les projets de logiciels Open Source et gratuits."
-
-#: ../SparkleShare/SparkleIntro.cs:187
-msgid "Also has paid accounts for extra private space and bandwidth."
-msgstr ""
-"Dispose aussi de comptes payants pour plus d'espace privé et de bande "
-"passante."
-
-#: ../SparkleShare/SparkleIntro.cs:195
-msgid "The GNOME Project"
-msgstr "Le projet GNOME"
-
-#: ../SparkleShare/SparkleIntro.cs:197
-msgid "GNOME is an easy to understand interface to your computer."
-msgstr ""
-"GNOME est une interface graphique simple à utiliser pour votre ordinateur."
-
-#: ../SparkleShare/SparkleIntro.cs:198
-msgid "Select this option if you’re a developer or designer working on GNOME."
-msgstr ""
-"Choisissez cette option si vous êtes un développeur ou concepteur "
-"travaillant sous GNOME."
-
-#: ../SparkleShare/SparkleIntro.cs:206
-msgid "Gitorious"
-msgstr "Gitorious"
-
-#: ../SparkleShare/SparkleIntro.cs:208
-msgid "Completely Free as in Freedom infrastructure."
-msgstr "Infrastructure entièrement libre."
-
-#: ../SparkleShare/SparkleIntro.cs:209
-msgid "Free accounts for Free and Open Source projects."
-msgstr "Comptes gratuits pour les projets Open Source et gratuits."
-
-#: ../SparkleShare/SparkleIntro.cs:220
-msgid "Username/Folder"
-msgstr "Nom d'utilisateur/Dossier"
-
-#: ../SparkleShare/SparkleIntro.cs:225
-msgid "Project/Folder"
-msgstr "Projet/Dossier"
-
-#: ../SparkleShare/SparkleIntro.cs:230
-msgid "Project"
-msgstr "Projet"
-
-#: ../SparkleShare/SparkleIntro.cs:235 ../SparkleShare/SparkleIntro.cs:254
+#: ../SparkleShare/SparkleSetup.cs:135 ../SparkleShare/SparkleSetup.cs:225
msgid "Folder"
msgstr "Dossier"
-#: ../SparkleShare/SparkleIntro.cs:259 ../SparkleShare/SparkleIntro.cs:377
+#: ../SparkleShare/SparkleSetup.cs:162
+msgid "address-to-server.com"
+msgstr "adresse-du-serveur.com"
+
+#: ../SparkleShare/SparkleSetup.cs:183
+msgid "Username/Folder"
+msgstr "Nom d'utilisateur/Dossier"
+
+#. Gitorious radiobutton
+#: ../SparkleShare/SparkleSetup.cs:188
+msgid "Gitorious"
+msgstr "Gitorious"
+
+#: ../SparkleShare/SparkleSetup.cs:196
+msgid "Project/Folder"
+msgstr "Projet/Dossier"
+
+#. GNOME radiobutton
+#: ../SparkleShare/SparkleSetup.cs:201
+msgid "The GNOME Project"
+msgstr "Le projet GNOME"
+
+#: ../SparkleShare/SparkleSetup.cs:209
+msgid "Project"
+msgstr "Projet"
+
+#: ../SparkleShare/SparkleSetup.cs:219
msgid "Folder Name:"
msgstr "Nom du dossier :"
-#: ../SparkleShare/SparkleIntro.cs:269
-msgid "Sync"
-msgstr "Synchroniser"
-
-#: ../SparkleShare/SparkleIntro.cs:312
+#. Cancel button
+#: ../SparkleShare/SparkleSetup.cs:250 ../SparkleShare/SparkleSetup.cs:296
msgid "Cancel"
msgstr "Annuler"
-#: ../SparkleShare/SparkleIntro.cs:320
-msgid "Skip"
-msgstr "Passer"
+#. Sync button
+#: ../SparkleShare/SparkleSetup.cs:258
+msgid "Add"
+msgstr "Ajouter"
-#: ../SparkleShare/SparkleIntro.cs:347
-msgid "Invitation received!"
-msgstr "Invitation reçue !"
+#: ../SparkleShare/SparkleSetup.cs:286
+#, csharp-format
+msgid "Adding project ‘{0}’…"
+msgstr "Ajout du projet '{0}'"
-#: ../SparkleShare/SparkleIntro.cs:353
-msgid ""
-"You've received an invitation to join a shared folder.\n"
-"We're ready to hook you up immediately if you wish."
-msgstr ""
-"Vous avez reçu une invitation pour rejoindre un dossier partagé.\n"
-"Nous sommes prêt à vous connecter si vous le souhaitez."
+#: ../SparkleShare/SparkleSetup.cs:287
+msgid "This may take a while."
+msgstr "Cela peut prendre un peu de temps."
-#: ../SparkleShare/SparkleIntro.cs:359
-msgid "Do you accept this invitation?"
-msgstr "Acceptez vous cette invitation ?"
+#: ../SparkleShare/SparkleSetup.cs:288
+msgid "Are you sure it’s not coffee o'clock?"
+msgstr "Ne pensez-vous pas qu'il est temps de prendre un café ?"
-#: ../SparkleShare/SparkleIntro.cs:368
-msgid "Server Address:"
-msgstr "Adresse du serveur :"
+#: ../SparkleShare/SparkleSetup.cs:292 ../SparkleShare/SparkleSetup.cs:408
+#: ../SparkleShare/SparkleSetup.cs:507
+msgid "Finish"
+msgstr "Terminer"
-#: ../SparkleShare/SparkleIntro.cs:391
-msgid "Reject"
-msgstr "Rejeter"
+#: ../SparkleShare/SparkleSetup.cs:325
+msgid "Something went wrong"
+msgstr "Il y a eu un problème"
-#: ../SparkleShare/SparkleIntro.cs:392
-msgid "Accept and Sync"
-msgstr "Accepter et synchronisez"
+#: ../SparkleShare/SparkleSetup.cs:373
+msgid "Try Again…"
+msgstr "Réessayez..."
-#: ../SparkleShare/SparkleIntro.cs:442
-msgid "Something went wrong…"
-msgstr "Quelque chose s'est mal passé…"
-
-#: ../SparkleShare/SparkleIntro.cs:448
-msgid "Try Again"
-msgstr "Réessayer"
-
-#: ../SparkleShare/SparkleIntro.cs:473
+#: ../SparkleShare/SparkleSetup.cs:392
#, csharp-format
msgid "‘{0}’ has been successfully added"
msgstr "« {0} » a été ajouté avec succès"
-#: ../SparkleShare/SparkleIntro.cs:482
-msgid "Folder synced successfully!"
-msgstr "Le dossier a été synchronisé avec succès !"
+#: ../SparkleShare/SparkleSetup.cs:398
+msgid "Project successfully added!"
+msgstr "Projet ajouté !"
-#: ../SparkleShare/SparkleIntro.cs:489
-#, csharp-format
-msgid ""
-"Now you can access the synced files from ‘{0}’ in your SparkleShare folder."
-msgstr ""
-"Vous pouvez à présent accéder aux fichiers synchronisés sur « {0} » depuis "
-"votre dossier SparkleShare."
+#: ../SparkleShare/SparkleSetup.cs:399
+msgid "Access the files from your SparkleShare folder."
+msgstr "Accéder vos fichiers depuis le répertoire Sparkleshare"
#. A button that opens the synced folder
-#: ../SparkleShare/SparkleIntro.cs:497
+#: ../SparkleShare/SparkleSetup.cs:402
msgid "Open Folder"
msgstr "Ouvrir le dossier"
-#: ../SparkleShare/SparkleIntro.cs:503 ../SparkleShare/SparkleIntro.cs:543
-#: ../SparkleShare/SparkleIntro.cs:604
-msgid "Finish"
-msgstr "Terminer"
+#: ../SparkleShare/SparkleSetup.cs:428
+msgid "What's happening next?"
+msgstr "Et ensuite ?"
-#: ../SparkleShare/SparkleIntro.cs:528
-#, csharp-format
-msgid "Syncing folder ‘{0}’…"
-msgstr "Synchronise le dossier « {0} » …"
-
-#: ../SparkleShare/SparkleIntro.cs:535
-msgid "This may take a while.\n"
-msgstr ""
-"Cette opération peut durer un moment.\n"
-"\n"
-
-#: ../SparkleShare/SparkleIntro.cs:536
-msgid "Are you sure it’s not coffee o'clock?"
-msgstr "Ne pensez-vous pas qu'il est l'heure de prendre un café ?"
-
-#: ../SparkleShare/SparkleIntro.cs:579
-msgid "SparkleShare is ready to go!"
-msgstr "SparkleShare est opérationnel !"
-
-#: ../SparkleShare/SparkleIntro.cs:585
+#: ../SparkleShare/SparkleSetup.cs:429
msgid ""
-"Now you can start accepting invitations from others. \n"
-"Just click on invitations you get by email and we will take care of the rest."
+"SparkleShare creates a special folder in your personal folder that will keep"
+" track of your projects."
+msgstr "Sparkleshare crée un répertoire spécial pour vos projets"
+
+#: ../SparkleShare/SparkleSetup.cs:432
+msgid "Skip Tutorial"
+msgstr "Sauter ce tutoriel"
+
+#: ../SparkleShare/SparkleSetup.cs:437 ../SparkleShare/SparkleSetup.cs:457
+#: ../SparkleShare/SparkleSetup.cs:475
+msgid "Continue"
+msgstr "Continuer"
+
+#: ../SparkleShare/SparkleSetup.cs:453
+msgid "Sharing files with others"
+msgstr "Partager des fichers avec d'autres utilisateurs"
+
+#: ../SparkleShare/SparkleSetup.cs:454
+msgid ""
+"All files added to your project folders are synced with the host "
+"automatically, as well as with your collaborators."
msgstr ""
-"Vous pouvez désormais accepter des invitations. \n"
-"Pour cela, il vous suffira de cliquer sur les invitations que vous aurez reçues par mail et nous nous occuperons du reste."
+"Tous les fichiers ajoutés à votre projet sont synchronisés automatiquement, "
+"avec les vôtres ou ceux qui collaborent avec vous"
-#: ../SparkleShare/SparkleIntro.cs:596
-msgid "Learn how to host your own SparkleServer"
-msgstr "Apprendre à héberger son propre serveur SparkleServer"
+#: ../SparkleShare/SparkleSetup.cs:471
+msgid "The status icon is here to help"
+msgstr "L'îcone d'état est là pour vous renseigner"
-#: ../SparkleShare/SparkleEventLog.cs:61
-msgid "Recent Events"
-msgstr "Évènements récents"
-
-#: ../SparkleShare/SparkleEventLog.cs:148
-#: ../SparkleShare/SparkleEventLog.cs:173
-msgid "All Folders"
-msgstr "Tous les dossiers"
-
-#: ../SparkleShare/SparkleShare.cs:53
-msgid "Sorry, you can't run SparkleShare with these permissions."
+#: ../SparkleShare/SparkleSetup.cs:472
+msgid ""
+"It shows the syncing process status, and contains links to your projects and"
+" the event log."
msgstr ""
-"Désolé, vous ne disposez pas des autorisations nécessaires pour lancer "
-"SparkleShare."
+"Elle montre l'état du processus de synchronisation et contient les liens "
+"vers vos projets, ainsi que l'historique des évènements "
-#: ../SparkleShare/SparkleShare.cs:54
-msgid "Things would go utterly wrong."
-msgstr "Les choses pourraient très mal tourner."
+#: ../SparkleShare/SparkleSetup.cs:489
+msgid "Adding projects to SparkleShare"
+msgstr "Ajout de projets dans SpakleShare"
-#: ../SparkleShare/SparkleShare.cs:61
-msgid "Print version information"
-msgstr "Affiche les informations de la version"
-
-#: ../SparkleShare/SparkleShare.cs:62
-msgid "Show this help text"
-msgstr "Afficher ce texte d’aide"
-
-#: ../SparkleShare/SparkleShare.cs:109
-msgid "SparkleShare, a collaboration and sharing tool."
-msgstr "SparkleShare, outils de collaboration et de partage"
-
-#: ../SparkleShare/SparkleShare.cs:110
-msgid "Copyright (C) 2010 Hylke Bons"
-msgstr "Copyright (C) 2010 Hylke Bons"
-
-#: ../SparkleShare/SparkleShare.cs:112
-msgid "This program comes with ABSOLUTELY NO WARRANTY."
-msgstr "Ce logiciel est diffusé sans AUCUNE GARANTIE."
-
-#: ../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:115
-msgid "under certain conditions. Please read the GNU GPLv3 for details."
+#: ../SparkleShare/SparkleSetup.cs:490
+msgid ""
+"Just click this button when you see it on the web, and the project will be "
+"automatically added:"
msgstr ""
-"sous certaines conditions. Merci de lire la licence GNU GPLv3 pour de plus "
-"amples informations."
+"Cliquez sur ce bouton dans une page Web, et le projet sera automatiquement "
+"ajouté"
-#: ../SparkleShare/SparkleShare.cs:117
-msgid "SparkleShare automatically syncs Git repositories in "
-msgstr "SparkleShare synchronise automatiquement les dépôts Git dans "
-
-#: ../SparkleShare/SparkleShare.cs:118
-msgid "the ~/SparkleShare folder with their remote origins."
-msgstr "le dossier ~/SparkleShare avec leurs racines distantes."
-
-#: ../SparkleShare/SparkleShare.cs:120
-msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..."
-msgstr "Utilisation : sparkleshare [start|stop|restart] [OPTION]…"
-
-#: ../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:123
-msgid "Arguments:"
-msgstr "Paramètres :"
-
-#: ../SparkleShare/SparkleShare.cs:133
-msgid "SparkleShare "
-msgstr "SparkleShare"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:208
-msgid "No Remote Folders Yet"
-msgstr "Aucun dossier distant pour l'instant."
+#: ../SparkleShare/SparkleSetup.cs:493
+msgid ""
+"…or select ‘Add Project…’ from the status icon menu to add one by "
+"hand."
+msgstr ""
+"ou choisissez 'Ajouter un projet ...' depuis l'ïcone Etat pour "
+"ajouter un projet manuellement"
#. Opens the wizard to add a new remote folder
-#: ../SparkleShare/SparkleStatusIcon.cs:218
-msgid "Add Remote Folder…"
-msgstr "Ajouter un dossier distant…"
+#: ../SparkleShare/SparkleSetup.cs:502
+#: ../SparkleShare/SparkleStatusIcon.cs:238
+msgid "Add Project…"
+msgstr "Ajouter un projet"
-#: ../SparkleShare/SparkleStatusIcon.cs:242
+#: ../SparkleShare/SparkleSetupWindow.cs:45
+msgid "SparkleShare Setup"
+msgstr "Configuration de SparkleShare"
+
+#: ../SparkleShare/SparkleStatusIcon.cs:228
+msgid "No projects yet"
+msgstr "Pas de projets déclarés"
+
+#: ../SparkleShare/SparkleStatusIcon.cs:262
msgid "Show Recent Events"
msgstr "Afficher les évènements récents"
-#: ../SparkleShare/SparkleStatusIcon.cs:262
+#: ../SparkleShare/SparkleStatusIcon.cs:282
msgid "Turn Notifications Off"
msgstr "Désactiver les notifications"
-#: ../SparkleShare/SparkleStatusIcon.cs:264
+#: ../SparkleShare/SparkleStatusIcon.cs:284
msgid "Turn Notifications On"
msgstr "Activer les notifications"
#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:286
+#: ../SparkleShare/SparkleStatusIcon.cs:311
msgid "Quit"
msgstr "Quitter"
-#: ../SparkleShare/SparkleUI.cs:99
-msgid "Ouch! Mid-air collision!"
-msgstr "Outch ! Collision en plein ciel !"
-
-#: ../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 "
-"fichiers en conflit."
-
-#: ../SparkleShare/SparkleWindow.cs:41
-msgid "SparkleShare Setup"
-msgstr "Configuration de SparkleShare"
-
diff --git a/po/he.po b/po/he.po
old mode 100644
new mode 100755
index 73e49af4..9ac4a952
--- a/po/he.po
+++ b/po/he.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: SparkleShare\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-29 11:38+0200\n"
-"PO-Revision-Date: 2011-06-26 09:22+0000\n"
+"POT-Creation-Date: 2011-07-19 07:04+0200\n"
+"PO-Revision-Date: 2011-07-19 05:10+0000\n"
"Last-Translator: deejay1 \n"
"Language-Team: LANGUAGE \n"
"MIME-Version: 1.0\n"
@@ -18,26 +18,27 @@ msgstr ""
"Language: he\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:337
-#: ../SparkleShare/SparkleIntro.cs:67 ../SparkleShare/SparkleStatusIcon.cs:345
-msgid "Welcome to SparkleShare!"
-msgstr "ברוכים הבאים לספארקלשר!"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:348
-#: ../SparkleShare/SparkleStatusIcon.cs:357
-msgid "Not everything is synced"
-msgstr "לא הכל מסונכרן"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:358
-#: ../SparkleShare/SparkleStatusIcon.cs:367
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:69
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:86
+#: ../SparkleShare/SparkleStatusIcon.cs:372
msgid "Up to date"
msgstr "מעודכן"
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:374
-#: ../SparkleShare/SparkleStatusIcon.cs:383
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:84
+#: ../SparkleShare/SparkleSetup.cs:69 ../SparkleShare/SparkleStatusIcon.cs:350
+msgid "Welcome to SparkleShare!"
+msgstr "ברוכים הבאים לספארקלשר!"
+
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:95
+#: ../SparkleShare/SparkleStatusIcon.cs:388
msgid "Syncing…"
msgstr "מסנכרן..."
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:105
+#: ../SparkleShare/SparkleStatusIcon.cs:362
+msgid "Not everything is synced"
+msgstr "לא הכל מסונכרן"
+
#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
msgid "Copy Web Link"
msgstr "העתק לינק"
@@ -59,256 +60,62 @@ msgid "Select to get a copy of this version"
msgstr "בחר כדי לקבל העתק של גרסה זו"
#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:46 ../SparkleShare/SparkleStatusIcon.cs:275
+#: ../SparkleShare/SparkleAbout.cs:54 ../SparkleShare/SparkleStatusIcon.cs:275
msgid "About SparkleShare"
msgstr ""
-#: ../SparkleShare/SparkleAbout.cs:53
-msgid "A newer version is available"
+#: ../SparkleShare/SparkleAbout.cs:72
+#, csharp-format
+msgid "A newer version ({0}) is available!"
msgstr ""
-#: ../SparkleShare/SparkleAbout.cs:60
+#: ../SparkleShare/SparkleAbout.cs:80
msgid "You are running the latest version."
msgstr ""
-#: ../SparkleShare/SparkleAbout.cs:87
+#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:110
msgid "Checking for updates..."
msgstr ""
-#: ../SparkleShare/SparkleAbout.cs:116
-msgid "_Show Credits"
+#: ../SparkleShare/SparkleController.cs:446
+msgid "dddd, MMMM d, yyyy"
msgstr ""
-#: ../SparkleShare/SparkleAbout.cs:129
-msgid "_Visit Website"
-msgstr "_בקר באתר"
-
-#: ../SparkleShare/SparkleController.cs:455
-msgid "ddd MMM d, yyyy"
+#: ../SparkleShare/SparkleController.cs:451
+msgid "dddd, MMMM d"
msgstr ""
-#: ../SparkleShare/SparkleController.cs:460
-msgid "ddd MMM d"
-msgstr ""
-
-#: ../SparkleShare/SparkleController.cs:661
+#: ../SparkleShare/SparkleController.cs:660
#, csharp-format
msgid "added ‘{0}’"
msgstr "הוסף ‘{0}’"
-#: ../SparkleShare/SparkleController.cs:666
+#: ../SparkleShare/SparkleController.cs:665
#, csharp-format
msgid "moved ‘{0}’"
msgstr ""
-#: ../SparkleShare/SparkleController.cs:671
+#: ../SparkleShare/SparkleController.cs:670
#, csharp-format
msgid "edited ‘{0}’"
msgstr "נערך ‘{0}’"
-#: ../SparkleShare/SparkleController.cs:676
+#: ../SparkleShare/SparkleController.cs:675
#, csharp-format
msgid "deleted ‘{0}’"
msgstr "נמחק ‘{0}’"
-#: ../SparkleShare/SparkleController.cs:685
+#: ../SparkleShare/SparkleController.cs:684
#, csharp-format
msgid "and {0} more"
msgid_plural "and {0} more"
msgstr[0] ""
msgstr[1] ""
-#: ../SparkleShare/SparkleController.cs:689
+#: ../SparkleShare/SparkleController.cs:688
msgid "did something magical"
msgstr ""
-#: ../SparkleShare/SparkleIntro.cs:73
-msgid ""
-"Before we can create a SparkleShare folder on this computer, we need a few "
-"bits of information from you."
-msgstr ""
-"לפני שנוכל ליצור תקיית ספארקלשר על מחשב זה, אנו צריכים כמה פיסות מידע ממך."
-
-#: ../SparkleShare/SparkleIntro.cs:83
-msgid "Full Name:"
-msgstr "שם מלא:"
-
-#: ../SparkleShare/SparkleIntro.cs:98
-msgid "Email:"
-msgstr "דוא\"ל"
-
-#: ../SparkleShare/SparkleIntro.cs:109
-msgid "Next"
-msgstr "הבא"
-
-#: ../SparkleShare/SparkleIntro.cs:115
-msgid "Configuring…"
-msgstr "קובע הגדרות..."
-
-#: ../SparkleShare/SparkleIntro.cs:161
-msgid "Where is your remote folder?"
-msgstr "היכן נמצאת תקייתך המרוחקת?"
-
-#: ../SparkleShare/SparkleIntro.cs:174
-msgid "address-to-server.com"
-msgstr "כתובת-שרת.קום"
-
-#: ../SparkleShare/SparkleIntro.cs:179
-msgid "On my own server:"
-msgstr "על השרת שלי:"
-
-#: ../SparkleShare/SparkleIntro.cs:186
-msgid "Free hosting for Free and Open Source Software projects."
-msgstr "שירותי אחסון חינמיים לפרוייקטי קוד פתוח חופשיים."
-
-#: ../SparkleShare/SparkleIntro.cs:187
-msgid "Also has paid accounts for extra private space and bandwidth."
-msgstr "מציעים גם חשבונות בתשלום עם מקום אחסון אישי ותעבורה גדולים."
-
-#: ../SparkleShare/SparkleIntro.cs:195
-msgid "The GNOME Project"
-msgstr "פרוייקט גנום"
-
-#: ../SparkleShare/SparkleIntro.cs:197
-msgid "GNOME is an easy to understand interface to your computer."
-msgstr "פרוייקט גנום הינו ממשק קל ונוח למחשבך"
-
-#: ../SparkleShare/SparkleIntro.cs:198
-msgid "Select this option if you’re a developer or designer working on GNOME."
-msgstr "בחר באפשרות זו אם אתה מתכנת או מעצב העובד על פרוייקט גנום."
-
-#: ../SparkleShare/SparkleIntro.cs:206
-msgid "Gitorious"
-msgstr "גיטוריוס"
-
-#: ../SparkleShare/SparkleIntro.cs:208
-msgid "Completely Free as in Freedom infrastructure."
-msgstr "חופשי לגמרי כבתשתית חופשית."
-
-#: ../SparkleShare/SparkleIntro.cs:209
-msgid "Free accounts for Free and Open Source projects."
-msgstr "חשבונות חינמיים לפרוייקטי קוד חופשי ופתוח."
-
-#: ../SparkleShare/SparkleIntro.cs:220
-msgid "Username/Folder"
-msgstr "שם משתמש\\תקייה"
-
-#: ../SparkleShare/SparkleIntro.cs:225
-msgid "Project/Folder"
-msgstr "פרוייקט\\תקייה"
-
-#: ../SparkleShare/SparkleIntro.cs:230
-msgid "Project"
-msgstr "פרוייקט"
-
-#: ../SparkleShare/SparkleIntro.cs:235 ../SparkleShare/SparkleIntro.cs:254
-msgid "Folder"
-msgstr "תקייה"
-
-#: ../SparkleShare/SparkleIntro.cs:259 ../SparkleShare/SparkleIntro.cs:377
-msgid "Folder Name:"
-msgstr "שם תקייה:"
-
-#: ../SparkleShare/SparkleIntro.cs:269
-msgid "Sync"
-msgstr "סנכרן"
-
-#: ../SparkleShare/SparkleIntro.cs:312
-msgid "Cancel"
-msgstr "בטל"
-
-#: ../SparkleShare/SparkleIntro.cs:320
-msgid "Skip"
-msgstr "דלג"
-
-#: ../SparkleShare/SparkleIntro.cs:347
-msgid "Invitation received!"
-msgstr "ההזמנה התקבלה!"
-
-#: ../SparkleShare/SparkleIntro.cs:353
-msgid ""
-"You've received an invitation to join a shared folder.\n"
-"We're ready to hook you up immediately if you wish."
-msgstr ""
-"קיבלת הזמנה להצטרף תקייה משותפת.\n"
-"אנו מוכנים לחבר אותך ברגע זה אם תרצה."
-
-#: ../SparkleShare/SparkleIntro.cs:359
-msgid "Do you accept this invitation?"
-msgstr "האם אתה מקבל את ההזמנה הזו?"
-
-#: ../SparkleShare/SparkleIntro.cs:368
-msgid "Server Address:"
-msgstr "כתובת שרת:"
-
-#: ../SparkleShare/SparkleIntro.cs:391
-msgid "Reject"
-msgstr "דחה"
-
-#: ../SparkleShare/SparkleIntro.cs:392
-msgid "Accept and Sync"
-msgstr "אשר וסנכרן"
-
-#: ../SparkleShare/SparkleIntro.cs:442
-msgid "Something went wrong…"
-msgstr "משהו לא הלך כשורה..."
-
-#: ../SparkleShare/SparkleIntro.cs:448
-msgid "Try Again"
-msgstr "נסה שוב"
-
-#: ../SparkleShare/SparkleIntro.cs:473
-#, csharp-format
-msgid "‘{0}’ has been successfully added"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:482
-msgid "Folder synced successfully!"
-msgstr "התקייה סונכרנה בהצלחה!"
-
-#: ../SparkleShare/SparkleIntro.cs:489
-#, csharp-format
-msgid ""
-"Now you can access the synced files from ‘{0}’ in your SparkleShare folder."
-msgstr "אפשר כעת לגשת לקבצים שסונכרנו מ-‘{0}’ בתיקיית ספארקלשר שלך."
-
-#. A button that opens the synced folder
-#: ../SparkleShare/SparkleIntro.cs:497
-msgid "Open Folder"
-msgstr "פתח תקייה"
-
-#: ../SparkleShare/SparkleIntro.cs:503 ../SparkleShare/SparkleIntro.cs:543
-#: ../SparkleShare/SparkleIntro.cs:604
-msgid "Finish"
-msgstr "סיים"
-
-#: ../SparkleShare/SparkleIntro.cs:528
-#, csharp-format
-msgid "Syncing folder ‘{0}’…"
-msgstr "מסנכרן תיקייה ‘{0}’..."
-
-#: ../SparkleShare/SparkleIntro.cs:535
-msgid "This may take a while.\n"
-msgstr "דבר זה יכול לקחת זמן.\n"
-
-#: ../SparkleShare/SparkleIntro.cs:536
-msgid "Are you sure it’s not coffee o'clock?"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:579
-msgid "SparkleShare is ready to go!"
-msgstr "ספארקלשר מוכן!"
-
-#: ../SparkleShare/SparkleIntro.cs:585
-msgid ""
-"Now you can start accepting invitations from others. \n"
-"Just click on invitations you get by email and we will take care of the rest."
-msgstr "הנך יכול עתה לקבל הזמנות מאחרים.פשוט לחץ על הזמנות שאתה מקבל."
-
-#: ../SparkleShare/SparkleIntro.cs:596
-msgid "Learn how to host your own SparkleServer"
-msgstr "למד איך להקים שרת אכסון, ספארקלסרבר (SparkleServer), של ספארקלשר משלך"
-
#: ../SparkleShare/SparkleEventLog.cs:61
msgid "Recent Events"
msgstr ""
@@ -318,6 +125,149 @@ msgstr ""
msgid "All Folders"
msgstr ""
+#: ../SparkleShare/SparkleSetup.cs:70
+msgid ""
+"Before we can create a SparkleShare folder on this computer, we need a few "
+"bits of information from you."
+msgstr ""
+"לפני שנוכל ליצור תקיית ספארקלשר על מחשב זה, אנו צריכים כמה פיסות מידע ממך."
+
+#: ../SparkleShare/SparkleSetup.cs:77
+msgid "Full Name:"
+msgstr "שם מלא:"
+
+#: ../SparkleShare/SparkleSetup.cs:92
+msgid "Email:"
+msgstr "דוא\"ל"
+
+#: ../SparkleShare/SparkleSetup.cs:102
+msgid "Next"
+msgstr "הבא"
+
+#: ../SparkleShare/SparkleSetup.cs:122
+msgid "Where is your remote folder?"
+msgstr "היכן נמצאת תקייתך המרוחקת?"
+
+#. Own server radiobutton
+#: ../SparkleShare/SparkleSetup.cs:131
+msgid "On my own server:"
+msgstr "על השרת שלי:"
+
+#: ../SparkleShare/SparkleSetup.cs:136 ../SparkleShare/SparkleSetup.cs:238
+msgid "Folder"
+msgstr "תקייה"
+
+#: ../SparkleShare/SparkleSetup.cs:163
+msgid "address-to-server.com"
+msgstr "כתובת-שרת.קום"
+
+#: ../SparkleShare/SparkleSetup.cs:178
+msgid "Free hosting for Free and Open Source Software projects."
+msgstr "שירותי אחסון חינמיים לפרוייקטי קוד פתוח חופשיים."
+
+#: ../SparkleShare/SparkleSetup.cs:179
+msgid "Also has paid accounts for extra private space and bandwidth."
+msgstr "מציעים גם חשבונות בתשלום עם מקום אחסון אישי ותעבורה גדולים."
+
+#: ../SparkleShare/SparkleSetup.cs:188
+msgid "Username/Folder"
+msgstr "שם משתמש\\תקייה"
+
+#. Gitorious radiobutton
+#: ../SparkleShare/SparkleSetup.cs:193
+msgid "Gitorious"
+msgstr "גיטוריוס"
+
+#: ../SparkleShare/SparkleSetup.cs:195
+msgid "Completely Free as in Freedom infrastructure."
+msgstr "חופשי לגמרי כבתשתית חופשית."
+
+#: ../SparkleShare/SparkleSetup.cs:196
+msgid "Free accounts for Free and Open Source projects."
+msgstr "חשבונות חינמיים לפרוייקטי קוד חופשי ופתוח."
+
+#: ../SparkleShare/SparkleSetup.cs:205
+msgid "Project/Folder"
+msgstr "פרוייקט\\תקייה"
+
+#. GNOME radiobutton
+#: ../SparkleShare/SparkleSetup.cs:210
+msgid "The GNOME Project"
+msgstr "פרוייקט גנום"
+
+#: ../SparkleShare/SparkleSetup.cs:212
+msgid "GNOME is an easy to understand interface to your computer."
+msgstr "פרוייקט גנום הינו ממשק קל ונוח למחשבך"
+
+#: ../SparkleShare/SparkleSetup.cs:213
+msgid "Select this option if you’re a developer or designer working on GNOME."
+msgstr "בחר באפשרות זו אם אתה מתכנת או מעצב העובד על פרוייקט גנום."
+
+#: ../SparkleShare/SparkleSetup.cs:222
+msgid "Project"
+msgstr "פרוייקט"
+
+#: ../SparkleShare/SparkleSetup.cs:232
+msgid "Folder Name:"
+msgstr "שם תקייה:"
+
+#. Cancel button
+#: ../SparkleShare/SparkleSetup.cs:251
+msgid "Cancel"
+msgstr "בטל"
+
+#. Sync button
+#: ../SparkleShare/SparkleSetup.cs:259
+msgid "Sync"
+msgstr "סנכרן"
+
+#: ../SparkleShare/SparkleSetup.cs:286
+#, csharp-format
+msgid "Syncing folder ‘{0}’…"
+msgstr "מסנכרן תיקייה ‘{0}’..."
+
+#: ../SparkleShare/SparkleSetup.cs:287
+msgid "This may take a while."
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:288
+msgid "Are you sure it’s not coffee o'clock?"
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:292 ../SparkleShare/SparkleSetup.cs:375
+msgid "Finish"
+msgstr "סיים"
+
+#: ../SparkleShare/SparkleSetup.cs:321
+msgid "Something went wrong"
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:341
+msgid "Try Again"
+msgstr "נסה שוב"
+
+#: ../SparkleShare/SparkleSetup.cs:359
+#, csharp-format
+msgid "‘{0}’ has been successfully added"
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:365
+msgid "Folder synced successfully!"
+msgstr "התקייה סונכרנה בהצלחה!"
+
+#: ../SparkleShare/SparkleSetup.cs:366
+msgid "Access the synced files from your SparkleShare folder."
+msgstr ""
+
+#. A button that opens the synced folder
+#: ../SparkleShare/SparkleSetup.cs:369
+msgid "Open Folder"
+msgstr "פתח תקייה"
+
+#: ../SparkleShare/SparkleSetupWindow.cs:45
+msgid "SparkleShare Setup"
+msgstr ""
+
#: ../SparkleShare/SparkleShare.cs:53
msgid "Sorry, you can't run SparkleShare with these permissions."
msgstr "מצטערים, אך אינך יכול להריץ ספארקלשר עם ההרשאות האלה."
@@ -400,20 +350,8 @@ msgid "Turn Notifications On"
msgstr ""
#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:286
+#: ../SparkleShare/SparkleStatusIcon.cs:291
msgid "Quit"
msgstr "צא"
-#: ../SparkleShare/SparkleUI.cs:99
-msgid "Ouch! Mid-air collision!"
-msgstr "איה! התנגשות באמצע ההעברה!"
-
-#: ../SparkleShare/SparkleUI.cs:100
-msgid "Don't worry, SparkleShare made a copy of each conflicting file."
-msgstr "אל דאגה, ספארקלשר יצר העתק של כל אחד מהקבצים הסותרים (השונים)"
-
-#: ../SparkleShare/SparkleWindow.cs:41
-msgid "SparkleShare Setup"
-msgstr ""
-
diff --git a/po/hu.po b/po/hu.po
old mode 100644
new mode 100755
index c098780f..20b52d81
--- a/po/hu.po
+++ b/po/hu.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: SparkleShare\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-29 11:38+0200\n"
-"PO-Revision-Date: 2011-06-26 09:22+0000\n"
+"POT-Creation-Date: 2011-07-19 07:04+0200\n"
+"PO-Revision-Date: 2011-07-19 05:10+0000\n"
"Last-Translator: deejay1 \n"
"Language-Team: LANGUAGE \n"
"MIME-Version: 1.0\n"
@@ -19,26 +19,27 @@ msgstr ""
"Language: hu\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: ../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:348
-#: ../SparkleShare/SparkleStatusIcon.cs:357
-msgid "Not everything is synced"
-msgstr "Nincs minden szinkronizálva"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:358
-#: ../SparkleShare/SparkleStatusIcon.cs:367
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:69
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:86
+#: ../SparkleShare/SparkleStatusIcon.cs:372
msgid "Up to date"
msgstr "Naprakész"
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:374
-#: ../SparkleShare/SparkleStatusIcon.cs:383
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:84
+#: ../SparkleShare/SparkleSetup.cs:69 ../SparkleShare/SparkleStatusIcon.cs:350
+msgid "Welcome to SparkleShare!"
+msgstr "Üdvözli a SparkleShare!"
+
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:95
+#: ../SparkleShare/SparkleStatusIcon.cs:388
msgid "Syncing…"
msgstr "Szinkronizálás..."
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:105
+#: ../SparkleShare/SparkleStatusIcon.cs:362
+msgid "Not everything is synced"
+msgstr "Nincs minden szinkronizálva"
+
#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
msgid "Copy Web Link"
msgstr "Weblink kimásolása"
@@ -60,266 +61,62 @@ msgid "Select to get a copy of this version"
msgstr "Válasszon hogy egy korábbi változatot megkapjon"
#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:46 ../SparkleShare/SparkleStatusIcon.cs:275
+#: ../SparkleShare/SparkleAbout.cs:54 ../SparkleShare/SparkleStatusIcon.cs:275
msgid "About SparkleShare"
msgstr "A SparkleShare-ről"
-#: ../SparkleShare/SparkleAbout.cs:53
-msgid "A newer version is available"
-msgstr "Egy újabb verzió elérhető"
+#: ../SparkleShare/SparkleAbout.cs:72
+#, csharp-format
+msgid "A newer version ({0}) is available!"
+msgstr ""
-#: ../SparkleShare/SparkleAbout.cs:60
+#: ../SparkleShare/SparkleAbout.cs:80
msgid "You are running the latest version."
msgstr "Az elérhető legújabb verziót használja."
-#: ../SparkleShare/SparkleAbout.cs:87
+#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:110
msgid "Checking for updates..."
msgstr "Frissítések keresése..."
-#: ../SparkleShare/SparkleAbout.cs:116
-msgid "_Show Credits"
-msgstr "Szerzői névsor megjelenítése"
+#: ../SparkleShare/SparkleController.cs:446
+msgid "dddd, MMMM d, yyyy"
+msgstr ""
-#: ../SparkleShare/SparkleAbout.cs:129
-msgid "_Visit Website"
-msgstr "Weboldal meglátogatása"
+#: ../SparkleShare/SparkleController.cs:451
+msgid "dddd, MMMM d"
+msgstr ""
-#: ../SparkleShare/SparkleController.cs:455
-msgid "ddd MMM d, yyyy"
-msgstr "ddd MMM d, yyyy"
-
-#: ../SparkleShare/SparkleController.cs:460
-msgid "ddd MMM d"
-msgstr "ddd MMM d"
-
-#: ../SparkleShare/SparkleController.cs:661
+#: ../SparkleShare/SparkleController.cs:660
#, csharp-format
msgid "added ‘{0}’"
msgstr "hozzáadva '{0}'"
-#: ../SparkleShare/SparkleController.cs:666
+#: ../SparkleShare/SparkleController.cs:665
#, csharp-format
msgid "moved ‘{0}’"
msgstr "elmozgatva '{0}'"
-#: ../SparkleShare/SparkleController.cs:671
+#: ../SparkleShare/SparkleController.cs:670
#, csharp-format
msgid "edited ‘{0}’"
msgstr "szerkesztve '{0}'"
-#: ../SparkleShare/SparkleController.cs:676
+#: ../SparkleShare/SparkleController.cs:675
#, csharp-format
msgid "deleted ‘{0}’"
msgstr "törölve '{0}'"
-#: ../SparkleShare/SparkleController.cs:685
+#: ../SparkleShare/SparkleController.cs:684
#, 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:689
+#: ../SparkleShare/SparkleController.cs:688
msgid "did something magical"
msgstr "valami varázslatosat tett"
-#: ../SparkleShare/SparkleIntro.cs:73
-msgid ""
-"Before we can create a SparkleShare folder on this computer, we need a few "
-"bits of information from you."
-msgstr ""
-"Mielőtt még egy SparkleShare mappát készítenénk ezen a gépen, még néhány "
-"apró információra lenne szükség."
-
-#: ../SparkleShare/SparkleIntro.cs:83
-msgid "Full Name:"
-msgstr "Teljes név:"
-
-#: ../SparkleShare/SparkleIntro.cs:98
-msgid "Email:"
-msgstr "Email:"
-
-#: ../SparkleShare/SparkleIntro.cs:109
-msgid "Next"
-msgstr "Következő"
-
-#: ../SparkleShare/SparkleIntro.cs:115
-msgid "Configuring…"
-msgstr "Beállítás alatt..."
-
-#: ../SparkleShare/SparkleIntro.cs:161
-msgid "Where is your remote folder?"
-msgstr "Hol van a távoli elérésű mappája?"
-
-#: ../SparkleShare/SparkleIntro.cs:174
-msgid "address-to-server.com"
-msgstr "cím-a-szerverhez.hu"
-
-#: ../SparkleShare/SparkleIntro.cs:179
-msgid "On my own server:"
-msgstr "A saját szerveremen:"
-
-#: ../SparkleShare/SparkleIntro.cs:186
-msgid "Free hosting for Free and Open Source Software projects."
-msgstr ""
-"Ingyenes tárhely szolgáltatás ingyenes és nyílt forrású szoftver projektek "
-"számára."
-
-#: ../SparkleShare/SparkleIntro.cs:187
-msgid "Also has paid accounts for extra private space and bandwidth."
-msgstr ""
-"De rendelkezünk fizetős regisztrációkkal még több személyes tárhelyhez és "
-"sávszélességhez."
-
-#: ../SparkleShare/SparkleIntro.cs:195
-msgid "The GNOME Project"
-msgstr "A GNOME Project"
-
-#: ../SparkleShare/SparkleIntro.cs:197
-msgid "GNOME is an easy to understand interface to your computer."
-msgstr "GNOME egy könnyen érthető kezelőfelület a gépéhez."
-
-#: ../SparkleShare/SparkleIntro.cs:198
-msgid "Select this option if you’re a developer or designer working on GNOME."
-msgstr ""
-"Válassza ezt az opciót ha fejlesztő vagy tervezőként dolgozik GNOME-ban"
-
-#: ../SparkleShare/SparkleIntro.cs:206
-msgid "Gitorious"
-msgstr "Gitorious"
-
-#: ../SparkleShare/SparkleIntro.cs:208
-msgid "Completely Free as in Freedom infrastructure."
-msgstr "Teljesen szabad mint Szabad infrastruktúra."
-
-#: ../SparkleShare/SparkleIntro.cs:209
-msgid "Free accounts for Free and Open Source projects."
-msgstr "Ingyenes regisztrációk a szabad és nyílt forrású projektek számára."
-
-#: ../SparkleShare/SparkleIntro.cs:220
-msgid "Username/Folder"
-msgstr "Felhasználónév / Mappa"
-
-#: ../SparkleShare/SparkleIntro.cs:225
-msgid "Project/Folder"
-msgstr "Projekt / Mappa"
-
-#: ../SparkleShare/SparkleIntro.cs:230
-msgid "Project"
-msgstr "Projekt"
-
-#: ../SparkleShare/SparkleIntro.cs:235 ../SparkleShare/SparkleIntro.cs:254
-msgid "Folder"
-msgstr "Mappa"
-
-#: ../SparkleShare/SparkleIntro.cs:259 ../SparkleShare/SparkleIntro.cs:377
-msgid "Folder Name:"
-msgstr "Mappa neve:"
-
-#: ../SparkleShare/SparkleIntro.cs:269
-msgid "Sync"
-msgstr "Szinkronizál"
-
-#: ../SparkleShare/SparkleIntro.cs:312
-msgid "Cancel"
-msgstr "Mégsem"
-
-#: ../SparkleShare/SparkleIntro.cs:320
-msgid "Skip"
-msgstr "Kihagyás"
-
-#: ../SparkleShare/SparkleIntro.cs:347
-msgid "Invitation received!"
-msgstr "Meghívás érkezett!"
-
-#: ../SparkleShare/SparkleIntro.cs:353
-msgid ""
-"You've received an invitation to join a shared folder.\n"
-"We're ready to hook you up immediately if you wish."
-msgstr ""
-"Meghívást kapott, hogy csatlakozzon egy megosztott mappához. Készen állunk "
-"hogy bekapcsoljuk azonnal, ha kívánja."
-
-#: ../SparkleShare/SparkleIntro.cs:359
-msgid "Do you accept this invitation?"
-msgstr "Elfogadja ezt a meghívást?"
-
-#: ../SparkleShare/SparkleIntro.cs:368
-msgid "Server Address:"
-msgstr "Szerver címe:"
-
-#: ../SparkleShare/SparkleIntro.cs:391
-msgid "Reject"
-msgstr "Elutasítás"
-
-#: ../SparkleShare/SparkleIntro.cs:392
-msgid "Accept and Sync"
-msgstr "Elfogadás és szinkronizálás"
-
-#: ../SparkleShare/SparkleIntro.cs:442
-msgid "Something went wrong…"
-msgstr "Valami nem sikerült..."
-
-#: ../SparkleShare/SparkleIntro.cs:448
-msgid "Try Again"
-msgstr "Próbálja újra"
-
-#: ../SparkleShare/SparkleIntro.cs:473
-#, csharp-format
-msgid "‘{0}’ has been successfully added"
-msgstr "'{0}' sikeresen hozzáadva"
-
-#: ../SparkleShare/SparkleIntro.cs:482
-msgid "Folder synced successfully!"
-msgstr "Mappa sikeresen szinkronizálva!"
-
-#: ../SparkleShare/SparkleIntro.cs:489
-#, csharp-format
-msgid ""
-"Now you can access the synced files from ‘{0}’ in your SparkleShare folder."
-msgstr ""
-"Most már el tudja érni a szinkronizált fájlokat '{0}' a SparkleShare "
-"mappában."
-
-#. A button that opens the synced folder
-#: ../SparkleShare/SparkleIntro.cs:497
-msgid "Open Folder"
-msgstr "Mappa megnyitása"
-
-#: ../SparkleShare/SparkleIntro.cs:503 ../SparkleShare/SparkleIntro.cs:543
-#: ../SparkleShare/SparkleIntro.cs:604
-msgid "Finish"
-msgstr "Befejezés"
-
-#: ../SparkleShare/SparkleIntro.cs:528
-#, csharp-format
-msgid "Syncing folder ‘{0}’…"
-msgstr "Szinkronizálása mappa '{0}'..."
-
-#: ../SparkleShare/SparkleIntro.cs:535
-msgid "This may take a while.\n"
-msgstr "Ez eltarthat egy ideig.\n"
-
-#: ../SparkleShare/SparkleIntro.cs:536
-msgid "Are you sure it’s not coffee o'clock?"
-msgstr "Biztos benne, hogy nincs kávészünet?"
-
-#: ../SparkleShare/SparkleIntro.cs:579
-msgid "SparkleShare is ready to go!"
-msgstr "SparkleShare készen áll!"
-
-#: ../SparkleShare/SparkleIntro.cs:585
-msgid ""
-"Now you can start accepting invitations from others. \n"
-"Just click on invitations you get by email and we will take care of the rest."
-msgstr ""
-"Most már meg lehet kezdeni elfogadni a meghívásokat másoktól.\n"
-"Csak kattintson a meghívásokra amit e-mailben kap, és mi gondoskodunk a többiről."
-
-#: ../SparkleShare/SparkleIntro.cs:596
-msgid "Learn how to host your own SparkleServer"
-msgstr "Ismerje meg, hogyan tarthat saját SparkleServer-t"
-
#: ../SparkleShare/SparkleEventLog.cs:61
msgid "Recent Events"
msgstr "Utóbbi események"
@@ -329,6 +126,155 @@ msgstr "Utóbbi események"
msgid "All Folders"
msgstr "MInden mappa"
+#: ../SparkleShare/SparkleSetup.cs:70
+msgid ""
+"Before we can create a SparkleShare folder on this computer, we need a few "
+"bits of information from you."
+msgstr ""
+"Mielőtt még egy SparkleShare mappát készítenénk ezen a gépen, még néhány "
+"apró információra lenne szükség."
+
+#: ../SparkleShare/SparkleSetup.cs:77
+msgid "Full Name:"
+msgstr "Teljes név:"
+
+#: ../SparkleShare/SparkleSetup.cs:92
+msgid "Email:"
+msgstr "Email:"
+
+#: ../SparkleShare/SparkleSetup.cs:102
+msgid "Next"
+msgstr "Következő"
+
+#: ../SparkleShare/SparkleSetup.cs:122
+msgid "Where is your remote folder?"
+msgstr "Hol van a távoli elérésű mappája?"
+
+#. Own server radiobutton
+#: ../SparkleShare/SparkleSetup.cs:131
+msgid "On my own server:"
+msgstr "A saját szerveremen:"
+
+#: ../SparkleShare/SparkleSetup.cs:136 ../SparkleShare/SparkleSetup.cs:238
+msgid "Folder"
+msgstr "Mappa"
+
+#: ../SparkleShare/SparkleSetup.cs:163
+msgid "address-to-server.com"
+msgstr "cím-a-szerverhez.hu"
+
+#: ../SparkleShare/SparkleSetup.cs:178
+msgid "Free hosting for Free and Open Source Software projects."
+msgstr ""
+"Ingyenes tárhely szolgáltatás ingyenes és nyílt forrású szoftver projektek "
+"számára."
+
+#: ../SparkleShare/SparkleSetup.cs:179
+msgid "Also has paid accounts for extra private space and bandwidth."
+msgstr ""
+"De rendelkezünk fizetős regisztrációkkal még több személyes tárhelyhez és "
+"sávszélességhez."
+
+#: ../SparkleShare/SparkleSetup.cs:188
+msgid "Username/Folder"
+msgstr "Felhasználónév / Mappa"
+
+#. Gitorious radiobutton
+#: ../SparkleShare/SparkleSetup.cs:193
+msgid "Gitorious"
+msgstr "Gitorious"
+
+#: ../SparkleShare/SparkleSetup.cs:195
+msgid "Completely Free as in Freedom infrastructure."
+msgstr "Teljesen szabad mint Szabad infrastruktúra."
+
+#: ../SparkleShare/SparkleSetup.cs:196
+msgid "Free accounts for Free and Open Source projects."
+msgstr "Ingyenes regisztrációk a szabad és nyílt forrású projektek számára."
+
+#: ../SparkleShare/SparkleSetup.cs:205
+msgid "Project/Folder"
+msgstr "Projekt / Mappa"
+
+#. GNOME radiobutton
+#: ../SparkleShare/SparkleSetup.cs:210
+msgid "The GNOME Project"
+msgstr "A GNOME Project"
+
+#: ../SparkleShare/SparkleSetup.cs:212
+msgid "GNOME is an easy to understand interface to your computer."
+msgstr "GNOME egy könnyen érthető kezelőfelület a gépéhez."
+
+#: ../SparkleShare/SparkleSetup.cs:213
+msgid "Select this option if you’re a developer or designer working on GNOME."
+msgstr ""
+"Válassza ezt az opciót ha fejlesztő vagy tervezőként dolgozik GNOME-ban"
+
+#: ../SparkleShare/SparkleSetup.cs:222
+msgid "Project"
+msgstr "Projekt"
+
+#: ../SparkleShare/SparkleSetup.cs:232
+msgid "Folder Name:"
+msgstr "Mappa neve:"
+
+#. Cancel button
+#: ../SparkleShare/SparkleSetup.cs:251
+msgid "Cancel"
+msgstr "Mégsem"
+
+#. Sync button
+#: ../SparkleShare/SparkleSetup.cs:259
+msgid "Sync"
+msgstr "Szinkronizál"
+
+#: ../SparkleShare/SparkleSetup.cs:286
+#, csharp-format
+msgid "Syncing folder ‘{0}’…"
+msgstr "Szinkronizálása mappa '{0}'..."
+
+#: ../SparkleShare/SparkleSetup.cs:287
+msgid "This may take a while."
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:288
+msgid "Are you sure it’s not coffee o'clock?"
+msgstr "Biztos benne, hogy nincs kávészünet?"
+
+#: ../SparkleShare/SparkleSetup.cs:292 ../SparkleShare/SparkleSetup.cs:375
+msgid "Finish"
+msgstr "Befejezés"
+
+#: ../SparkleShare/SparkleSetup.cs:321
+msgid "Something went wrong"
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:341
+msgid "Try Again"
+msgstr "Próbálja újra"
+
+#: ../SparkleShare/SparkleSetup.cs:359
+#, csharp-format
+msgid "‘{0}’ has been successfully added"
+msgstr "'{0}' sikeresen hozzáadva"
+
+#: ../SparkleShare/SparkleSetup.cs:365
+msgid "Folder synced successfully!"
+msgstr "Mappa sikeresen szinkronizálva!"
+
+#: ../SparkleShare/SparkleSetup.cs:366
+msgid "Access the synced files from your SparkleShare folder."
+msgstr ""
+
+#. A button that opens the synced folder
+#: ../SparkleShare/SparkleSetup.cs:369
+msgid "Open Folder"
+msgstr "Mappa megnyitása"
+
+#: ../SparkleShare/SparkleSetupWindow.cs:45
+msgid "SparkleShare Setup"
+msgstr "SparkleShare beállítása"
+
#: ../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."
@@ -412,22 +358,8 @@ msgid "Turn Notifications On"
msgstr "Értesítések bekapcsolása"
#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:286
+#: ../SparkleShare/SparkleStatusIcon.cs:291
msgid "Quit"
msgstr "Kilépés"
-#: ../SparkleShare/SparkleUI.cs:99
-msgid "Ouch! Mid-air collision!"
-msgstr "Jaj! Ütközés a forgalomban!"
-
-#: ../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 "
-"másolatot."
-
-#: ../SparkleShare/SparkleWindow.cs:41
-msgid "SparkleShare Setup"
-msgstr "SparkleShare beállítása"
-
diff --git a/po/it.po b/po/it.po
old mode 100644
new mode 100755
index 43ecf2c3..4adb8917
--- a/po/it.po
+++ b/po/it.po
@@ -5,14 +5,15 @@
# back in the future.
#
# Ilias Bartolini , 2011.
+# Luca Delucchi , 2011.
# Łukasz Jernaś , 2011.
msgid ""
msgstr ""
"Project-Id-Version: SparkleShare\n"
"Report-Msgid-Bugs-To: \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"
+"POT-Creation-Date: 2011-07-19 07:04+0200\n"
+"PO-Revision-Date: 2011-08-04 09:09+0000\n"
+"Last-Translator: lucadelu \n"
"Language-Team: LANGUAGE \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,33 +21,34 @@ msgstr ""
"Language: it\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: ../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:348
-#: ../SparkleShare/SparkleStatusIcon.cs:357
-msgid "Not everything is synced"
-msgstr "Non tutto è sincronizzato"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:358
-#: ../SparkleShare/SparkleStatusIcon.cs:367
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:69
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:86
+#: ../SparkleShare/SparkleStatusIcon.cs:372
msgid "Up to date"
msgstr "Aggiornato"
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:374
-#: ../SparkleShare/SparkleStatusIcon.cs:383
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:84
+#: ../SparkleShare/SparkleSetup.cs:69 ../SparkleShare/SparkleStatusIcon.cs:350
+msgid "Welcome to SparkleShare!"
+msgstr "Benvenuto in SparkleShare!"
+
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:95
+#: ../SparkleShare/SparkleStatusIcon.cs:388
msgid "Syncing…"
msgstr "Sincronizzazione in corso..."
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:105
+#: ../SparkleShare/SparkleStatusIcon.cs:362
+msgid "Not everything is synced"
+msgstr "Non tutto è sincronizzato"
+
#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
msgid "Copy Web Link"
-msgstr "Copia Indirizzo Web"
+msgstr "Copia link web"
#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:114
msgid "Copy the web address of this file to the clipboard"
-msgstr "Copia l'indirizzo web di questo file negli appunti"
+msgstr "Copia l'indirizzo web di questo file"
#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:147
msgid "Get Earlier Version"
@@ -61,70 +63,72 @@ msgid "Select to get a copy of this version"
msgstr "Seleziona per ottenere una copia di questa versione"
#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:46 ../SparkleShare/SparkleStatusIcon.cs:275
+#: ../SparkleShare/SparkleAbout.cs:54 ../SparkleShare/SparkleStatusIcon.cs:275
msgid "About SparkleShare"
msgstr "Informazioni su SparkleShare"
-#: ../SparkleShare/SparkleAbout.cs:53
-msgid "A newer version is available"
-msgstr ""
+#: ../SparkleShare/SparkleAbout.cs:72
+#, csharp-format
+msgid "A newer version ({0}) is available!"
+msgstr "È disponibile una nuova versione ({0})"
-#: ../SparkleShare/SparkleAbout.cs:60
+#: ../SparkleShare/SparkleAbout.cs:80
msgid "You are running the latest version."
-msgstr ""
+msgstr "Stai lanciando l'ultima versione"
-#: ../SparkleShare/SparkleAbout.cs:87
+#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:110
msgid "Checking for updates..."
-msgstr ""
+msgstr "Controllando per aggiornamenti..."
-#: ../SparkleShare/SparkleAbout.cs:116
-msgid "_Show Credits"
-msgstr "_Mostra Crediti"
+#: ../SparkleShare/SparkleController.cs:446
+msgid "dddd, MMMM d, yyyy"
+msgstr "dddd, MMMM d, yyyy"
-#: ../SparkleShare/SparkleAbout.cs:129
-msgid "_Visit Website"
-msgstr "_Visita il sito web"
+#: ../SparkleShare/SparkleController.cs:451
+msgid "dddd, MMMM d"
+msgstr "dddd, MMMM d"
-#: ../SparkleShare/SparkleController.cs:455
-msgid "ddd MMM d, yyyy"
-msgstr "ddd MMM d, yyyy"
-
-#: ../SparkleShare/SparkleController.cs:460
-msgid "ddd MMM d"
-msgstr "ddd MMM d"
-
-#: ../SparkleShare/SparkleController.cs:661
+#: ../SparkleShare/SparkleController.cs:660
#, csharp-format
msgid "added ‘{0}’"
msgstr "aggiunti '{0}'"
-#: ../SparkleShare/SparkleController.cs:666
+#: ../SparkleShare/SparkleController.cs:665
#, csharp-format
msgid "moved ‘{0}’"
-msgstr ""
+msgstr "spostato '{0}'"
-#: ../SparkleShare/SparkleController.cs:671
+#: ../SparkleShare/SparkleController.cs:670
#, csharp-format
msgid "edited ‘{0}’"
msgstr "modificati '{0}'"
-#: ../SparkleShare/SparkleController.cs:676
+#: ../SparkleShare/SparkleController.cs:675
#, csharp-format
msgid "deleted ‘{0}’"
msgstr "eliminati '{0}'"
-#: ../SparkleShare/SparkleController.cs:685
+#: ../SparkleShare/SparkleController.cs:684
#, csharp-format
msgid "and {0} more"
msgid_plural "and {0} more"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "uno: e {0} più"
+msgstr[1] "altro: e {0} più"
-#: ../SparkleShare/SparkleController.cs:689
+#: ../SparkleShare/SparkleController.cs:688
msgid "did something magical"
-msgstr ""
+msgstr "È successo qualcosa di magico"
-#: ../SparkleShare/SparkleIntro.cs:73
+#: ../SparkleShare/SparkleEventLog.cs:61
+msgid "Recent Events"
+msgstr "Eventi recenti"
+
+#: ../SparkleShare/SparkleEventLog.cs:148
+#: ../SparkleShare/SparkleEventLog.cs:173
+msgid "All Folders"
+msgstr "Tutte le cartelle"
+
+#: ../SparkleShare/SparkleSetup.cs:70
msgid ""
"Before we can create a SparkleShare folder on this computer, we need a few "
"bits of information from you."
@@ -132,202 +136,145 @@ msgstr ""
"Prima di poter creare una cartella SparkleShare in questo computer, abbiamo "
"bisogno di qualche informazione da voi."
-#: ../SparkleShare/SparkleIntro.cs:83
+#: ../SparkleShare/SparkleSetup.cs:77
msgid "Full Name:"
msgstr "Nome e Cognome:"
-#: ../SparkleShare/SparkleIntro.cs:98
+#: ../SparkleShare/SparkleSetup.cs:92
msgid "Email:"
msgstr "Email:"
-#: ../SparkleShare/SparkleIntro.cs:109
+#: ../SparkleShare/SparkleSetup.cs:102
msgid "Next"
msgstr "Successivo"
-#: ../SparkleShare/SparkleIntro.cs:115
-msgid "Configuring…"
-msgstr "Configurazione in corso..."
-
-#: ../SparkleShare/SparkleIntro.cs:161
+#: ../SparkleShare/SparkleSetup.cs:122
msgid "Where is your remote folder?"
msgstr "Dove si trova la tua cartella remota?"
-#: ../SparkleShare/SparkleIntro.cs:174
-msgid "address-to-server.com"
-msgstr "indirizzo-del-server.com"
-
-#: ../SparkleShare/SparkleIntro.cs:179
+#. Own server radiobutton
+#: ../SparkleShare/SparkleSetup.cs:131
msgid "On my own server:"
msgstr "In un mio server personale:"
-#: ../SparkleShare/SparkleIntro.cs:186
+#: ../SparkleShare/SparkleSetup.cs:136 ../SparkleShare/SparkleSetup.cs:238
+msgid "Folder"
+msgstr "Cartella"
+
+#: ../SparkleShare/SparkleSetup.cs:163
+msgid "address-to-server.com"
+msgstr "indirizzo-del-server.com"
+
+#: ../SparkleShare/SparkleSetup.cs:178
msgid "Free hosting for Free and Open Source Software projects."
msgstr "Hosting gratuito per progetti di Software Libero ed Open Source:"
-#: ../SparkleShare/SparkleIntro.cs:187
+#: ../SparkleShare/SparkleSetup.cs:179
msgid "Also has paid accounts for extra private space and bandwidth."
msgstr ""
"Ha anche account a pagamento per una maggiore larghezza di banda e spazio "
"privato."
-#: ../SparkleShare/SparkleIntro.cs:195
+#: ../SparkleShare/SparkleSetup.cs:188
+msgid "Username/Folder"
+msgstr "Username/Cartella"
+
+#. Gitorious radiobutton
+#: ../SparkleShare/SparkleSetup.cs:193
+msgid "Gitorious"
+msgstr "Gitorius"
+
+#: ../SparkleShare/SparkleSetup.cs:195
+msgid "Completely Free as in Freedom infrastructure."
+msgstr "Completamente Libero, come nelle infrastrutture Libere"
+
+#: ../SparkleShare/SparkleSetup.cs:196
+msgid "Free accounts for Free and Open Source projects."
+msgstr "Account gratuiti per Software libero e progetti Open Source."
+
+#: ../SparkleShare/SparkleSetup.cs:205
+msgid "Project/Folder"
+msgstr "Progetto/Cartella"
+
+#. GNOME radiobutton
+#: ../SparkleShare/SparkleSetup.cs:210
msgid "The GNOME Project"
msgstr "The GNOME Project"
-#: ../SparkleShare/SparkleIntro.cs:197
+#: ../SparkleShare/SparkleSetup.cs:212
msgid "GNOME is an easy to understand interface to your computer."
msgstr "GNOME è una facile interfaccia al tuo computer."
-#: ../SparkleShare/SparkleIntro.cs:198
+#: ../SparkleShare/SparkleSetup.cs:213
msgid "Select this option if you’re a developer or designer working on GNOME."
msgstr ""
"Selezionare questa opzione se sei uno sviluppatore o progettista che sta "
"lavorando su GNOME."
-#: ../SparkleShare/SparkleIntro.cs:206
-msgid "Gitorious"
-msgstr "Gitorius"
-
-#: ../SparkleShare/SparkleIntro.cs:208
-msgid "Completely Free as in Freedom infrastructure."
-msgstr "Completamente Libero, come nelle infrastrutture Libere"
-
-#: ../SparkleShare/SparkleIntro.cs:209
-msgid "Free accounts for Free and Open Source projects."
-msgstr "Account gratuiti per Software libero e progetti Open Source."
-
-#: ../SparkleShare/SparkleIntro.cs:220
-msgid "Username/Folder"
-msgstr "Username/Cartella"
-
-#: ../SparkleShare/SparkleIntro.cs:225
-msgid "Project/Folder"
-msgstr "Progetto/Cartella"
-
-#: ../SparkleShare/SparkleIntro.cs:230
+#: ../SparkleShare/SparkleSetup.cs:222
msgid "Project"
msgstr "Progetto"
-#: ../SparkleShare/SparkleIntro.cs:235 ../SparkleShare/SparkleIntro.cs:254
-msgid "Folder"
-msgstr "Cartella"
-
-#: ../SparkleShare/SparkleIntro.cs:259 ../SparkleShare/SparkleIntro.cs:377
+#: ../SparkleShare/SparkleSetup.cs:232
msgid "Folder Name:"
msgstr "Nome Cartella:"
-#: ../SparkleShare/SparkleIntro.cs:269
-msgid "Sync"
-msgstr "Sincronizza"
-
-#: ../SparkleShare/SparkleIntro.cs:312
+#. Cancel button
+#: ../SparkleShare/SparkleSetup.cs:251
msgid "Cancel"
msgstr "Cancella"
-#: ../SparkleShare/SparkleIntro.cs:320
-msgid "Skip"
-msgstr "Salta"
+#. Sync button
+#: ../SparkleShare/SparkleSetup.cs:259
+msgid "Sync"
+msgstr "Sincronizza"
-#: ../SparkleShare/SparkleIntro.cs:347
-msgid "Invitation received!"
-msgstr "Invito ricevuto!"
-
-#: ../SparkleShare/SparkleIntro.cs:353
-msgid ""
-"You've received an invitation to join a shared folder.\n"
-"We're ready to hook you up immediately if you wish."
-msgstr ""
-"Hai ricevuto un invito a partecipare a una cartella condivisa. \n"
-" Siamo pronti ad agganciarti subito, se lo desideri"
-
-#: ../SparkleShare/SparkleIntro.cs:359
-msgid "Do you accept this invitation?"
-msgstr "Vuoi accettare questo invito?"
-
-#: ../SparkleShare/SparkleIntro.cs:368
-msgid "Server Address:"
-msgstr "Indirizzo Server:"
-
-#: ../SparkleShare/SparkleIntro.cs:391
-msgid "Reject"
-msgstr "Respingi"
-
-#: ../SparkleShare/SparkleIntro.cs:392
-msgid "Accept and Sync"
-msgstr "Accetta e Sincronizza"
-
-#: ../SparkleShare/SparkleIntro.cs:442
-msgid "Something went wrong…"
-msgstr "Si è verificato un errore..."
-
-#: ../SparkleShare/SparkleIntro.cs:448
-msgid "Try Again"
-msgstr "Prova Ancora"
-
-#: ../SparkleShare/SparkleIntro.cs:473
-#, csharp-format
-msgid "‘{0}’ has been successfully added"
-msgstr "‘{0}’ è stato aggiunto con successo"
-
-#: ../SparkleShare/SparkleIntro.cs:482
-msgid "Folder synced successfully!"
-msgstr "Cartella sincronizzata con successo!"
-
-#: ../SparkleShare/SparkleIntro.cs:489
-#, csharp-format
-msgid ""
-"Now you can access the synced files from ‘{0}’ in your SparkleShare folder."
-msgstr ""
-"Ora puoi accedere ai file sincronizzati da ‘{0}’ nella tua cartella "
-"SparkleShare."
-
-#. A button that opens the synced folder
-#: ../SparkleShare/SparkleIntro.cs:497
-msgid "Open Folder"
-msgstr "Apri cartella"
-
-#: ../SparkleShare/SparkleIntro.cs:503 ../SparkleShare/SparkleIntro.cs:543
-#: ../SparkleShare/SparkleIntro.cs:604
-msgid "Finish"
-msgstr "Finito"
-
-#: ../SparkleShare/SparkleIntro.cs:528
+#: ../SparkleShare/SparkleSetup.cs:286
#, csharp-format
msgid "Syncing folder ‘{0}’…"
msgstr "Sincronizzo cartella '{0}' ..."
-#: ../SparkleShare/SparkleIntro.cs:535
-msgid "This may take a while.\n"
-msgstr "Potrebbe impiegare un po' di tempo\n"
+#: ../SparkleShare/SparkleSetup.cs:287
+msgid "This may take a while."
+msgstr "Questa operazione potrebbe richiedere un po' di tempo."
-#: ../SparkleShare/SparkleIntro.cs:536
+#: ../SparkleShare/SparkleSetup.cs:288
msgid "Are you sure it’s not coffee o'clock?"
msgstr "Sei sicuro che non sia l'ora di un caffè?"
-#: ../SparkleShare/SparkleIntro.cs:579
-msgid "SparkleShare is ready to go!"
-msgstr "SparkleShare è pronto!"
+#: ../SparkleShare/SparkleSetup.cs:292 ../SparkleShare/SparkleSetup.cs:375
+msgid "Finish"
+msgstr "Finito"
-#: ../SparkleShare/SparkleIntro.cs:585
-msgid ""
-"Now you can start accepting invitations from others. \n"
-"Just click on invitations you get by email and we will take care of the rest."
-msgstr ""
-"Ora si può iniziare ad accettare inviti da altri. \n"
-"Basta cliccare sugli inviti ottenuti via email e noi ci occuperemo del resto."
+#: ../SparkleShare/SparkleSetup.cs:321
+msgid "Something went wrong"
+msgstr "Qualcosa è andato storto"
-#: ../SparkleShare/SparkleIntro.cs:596
-msgid "Learn how to host your own SparkleServer"
-msgstr "Impara come installare il tuo SparkleServer personale"
+#: ../SparkleShare/SparkleSetup.cs:341
+msgid "Try Again"
+msgstr "Prova Ancora"
-#: ../SparkleShare/SparkleEventLog.cs:61
-msgid "Recent Events"
-msgstr ""
+#: ../SparkleShare/SparkleSetup.cs:359
+#, csharp-format
+msgid "‘{0}’ has been successfully added"
+msgstr "‘{0}’ è stato aggiunto con successo"
-#: ../SparkleShare/SparkleEventLog.cs:148
-#: ../SparkleShare/SparkleEventLog.cs:173
-msgid "All Folders"
-msgstr ""
+#: ../SparkleShare/SparkleSetup.cs:365
+msgid "Folder synced successfully!"
+msgstr "Cartella sincronizzata con successo!"
+
+#: ../SparkleShare/SparkleSetup.cs:366
+msgid "Access the synced files from your SparkleShare folder."
+msgstr "Accesso ai file sincronizzati dalla cartella SparkleShare."
+
+#. A button that opens the synced folder
+#: ../SparkleShare/SparkleSetup.cs:369
+msgid "Open Folder"
+msgstr "Apri cartella"
+
+#: ../SparkleShare/SparkleSetupWindow.cs:45
+msgid "SparkleShare Setup"
+msgstr "Impostazioni "
#: ../SparkleShare/SparkleShare.cs:53
msgid "Sorry, you can't run SparkleShare with these permissions."
@@ -347,7 +294,7 @@ msgstr "Mostra questo messaggio di aiuto"
#: ../SparkleShare/SparkleShare.cs:109
msgid "SparkleShare, a collaboration and sharing tool."
-msgstr ""
+msgstr "SparkleShare, uno strumento collaborativo e di condivisione"
#: ../SparkleShare/SparkleShare.cs:110
msgid "Copyright (C) 2010 Hylke Bons"
@@ -401,7 +348,7 @@ msgstr "Aggiungi Cartella Remota..."
#: ../SparkleShare/SparkleStatusIcon.cs:242
msgid "Show Recent Events"
-msgstr ""
+msgstr "Mostra eventi recenti"
#: ../SparkleShare/SparkleStatusIcon.cs:262
msgid "Turn Notifications Off"
@@ -412,22 +359,8 @@ msgid "Turn Notifications On"
msgstr "Accendi le notifiche"
#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:286
+#: ../SparkleShare/SparkleStatusIcon.cs:291
msgid "Quit"
msgstr "Esci"
-#: ../SparkleShare/SparkleUI.cs:99
-msgid "Ouch! Mid-air collision!"
-msgstr "Ahi! Una collisione in volo!"
-
-#: ../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 "
-"conflitto."
-
-#: ../SparkleShare/SparkleWindow.cs:41
-msgid "SparkleShare Setup"
-msgstr ""
-
diff --git a/po/ja.po b/po/ja.po
old mode 100644
new mode 100755
index 2768e0f5..6dcebc93
--- a/po/ja.po
+++ b/po/ja.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: SparkleShare\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-29 11:38+0200\n"
-"PO-Revision-Date: 2011-06-26 09:22+0000\n"
+"POT-Creation-Date: 2011-07-19 07:04+0200\n"
+"PO-Revision-Date: 2011-07-19 05:10+0000\n"
"Last-Translator: deejay1 \n"
"Language-Team: LANGUAGE \n"
"MIME-Version: 1.0\n"
@@ -20,26 +20,27 @@ msgstr ""
"Language: ja\n"
"Plural-Forms: nplurals=1; plural=0\n"
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:337
-#: ../SparkleShare/SparkleIntro.cs:67 ../SparkleShare/SparkleStatusIcon.cs:345
-msgid "Welcome to SparkleShare!"
-msgstr "SparkleShareへようこそ!"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:348
-#: ../SparkleShare/SparkleStatusIcon.cs:357
-msgid "Not everything is synced"
-msgstr "すべてが同期されていません"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:358
-#: ../SparkleShare/SparkleStatusIcon.cs:367
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:69
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:86
+#: ../SparkleShare/SparkleStatusIcon.cs:372
msgid "Up to date"
msgstr "最新の状態です。"
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:374
-#: ../SparkleShare/SparkleStatusIcon.cs:383
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:84
+#: ../SparkleShare/SparkleSetup.cs:69 ../SparkleShare/SparkleStatusIcon.cs:350
+msgid "Welcome to SparkleShare!"
+msgstr "SparkleShareへようこそ!"
+
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:95
+#: ../SparkleShare/SparkleStatusIcon.cs:388
msgid "Syncing…"
msgstr "同期中..."
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:105
+#: ../SparkleShare/SparkleStatusIcon.cs:362
+msgid "Not everything is synced"
+msgstr "すべてが同期されていません"
+
#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
msgid "Copy Web Link"
msgstr "ウェブリンクのコピー"
@@ -61,256 +62,61 @@ msgid "Select to get a copy of this version"
msgstr "このヴァージョンを選択し、コピー"
#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:46 ../SparkleShare/SparkleStatusIcon.cs:275
+#: ../SparkleShare/SparkleAbout.cs:54 ../SparkleShare/SparkleStatusIcon.cs:275
msgid "About SparkleShare"
msgstr "SparkleShareについて"
-#: ../SparkleShare/SparkleAbout.cs:53
-msgid "A newer version is available"
-msgstr "新しいバージョンがあります"
+#: ../SparkleShare/SparkleAbout.cs:72
+#, csharp-format
+msgid "A newer version ({0}) is available!"
+msgstr ""
-#: ../SparkleShare/SparkleAbout.cs:60
+#: ../SparkleShare/SparkleAbout.cs:80
msgid "You are running the latest version."
msgstr "最新のバージョンです。"
-#: ../SparkleShare/SparkleAbout.cs:87
+#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:110
msgid "Checking for updates..."
msgstr "更新の確認中..."
-#: ../SparkleShare/SparkleAbout.cs:116
-msgid "_Show Credits"
-msgstr "クレジットを表示する(_S)"
+#: ../SparkleShare/SparkleController.cs:446
+msgid "dddd, MMMM d, yyyy"
+msgstr ""
-#: ../SparkleShare/SparkleAbout.cs:129
-msgid "_Visit Website"
-msgstr "Webサイトにアクセスする(_V)"
+#: ../SparkleShare/SparkleController.cs:451
+msgid "dddd, MMMM d"
+msgstr ""
-#: ../SparkleShare/SparkleController.cs:455
-msgid "ddd MMM d, yyyy"
-msgstr "ddd MMM d, yyyy"
-
-#: ../SparkleShare/SparkleController.cs:460
-msgid "ddd MMM d"
-msgstr "ddd MMM d"
-
-#: ../SparkleShare/SparkleController.cs:661
+#: ../SparkleShare/SparkleController.cs:660
#, csharp-format
msgid "added ‘{0}’"
msgstr "'{0}'を追加しました"
-#: ../SparkleShare/SparkleController.cs:666
+#: ../SparkleShare/SparkleController.cs:665
#, csharp-format
msgid "moved ‘{0}’"
msgstr "'{0}'を移動しました"
-#: ../SparkleShare/SparkleController.cs:671
+#: ../SparkleShare/SparkleController.cs:670
#, csharp-format
msgid "edited ‘{0}’"
msgstr "'{0}'を編集しました"
-#: ../SparkleShare/SparkleController.cs:676
+#: ../SparkleShare/SparkleController.cs:675
#, csharp-format
msgid "deleted ‘{0}’"
msgstr "'{0}'を削除しました"
-#: ../SparkleShare/SparkleController.cs:685
+#: ../SparkleShare/SparkleController.cs:684
#, csharp-format
msgid "and {0} more"
msgid_plural "and {0} more"
msgstr[0] "、{0}詳細"
-#: ../SparkleShare/SparkleController.cs:689
+#: ../SparkleShare/SparkleController.cs:688
msgid "did something magical"
msgstr "何か摩訶不思議なことをしました"
-#: ../SparkleShare/SparkleIntro.cs:73
-msgid ""
-"Before we can create a SparkleShare folder on this computer, we need a few "
-"bits of information from you."
-msgstr "SparkleShareのフォルダをこのコンピュータ上に作成する前に、少しですがお知らせがあります。"
-
-#: ../SparkleShare/SparkleIntro.cs:83
-msgid "Full Name:"
-msgstr "氏名:"
-
-#: ../SparkleShare/SparkleIntro.cs:98
-msgid "Email:"
-msgstr "電子メール:"
-
-#: ../SparkleShare/SparkleIntro.cs:109
-msgid "Next"
-msgstr "次"
-
-#: ../SparkleShare/SparkleIntro.cs:115
-msgid "Configuring…"
-msgstr "設定中..."
-
-#: ../SparkleShare/SparkleIntro.cs:161
-msgid "Where is your remote folder?"
-msgstr "リモート・フォルダの場所はどこですか?"
-
-#: ../SparkleShare/SparkleIntro.cs:174
-msgid "address-to-server.com"
-msgstr "サーバのアドレス.com"
-
-#: ../SparkleShare/SparkleIntro.cs:179
-msgid "On my own server:"
-msgstr "個人のサーバ:"
-
-#: ../SparkleShare/SparkleIntro.cs:186
-msgid "Free hosting for Free and Open Source Software projects."
-msgstr "フリーでオープンソースのソフトウェアプロジェクトのための無料ホスティング。"
-
-#: ../SparkleShare/SparkleIntro.cs:187
-msgid "Also has paid accounts for extra private space and bandwidth."
-msgstr "また、プライベートなストレージ領域の増量や高速通信のための有用アカウントもあります。"
-
-#: ../SparkleShare/SparkleIntro.cs:195
-msgid "The GNOME Project"
-msgstr "GNOMEプロジェクト"
-
-#: ../SparkleShare/SparkleIntro.cs:197
-msgid "GNOME is an easy to understand interface to your computer."
-msgstr "GNOMEはあなたのコンピュータ使いやすくする環境です。"
-
-#: ../SparkleShare/SparkleIntro.cs:198
-msgid "Select this option if you’re a developer or designer working on GNOME."
-msgstr "もしあなたが、GNOMEの開発/デザインに関わっているなら、このオプションを選択。"
-
-#: ../SparkleShare/SparkleIntro.cs:206
-msgid "Gitorious"
-msgstr "Gitorious"
-
-#: ../SparkleShare/SparkleIntro.cs:208
-msgid "Completely Free as in Freedom infrastructure."
-msgstr "自由なインフラストラクチャとして完全無料。"
-
-#: ../SparkleShare/SparkleIntro.cs:209
-msgid "Free accounts for Free and Open Source projects."
-msgstr "無料でオープンソースなプロジェクトのための無料アカウント"
-
-#: ../SparkleShare/SparkleIntro.cs:220
-msgid "Username/Folder"
-msgstr "ユーザー名/フォルダ"
-
-#: ../SparkleShare/SparkleIntro.cs:225
-msgid "Project/Folder"
-msgstr "プロジェクト/フォルダ"
-
-#: ../SparkleShare/SparkleIntro.cs:230
-msgid "Project"
-msgstr "プロジェクト"
-
-#: ../SparkleShare/SparkleIntro.cs:235 ../SparkleShare/SparkleIntro.cs:254
-msgid "Folder"
-msgstr "フォルダ"
-
-#: ../SparkleShare/SparkleIntro.cs:259 ../SparkleShare/SparkleIntro.cs:377
-msgid "Folder Name:"
-msgstr "フォルダ名:"
-
-#: ../SparkleShare/SparkleIntro.cs:269
-msgid "Sync"
-msgstr "同期"
-
-#: ../SparkleShare/SparkleIntro.cs:312
-msgid "Cancel"
-msgstr "キャンセル"
-
-#: ../SparkleShare/SparkleIntro.cs:320
-msgid "Skip"
-msgstr "スキップ"
-
-#: ../SparkleShare/SparkleIntro.cs:347
-msgid "Invitation received!"
-msgstr "招待状が届きました!"
-
-#: ../SparkleShare/SparkleIntro.cs:353
-msgid ""
-"You've received an invitation to join a shared folder.\n"
-"We're ready to hook you up immediately if you wish."
-msgstr ""
-"共有フォルダへのアクセスの招待状が届きました。\n"
-"すぐにアクセスする設置をする準備が整っています。"
-
-#: ../SparkleShare/SparkleIntro.cs:359
-msgid "Do you accept this invitation?"
-msgstr "この招待状を受諾しますか?"
-
-#: ../SparkleShare/SparkleIntro.cs:368
-msgid "Server Address:"
-msgstr "サーバアドレス:"
-
-#: ../SparkleShare/SparkleIntro.cs:391
-msgid "Reject"
-msgstr "拒否"
-
-#: ../SparkleShare/SparkleIntro.cs:392
-msgid "Accept and Sync"
-msgstr "受諾して同期する"
-
-#: ../SparkleShare/SparkleIntro.cs:442
-msgid "Something went wrong…"
-msgstr "何らかの不具合の発生..."
-
-#: ../SparkleShare/SparkleIntro.cs:448
-msgid "Try Again"
-msgstr "再トライ"
-
-#: ../SparkleShare/SparkleIntro.cs:473
-#, csharp-format
-msgid "‘{0}’ has been successfully added"
-msgstr "'{0}'は正常に追加されました"
-
-#: ../SparkleShare/SparkleIntro.cs:482
-msgid "Folder synced successfully!"
-msgstr "フォルダが正常に同期されました!"
-
-#: ../SparkleShare/SparkleIntro.cs:489
-#, csharp-format
-msgid ""
-"Now you can access the synced files from ‘{0}’ in your SparkleShare folder."
-msgstr "これで、SparkleShareフォルダ'{0}'から同期されたファイルが使用可能です。"
-
-#. A button that opens the synced folder
-#: ../SparkleShare/SparkleIntro.cs:497
-msgid "Open Folder"
-msgstr "フォルダを開く"
-
-#: ../SparkleShare/SparkleIntro.cs:503 ../SparkleShare/SparkleIntro.cs:543
-#: ../SparkleShare/SparkleIntro.cs:604
-msgid "Finish"
-msgstr "完了"
-
-#: ../SparkleShare/SparkleIntro.cs:528
-#, csharp-format
-msgid "Syncing folder ‘{0}’…"
-msgstr "フォルダ'{0}'の同期中..."
-
-#: ../SparkleShare/SparkleIntro.cs:535
-msgid "This may take a while.\n"
-msgstr "しばらくお待ちください。\n"
-
-#: ../SparkleShare/SparkleIntro.cs:536
-msgid "Are you sure it’s not coffee o'clock?"
-msgstr "コーヒー時ではありませんか?"
-
-#: ../SparkleShare/SparkleIntro.cs:579
-msgid "SparkleShare is ready to go!"
-msgstr "SparkleShareは準備完了です!"
-
-#: ../SparkleShare/SparkleIntro.cs:585
-msgid ""
-"Now you can start accepting invitations from others. \n"
-"Just click on invitations you get by email and we will take care of the rest."
-msgstr ""
-"他の人から招待を受ける準備が整いました。\n"
-"あなたは、電子メールで受け取った招待状をクリックするだけです。後は私たちにお任せください。"
-
-#: ../SparkleShare/SparkleIntro.cs:596
-msgid "Learn how to host your own SparkleServer"
-msgstr "個人でSparkleServerを立ち上げる方法"
-
#: ../SparkleShare/SparkleEventLog.cs:61
msgid "Recent Events"
msgstr ""
@@ -320,6 +126,148 @@ msgstr ""
msgid "All Folders"
msgstr ""
+#: ../SparkleShare/SparkleSetup.cs:70
+msgid ""
+"Before we can create a SparkleShare folder on this computer, we need a few "
+"bits of information from you."
+msgstr "SparkleShareのフォルダをこのコンピュータ上に作成する前に、少しですがお知らせがあります。"
+
+#: ../SparkleShare/SparkleSetup.cs:77
+msgid "Full Name:"
+msgstr "氏名:"
+
+#: ../SparkleShare/SparkleSetup.cs:92
+msgid "Email:"
+msgstr "電子メール:"
+
+#: ../SparkleShare/SparkleSetup.cs:102
+msgid "Next"
+msgstr "次"
+
+#: ../SparkleShare/SparkleSetup.cs:122
+msgid "Where is your remote folder?"
+msgstr "リモート・フォルダの場所はどこですか?"
+
+#. Own server radiobutton
+#: ../SparkleShare/SparkleSetup.cs:131
+msgid "On my own server:"
+msgstr "個人のサーバ:"
+
+#: ../SparkleShare/SparkleSetup.cs:136 ../SparkleShare/SparkleSetup.cs:238
+msgid "Folder"
+msgstr "フォルダ"
+
+#: ../SparkleShare/SparkleSetup.cs:163
+msgid "address-to-server.com"
+msgstr "サーバのアドレス.com"
+
+#: ../SparkleShare/SparkleSetup.cs:178
+msgid "Free hosting for Free and Open Source Software projects."
+msgstr "フリーでオープンソースのソフトウェアプロジェクトのための無料ホスティング。"
+
+#: ../SparkleShare/SparkleSetup.cs:179
+msgid "Also has paid accounts for extra private space and bandwidth."
+msgstr "また、プライベートなストレージ領域の増量や高速通信のための有用アカウントもあります。"
+
+#: ../SparkleShare/SparkleSetup.cs:188
+msgid "Username/Folder"
+msgstr "ユーザー名/フォルダ"
+
+#. Gitorious radiobutton
+#: ../SparkleShare/SparkleSetup.cs:193
+msgid "Gitorious"
+msgstr "Gitorious"
+
+#: ../SparkleShare/SparkleSetup.cs:195
+msgid "Completely Free as in Freedom infrastructure."
+msgstr "自由なインフラストラクチャとして完全無料。"
+
+#: ../SparkleShare/SparkleSetup.cs:196
+msgid "Free accounts for Free and Open Source projects."
+msgstr "無料でオープンソースなプロジェクトのための無料アカウント"
+
+#: ../SparkleShare/SparkleSetup.cs:205
+msgid "Project/Folder"
+msgstr "プロジェクト/フォルダ"
+
+#. GNOME radiobutton
+#: ../SparkleShare/SparkleSetup.cs:210
+msgid "The GNOME Project"
+msgstr "GNOMEプロジェクト"
+
+#: ../SparkleShare/SparkleSetup.cs:212
+msgid "GNOME is an easy to understand interface to your computer."
+msgstr "GNOMEはあなたのコンピュータ使いやすくする環境です。"
+
+#: ../SparkleShare/SparkleSetup.cs:213
+msgid "Select this option if you’re a developer or designer working on GNOME."
+msgstr "もしあなたが、GNOMEの開発/デザインに関わっているなら、このオプションを選択。"
+
+#: ../SparkleShare/SparkleSetup.cs:222
+msgid "Project"
+msgstr "プロジェクト"
+
+#: ../SparkleShare/SparkleSetup.cs:232
+msgid "Folder Name:"
+msgstr "フォルダ名:"
+
+#. Cancel button
+#: ../SparkleShare/SparkleSetup.cs:251
+msgid "Cancel"
+msgstr "キャンセル"
+
+#. Sync button
+#: ../SparkleShare/SparkleSetup.cs:259
+msgid "Sync"
+msgstr "同期"
+
+#: ../SparkleShare/SparkleSetup.cs:286
+#, csharp-format
+msgid "Syncing folder ‘{0}’…"
+msgstr "フォルダ'{0}'の同期中..."
+
+#: ../SparkleShare/SparkleSetup.cs:287
+msgid "This may take a while."
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:288
+msgid "Are you sure it’s not coffee o'clock?"
+msgstr "コーヒー時ではありませんか?"
+
+#: ../SparkleShare/SparkleSetup.cs:292 ../SparkleShare/SparkleSetup.cs:375
+msgid "Finish"
+msgstr "完了"
+
+#: ../SparkleShare/SparkleSetup.cs:321
+msgid "Something went wrong"
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:341
+msgid "Try Again"
+msgstr "再トライ"
+
+#: ../SparkleShare/SparkleSetup.cs:359
+#, csharp-format
+msgid "‘{0}’ has been successfully added"
+msgstr "'{0}'は正常に追加されました"
+
+#: ../SparkleShare/SparkleSetup.cs:365
+msgid "Folder synced successfully!"
+msgstr "フォルダが正常に同期されました!"
+
+#: ../SparkleShare/SparkleSetup.cs:366
+msgid "Access the synced files from your SparkleShare folder."
+msgstr ""
+
+#. A button that opens the synced folder
+#: ../SparkleShare/SparkleSetup.cs:369
+msgid "Open Folder"
+msgstr "フォルダを開く"
+
+#: ../SparkleShare/SparkleSetupWindow.cs:45
+msgid "SparkleShare Setup"
+msgstr "SparkleShareセットアップ"
+
#: ../SparkleShare/SparkleShare.cs:53
msgid "Sorry, you can't run SparkleShare with these permissions."
msgstr "申し訳ありませんが、SparkleShareを実行する権限がありません。パーミッションの設定を見直してください。"
@@ -402,20 +350,8 @@ msgid "Turn Notifications On"
msgstr "通知をオン"
#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:286
+#: ../SparkleShare/SparkleStatusIcon.cs:291
msgid "Quit"
msgstr "終了"
-#: ../SparkleShare/SparkleUI.cs:99
-msgid "Ouch! Mid-air collision!"
-msgstr "イテテ!空中衝突だ!"
-
-#: ../SparkleShare/SparkleUI.cs:100
-msgid "Don't worry, SparkleShare made a copy of each conflicting file."
-msgstr "心配しないでください。SparkleShareは、各競合しているファイルのコピーを作成しました。"
-
-#: ../SparkleShare/SparkleWindow.cs:41
-msgid "SparkleShare Setup"
-msgstr "SparkleShareセットアップ"
-
diff --git a/po/nl.po b/po/nl.po
old mode 100644
new mode 100755
diff --git a/po/nn_NO.po b/po/nn_NO.po
new file mode 100755
index 00000000..bde22e4b
--- /dev/null
+++ b/po/nn_NO.po
@@ -0,0 +1,356 @@
+# This file is distributed under the same license as the Sparkleshare package.
+#
+# , 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: SparkleShare\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-08-25 13:59+0200\n"
+"PO-Revision-Date: 2011-08-28 15:31+0000\n"
+"Last-Translator: anjar \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nn_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:69
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:86
+#: ../SparkleShare/SparkleStatusIcon.cs:372
+msgid "Up to date"
+msgstr ""
+
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:84
+#: ../SparkleShare/SparkleSetup.cs:69 ../SparkleShare/SparkleStatusIcon.cs:350
+msgid "Welcome to SparkleShare!"
+msgstr "Velkommen åt SparkleShare!"
+
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:95
+#: ../SparkleShare/SparkleStatusIcon.cs:388
+msgid "Syncing…"
+msgstr "Synkroniserer..."
+
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:105
+#: ../SparkleShare/SparkleStatusIcon.cs:362
+msgid "Not everything is synced"
+msgstr "Ikkje alt er synkronisert"
+
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
+msgid "Copy Web Link"
+msgstr "Kopier web-lenke"
+
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:114
+msgid "Copy the web address of this file to the clipboard"
+msgstr ""
+
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:147
+msgid "Get Earlier Version"
+msgstr "Skaff ein tidlegare versjon"
+
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:148
+msgid "Make a copy of an earlier version in this folder"
+msgstr "Lag ein kopi av ein tidlegare versjon i denne mappa"
+
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:161
+msgid "Select to get a copy of this version"
+msgstr "Vel for å få ein kopi av tidlegare versjon"
+
+#. A menu item that takes the user to http://www.sparkleshare.org/
+#: ../SparkleShare/SparkleAbout.cs:53 ../SparkleShare/SparkleStatusIcon.cs:275
+msgid "About SparkleShare"
+msgstr "Om SparkleShare"
+
+#: ../SparkleShare/SparkleAbout.cs:70
+#, csharp-format
+msgid "A newer version ({0}) is available!"
+msgstr ""
+
+#: ../SparkleShare/SparkleAbout.cs:79
+msgid "You are running the latest version."
+msgstr "Du køyrer den nyaste versjonen."
+
+#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:113
+msgid "Checking for updates..."
+msgstr "Ser etter oppdateringar..."
+
+#: ../SparkleShare/SparkleController.cs:483
+msgid "dddd, MMMM d, yyyy"
+msgstr ""
+
+#: ../SparkleShare/SparkleController.cs:489
+msgid "dddd, MMMM d"
+msgstr ""
+
+#: ../SparkleShare/SparkleController.cs:706
+#, csharp-format
+msgid "added ‘{0}’"
+msgstr "la til '{0}'"
+
+#: ../SparkleShare/SparkleController.cs:711
+#, csharp-format
+msgid "moved ‘{0}’"
+msgstr "flytta '{0}'"
+
+#: ../SparkleShare/SparkleController.cs:716
+#, csharp-format
+msgid "edited ‘{0}’"
+msgstr "endra '{0}'"
+
+#: ../SparkleShare/SparkleController.cs:721
+#, csharp-format
+msgid "deleted ‘{0}’"
+msgstr "sletta '{0}'"
+
+#: ../SparkleShare/SparkleController.cs:730
+#, csharp-format
+msgid "and {0} more"
+msgid_plural "and {0} more"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../SparkleShare/SparkleController.cs:734
+msgid "did something magical"
+msgstr "gjorde noko magisk"
+
+#: ../SparkleShare/SparkleEventLog.cs:58
+msgid "Recent Events"
+msgstr "Siste hendingar"
+
+#: ../SparkleShare/SparkleEventLog.cs:169
+#: ../SparkleShare/SparkleEventLog.cs:188
+msgid "All Folders"
+msgstr "Alle mapper"
+
+#: ../SparkleShare/SparkleSetup.cs:70
+msgid ""
+"Before we can create a SparkleShare folder on this computer, we need a few "
+"bits of information from you."
+msgstr ""
+"Før me kan lage ei SparkleShare-mappe på denne datamaskina, må me ha litt "
+"meir informasjon frå deg."
+
+#: ../SparkleShare/SparkleSetup.cs:77
+msgid "Full Name:"
+msgstr "Fullt namn:"
+
+#: ../SparkleShare/SparkleSetup.cs:92
+msgid "Email:"
+msgstr "E-post:"
+
+#: ../SparkleShare/SparkleSetup.cs:102
+msgid "Next"
+msgstr "Neste"
+
+#: ../SparkleShare/SparkleSetup.cs:123
+msgid "Where is your remote folder?"
+msgstr "Kvar er di fjernmappe?"
+
+#. Own server radiobutton
+#: ../SparkleShare/SparkleSetup.cs:132
+msgid "On my own server:"
+msgstr "På min eigen server:"
+
+#: ../SparkleShare/SparkleSetup.cs:137 ../SparkleShare/SparkleSetup.cs:239
+msgid "Folder"
+msgstr "Mappe"
+
+#: ../SparkleShare/SparkleSetup.cs:164
+msgid "address-to-server.com"
+msgstr "adressa-åt-serveren.com"
+
+#: ../SparkleShare/SparkleSetup.cs:179
+msgid "Free hosting for Free and Open Source Software projects."
+msgstr "Gratis lagring for frie og opne prosjekt"
+
+#: ../SparkleShare/SparkleSetup.cs:180
+msgid "Also has paid accounts for extra private space and bandwidth."
+msgstr "Har òg betal-kontoar for meir plass og båndbredde."
+
+#: ../SparkleShare/SparkleSetup.cs:189
+msgid "Username/Folder"
+msgstr "Brukarnamn/Mappe"
+
+#. Gitorious radiobutton
+#: ../SparkleShare/SparkleSetup.cs:194
+msgid "Gitorious"
+msgstr "Gitorious"
+
+#: ../SparkleShare/SparkleSetup.cs:196
+msgid "Completely Free as in Freedom infrastructure."
+msgstr "Heilt fri."
+
+#: ../SparkleShare/SparkleSetup.cs:197
+msgid "Free accounts for Free and Open Source projects."
+msgstr "Gratise kontoar for frie og opne prosjekt"
+
+#: ../SparkleShare/SparkleSetup.cs:206
+msgid "Project/Folder"
+msgstr "Prosjekt/Mappe"
+
+#. GNOME radiobutton
+#: ../SparkleShare/SparkleSetup.cs:211
+msgid "The GNOME Project"
+msgstr "GNOME-prosjektet"
+
+#: ../SparkleShare/SparkleSetup.cs:213
+msgid "GNOME is an easy to understand interface to your computer."
+msgstr "GNOME er eit \"enkelt å forstå\"-grensesnitt for di datamaskin."
+
+#: ../SparkleShare/SparkleSetup.cs:214
+msgid "Select this option if you’re a developer or designer working on GNOME."
+msgstr ""
+"Vel dette om du er ein utviklar eller designer som arbeider med GNOME."
+
+#: ../SparkleShare/SparkleSetup.cs:223
+msgid "Project"
+msgstr "Prosjekt"
+
+#: ../SparkleShare/SparkleSetup.cs:233
+msgid "Folder Name:"
+msgstr "Mappenamn:"
+
+#. Cancel button
+#: ../SparkleShare/SparkleSetup.cs:261
+msgid "Cancel"
+msgstr "Avbryt"
+
+#. Sync button
+#: ../SparkleShare/SparkleSetup.cs:269
+msgid "Sync"
+msgstr "Synkroniser"
+
+#: ../SparkleShare/SparkleSetup.cs:297
+#, csharp-format
+msgid "Syncing folder ‘{0}’…"
+msgstr "Synkroniserer mappe '{0}'"
+
+#: ../SparkleShare/SparkleSetup.cs:298
+msgid "This may take a while."
+msgstr "Dette kan ta ei tid"
+
+#: ../SparkleShare/SparkleSetup.cs:299
+msgid "Are you sure it’s not coffee o'clock?"
+msgstr "Ta deg ei kaffitår"
+
+#: ../SparkleShare/SparkleSetup.cs:303 ../SparkleShare/SparkleSetup.cs:388
+msgid "Finish"
+msgstr "Ferdig"
+
+#: ../SparkleShare/SparkleSetup.cs:333
+msgid "Something went wrong"
+msgstr "Noko gjekk gale"
+
+#: ../SparkleShare/SparkleSetup.cs:353
+msgid "Try Again"
+msgstr "Prøv igjen"
+
+#: ../SparkleShare/SparkleSetup.cs:372
+#, csharp-format
+msgid "‘{0}’ has been successfully added"
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:378
+msgid "Folder synced successfully!"
+msgstr "Mappesynkroniseringa vert utført utan feil!"
+
+#: ../SparkleShare/SparkleSetup.cs:379
+msgid "Access the synced files from your SparkleShare folder."
+msgstr ""
+
+#. A button that opens the synced folder
+#: ../SparkleShare/SparkleSetup.cs:382
+msgid "Open Folder"
+msgstr "Opne mappe"
+
+#: ../SparkleShare/SparkleSetupWindow.cs:45
+msgid "SparkleShare Setup"
+msgstr ""
+
+#: ../SparkleShare/SparkleShare.cs:53
+msgid "Sorry, you can't run SparkleShare with these permissions."
+msgstr "Beklager, du kan ikkje køyre SparkleShare med disse rettighetane."
+
+#: ../SparkleShare/SparkleShare.cs:54
+msgid "Things would go utterly wrong."
+msgstr "Ting kan gå fysomt fælt."
+
+#: ../SparkleShare/SparkleShare.cs:61
+msgid "Print version information"
+msgstr "Skriv ut versjonsinformasjon"
+
+#: ../SparkleShare/SparkleShare.cs:62
+msgid "Show this help text"
+msgstr "Vis denne hjølpsomme teksten"
+
+#: ../SparkleShare/SparkleShare.cs:109
+msgid "SparkleShare, a collaboration and sharing tool."
+msgstr ""
+
+#: ../SparkleShare/SparkleShare.cs:110
+msgid "Copyright (C) 2010 Hylke Bons"
+msgstr "Copyright (C) 2010 Hylke Bons"
+
+#: ../SparkleShare/SparkleShare.cs:112
+msgid "This program comes with ABSOLUTELY NO WARRANTY."
+msgstr "Dette programmet kjem heilt uten garantiar."
+
+#: ../SparkleShare/SparkleShare.cs:114
+msgid "This is free software, and you are welcome to redistribute it "
+msgstr "Dette er fri programvare, og du står fritt til å spre det"
+
+#: ../SparkleShare/SparkleShare.cs:115
+msgid "under certain conditions. Please read the GNU GPLv3 for details."
+msgstr "under nokre få vilkår. Les GNU GPLv3 for fleire detaljar"
+
+#: ../SparkleShare/SparkleShare.cs:117
+msgid "SparkleShare automatically syncs Git repositories in "
+msgstr "SparkleShare synkroniserer automatisk Git-strukturar i"
+
+#: ../SparkleShare/SparkleShare.cs:118
+msgid "the ~/SparkleShare folder with their remote origins."
+msgstr "~/SparkleShare-mappa med fjernfilane"
+
+#: ../SparkleShare/SparkleShare.cs:120
+msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..."
+msgstr ""
+
+#: ../SparkleShare/SparkleShare.cs:121
+msgid "Sync SparkleShare folder with remote repositories."
+msgstr ""
+
+#: ../SparkleShare/SparkleShare.cs:123
+msgid "Arguments:"
+msgstr ""
+
+#: ../SparkleShare/SparkleShare.cs:133
+msgid "SparkleShare "
+msgstr "SparkleShare"
+
+#: ../SparkleShare/SparkleStatusIcon.cs:208
+msgid "No Remote Folders Yet"
+msgstr "Ikkje nokon fjernmappe enno"
+
+#. Opens the wizard to add a new remote folder
+#: ../SparkleShare/SparkleStatusIcon.cs:218
+msgid "Add Remote Folder…"
+msgstr ""
+
+#: ../SparkleShare/SparkleStatusIcon.cs:242
+msgid "Show Recent Events"
+msgstr "Vis siste hendingar"
+
+#: ../SparkleShare/SparkleStatusIcon.cs:262
+msgid "Turn Notifications Off"
+msgstr ""
+
+#: ../SparkleShare/SparkleStatusIcon.cs:264
+msgid "Turn Notifications On"
+msgstr ""
+
+#. A menu item that quits the application
+#: ../SparkleShare/SparkleStatusIcon.cs:291
+msgid "Quit"
+msgstr "Avslutt"
+
+
diff --git a/po/no_NO.po b/po/no_NO.po
old mode 100644
new mode 100755
index 17720c69..8eaa9290
--- a/po/no_NO.po
+++ b/po/no_NO.po
@@ -1,18 +1,16 @@
# This file is distributed under the same license as the Sparkleshare package.
#
-# WARNING: Due to the nature of Transifex all translation file headers were lost
-# we apologise for any incovenience this may have caused and we hope to bring them
-# back in the future.
-#
-# , 2011.
+# Translators:
+# , 2011.
# habakke , 2011.
+# , 2011.
msgid ""
msgstr ""
"Project-Id-Version: SparkleShare\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-29 11:38+0200\n"
-"PO-Revision-Date: 2011-07-05 10:29+0000\n"
-"Last-Translator: VegardAa \n"
+"POT-Creation-Date: 2011-08-25 13:59+0200\n"
+"PO-Revision-Date: 2011-09-01 14:40+0000\n"
+"Last-Translator: anjar \n"
"Language-Team: LANGUAGE \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,33 +18,34 @@ msgstr ""
"Language: no_NO\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: ../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:348
-#: ../SparkleShare/SparkleStatusIcon.cs:357
-msgid "Not everything is synced"
-msgstr "Ikke alt er synkronisert"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:358
-#: ../SparkleShare/SparkleStatusIcon.cs:367
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:69
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:86
+#: ../SparkleShare/SparkleStatusIcon.cs:372
msgid "Up to date"
msgstr "Oppdatert"
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:374
-#: ../SparkleShare/SparkleStatusIcon.cs:383
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:84
+#: ../SparkleShare/SparkleSetup.cs:69 ../SparkleShare/SparkleStatusIcon.cs:350
+msgid "Welcome to SparkleShare!"
+msgstr "Velkommen til SparkleShare!"
+
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:95
+#: ../SparkleShare/SparkleStatusIcon.cs:388
msgid "Syncing…"
msgstr "Synkroniserer..."
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:105
+#: ../SparkleShare/SparkleStatusIcon.cs:362
+msgid "Not everything is synced"
+msgstr "Ikke alt er synkronisert"
+
#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
msgid "Copy Web Link"
-msgstr "Kopier web link"
+msgstr "Kopier web-link"
#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:114
msgid "Copy the web address of this file to the clipboard"
-msgstr "Kopier denne filens web addresse til utklippstavlen"
+msgstr "Kopier denne filens web-addresse til utklippstavlen"
#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:147
msgid "Get Earlier Version"
@@ -58,73 +57,75 @@ msgstr "Lag en kopi av en tidligere versjon i denne mappen"
#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:161
msgid "Select to get a copy of this version"
-msgstr "Vel for å få en kopi av denne versjonen."
+msgstr "Velg for å få en kopi av denne versjonen."
#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:46 ../SparkleShare/SparkleStatusIcon.cs:275
+#: ../SparkleShare/SparkleAbout.cs:53 ../SparkleShare/SparkleStatusIcon.cs:275
msgid "About SparkleShare"
msgstr "Om SparkleShare"
-#: ../SparkleShare/SparkleAbout.cs:53
-msgid "A newer version is available"
-msgstr "En nyere versjon er tilgjengelig"
+#: ../SparkleShare/SparkleAbout.cs:70
+#, csharp-format
+msgid "A newer version ({0}) is available!"
+msgstr "En nyere versjon ({0}) er tilgjengelig!"
-#: ../SparkleShare/SparkleAbout.cs:60
+#: ../SparkleShare/SparkleAbout.cs:79
msgid "You are running the latest version."
msgstr "Du kjører siste versjon"
-#: ../SparkleShare/SparkleAbout.cs:87
+#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:113
msgid "Checking for updates..."
msgstr "Ser etter oppdateringer..."
-#: ../SparkleShare/SparkleAbout.cs:116
-msgid "_Show Credits"
-msgstr "_Vis ...."
+#: ../SparkleShare/SparkleController.cs:483
+msgid "dddd, MMMM d, yyyy"
+msgstr "dddd, MMMM d, åååå"
-#: ../SparkleShare/SparkleAbout.cs:129
-msgid "_Visit Website"
-msgstr "_Besøk webside"
+#: ../SparkleShare/SparkleController.cs:489
+msgid "dddd, MMMM d"
+msgstr "dddd, MMMM d"
-#: ../SparkleShare/SparkleController.cs:455
-msgid "ddd MMM d, yyyy"
-msgstr ""
-
-#: ../SparkleShare/SparkleController.cs:460
-msgid "ddd MMM d"
-msgstr ""
-
-#: ../SparkleShare/SparkleController.cs:661
+#: ../SparkleShare/SparkleController.cs:706
#, csharp-format
msgid "added ‘{0}’"
msgstr "la til '{0}'"
-#: ../SparkleShare/SparkleController.cs:666
+#: ../SparkleShare/SparkleController.cs:711
#, csharp-format
msgid "moved ‘{0}’"
msgstr "Flyttet ‘{0}’"
-#: ../SparkleShare/SparkleController.cs:671
+#: ../SparkleShare/SparkleController.cs:716
#, csharp-format
msgid "edited ‘{0}’"
msgstr "redigerte '{0}'"
-#: ../SparkleShare/SparkleController.cs:676
+#: ../SparkleShare/SparkleController.cs:721
#, csharp-format
msgid "deleted ‘{0}’"
msgstr "slettet '{0}'"
-#: ../SparkleShare/SparkleController.cs:685
+#: ../SparkleShare/SparkleController.cs:730
#, csharp-format
msgid "and {0} more"
msgid_plural "and {0} more"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "og én til"
+msgstr[1] "og {0] til"
-#: ../SparkleShare/SparkleController.cs:689
+#: ../SparkleShare/SparkleController.cs:734
msgid "did something magical"
msgstr "Gjorde noe magisk"
-#: ../SparkleShare/SparkleIntro.cs:73
+#: ../SparkleShare/SparkleEventLog.cs:58
+msgid "Recent Events"
+msgstr "Nylige hendelser"
+
+#: ../SparkleShare/SparkleEventLog.cs:169
+#: ../SparkleShare/SparkleEventLog.cs:188
+msgid "All Folders"
+msgstr "Alle mapper"
+
+#: ../SparkleShare/SparkleSetup.cs:70
msgid ""
"Before we can create a SparkleShare folder on this computer, we need a few "
"bits of information from you."
@@ -132,201 +133,151 @@ msgstr ""
"Før vi kan lage en SparkleShare mappe på denne datamaskinen, trenger vi litt"
" informasjon fra deg."
-#: ../SparkleShare/SparkleIntro.cs:83
+#: ../SparkleShare/SparkleSetup.cs:77
msgid "Full Name:"
-msgstr "Fullt Navn:"
+msgstr "Fullt navn:"
-#: ../SparkleShare/SparkleIntro.cs:98
+#: ../SparkleShare/SparkleSetup.cs:92
msgid "Email:"
-msgstr "Epost:"
+msgstr "E-post:"
-#: ../SparkleShare/SparkleIntro.cs:109
+#: ../SparkleShare/SparkleSetup.cs:102
msgid "Next"
msgstr "Neste"
-#: ../SparkleShare/SparkleIntro.cs:115
-msgid "Configuring…"
-msgstr "Konfigurerer..."
-
-#: ../SparkleShare/SparkleIntro.cs:161
+#: ../SparkleShare/SparkleSetup.cs:123
msgid "Where is your remote folder?"
msgstr "Hvor er din eksterne mappe?"
-#: ../SparkleShare/SparkleIntro.cs:174
-msgid "address-to-server.com"
-msgstr "addresse-til-server.com"
-
-#: ../SparkleShare/SparkleIntro.cs:179
+#. Own server radiobutton
+#: ../SparkleShare/SparkleSetup.cs:132
msgid "On my own server:"
msgstr "På min egen server:"
-#: ../SparkleShare/SparkleIntro.cs:186
+#: ../SparkleShare/SparkleSetup.cs:137 ../SparkleShare/SparkleSetup.cs:239
+msgid "Folder"
+msgstr "Mappe"
+
+#: ../SparkleShare/SparkleSetup.cs:164
+msgid "address-to-server.com"
+msgstr "addresse-til-server.com"
+
+#: ../SparkleShare/SparkleSetup.cs:179
msgid "Free hosting for Free and Open Source Software projects."
msgstr "Gratis hosting for gratis og Åpen Kildekode prosjekter"
-#: ../SparkleShare/SparkleIntro.cs:187
+#: ../SparkleShare/SparkleSetup.cs:180
msgid "Also has paid accounts for extra private space and bandwidth."
msgstr ""
"Har også betalte kontoer som gir ekstra privat lagringsplass og båndbredde."
-#: ../SparkleShare/SparkleIntro.cs:195
+#: ../SparkleShare/SparkleSetup.cs:189
+msgid "Username/Folder"
+msgstr "Brukernavn/Mappe"
+
+#. Gitorious radiobutton
+#: ../SparkleShare/SparkleSetup.cs:194
+msgid "Gitorious"
+msgstr "Gitorious"
+
+#: ../SparkleShare/SparkleSetup.cs:196
+msgid "Completely Free as in Freedom infrastructure."
+msgstr "Helt fri som i frihet infrastruktur."
+
+#: ../SparkleShare/SparkleSetup.cs:197
+msgid "Free accounts for Free and Open Source projects."
+msgstr "Gratis kontoer for gratis og åpen kildekode prosjekter."
+
+#: ../SparkleShare/SparkleSetup.cs:206
+msgid "Project/Folder"
+msgstr "Prosjekt/Mappe"
+
+#. GNOME radiobutton
+#: ../SparkleShare/SparkleSetup.cs:211
msgid "The GNOME Project"
msgstr "GNOME Prosjektet"
-#: ../SparkleShare/SparkleIntro.cs:197
+#: ../SparkleShare/SparkleSetup.cs:213
msgid "GNOME is an easy to understand interface to your computer."
msgstr "GNOME er et lettfattelig grensesnitt for din datamaskin."
-#: ../SparkleShare/SparkleIntro.cs:198
+#: ../SparkleShare/SparkleSetup.cs:214
msgid "Select this option if you’re a developer or designer working on GNOME."
msgstr ""
"Velg dette valget dersom du er en utvikler eller designer som arbeider med "
"GNOME."
-#: ../SparkleShare/SparkleIntro.cs:206
-msgid "Gitorious"
-msgstr "Gitorious"
-
-#: ../SparkleShare/SparkleIntro.cs:208
-msgid "Completely Free as in Freedom infrastructure."
-msgstr "Helt fri som i frihet infrastruktur."
-
-#: ../SparkleShare/SparkleIntro.cs:209
-msgid "Free accounts for Free and Open Source projects."
-msgstr "Gratis kontoer for gratis og åpen kildekode prosjekter."
-
-#: ../SparkleShare/SparkleIntro.cs:220
-msgid "Username/Folder"
-msgstr "Brukernavn/Mappe"
-
-#: ../SparkleShare/SparkleIntro.cs:225
-msgid "Project/Folder"
-msgstr "Prosjekt/Mappe"
-
-#: ../SparkleShare/SparkleIntro.cs:230
+#: ../SparkleShare/SparkleSetup.cs:223
msgid "Project"
msgstr "Prosjekt"
-#: ../SparkleShare/SparkleIntro.cs:235 ../SparkleShare/SparkleIntro.cs:254
-msgid "Folder"
-msgstr "Mappe"
-
-#: ../SparkleShare/SparkleIntro.cs:259 ../SparkleShare/SparkleIntro.cs:377
+#: ../SparkleShare/SparkleSetup.cs:233
msgid "Folder Name:"
msgstr "Mappe Navn:"
-#: ../SparkleShare/SparkleIntro.cs:269
-msgid "Sync"
-msgstr "Synkroniser"
-
-#: ../SparkleShare/SparkleIntro.cs:312
+#. Cancel button
+#: ../SparkleShare/SparkleSetup.cs:261
msgid "Cancel"
msgstr "Avbryt"
-#: ../SparkleShare/SparkleIntro.cs:320
-msgid "Skip"
-msgstr "Hopp over"
+#. Sync button
+#: ../SparkleShare/SparkleSetup.cs:269
+msgid "Sync"
+msgstr "Synkroniser"
-#: ../SparkleShare/SparkleIntro.cs:347
-msgid "Invitation received!"
-msgstr "Invitasjon mottatt!"
-
-#: ../SparkleShare/SparkleIntro.cs:353
-msgid ""
-"You've received an invitation to join a shared folder.\n"
-"We're ready to hook you up immediately if you wish."
-msgstr ""
-"Du har mottatt en invitasjon til å delta i en delt mappe. Vi er klar til å "
-"koble deg opp umiddelbart hvis du ønsker dette."
-
-#: ../SparkleShare/SparkleIntro.cs:359
-msgid "Do you accept this invitation?"
-msgstr "Aksepterer du denne invitasjonen?"
-
-#: ../SparkleShare/SparkleIntro.cs:368
-msgid "Server Address:"
-msgstr "Tjener Adresse:"
-
-#: ../SparkleShare/SparkleIntro.cs:391
-msgid "Reject"
-msgstr "Avvis"
-
-#: ../SparkleShare/SparkleIntro.cs:392
-msgid "Accept and Sync"
-msgstr "Godta og Synkroniser"
-
-#: ../SparkleShare/SparkleIntro.cs:442
-msgid "Something went wrong…"
-msgstr "Noe gikk galt..."
-
-#: ../SparkleShare/SparkleIntro.cs:448
-msgid "Try Again"
-msgstr "Forsøk igjen"
-
-#: ../SparkleShare/SparkleIntro.cs:473
-#, csharp-format
-msgid "‘{0}’ has been successfully added"
-msgstr "‘{0}’ har blitt lagt til"
-
-#: ../SparkleShare/SparkleIntro.cs:482
-msgid "Folder synced successfully!"
-msgstr "Mappe synkronisering vellykket!"
-
-#: ../SparkleShare/SparkleIntro.cs:489
-#, csharp-format
-msgid ""
-"Now you can access the synced files from ‘{0}’ in your SparkleShare folder."
-msgstr ""
-"Nå kan du få tilgang til de synkroniserte filene fra '{0}' i SparkleShare "
-"mappen."
-
-#. A button that opens the synced folder
-#: ../SparkleShare/SparkleIntro.cs:497
-msgid "Open Folder"
-msgstr "Åpne Mappe"
-
-#: ../SparkleShare/SparkleIntro.cs:503 ../SparkleShare/SparkleIntro.cs:543
-#: ../SparkleShare/SparkleIntro.cs:604
-msgid "Finish"
-msgstr "Fullfør"
-
-#: ../SparkleShare/SparkleIntro.cs:528
+#: ../SparkleShare/SparkleSetup.cs:297
#, csharp-format
msgid "Syncing folder ‘{0}’…"
msgstr "Synkronisere mappe '{0}' ..."
-#: ../SparkleShare/SparkleIntro.cs:535
-msgid "This may take a while.\n"
-msgstr "Dette kan ta litt tid.\n"
+#: ../SparkleShare/SparkleSetup.cs:298
+msgid "This may take a while."
+msgstr "Dette kan ta en stund."
-#: ../SparkleShare/SparkleIntro.cs:536
+#: ../SparkleShare/SparkleSetup.cs:299
msgid "Are you sure it’s not coffee o'clock?"
msgstr ""
+"Ta deg en kopp te:\n"
+"Kok opp vann\n"
+"Ha litt varmt vann i koppen\n"
+"Tøm koppen, og ha i teposen\n"
+"Tilsett varmt vann, ev. sukker og melk eller sitronsaft\n"
+"Nyt teen\n"
+"Kom tilbake, og nyt SparkleShare!"
-#: ../SparkleShare/SparkleIntro.cs:579
-msgid "SparkleShare is ready to go!"
-msgstr "SparkleShare er klar til start!"
+#: ../SparkleShare/SparkleSetup.cs:303 ../SparkleShare/SparkleSetup.cs:388
+msgid "Finish"
+msgstr "Fullfør"
-#: ../SparkleShare/SparkleIntro.cs:585
-msgid ""
-"Now you can start accepting invitations from others. \n"
-"Just click on invitations you get by email and we will take care of the rest."
-msgstr ""
-"Nå kan du begynne å akseptere invitasjoner fra andre. Bare klikk på "
-"invitasjoner du får via e-post og vi vil ta vare på resten."
+#: ../SparkleShare/SparkleSetup.cs:333
+msgid "Something went wrong"
+msgstr "Noe gikk galt"
-#: ../SparkleShare/SparkleIntro.cs:596
-msgid "Learn how to host your own SparkleServer"
-msgstr "Lær hvordan du kan være vert for din egen SparkleServer"
+#: ../SparkleShare/SparkleSetup.cs:353
+msgid "Try Again"
+msgstr "Forsøk igjen"
-#: ../SparkleShare/SparkleEventLog.cs:61
-msgid "Recent Events"
-msgstr "Nylige hendelser"
+#: ../SparkleShare/SparkleSetup.cs:372
+#, csharp-format
+msgid "‘{0}’ has been successfully added"
+msgstr "‘{0}’ har blitt lagt til"
-#: ../SparkleShare/SparkleEventLog.cs:148
-#: ../SparkleShare/SparkleEventLog.cs:173
-msgid "All Folders"
-msgstr "Alle mapper"
+#: ../SparkleShare/SparkleSetup.cs:378
+msgid "Folder synced successfully!"
+msgstr "Mappe synkronisering vellykket!"
+
+#: ../SparkleShare/SparkleSetup.cs:379
+msgid "Access the synced files from your SparkleShare folder."
+msgstr "Få tilgang til synkroniserte filer fra din SparkleShare-mappe"
+
+#. A button that opens the synced folder
+#: ../SparkleShare/SparkleSetup.cs:382
+msgid "Open Folder"
+msgstr "Åpne Mappe"
+
+#: ../SparkleShare/SparkleSetupWindow.cs:45
+msgid "SparkleShare Setup"
+msgstr "Sett opp SparkleShare"
#: ../SparkleShare/SparkleShare.cs:53
msgid "Sorry, you can't run SparkleShare with these permissions."
@@ -346,7 +297,7 @@ msgstr "Vis denne hjelpeteksten"
#: ../SparkleShare/SparkleShare.cs:109
msgid "SparkleShare, a collaboration and sharing tool."
-msgstr ""
+msgstr "SparkleShare, et samarbeids- og fildelingsverktøy"
#: ../SparkleShare/SparkleShare.cs:110
msgid "Copyright (C) 2010 Hylke Bons"
@@ -411,21 +362,8 @@ msgid "Turn Notifications On"
msgstr "Slå på varslinger"
#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:286
+#: ../SparkleShare/SparkleStatusIcon.cs:291
msgid "Quit"
msgstr "Avslutt"
-#: ../SparkleShare/SparkleUI.cs:99
-msgid "Ouch! Mid-air collision!"
-msgstr "Au! Kollisjon midt i luften!"
-
-#: ../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."
-
-#: ../SparkleShare/SparkleWindow.cs:41
-msgid "SparkleShare Setup"
-msgstr ""
-
diff --git a/po/pl.po b/po/pl.po
old mode 100644
new mode 100755
index 9339a685..f7e3b4b8
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,16 +1,12 @@
# This file is distributed under the same license as the Sparkleshare package.
#
-# WARNING: Due to the nature of Transifex all translation file headers were lost
-# we apologise for any incovenience this may have caused and we hope to bring them
-# back in the future.
-#
# Łukasz Jernaś , 2011.
msgid ""
msgstr ""
"Project-Id-Version: SparkleShare\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-29 11:38+0200\n"
-"PO-Revision-Date: 2011-07-02 16:58+0000\n"
+"POT-Creation-Date: 2011-08-25 13:59+0200\n"
+"PO-Revision-Date: 2011-08-25 12:02+0000\n"
"Last-Translator: deejay1 \n"
"Language-Team: LANGUAGE \n"
"MIME-Version: 1.0\n"
@@ -19,26 +15,27 @@ msgstr ""
"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:337
-#: ../SparkleShare/SparkleIntro.cs:67 ../SparkleShare/SparkleStatusIcon.cs:345
-msgid "Welcome to SparkleShare!"
-msgstr "Witamy w programie SparkleShare!"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:348
-#: ../SparkleShare/SparkleStatusIcon.cs:357
-msgid "Not everything is synced"
-msgstr "Nie wszystko zostało zsynchronizowane"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:358
-#: ../SparkleShare/SparkleStatusIcon.cs:367
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:69
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:86
+#: ../SparkleShare/SparkleStatusIcon.cs:372
msgid "Up to date"
msgstr "Wszystko jest aktualne"
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:374
-#: ../SparkleShare/SparkleStatusIcon.cs:383
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:84
+#: ../SparkleShare/SparkleSetup.cs:69 ../SparkleShare/SparkleStatusIcon.cs:350
+msgid "Welcome to SparkleShare!"
+msgstr "Witamy w programie SparkleShare!"
+
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:95
+#: ../SparkleShare/SparkleStatusIcon.cs:388
msgid "Syncing…"
msgstr "Synchronizowanie…"
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:105
+#: ../SparkleShare/SparkleStatusIcon.cs:362
+msgid "Not everything is synced"
+msgstr "Nie wszystko zostało zsynchronizowane"
+
#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
msgid "Copy Web Link"
msgstr "Skopiuj odnośnik"
@@ -60,59 +57,52 @@ msgid "Select to get a copy of this version"
msgstr "Zaznacz, aby pobrać kopię tej wersji"
#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:46 ../SparkleShare/SparkleStatusIcon.cs:275
+#: ../SparkleShare/SparkleAbout.cs:53 ../SparkleShare/SparkleStatusIcon.cs:275
msgid "About SparkleShare"
msgstr "Informacje o"
-#: ../SparkleShare/SparkleAbout.cs:53
-msgid "A newer version is available"
-msgstr "Dostępna jest nowsza wersja"
+#: ../SparkleShare/SparkleAbout.cs:70
+#, csharp-format
+msgid "A newer version ({0}) is available!"
+msgstr "Dostępna jest nowa wersja: {0}"
-#: ../SparkleShare/SparkleAbout.cs:60
+#: ../SparkleShare/SparkleAbout.cs:79
msgid "You are running the latest version."
msgstr "Korzystasz z najnowszej wersji."
-#: ../SparkleShare/SparkleAbout.cs:87
+#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:113
msgid "Checking for updates..."
msgstr "Wyszukiwanie aktualizacji"
-#: ../SparkleShare/SparkleAbout.cs:116
-msgid "_Show Credits"
-msgstr "Za_sługi"
+#: ../SparkleShare/SparkleController.cs:483
+msgid "dddd, MMMM d, yyyy"
+msgstr "dddd, MMMM d, yyyy"
-#: ../SparkleShare/SparkleAbout.cs:129
-msgid "_Visit Website"
-msgstr "_Odwiedź stronę domową"
+#: ../SparkleShare/SparkleController.cs:489
+msgid "dddd, MMMM d"
+msgstr "dddd, MMMM d"
-#: ../SparkleShare/SparkleController.cs:455
-msgid "ddd MMM d, yyyy"
-msgstr "ddd, d MMM yyyy"
-
-#: ../SparkleShare/SparkleController.cs:460
-msgid "ddd MMM d"
-msgstr "ddd, d MMM"
-
-#: ../SparkleShare/SparkleController.cs:661
+#: ../SparkleShare/SparkleController.cs:706
#, csharp-format
msgid "added ‘{0}’"
msgstr "dodano „{0}”"
-#: ../SparkleShare/SparkleController.cs:666
+#: ../SparkleShare/SparkleController.cs:711
#, csharp-format
msgid "moved ‘{0}’"
msgstr "przesunięto \"{0}\""
-#: ../SparkleShare/SparkleController.cs:671
+#: ../SparkleShare/SparkleController.cs:716
#, csharp-format
msgid "edited ‘{0}’"
msgstr "edytowano „{0}”"
-#: ../SparkleShare/SparkleController.cs:676
+#: ../SparkleShare/SparkleController.cs:721
#, csharp-format
msgid "deleted ‘{0}’"
msgstr "usunięto „{0}”"
-#: ../SparkleShare/SparkleController.cs:685
+#: ../SparkleShare/SparkleController.cs:730
#, csharp-format
msgid "and {0} more"
msgid_plural "and {0} more"
@@ -120,11 +110,20 @@ msgstr[0] "oraz {0} więcej"
msgstr[1] "oraz {0} więcej"
msgstr[2] "oraz {0} więcej"
-#: ../SparkleShare/SparkleController.cs:689
+#: ../SparkleShare/SparkleController.cs:734
msgid "did something magical"
msgstr "wydarzyło się coś magicznego"
-#: ../SparkleShare/SparkleIntro.cs:73
+#: ../SparkleShare/SparkleEventLog.cs:58
+msgid "Recent Events"
+msgstr "Ostatnie zdarzenia"
+
+#: ../SparkleShare/SparkleEventLog.cs:169
+#: ../SparkleShare/SparkleEventLog.cs:188
+msgid "All Folders"
+msgstr "Wszystkie katalogi"
+
+#: ../SparkleShare/SparkleSetup.cs:70
msgid ""
"Before we can create a SparkleShare folder on this computer, we need a few "
"bits of information from you."
@@ -132,199 +131,144 @@ msgstr ""
"Program SparkleShare wymaga podania kilku informacji, nim możliwe będzie "
"utworzenie katalogu na tym komputerze."
-#: ../SparkleShare/SparkleIntro.cs:83
+#: ../SparkleShare/SparkleSetup.cs:77
msgid "Full Name:"
msgstr "Imię i nazwisko:"
-#: ../SparkleShare/SparkleIntro.cs:98
+#: ../SparkleShare/SparkleSetup.cs:92
msgid "Email:"
msgstr "Email:"
-#: ../SparkleShare/SparkleIntro.cs:109
+#: ../SparkleShare/SparkleSetup.cs:102
msgid "Next"
msgstr "Następny"
-#: ../SparkleShare/SparkleIntro.cs:115
-msgid "Configuring…"
-msgstr "Trwa konfigurowanie…"
-
-#: ../SparkleShare/SparkleIntro.cs:161
+#: ../SparkleShare/SparkleSetup.cs:123
msgid "Where is your remote folder?"
msgstr "Gdzie znajduje się zdalny folder?"
-#: ../SparkleShare/SparkleIntro.cs:174
-msgid "address-to-server.com"
-msgstr "serwer.pl"
-
-#: ../SparkleShare/SparkleIntro.cs:179
+#. Own server radiobutton
+#: ../SparkleShare/SparkleSetup.cs:132
msgid "On my own server:"
msgstr "Na własnym serwerze:"
-#: ../SparkleShare/SparkleIntro.cs:186
+#: ../SparkleShare/SparkleSetup.cs:137 ../SparkleShare/SparkleSetup.cs:239
+msgid "Folder"
+msgstr "Katalog"
+
+#: ../SparkleShare/SparkleSetup.cs:164
+msgid "address-to-server.com"
+msgstr "serwer.pl"
+
+#: ../SparkleShare/SparkleSetup.cs:179
msgid "Free hosting for Free and Open Source Software projects."
msgstr "Darmowy hosting Wolnych i Otwartych projektów."
-#: ../SparkleShare/SparkleIntro.cs:187
+#: ../SparkleShare/SparkleSetup.cs:180
msgid "Also has paid accounts for extra private space and bandwidth."
msgstr ""
"Posiada również płatne konta zwiększające dostępną przestrzeń oraz pasmo."
-#: ../SparkleShare/SparkleIntro.cs:195
+#: ../SparkleShare/SparkleSetup.cs:189
+msgid "Username/Folder"
+msgstr "Nazwa użytkownika/katalog"
+
+#. Gitorious radiobutton
+#: ../SparkleShare/SparkleSetup.cs:194
+msgid "Gitorious"
+msgstr "Gitorious"
+
+#: ../SparkleShare/SparkleSetup.cs:196
+msgid "Completely Free as in Freedom infrastructure."
+msgstr "W pełni wolny, jak w wyrażeniu wolna infrastruktura."
+
+#: ../SparkleShare/SparkleSetup.cs:197
+msgid "Free accounts for Free and Open Source projects."
+msgstr "Wolne konta dla projektów Wolnych i Otwartych projektów."
+
+#: ../SparkleShare/SparkleSetup.cs:206
+msgid "Project/Folder"
+msgstr "Projekt/Katalog"
+
+#. GNOME radiobutton
+#: ../SparkleShare/SparkleSetup.cs:211
msgid "The GNOME Project"
msgstr "Projekt GNOME"
-#: ../SparkleShare/SparkleIntro.cs:197
+#: ../SparkleShare/SparkleSetup.cs:213
msgid "GNOME is an easy to understand interface to your computer."
msgstr ""
"Środowisko GNOME jest łatwym w użyciu interfejsem dla twojego komputera."
-#: ../SparkleShare/SparkleIntro.cs:198
+#: ../SparkleShare/SparkleSetup.cs:214
msgid "Select this option if you’re a developer or designer working on GNOME."
msgstr ""
"Zaznacz tą opcję, jeśli programujesz lub projektujesz dla projektu GNOME."
-#: ../SparkleShare/SparkleIntro.cs:206
-msgid "Gitorious"
-msgstr "Gitorious"
-
-#: ../SparkleShare/SparkleIntro.cs:208
-msgid "Completely Free as in Freedom infrastructure."
-msgstr "W pełni wolny, jak w wyrażeniu wolna infrastruktura."
-
-#: ../SparkleShare/SparkleIntro.cs:209
-msgid "Free accounts for Free and Open Source projects."
-msgstr "Wolne konta dla projektów Wolnych i Otwartych projektów."
-
-#: ../SparkleShare/SparkleIntro.cs:220
-msgid "Username/Folder"
-msgstr "Nazwa użytkownika/katalog"
-
-#: ../SparkleShare/SparkleIntro.cs:225
-msgid "Project/Folder"
-msgstr "Projekt/Katalog"
-
-#: ../SparkleShare/SparkleIntro.cs:230
+#: ../SparkleShare/SparkleSetup.cs:223
msgid "Project"
msgstr "Projekt"
-#: ../SparkleShare/SparkleIntro.cs:235 ../SparkleShare/SparkleIntro.cs:254
-msgid "Folder"
-msgstr "Katalog"
-
-#: ../SparkleShare/SparkleIntro.cs:259 ../SparkleShare/SparkleIntro.cs:377
+#: ../SparkleShare/SparkleSetup.cs:233
msgid "Folder Name:"
msgstr "Nazwa folderu:"
-#: ../SparkleShare/SparkleIntro.cs:269
-msgid "Sync"
-msgstr "Synchronizuj"
-
-#: ../SparkleShare/SparkleIntro.cs:312
+#. Cancel button
+#: ../SparkleShare/SparkleSetup.cs:261
msgid "Cancel"
msgstr "Anuluj"
-#: ../SparkleShare/SparkleIntro.cs:320
-msgid "Skip"
-msgstr "Pomiń"
+#. Sync button
+#: ../SparkleShare/SparkleSetup.cs:269
+msgid "Sync"
+msgstr "Synchronizuj"
-#: ../SparkleShare/SparkleIntro.cs:347
-msgid "Invitation received!"
-msgstr "Otrzymano zaproszenie."
-
-#: ../SparkleShare/SparkleIntro.cs:353
-msgid ""
-"You've received an invitation to join a shared folder.\n"
-"We're ready to hook you up immediately if you wish."
-msgstr ""
-"Otrzymano zaproszenie do współpracy. \n"
-" Program SparkleShare jest gotowy, by rozpocząć współpracę, jeśli tylko sobie tego życzysz."
-
-#: ../SparkleShare/SparkleIntro.cs:359
-msgid "Do you accept this invitation?"
-msgstr "Przyjąć zaproszenie?"
-
-#: ../SparkleShare/SparkleIntro.cs:368
-msgid "Server Address:"
-msgstr "Adres serwera:"
-
-#: ../SparkleShare/SparkleIntro.cs:391
-msgid "Reject"
-msgstr "Odrzuć"
-
-#: ../SparkleShare/SparkleIntro.cs:392
-msgid "Accept and Sync"
-msgstr "Przyjmij i zsynchronizuj"
-
-#: ../SparkleShare/SparkleIntro.cs:442
-msgid "Something went wrong…"
-msgstr "Coś poszło nie tak..."
-
-#: ../SparkleShare/SparkleIntro.cs:448
-msgid "Try Again"
-msgstr "Spróbuj ponownie"
-
-#: ../SparkleShare/SparkleIntro.cs:473
-#, csharp-format
-msgid "‘{0}’ has been successfully added"
-msgstr "„{0}” został poprawnie dodany"
-
-#: ../SparkleShare/SparkleIntro.cs:482
-msgid "Folder synced successfully!"
-msgstr "Poprawnie zsynchronizowano folder"
-
-#: ../SparkleShare/SparkleIntro.cs:489
-#, csharp-format
-msgid ""
-"Now you can access the synced files from ‘{0}’ in your SparkleShare folder."
-msgstr "Pliki synchronizowane z „{0}” znajdują się z katalogu SparkleShare."
-
-#. A button that opens the synced folder
-#: ../SparkleShare/SparkleIntro.cs:497
-msgid "Open Folder"
-msgstr "Otwórz katalog"
-
-#: ../SparkleShare/SparkleIntro.cs:503 ../SparkleShare/SparkleIntro.cs:543
-#: ../SparkleShare/SparkleIntro.cs:604
-msgid "Finish"
-msgstr "Zakończ"
-
-#: ../SparkleShare/SparkleIntro.cs:528
+#: ../SparkleShare/SparkleSetup.cs:297
#, csharp-format
msgid "Syncing folder ‘{0}’…"
msgstr "Synchronizowanie katalogu „{0}”"
-#: ../SparkleShare/SparkleIntro.cs:535
-msgid "This may take a while.\n"
-msgstr "Proces może chwilę potrwać.\n"
+#: ../SparkleShare/SparkleSetup.cs:298
+msgid "This may take a while."
+msgstr "Może to chwilę zająć."
-#: ../SparkleShare/SparkleIntro.cs:536
+#: ../SparkleShare/SparkleSetup.cs:299
msgid "Are you sure it’s not coffee o'clock?"
msgstr "Czy to nie jest czasem przerwa na kawę?"
-#: ../SparkleShare/SparkleIntro.cs:579
-msgid "SparkleShare is ready to go!"
-msgstr "Program SparkleShare jest gotowy do pracy."
+#: ../SparkleShare/SparkleSetup.cs:303 ../SparkleShare/SparkleSetup.cs:388
+msgid "Finish"
+msgstr "Zakończ"
-#: ../SparkleShare/SparkleIntro.cs:585
-msgid ""
-"Now you can start accepting invitations from others. \n"
-"Just click on invitations you get by email and we will take care of the rest."
-msgstr ""
-"Można teraz przyjmować zaproszenia od innych osób. \n"
-" Wystarczy kliknąć na zaproszenie otrzymane w emailu, a program SparkleShare zajmie się resztą."
+#: ../SparkleShare/SparkleSetup.cs:333
+msgid "Something went wrong"
+msgstr "Coś się nie udało"
-#: ../SparkleShare/SparkleIntro.cs:596
-msgid "Learn how to host your own SparkleServer"
-msgstr "Dowiedz się, jak postawić własny SparkleServer"
+#: ../SparkleShare/SparkleSetup.cs:353
+msgid "Try Again"
+msgstr "Spróbuj ponownie"
-#: ../SparkleShare/SparkleEventLog.cs:61
-msgid "Recent Events"
-msgstr "Ostatnie zdarzenia"
+#: ../SparkleShare/SparkleSetup.cs:372
+#, csharp-format
+msgid "‘{0}’ has been successfully added"
+msgstr "„{0}” został poprawnie dodany"
-#: ../SparkleShare/SparkleEventLog.cs:148
-#: ../SparkleShare/SparkleEventLog.cs:173
-msgid "All Folders"
-msgstr "Wszystkie katalogi"
+#: ../SparkleShare/SparkleSetup.cs:378
+msgid "Folder synced successfully!"
+msgstr "Poprawnie zsynchronizowano folder"
+
+#: ../SparkleShare/SparkleSetup.cs:379
+msgid "Access the synced files from your SparkleShare folder."
+msgstr "Współdzielone pliki dostępne są w katalogu SparkleShare."
+
+#. A button that opens the synced folder
+#: ../SparkleShare/SparkleSetup.cs:382
+msgid "Open Folder"
+msgstr "Otwórz katalog"
+
+#: ../SparkleShare/SparkleSetupWindow.cs:45
+msgid "SparkleShare Setup"
+msgstr "Ustawienia programu SparkleShare"
#: ../SparkleShare/SparkleShare.cs:53
msgid "Sorry, you can't run SparkleShare with these permissions."
@@ -417,20 +361,8 @@ msgid "Turn Notifications On"
msgstr "Włącz powiadomienia"
#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:286
+#: ../SparkleShare/SparkleStatusIcon.cs:291
msgid "Quit"
msgstr "Zakończ"
-#: ../SparkleShare/SparkleUI.cs:99
-msgid "Ouch! Mid-air collision!"
-msgstr "Ups! Nastąpiło czołowe zderzenie! "
-
-#: ../SparkleShare/SparkleUI.cs:100
-msgid "Don't worry, SparkleShare made a copy of each conflicting file."
-msgstr "Bez obaw, program SparkleShare wykonał kopię skonfliktowanych plików."
-
-#: ../SparkleShare/SparkleWindow.cs:41
-msgid "SparkleShare Setup"
-msgstr "Ustawienia programu SparkleShare"
-
diff --git a/po/pt_BR.po b/po/pt_BR.po
old mode 100644
new mode 100755
index 0e7c7923..b6a18716
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,14 +5,15 @@
# back in the future.
#
# Paulo Paulo , 2011.
+# , 2011.
# DigitalDead , 2011.
msgid ""
msgstr ""
"Project-Id-Version: SparkleShare\n"
"Report-Msgid-Bugs-To: \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"
+"POT-Creation-Date: 2011-07-19 07:04+0200\n"
+"PO-Revision-Date: 2011-08-04 11:32+0000\n"
+"Last-Translator: eduardosilva \n"
"Language-Team: LANGUAGE \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,26 +21,27 @@ msgstr ""
"Language: pt_BR\n"
"Plural-Forms: nplurals=2; plural=(n > 1)\n"
-#: ../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:348
-#: ../SparkleShare/SparkleStatusIcon.cs:357
-msgid "Not everything is synced"
-msgstr "Nem tudo foi sincronizado"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:358
-#: ../SparkleShare/SparkleStatusIcon.cs:367
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:69
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:86
+#: ../SparkleShare/SparkleStatusIcon.cs:372
msgid "Up to date"
msgstr "Atualizado"
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:374
-#: ../SparkleShare/SparkleStatusIcon.cs:383
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:84
+#: ../SparkleShare/SparkleSetup.cs:69 ../SparkleShare/SparkleStatusIcon.cs:350
+msgid "Welcome to SparkleShare!"
+msgstr "Bem-vindo ao SparkleShare!"
+
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:95
+#: ../SparkleShare/SparkleStatusIcon.cs:388
msgid "Syncing…"
msgstr "Sincronizando…"
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:105
+#: ../SparkleShare/SparkleStatusIcon.cs:362
+msgid "Not everything is synced"
+msgstr "Nem tudo foi sincronizado"
+
#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
msgid "Copy Web Link"
msgstr "Copiar Endereço Web"
@@ -61,70 +63,72 @@ msgid "Select to get a copy of this version"
msgstr "Selecione para obter uma cópia dessa versão"
#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:46 ../SparkleShare/SparkleStatusIcon.cs:275
+#: ../SparkleShare/SparkleAbout.cs:54 ../SparkleShare/SparkleStatusIcon.cs:275
msgid "About SparkleShare"
msgstr "Sobre o SparkleShare"
-#: ../SparkleShare/SparkleAbout.cs:53
-msgid "A newer version is available"
-msgstr "Uma nova versão está disponível"
+#: ../SparkleShare/SparkleAbout.cs:72
+#, csharp-format
+msgid "A newer version ({0}) is available!"
+msgstr "Uma nova versão ({0}) está disponível!"
-#: ../SparkleShare/SparkleAbout.cs:60
+#: ../SparkleShare/SparkleAbout.cs:80
msgid "You are running the latest version."
msgstr "Você está executando a última versão"
-#: ../SparkleShare/SparkleAbout.cs:87
+#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:110
msgid "Checking for updates..."
msgstr "Verificando atualizações"
-#: ../SparkleShare/SparkleAbout.cs:116
-msgid "_Show Credits"
-msgstr "_Exibir os Créditos"
+#: ../SparkleShare/SparkleController.cs:446
+msgid "dddd, MMMM d, yyyy"
+msgstr ""
-#: ../SparkleShare/SparkleAbout.cs:129
-msgid "_Visit Website"
-msgstr "Visite o site"
+#: ../SparkleShare/SparkleController.cs:451
+msgid "dddd, MMMM d"
+msgstr ""
-#: ../SparkleShare/SparkleController.cs:455
-msgid "ddd MMM d, yyyy"
-msgstr "ddd d MMM yyyy"
-
-#: ../SparkleShare/SparkleController.cs:460
-msgid "ddd MMM d"
-msgstr "ddd d MMM"
-
-#: ../SparkleShare/SparkleController.cs:661
+#: ../SparkleShare/SparkleController.cs:660
#, csharp-format
msgid "added ‘{0}’"
msgstr "incluído '{0}'"
-#: ../SparkleShare/SparkleController.cs:666
+#: ../SparkleShare/SparkleController.cs:665
#, csharp-format
msgid "moved ‘{0}’"
msgstr "'{0}' movida"
-#: ../SparkleShare/SparkleController.cs:671
+#: ../SparkleShare/SparkleController.cs:670
#, csharp-format
msgid "edited ‘{0}’"
msgstr "editado '{0}'"
-#: ../SparkleShare/SparkleController.cs:676
+#: ../SparkleShare/SparkleController.cs:675
#, csharp-format
msgid "deleted ‘{0}’"
msgstr "excluído '{0}'"
-#: ../SparkleShare/SparkleController.cs:685
+#: ../SparkleShare/SparkleController.cs:684
#, csharp-format
msgid "and {0} more"
msgid_plural "and {0} more"
msgstr[0] "e {0} mais"
msgstr[1] "e {0} mais"
-#: ../SparkleShare/SparkleController.cs:689
+#: ../SparkleShare/SparkleController.cs:688
msgid "did something magical"
msgstr "Algo mágico aconteceu"
-#: ../SparkleShare/SparkleIntro.cs:73
+#: ../SparkleShare/SparkleEventLog.cs:61
+msgid "Recent Events"
+msgstr "Eventos Recentes"
+
+#: ../SparkleShare/SparkleEventLog.cs:148
+#: ../SparkleShare/SparkleEventLog.cs:173
+msgid "All Folders"
+msgstr "Todas as pastas"
+
+#: ../SparkleShare/SparkleSetup.cs:70
msgid ""
"Before we can create a SparkleShare folder on this computer, we need a few "
"bits of information from you."
@@ -132,200 +136,143 @@ msgstr ""
"Antes de criarmos uma pasta SparkleShare neste computador, precisamos de "
"algumas informações sobre você."
-#: ../SparkleShare/SparkleIntro.cs:83
+#: ../SparkleShare/SparkleSetup.cs:77
msgid "Full Name:"
msgstr "Nome Completo:"
-#: ../SparkleShare/SparkleIntro.cs:98
+#: ../SparkleShare/SparkleSetup.cs:92
msgid "Email:"
msgstr "Email:"
-#: ../SparkleShare/SparkleIntro.cs:109
+#: ../SparkleShare/SparkleSetup.cs:102
msgid "Next"
msgstr "Próximo"
-#: ../SparkleShare/SparkleIntro.cs:115
-msgid "Configuring…"
-msgstr "Configurando..."
-
-#: ../SparkleShare/SparkleIntro.cs:161
+#: ../SparkleShare/SparkleSetup.cs:122
msgid "Where is your remote folder?"
msgstr "Onde está sua pasta remota?"
-#: ../SparkleShare/SparkleIntro.cs:174
-msgid "address-to-server.com"
-msgstr "endereço-do-servidor.com"
-
-#: ../SparkleShare/SparkleIntro.cs:179
+#. Own server radiobutton
+#: ../SparkleShare/SparkleSetup.cs:131
msgid "On my own server:"
msgstr "No meu próprio servidor:"
-#: ../SparkleShare/SparkleIntro.cs:186
+#: ../SparkleShare/SparkleSetup.cs:136 ../SparkleShare/SparkleSetup.cs:238
+msgid "Folder"
+msgstr "Pasta"
+
+#: ../SparkleShare/SparkleSetup.cs:163
+msgid "address-to-server.com"
+msgstr "endereço-do-servidor.com"
+
+#: ../SparkleShare/SparkleSetup.cs:178
msgid "Free hosting for Free and Open Source Software projects."
msgstr "Hospedagem gratuita para projetos de Software Livre e Código Aberto"
-#: ../SparkleShare/SparkleIntro.cs:187
+#: ../SparkleShare/SparkleSetup.cs:179
msgid "Also has paid accounts for extra private space and bandwidth."
msgstr "Também oferece contas pagas para mais espaço privado e transferência."
-#: ../SparkleShare/SparkleIntro.cs:195
+#: ../SparkleShare/SparkleSetup.cs:188
+msgid "Username/Folder"
+msgstr "Nome do usuário/Pasta"
+
+#. Gitorious radiobutton
+#: ../SparkleShare/SparkleSetup.cs:193
+msgid "Gitorious"
+msgstr "Gitorious"
+
+#: ../SparkleShare/SparkleSetup.cs:195
+msgid "Completely Free as in Freedom infrastructure."
+msgstr "Infraestrutura completamente Livre como em Liberdade"
+
+#: ../SparkleShare/SparkleSetup.cs:196
+msgid "Free accounts for Free and Open Source projects."
+msgstr "Contas gratuitas para projetos de Software Livre e de Código Aberto"
+
+#: ../SparkleShare/SparkleSetup.cs:205
+msgid "Project/Folder"
+msgstr "Projeto/Pasta"
+
+#. GNOME radiobutton
+#: ../SparkleShare/SparkleSetup.cs:210
msgid "The GNOME Project"
msgstr "O projeto GNOME"
-#: ../SparkleShare/SparkleIntro.cs:197
+#: ../SparkleShare/SparkleSetup.cs:212
msgid "GNOME is an easy to understand interface to your computer."
msgstr "GNOME é uma interface de fácil compreensão para o seu computador."
-#: ../SparkleShare/SparkleIntro.cs:198
+#: ../SparkleShare/SparkleSetup.cs:213
msgid "Select this option if you’re a developer or designer working on GNOME."
msgstr ""
"Selecione esta opção se você é um desenvolvedor ou designer trabalhando com "
"o GNOME."
-#: ../SparkleShare/SparkleIntro.cs:206
-msgid "Gitorious"
-msgstr "Gitorious"
-
-#: ../SparkleShare/SparkleIntro.cs:208
-msgid "Completely Free as in Freedom infrastructure."
-msgstr "Infraestrutura completamente Livre como em Liberdade"
-
-#: ../SparkleShare/SparkleIntro.cs:209
-msgid "Free accounts for Free and Open Source projects."
-msgstr "Contas gratuitas para projetos de Software Livre e de Código Aberto"
-
-#: ../SparkleShare/SparkleIntro.cs:220
-msgid "Username/Folder"
-msgstr "Nome do usuário/Pasta"
-
-#: ../SparkleShare/SparkleIntro.cs:225
-msgid "Project/Folder"
-msgstr "Projeto/Pasta"
-
-#: ../SparkleShare/SparkleIntro.cs:230
+#: ../SparkleShare/SparkleSetup.cs:222
msgid "Project"
msgstr "Projeto"
-#: ../SparkleShare/SparkleIntro.cs:235 ../SparkleShare/SparkleIntro.cs:254
-msgid "Folder"
-msgstr "Pasta"
-
-#: ../SparkleShare/SparkleIntro.cs:259 ../SparkleShare/SparkleIntro.cs:377
+#: ../SparkleShare/SparkleSetup.cs:232
msgid "Folder Name:"
msgstr "Nome da Pasta"
-#: ../SparkleShare/SparkleIntro.cs:269
-msgid "Sync"
-msgstr "Sincronizar"
-
-#: ../SparkleShare/SparkleIntro.cs:312
+#. Cancel button
+#: ../SparkleShare/SparkleSetup.cs:251
msgid "Cancel"
msgstr "Cancelar"
-#: ../SparkleShare/SparkleIntro.cs:320
-msgid "Skip"
-msgstr "Pular"
+#. Sync button
+#: ../SparkleShare/SparkleSetup.cs:259
+msgid "Sync"
+msgstr "Sincronizar"
-#: ../SparkleShare/SparkleIntro.cs:347
-msgid "Invitation received!"
-msgstr "Convite recebido!"
-
-#: ../SparkleShare/SparkleIntro.cs:353
-msgid ""
-"You've received an invitation to join a shared folder.\n"
-"We're ready to hook you up immediately if you wish."
-msgstr ""
-"Você recebeu um convite para compartilhar uma pasta.\n"
-"Estamos prontos para compartilhar imediatamente, se desejar"
-
-#: ../SparkleShare/SparkleIntro.cs:359
-msgid "Do you accept this invitation?"
-msgstr "Você deseja aceitar esse convite?"
-
-#: ../SparkleShare/SparkleIntro.cs:368
-msgid "Server Address:"
-msgstr "Endereço do Servidor:"
-
-#: ../SparkleShare/SparkleIntro.cs:391
-msgid "Reject"
-msgstr "Rejeitar"
-
-#: ../SparkleShare/SparkleIntro.cs:392
-msgid "Accept and Sync"
-msgstr "Aceitar e Sincronizar"
-
-#: ../SparkleShare/SparkleIntro.cs:442
-msgid "Something went wrong…"
-msgstr "Algo está errado..."
-
-#: ../SparkleShare/SparkleIntro.cs:448
-msgid "Try Again"
-msgstr "Tente de Novo"
-
-#: ../SparkleShare/SparkleIntro.cs:473
-#, csharp-format
-msgid "‘{0}’ has been successfully added"
-msgstr "'{0}' foi incluída com sucesso"
-
-#: ../SparkleShare/SparkleIntro.cs:482
-msgid "Folder synced successfully!"
-msgstr "Pasta sincronizada com sucesso!"
-
-#: ../SparkleShare/SparkleIntro.cs:489
-#, csharp-format
-msgid ""
-"Now you can access the synced files from ‘{0}’ in your SparkleShare folder."
-msgstr ""
-"Agora, você pode acessar os arquivos sincronizados de '{0}' na sua pasta do "
-"SparkleShare"
-
-#. A button that opens the synced folder
-#: ../SparkleShare/SparkleIntro.cs:497
-msgid "Open Folder"
-msgstr "Abrir Pasta"
-
-#: ../SparkleShare/SparkleIntro.cs:503 ../SparkleShare/SparkleIntro.cs:543
-#: ../SparkleShare/SparkleIntro.cs:604
-msgid "Finish"
-msgstr "Finalizar"
-
-#: ../SparkleShare/SparkleIntro.cs:528
+#: ../SparkleShare/SparkleSetup.cs:286
#, csharp-format
msgid "Syncing folder ‘{0}’…"
msgstr "Sincronizando pasta '{0}'"
-#: ../SparkleShare/SparkleIntro.cs:535
-msgid "This may take a while.\n"
-msgstr "Isso pode demorar um pouco.\n"
+#: ../SparkleShare/SparkleSetup.cs:287
+msgid "This may take a while."
+msgstr "Isto pode demorar um pouco."
-#: ../SparkleShare/SparkleIntro.cs:536
+#: ../SparkleShare/SparkleSetup.cs:288
msgid "Are you sure it’s not coffee o'clock?"
msgstr "Você tem certeza de que não é hora do café?"
-#: ../SparkleShare/SparkleIntro.cs:579
-msgid "SparkleShare is ready to go!"
-msgstr "O SparkleShare está pronto!"
+#: ../SparkleShare/SparkleSetup.cs:292 ../SparkleShare/SparkleSetup.cs:375
+msgid "Finish"
+msgstr "Finalizar"
-#: ../SparkleShare/SparkleIntro.cs:585
-msgid ""
-"Now you can start accepting invitations from others. \n"
-"Just click on invitations you get by email and we will take care of the rest."
-msgstr ""
-"Agora você pode aceitar convites de outros usuários.\n"
-"Apenas clique nos convites que você receber por e-mail e nós cuidaremos do resto."
+#: ../SparkleShare/SparkleSetup.cs:321
+msgid "Something went wrong"
+msgstr "Algum problema ocorreu"
-#: ../SparkleShare/SparkleIntro.cs:596
-msgid "Learn how to host your own SparkleServer"
-msgstr "Aprenda a hospedar o seu próprio SparkleServer"
+#: ../SparkleShare/SparkleSetup.cs:341
+msgid "Try Again"
+msgstr "Tente de Novo"
-#: ../SparkleShare/SparkleEventLog.cs:61
-msgid "Recent Events"
-msgstr ""
+#: ../SparkleShare/SparkleSetup.cs:359
+#, csharp-format
+msgid "‘{0}’ has been successfully added"
+msgstr "'{0}' foi incluída com sucesso"
-#: ../SparkleShare/SparkleEventLog.cs:148
-#: ../SparkleShare/SparkleEventLog.cs:173
-msgid "All Folders"
-msgstr ""
+#: ../SparkleShare/SparkleSetup.cs:365
+msgid "Folder synced successfully!"
+msgstr "Pasta sincronizada com sucesso!"
+
+#: ../SparkleShare/SparkleSetup.cs:366
+msgid "Access the synced files from your SparkleShare folder."
+msgstr "Acessar os arquivos sincronizados da sua pasta SparkleShare"
+
+#. A button that opens the synced folder
+#: ../SparkleShare/SparkleSetup.cs:369
+msgid "Open Folder"
+msgstr "Abrir Pasta"
+
+#: ../SparkleShare/SparkleSetupWindow.cs:45
+msgid "SparkleShare Setup"
+msgstr "Configurações do SparkleShare"
#: ../SparkleShare/SparkleShare.cs:53
msgid "Sorry, you can't run SparkleShare with these permissions."
@@ -399,7 +346,7 @@ msgstr "Incluir pasta remota"
#: ../SparkleShare/SparkleStatusIcon.cs:242
msgid "Show Recent Events"
-msgstr ""
+msgstr "Mostrar Eventos Recentes"
#: ../SparkleShare/SparkleStatusIcon.cs:262
msgid "Turn Notifications Off"
@@ -410,21 +357,8 @@ msgid "Turn Notifications On"
msgstr "Ligar as notificações"
#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:286
+#: ../SparkleShare/SparkleStatusIcon.cs:291
msgid "Quit"
msgstr "Sair"
-#: ../SparkleShare/SparkleUI.cs:99
-msgid "Ouch! Mid-air collision!"
-msgstr "Ops! Colisão em pleno vôo!"
-
-#: ../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."
-
-#: ../SparkleShare/SparkleWindow.cs:41
-msgid "SparkleShare Setup"
-msgstr "Configurações do SparkleShare"
-
diff --git a/po/ru.po b/po/ru.po
old mode 100644
new mode 100755
index 82201bb8..ca0b60a2
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,17 +1,16 @@
# This file is distributed under the same license as the Sparkleshare package.
#
-# WARNING: Due to the nature of Transifex all translation file headers were lost
-# we apologise for any incovenience this may have caused and we hope to bring them
-# back in the future.
-#
+# Translators:
# Dmitry Golubkov , 2011.
+# Just a baka , 2011.
+# Oleg Shmelyov , 2011.
msgid ""
msgstr ""
"Project-Id-Version: SparkleShare\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-29 11:38+0200\n"
-"PO-Revision-Date: 2011-06-30 10:25+0000\n"
-"Last-Translator: herclogon \n"
+"POT-Creation-Date: 2011-08-25 13:59+0200\n"
+"PO-Revision-Date: 2011-09-12 14:27+0000\n"
+"Last-Translator: justabaka \n"
"Language-Team: LANGUAGE \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,26 +18,27 @@ msgstr ""
"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:337
-#: ../SparkleShare/SparkleIntro.cs:67 ../SparkleShare/SparkleStatusIcon.cs:345
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:69
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:86
+#: ../SparkleShare/SparkleStatusIcon.cs:372
+msgid "Up to date"
+msgstr "Обновлено"
+
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:84
+#: ../SparkleShare/SparkleSetup.cs:69 ../SparkleShare/SparkleStatusIcon.cs:350
msgid "Welcome to SparkleShare!"
msgstr "Добро пожаловать в SparkleShare!"
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:348
-#: ../SparkleShare/SparkleStatusIcon.cs:357
-msgid "Not everything is synced"
-msgstr ""
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:358
-#: ../SparkleShare/SparkleStatusIcon.cs:367
-msgid "Up to date"
-msgstr ""
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:374
-#: ../SparkleShare/SparkleStatusIcon.cs:383
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:95
+#: ../SparkleShare/SparkleStatusIcon.cs:388
msgid "Syncing…"
msgstr "Синхронизация…"
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:105
+#: ../SparkleShare/SparkleStatusIcon.cs:362
+msgid "Not everything is synced"
+msgstr "Синхронизация не завершена"
+
#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
msgid "Copy Web Link"
msgstr "Копировать ссылку"
@@ -57,74 +57,76 @@ msgstr "Сделать копию более ранней версии в это
#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:161
msgid "Select to get a copy of this version"
-msgstr ""
+msgstr "Выберите, чтобы скопировать эту версию"
#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:46 ../SparkleShare/SparkleStatusIcon.cs:275
+#: ../SparkleShare/SparkleAbout.cs:53 ../SparkleShare/SparkleStatusIcon.cs:275
msgid "About SparkleShare"
-msgstr ""
+msgstr "О программе"
-#: ../SparkleShare/SparkleAbout.cs:53
-msgid "A newer version is available"
-msgstr ""
+#: ../SparkleShare/SparkleAbout.cs:70
+#, csharp-format
+msgid "A newer version ({0}) is available!"
+msgstr "Доступна более новая версия ({0})!"
-#: ../SparkleShare/SparkleAbout.cs:60
+#: ../SparkleShare/SparkleAbout.cs:79
msgid "You are running the latest version."
-msgstr ""
+msgstr "У вас уже установлена самая последняя версия."
-#: ../SparkleShare/SparkleAbout.cs:87
+#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:113
msgid "Checking for updates..."
-msgstr ""
+msgstr "Проверка обновлений…"
-#: ../SparkleShare/SparkleAbout.cs:116
-msgid "_Show Credits"
-msgstr ""
+#: ../SparkleShare/SparkleController.cs:483
+msgid "dddd, MMMM d, yyyy"
+msgstr "dddd, MMMM d, yyyy"
-#: ../SparkleShare/SparkleAbout.cs:129
-msgid "_Visit Website"
-msgstr "Посетить сайт"
+#: ../SparkleShare/SparkleController.cs:489
+msgid "dddd, MMMM d"
+msgstr "dddd, MMMM d"
-#: ../SparkleShare/SparkleController.cs:455
-msgid "ddd MMM d, yyyy"
-msgstr ""
-
-#: ../SparkleShare/SparkleController.cs:460
-msgid "ddd MMM d"
-msgstr ""
-
-#: ../SparkleShare/SparkleController.cs:661
+#: ../SparkleShare/SparkleController.cs:706
#, csharp-format
msgid "added ‘{0}’"
-msgstr ""
+msgstr " добавлено ‘{0}’"
-#: ../SparkleShare/SparkleController.cs:666
+#: ../SparkleShare/SparkleController.cs:711
#, csharp-format
msgid "moved ‘{0}’"
-msgstr ""
+msgstr "перенесено ‘{0}’"
-#: ../SparkleShare/SparkleController.cs:671
+#: ../SparkleShare/SparkleController.cs:716
#, csharp-format
msgid "edited ‘{0}’"
-msgstr ""
+msgstr " изменено ‘{0}’"
-#: ../SparkleShare/SparkleController.cs:676
+#: ../SparkleShare/SparkleController.cs:721
#, csharp-format
msgid "deleted ‘{0}’"
-msgstr ""
+msgstr " удалено ‘{0}’"
-#: ../SparkleShare/SparkleController.cs:685
+#: ../SparkleShare/SparkleController.cs:730
#, csharp-format
msgid "and {0} more"
msgid_plural "and {0} more"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "и еще {0}"
+msgstr[1] "и еще {0}"
+msgstr[2] "и еще {0}"
-#: ../SparkleShare/SparkleController.cs:689
+#: ../SparkleShare/SparkleController.cs:734
msgid "did something magical"
msgstr "сделал что-то магическое"
-#: ../SparkleShare/SparkleIntro.cs:73
+#: ../SparkleShare/SparkleEventLog.cs:58
+msgid "Recent Events"
+msgstr "Недавние события"
+
+#: ../SparkleShare/SparkleEventLog.cs:169
+#: ../SparkleShare/SparkleEventLog.cs:188
+msgid "All Folders"
+msgstr "Все папки"
+
+#: ../SparkleShare/SparkleSetup.cs:70
msgid ""
"Before we can create a SparkleShare folder on this computer, we need a few "
"bits of information from you."
@@ -132,192 +134,141 @@ msgstr ""
"Прежде чем мы сможем создать папку SparkleShare на этом компьютере, нам "
"нужно от вас немного информации."
-#: ../SparkleShare/SparkleIntro.cs:83
+#: ../SparkleShare/SparkleSetup.cs:77
msgid "Full Name:"
msgstr "Полное имя:"
-#: ../SparkleShare/SparkleIntro.cs:98
+#: ../SparkleShare/SparkleSetup.cs:92
msgid "Email:"
msgstr "Эл. почта:"
-#: ../SparkleShare/SparkleIntro.cs:109
+#: ../SparkleShare/SparkleSetup.cs:102
msgid "Next"
msgstr "Следующий"
-#: ../SparkleShare/SparkleIntro.cs:115
-msgid "Configuring…"
-msgstr "Настройка ..."
-
-#: ../SparkleShare/SparkleIntro.cs:161
+#: ../SparkleShare/SparkleSetup.cs:123
msgid "Where is your remote folder?"
-msgstr ""
+msgstr "Где находится удалённая папка?"
-#: ../SparkleShare/SparkleIntro.cs:174
-msgid "address-to-server.com"
-msgstr "address-to-server.com"
-
-#: ../SparkleShare/SparkleIntro.cs:179
+#. Own server radiobutton
+#: ../SparkleShare/SparkleSetup.cs:132
msgid "On my own server:"
msgstr "На моем собственном сервере:"
-#: ../SparkleShare/SparkleIntro.cs:186
-msgid "Free hosting for Free and Open Source Software projects."
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:187
-msgid "Also has paid accounts for extra private space and bandwidth."
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:195
-msgid "The GNOME Project"
-msgstr "The GNOME Project"
-
-#: ../SparkleShare/SparkleIntro.cs:197
-msgid "GNOME is an easy to understand interface to your computer."
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:198
-msgid "Select this option if you’re a developer or designer working on GNOME."
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:206
-msgid "Gitorious"
-msgstr "Gitorious"
-
-#: ../SparkleShare/SparkleIntro.cs:208
-msgid "Completely Free as in Freedom infrastructure."
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:209
-msgid "Free accounts for Free and Open Source projects."
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:220
-msgid "Username/Folder"
-msgstr "Пользователь/Папка"
-
-#: ../SparkleShare/SparkleIntro.cs:225
-msgid "Project/Folder"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:230
-msgid "Project"
-msgstr "Проект"
-
-#: ../SparkleShare/SparkleIntro.cs:235 ../SparkleShare/SparkleIntro.cs:254
+#: ../SparkleShare/SparkleSetup.cs:137 ../SparkleShare/SparkleSetup.cs:239
msgid "Folder"
msgstr "Папка"
-#: ../SparkleShare/SparkleIntro.cs:259 ../SparkleShare/SparkleIntro.cs:377
+#: ../SparkleShare/SparkleSetup.cs:164
+msgid "address-to-server.com"
+msgstr "address-to-server.com"
+
+#: ../SparkleShare/SparkleSetup.cs:179
+msgid "Free hosting for Free and Open Source Software projects."
+msgstr "Бесплатный хостинг для свободных и Open Source проектов."
+
+#: ../SparkleShare/SparkleSetup.cs:180
+msgid "Also has paid accounts for extra private space and bandwidth."
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:189
+msgid "Username/Folder"
+msgstr "Пользователь/Папка"
+
+#. Gitorious radiobutton
+#: ../SparkleShare/SparkleSetup.cs:194
+msgid "Gitorious"
+msgstr "Gitorious"
+
+#: ../SparkleShare/SparkleSetup.cs:196
+msgid "Completely Free as in Freedom infrastructure."
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:197
+msgid "Free accounts for Free and Open Source projects."
+msgstr "Бесплатные аккаунты для свободных и Open Source проектов."
+
+#: ../SparkleShare/SparkleSetup.cs:206
+msgid "Project/Folder"
+msgstr "Проект/Папка"
+
+#. GNOME radiobutton
+#: ../SparkleShare/SparkleSetup.cs:211
+msgid "The GNOME Project"
+msgstr "The GNOME Project"
+
+#: ../SparkleShare/SparkleSetup.cs:213
+msgid "GNOME is an easy to understand interface to your computer."
+msgstr "GNOME - это простая в освоении среда рабочего стола."
+
+#: ../SparkleShare/SparkleSetup.cs:214
+msgid "Select this option if you’re a developer or designer working on GNOME."
+msgstr "Отметьте, если вы - разработчик или дизайнер, работающий над GNOME."
+
+#: ../SparkleShare/SparkleSetup.cs:223
+msgid "Project"
+msgstr "Проект"
+
+#: ../SparkleShare/SparkleSetup.cs:233
msgid "Folder Name:"
msgstr "Имя папки:"
-#: ../SparkleShare/SparkleIntro.cs:269
-msgid "Sync"
-msgstr "Синхронизировать"
-
-#: ../SparkleShare/SparkleIntro.cs:312
+#. Cancel button
+#: ../SparkleShare/SparkleSetup.cs:261
msgid "Cancel"
msgstr "Отменить"
-#: ../SparkleShare/SparkleIntro.cs:320
-msgid "Skip"
-msgstr "Пропустить"
+#. Sync button
+#: ../SparkleShare/SparkleSetup.cs:269
+msgid "Sync"
+msgstr "Синхронизировать"
-#: ../SparkleShare/SparkleIntro.cs:347
-msgid "Invitation received!"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:353
-msgid ""
-"You've received an invitation to join a shared folder.\n"
-"We're ready to hook you up immediately if you wish."
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:359
-msgid "Do you accept this invitation?"
-msgstr "Вы принимаете это приглашение?"
-
-#: ../SparkleShare/SparkleIntro.cs:368
-msgid "Server Address:"
-msgstr "Адрес сервера:"
-
-#: ../SparkleShare/SparkleIntro.cs:391
-msgid "Reject"
-msgstr "Отказать"
-
-#: ../SparkleShare/SparkleIntro.cs:392
-msgid "Accept and Sync"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:442
-msgid "Something went wrong…"
-msgstr "Что-то пошло не так ..."
-
-#: ../SparkleShare/SparkleIntro.cs:448
-msgid "Try Again"
-msgstr "Попробуйте еще раз"
-
-#: ../SparkleShare/SparkleIntro.cs:473
-#, csharp-format
-msgid "‘{0}’ has been successfully added"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:482
-msgid "Folder synced successfully!"
-msgstr "Папка синхронизирована успешно!"
-
-#: ../SparkleShare/SparkleIntro.cs:489
-#, csharp-format
-msgid ""
-"Now you can access the synced files from ‘{0}’ in your SparkleShare folder."
-msgstr ""
-
-#. A button that opens the synced folder
-#: ../SparkleShare/SparkleIntro.cs:497
-msgid "Open Folder"
-msgstr "Открыть папку"
-
-#: ../SparkleShare/SparkleIntro.cs:503 ../SparkleShare/SparkleIntro.cs:543
-#: ../SparkleShare/SparkleIntro.cs:604
-msgid "Finish"
-msgstr "Завершить"
-
-#: ../SparkleShare/SparkleIntro.cs:528
+#: ../SparkleShare/SparkleSetup.cs:297
#, csharp-format
msgid "Syncing folder ‘{0}’…"
-msgstr ""
+msgstr "Синхронизируется папка ‘{0}’…"
-#: ../SparkleShare/SparkleIntro.cs:535
-msgid "This may take a while.\n"
-msgstr ""
+#: ../SparkleShare/SparkleSetup.cs:298
+msgid "This may take a while."
+msgstr "Это может занять некоторое время."
-#: ../SparkleShare/SparkleIntro.cs:536
+#: ../SparkleShare/SparkleSetup.cs:299
msgid "Are you sure it’s not coffee o'clock?"
msgstr ""
-#: ../SparkleShare/SparkleIntro.cs:579
-msgid "SparkleShare is ready to go!"
-msgstr "SparkleShare готов к работе!"
+#: ../SparkleShare/SparkleSetup.cs:303 ../SparkleShare/SparkleSetup.cs:388
+msgid "Finish"
+msgstr "Завершить"
-#: ../SparkleShare/SparkleIntro.cs:585
-msgid ""
-"Now you can start accepting invitations from others. \n"
-"Just click on invitations you get by email and we will take care of the rest."
+#: ../SparkleShare/SparkleSetup.cs:333
+msgid "Something went wrong"
+msgstr "Что-то пошло не так"
+
+#: ../SparkleShare/SparkleSetup.cs:353
+msgid "Try Again"
+msgstr "Попробуйте еще раз"
+
+#: ../SparkleShare/SparkleSetup.cs:372
+#, csharp-format
+msgid "‘{0}’ has been successfully added"
+msgstr "{0}’ был успешно добавлен"
+
+#: ../SparkleShare/SparkleSetup.cs:378
+msgid "Folder synced successfully!"
+msgstr "Папка синхронизирована успешно!"
+
+#: ../SparkleShare/SparkleSetup.cs:379
+msgid "Access the synced files from your SparkleShare folder."
msgstr ""
-#: ../SparkleShare/SparkleIntro.cs:596
-msgid "Learn how to host your own SparkleServer"
-msgstr ""
+#. A button that opens the synced folder
+#: ../SparkleShare/SparkleSetup.cs:382
+msgid "Open Folder"
+msgstr "Открыть папку"
-#: ../SparkleShare/SparkleEventLog.cs:61
-msgid "Recent Events"
-msgstr ""
-
-#: ../SparkleShare/SparkleEventLog.cs:148
-#: ../SparkleShare/SparkleEventLog.cs:173
-msgid "All Folders"
-msgstr "Все папки"
+#: ../SparkleShare/SparkleSetupWindow.cs:45
+msgid "SparkleShare Setup"
+msgstr "Установка SparkleShare"
#: ../SparkleShare/SparkleShare.cs:53
msgid "Sorry, you can't run SparkleShare with these permissions."
@@ -326,15 +277,15 @@ msgstr ""
#: ../SparkleShare/SparkleShare.cs:54
msgid "Things would go utterly wrong."
-msgstr ""
+msgstr "Плохи были бы совершенно неправильно."
#: ../SparkleShare/SparkleShare.cs:61
msgid "Print version information"
-msgstr ""
+msgstr "Вывести информацию о версии программы."
#: ../SparkleShare/SparkleShare.cs:62
msgid "Show this help text"
-msgstr ""
+msgstr "Показать это справочное сообщение"
#: ../SparkleShare/SparkleShare.cs:109
msgid "SparkleShare, a collaboration and sharing tool."
@@ -342,7 +293,7 @@ msgstr ""
#: ../SparkleShare/SparkleShare.cs:110
msgid "Copyright (C) 2010 Hylke Bons"
-msgstr ""
+msgstr "Copyright (C) 2010 Hylke Bons"
#: ../SparkleShare/SparkleShare.cs:112
msgid "This program comes with ABSOLUTELY NO WARRANTY."
@@ -358,11 +309,11 @@ msgstr "при соблюдении требований лицензии GNU GP
#: ../SparkleShare/SparkleShare.cs:117
msgid "SparkleShare automatically syncs Git repositories in "
-msgstr ""
+msgstr "SparkleShare автоматически синхронизирует Git-репозитории,"
#: ../SparkleShare/SparkleShare.cs:118
msgid "the ~/SparkleShare folder with their remote origins."
-msgstr ""
+msgstr "находящиеся в папке ~/SparkleShare, с их удалёнными ветвями."
#: ../SparkleShare/SparkleShare.cs:120
msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..."
@@ -378,44 +329,32 @@ msgstr "Параметры:"
#: ../SparkleShare/SparkleShare.cs:133
msgid "SparkleShare "
-msgstr ""
+msgstr "SparkleShare "
#: ../SparkleShare/SparkleStatusIcon.cs:208
msgid "No Remote Folders Yet"
-msgstr ""
+msgstr "У вас пока нет удалённых папок"
#. Opens the wizard to add a new remote folder
#: ../SparkleShare/SparkleStatusIcon.cs:218
msgid "Add Remote Folder…"
-msgstr ""
+msgstr "Добавить удалённую папку…"
#: ../SparkleShare/SparkleStatusIcon.cs:242
msgid "Show Recent Events"
-msgstr ""
+msgstr "Показать последние изменения"
#: ../SparkleShare/SparkleStatusIcon.cs:262
msgid "Turn Notifications Off"
-msgstr ""
+msgstr "Выключить уведомления"
#: ../SparkleShare/SparkleStatusIcon.cs:264
msgid "Turn Notifications On"
-msgstr "Уведомления включены"
+msgstr "Включить уведомления"
#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:286
+#: ../SparkleShare/SparkleStatusIcon.cs:291
msgid "Quit"
msgstr "Выход"
-#: ../SparkleShare/SparkleUI.cs:99
-msgid "Ouch! Mid-air collision!"
-msgstr ""
-
-#: ../SparkleShare/SparkleUI.cs:100
-msgid "Don't worry, SparkleShare made a copy of each conflicting file."
-msgstr ""
-
-#: ../SparkleShare/SparkleWindow.cs:41
-msgid "SparkleShare Setup"
-msgstr ""
-
diff --git a/po/sl.po b/po/sl.po
new file mode 100644
index 00000000..ad6de9b1
--- /dev/null
+++ b/po/sl.po
@@ -0,0 +1,355 @@
+# This file is distributed under the same license as the Sparkleshare package.
+#
+# Translators:
+# , 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: SparkleShare\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-09-22 10:47+0200\n"
+"PO-Revision-Date: 2011-09-22 08:48+0000\n"
+"Last-Translator: deejay1 \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
+
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:69
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:86
+#: ../SparkleShare/SparkleStatusIcon.cs:74
+#: ../SparkleShare/SparkleStatusIcon.cs:88
+msgid "Up to date"
+msgstr "Posodobljeno"
+
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:84
+#: ../SparkleShare/SparkleSetup.cs:67 ../SparkleShare/SparkleStatusIcon.cs:86
+msgid "Welcome to SparkleShare!"
+msgstr "Dobrodošli v SparkleShare!"
+
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:95
+#: ../SparkleShare/SparkleStatusIcon.cs:103
+msgid "Syncing…"
+msgstr "Sinhroniziram..."
+
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:105
+#: ../SparkleShare/SparkleStatusIcon.cs:113
+msgid "Not everything is synced"
+msgstr "Sinhronizacija še ni dokončana"
+
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
+msgid "Copy Web Link"
+msgstr "Kopiraj spletno povezavo"
+
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:114
+msgid "Copy the web address of this file to the clipboard"
+msgstr "Kopiraj spletno povezavo do te datoteke v odložišče"
+
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:147
+msgid "Get Earlier Version"
+msgstr "Pridobi starejšo različico"
+
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:148
+msgid "Make a copy of an earlier version in this folder"
+msgstr "Ustvari kopijo prejšnje različice v tej mapi"
+
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:161
+msgid "Select to get a copy of this version"
+msgstr "Izberite za pridobitev kopije te različice"
+
+#: ../SparkleShare/Program.cs:51
+msgid "Print version information"
+msgstr "Izpiši informacije o različici"
+
+#: ../SparkleShare/Program.cs:52
+msgid "Show this help text"
+msgstr "Prikaži to besedilo za pomoč"
+
+#: ../SparkleShare/Program.cs:97
+msgid "SparkleShare, a collaboration and sharing tool."
+msgstr "SparkleShare, orodje za deljenje in sodelovanje."
+
+#: ../SparkleShare/Program.cs:98
+msgid "Copyright (C) 2010 Hylke Bons"
+msgstr "Copyright (C) 2010 Hylke Bons"
+
+#: ../SparkleShare/Program.cs:100
+msgid "This program comes with ABSOLUTELY NO WARRANTY."
+msgstr "Ta programska oprema je na voljo BREZ GARANCIJE."
+
+#: ../SparkleShare/Program.cs:102
+msgid "This is free software, and you are welcome to redistribute it "
+msgstr "To je prosta programska oprema in jo lahko redistribuirate "
+
+#: ../SparkleShare/Program.cs:103
+msgid "under certain conditions. Please read the GNU GPLv3 for details."
+msgstr ""
+"pod določenimi pogoji. Prosimo preberite licenco GNU GPLv3 za podrobnosti."
+
+#: ../SparkleShare/Program.cs:105
+msgid "SparkleShare automatically syncs Git repositories in "
+msgstr "SparkleShare avtomatsko sinhronizira Git repozitorije"
+
+#: ../SparkleShare/Program.cs:106
+msgid "the ~/SparkleShare folder with their remote origins."
+msgstr "~/SparkleShare mapi z njihovimi oddaljenimi izvori."
+
+#: ../SparkleShare/Program.cs:108
+msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..."
+msgstr "Uporaba: sparkleshare [start|stop|restart] [OPTION]..."
+
+#: ../SparkleShare/Program.cs:109
+msgid "Sync SparkleShare folder with remote repositories."
+msgstr "Sinhroniziraj SparkleShare mapo z oddaljenimi repozitoriji."
+
+#: ../SparkleShare/Program.cs:111
+msgid "Arguments:"
+msgstr "Argumenti:"
+
+#: ../SparkleShare/Program.cs:121
+msgid "SparkleShare "
+msgstr "SparkleShare "
+
+#. A menu item that takes the user to http://www.sparkleshare.org/
+#: ../SparkleShare/SparkleAbout.cs:53 ../SparkleShare/SparkleStatusIcon.cs:292
+msgid "About SparkleShare"
+msgstr "O SparkleShare"
+
+#: ../SparkleShare/SparkleAbout.cs:70
+#, csharp-format
+msgid "A newer version ({0}) is available!"
+msgstr "Novejša različica ({0}) je na voljo!"
+
+#: ../SparkleShare/SparkleAbout.cs:79
+msgid "You are running the latest version."
+msgstr "Uporabljate najnovejšo različico."
+
+#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:113
+msgid "Checking for updates..."
+msgstr "Preverjam za posodobitve..."
+
+#: ../SparkleShare/SparkleController.cs:488
+msgid "dddd, MMMM d, yyyy"
+msgstr "dddd, MMMM d, yyyy"
+
+#: ../SparkleShare/SparkleController.cs:494
+msgid "dddd, MMMM d"
+msgstr "dddd, MMMM d"
+
+#: ../SparkleShare/SparkleController.cs:702
+#, csharp-format
+msgid "added ‘{0}’"
+msgstr "dodano '{0}'"
+
+#: ../SparkleShare/SparkleController.cs:707
+#, csharp-format
+msgid "moved ‘{0}’"
+msgstr "premaknjeno '{0}'"
+
+#: ../SparkleShare/SparkleController.cs:712
+#, csharp-format
+msgid "edited ‘{0}’"
+msgstr "spremenjeno '{0}'"
+
+#: ../SparkleShare/SparkleController.cs:717
+#, csharp-format
+msgid "deleted ‘{0}’"
+msgstr "izbrisano '{0}'"
+
+#: ../SparkleShare/SparkleController.cs:726
+#, csharp-format
+msgid "and {0} more"
+msgid_plural "and {0} more"
+msgstr[0] "in še {0}"
+msgstr[1] "in še {0}"
+msgstr[2] "in še {0}"
+msgstr[3] "in še {0}"
+
+#: ../SparkleShare/SparkleController.cs:730
+msgid "did something magical"
+msgstr "narejeno nekaj čarobnega"
+
+#: ../SparkleShare/SparkleEventLog.cs:58
+msgid "Recent Events"
+msgstr "Nedavni dogodki"
+
+#: ../SparkleShare/SparkleEventLog.cs:169
+#: ../SparkleShare/SparkleEventLog.cs:188
+msgid "All Folders"
+msgstr "Vse mape"
+
+#: ../SparkleShare/SparkleSetup.cs:68
+msgid ""
+"Before we can create a SparkleShare folder on this computer, we need a few "
+"bits of information from you."
+msgstr ""
+"Preden lahko ustvarimo SparkleShare mape na tem računalniku potrebujemo od "
+"vas nekaj informacij."
+
+#: ../SparkleShare/SparkleSetup.cs:75
+msgid "Full Name:"
+msgstr "Polno ime:"
+
+#: ../SparkleShare/SparkleSetup.cs:90
+msgid "Email:"
+msgstr "Email:"
+
+#: ../SparkleShare/SparkleSetup.cs:100
+msgid "Next"
+msgstr "Naprej"
+
+#: ../SparkleShare/SparkleSetup.cs:121
+msgid "Where is your remote folder?"
+msgstr "Kje se nahaja vaša oddaljena mapa?"
+
+#. Own server radiobutton
+#: ../SparkleShare/SparkleSetup.cs:130
+msgid "On my own server:"
+msgstr "Na mojem strežniku:"
+
+#: ../SparkleShare/SparkleSetup.cs:135 ../SparkleShare/SparkleSetup.cs:237
+msgid "Folder"
+msgstr "Mapa"
+
+#: ../SparkleShare/SparkleSetup.cs:162
+msgid "address-to-server.com"
+msgstr "naslov-streznika.com"
+
+#: ../SparkleShare/SparkleSetup.cs:177
+msgid "Free hosting for Free and Open Source Software projects."
+msgstr "Brezplačno gostovanje za proste in odprtokodne programske projekte."
+
+#: ../SparkleShare/SparkleSetup.cs:178
+msgid "Also has paid accounts for extra private space and bandwidth."
+msgstr ""
+"Na voljo tudi plačljivi računi za dodaten zaseben prostor in prenos "
+"podatkov."
+
+#: ../SparkleShare/SparkleSetup.cs:187
+msgid "Username/Folder"
+msgstr "UporabniskoIme/Mapa"
+
+#. Gitorious radiobutton
+#: ../SparkleShare/SparkleSetup.cs:192
+msgid "Gitorious"
+msgstr "Gitorious"
+
+#: ../SparkleShare/SparkleSetup.cs:194
+msgid "Completely Free as in Freedom infrastructure."
+msgstr "Povsem prosto (svobodno) kot svoboda govora."
+
+#: ../SparkleShare/SparkleSetup.cs:195
+msgid "Free accounts for Free and Open Source projects."
+msgstr "Brezplačni računi za proste in odprtokodne programske projekte."
+
+#: ../SparkleShare/SparkleSetup.cs:204
+msgid "Project/Folder"
+msgstr "Projekt/Mapa"
+
+#. GNOME radiobutton
+#: ../SparkleShare/SparkleSetup.cs:209
+msgid "The GNOME Project"
+msgstr "Projekt GNOME"
+
+#: ../SparkleShare/SparkleSetup.cs:211
+msgid "GNOME is an easy to understand interface to your computer."
+msgstr "GNOME je lahko razumljiv vmesnik za vaš računalnik."
+
+#: ../SparkleShare/SparkleSetup.cs:212
+msgid "Select this option if you’re a developer or designer working on GNOME."
+msgstr ""
+"Označite to možnost, če ste razvijalec ali oblikovalec, ki dela na projektu "
+"GNOME."
+
+#: ../SparkleShare/SparkleSetup.cs:221
+msgid "Project"
+msgstr "Projekt"
+
+#: ../SparkleShare/SparkleSetup.cs:231
+msgid "Folder Name:"
+msgstr "Ime mape:"
+
+#. Cancel button
+#: ../SparkleShare/SparkleSetup.cs:259 ../SparkleShare/SparkleSetup.cs:305
+msgid "Cancel"
+msgstr "Prekliči"
+
+#. Sync button
+#: ../SparkleShare/SparkleSetup.cs:267
+msgid "Sync"
+msgstr "Sinhroniziraj"
+
+#: ../SparkleShare/SparkleSetup.cs:295
+#, csharp-format
+msgid "Syncing folder ‘{0}’…"
+msgstr "Sinhroniziram mapo '{0}'..."
+
+#: ../SparkleShare/SparkleSetup.cs:296
+msgid "This may take a while."
+msgstr "To lahko nekaj časa traja."
+
+#: ../SparkleShare/SparkleSetup.cs:297
+msgid "Are you sure it’s not coffee o'clock?"
+msgstr "A ste prepričani da ni čas za kavo?"
+
+#: ../SparkleShare/SparkleSetup.cs:301 ../SparkleShare/SparkleSetup.cs:417
+msgid "Finish"
+msgstr "Dokončaj"
+
+#: ../SparkleShare/SparkleSetup.cs:334
+msgid "Something went wrong"
+msgstr "Nekaj je šlo narobe"
+
+#: ../SparkleShare/SparkleSetup.cs:382
+msgid "Try Again…"
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:401
+#, csharp-format
+msgid "‘{0}’ has been successfully added"
+msgstr "'{0}' uspešno dodano"
+
+#: ../SparkleShare/SparkleSetup.cs:407
+msgid "Folder synced successfully!"
+msgstr "Mapa uspešno sinhronizirana!"
+
+#: ../SparkleShare/SparkleSetup.cs:408
+msgid "Access the synced files from your SparkleShare folder."
+msgstr "Dostopajte do sinhroniziranih datotek iz vaše SparkleShare mape."
+
+#. A button that opens the synced folder
+#: ../SparkleShare/SparkleSetup.cs:411
+msgid "Open Folder"
+msgstr "Odpri mapo"
+
+#: ../SparkleShare/SparkleSetupWindow.cs:45
+msgid "SparkleShare Setup"
+msgstr "SparkleShare Nastavitev"
+
+#: ../SparkleShare/SparkleStatusIcon.cs:225
+msgid "No Remote Folders Yet"
+msgstr "Oddaljene mape še ne obstajajo"
+
+#. Opens the wizard to add a new remote folder
+#: ../SparkleShare/SparkleStatusIcon.cs:235
+msgid "Add Remote Folder…"
+msgstr "Dodaj oddaljeno mapo"
+
+#: ../SparkleShare/SparkleStatusIcon.cs:259
+msgid "Show Recent Events"
+msgstr "Prikaži nedavne dogodke"
+
+#: ../SparkleShare/SparkleStatusIcon.cs:279
+msgid "Turn Notifications Off"
+msgstr "Izključi obvestila"
+
+#: ../SparkleShare/SparkleStatusIcon.cs:281
+msgid "Turn Notifications On"
+msgstr "Vključi obvestila"
+
+#. A menu item that quits the application
+#: ../SparkleShare/SparkleStatusIcon.cs:308
+msgid "Quit"
+msgstr "Izhod"
+
+
diff --git a/po/sr_RS.po b/po/sr_RS.po
new file mode 100755
index 00000000..ffb6aac3
--- /dev/null
+++ b/po/sr_RS.po
@@ -0,0 +1,362 @@
+# This file is distributed under the same license as the Sparkleshare package.
+#
+# , 2011.
+# Небојша Јаковљевић , 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: SparkleShare\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-08-25 13:59+0200\n"
+"PO-Revision-Date: 2011-08-27 12:42+0000\n"
+"Last-Translator: nebjak \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr_RS\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:69
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:86
+#: ../SparkleShare/SparkleStatusIcon.cs:372
+msgid "Up to date"
+msgstr "Све је синхронизовано"
+
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:84
+#: ../SparkleShare/SparkleSetup.cs:69 ../SparkleShare/SparkleStatusIcon.cs:350
+msgid "Welcome to SparkleShare!"
+msgstr "Добродошли у СпарклШер!"
+
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:95
+#: ../SparkleShare/SparkleStatusIcon.cs:388
+msgid "Syncing…"
+msgstr "Синхронизација..."
+
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:105
+#: ../SparkleShare/SparkleStatusIcon.cs:362
+msgid "Not everything is synced"
+msgstr "Није све синхронизовано"
+
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
+msgid "Copy Web Link"
+msgstr "Копирај веб линк"
+
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:114
+msgid "Copy the web address of this file to the clipboard"
+msgstr "Копирај веб адресу ове датотеке"
+
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:147
+msgid "Get Earlier Version"
+msgstr "Добави ранију верзију"
+
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:148
+msgid "Make a copy of an earlier version in this folder"
+msgstr "Направи копију раније верзије у овом директоријуму"
+
+#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:161
+msgid "Select to get a copy of this version"
+msgstr "Изабери да добавиш копију ове верзије"
+
+#. A menu item that takes the user to http://www.sparkleshare.org/
+#: ../SparkleShare/SparkleAbout.cs:53 ../SparkleShare/SparkleStatusIcon.cs:275
+msgid "About SparkleShare"
+msgstr "О СпарклШеру"
+
+#: ../SparkleShare/SparkleAbout.cs:70
+#, csharp-format
+msgid "A newer version ({0}) is available!"
+msgstr "Новија верзија ({0}) је доступна!"
+
+#: ../SparkleShare/SparkleAbout.cs:79
+msgid "You are running the latest version."
+msgstr "Кориситите последњу верзију."
+
+#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:113
+msgid "Checking for updates..."
+msgstr "Проверавам освежења..."
+
+#: ../SparkleShare/SparkleController.cs:483
+msgid "dddd, MMMM d, yyyy"
+msgstr "dddd, d. MMMM yyyy."
+
+#: ../SparkleShare/SparkleController.cs:489
+msgid "dddd, MMMM d"
+msgstr "dddd, d. MMMM"
+
+#: ../SparkleShare/SparkleController.cs:706
+#, csharp-format
+msgid "added ‘{0}’"
+msgstr "додат ‘{0}’"
+
+#: ../SparkleShare/SparkleController.cs:711
+#, csharp-format
+msgid "moved ‘{0}’"
+msgstr "пребачен ‘{0}’"
+
+#: ../SparkleShare/SparkleController.cs:716
+#, csharp-format
+msgid "edited ‘{0}’"
+msgstr "измењен ‘{0}’"
+
+#: ../SparkleShare/SparkleController.cs:721
+#, csharp-format
+msgid "deleted ‘{0}’"
+msgstr "избрисан ‘{0}’"
+
+#: ../SparkleShare/SparkleController.cs:730
+#, csharp-format
+msgid "and {0} more"
+msgid_plural "and {0} more"
+msgstr[0] "и још {0}"
+msgstr[1] "и још {0}"
+msgstr[2] "и још {0}"
+msgstr[3] "и још {0}"
+
+#: ../SparkleShare/SparkleController.cs:734
+msgid "did something magical"
+msgstr "урадио нешто магично"
+
+#: ../SparkleShare/SparkleEventLog.cs:58
+msgid "Recent Events"
+msgstr "Скорашњи догађаји"
+
+#: ../SparkleShare/SparkleEventLog.cs:169
+#: ../SparkleShare/SparkleEventLog.cs:188
+msgid "All Folders"
+msgstr "Сви директоријуми"
+
+#: ../SparkleShare/SparkleSetup.cs:70
+msgid ""
+"Before we can create a SparkleShare folder on this computer, we need a few "
+"bits of information from you."
+msgstr ""
+"Пре него што направимо СпарклШер директоријум на овом рачунару, потребно нам"
+" је неколико информација од Вас."
+
+#: ../SparkleShare/SparkleSetup.cs:77
+msgid "Full Name:"
+msgstr "Пуно име:"
+
+#: ../SparkleShare/SparkleSetup.cs:92
+msgid "Email:"
+msgstr "Е-пошта:"
+
+#: ../SparkleShare/SparkleSetup.cs:102
+msgid "Next"
+msgstr "Даље"
+
+#: ../SparkleShare/SparkleSetup.cs:123
+msgid "Where is your remote folder?"
+msgstr "Где је ваш удаљени директоријум?"
+
+#. Own server radiobutton
+#: ../SparkleShare/SparkleSetup.cs:132
+msgid "On my own server:"
+msgstr "На мом личном серверу:"
+
+#: ../SparkleShare/SparkleSetup.cs:137 ../SparkleShare/SparkleSetup.cs:239
+msgid "Folder"
+msgstr "Датотека"
+
+#: ../SparkleShare/SparkleSetup.cs:164
+msgid "address-to-server.com"
+msgstr "adresa-do-servera.com"
+
+#: ../SparkleShare/SparkleSetup.cs:179
+msgid "Free hosting for Free and Open Source Software projects."
+msgstr "Бесплатан хостинг за Слободне и пројекте отвореног кода."
+
+#: ../SparkleShare/SparkleSetup.cs:180
+msgid "Also has paid accounts for extra private space and bandwidth."
+msgstr ""
+"Такође нуде плаћене налоге који омогућавају додатни приватни простор и "
+"проток података."
+
+#: ../SparkleShare/SparkleSetup.cs:189
+msgid "Username/Folder"
+msgstr "Korisničko_ime/Direktorijum"
+
+#. Gitorious radiobutton
+#: ../SparkleShare/SparkleSetup.cs:194
+msgid "Gitorious"
+msgstr "Гиториус"
+
+#: ../SparkleShare/SparkleSetup.cs:196
+msgid "Completely Free as in Freedom infrastructure."
+msgstr "Потпуно слободна инфраструктура."
+
+#: ../SparkleShare/SparkleSetup.cs:197
+msgid "Free accounts for Free and Open Source projects."
+msgstr "Бесплатни налози за Слободне и пројекте Отвореног кода."
+
+#: ../SparkleShare/SparkleSetup.cs:206
+msgid "Project/Folder"
+msgstr "Projekat/Direktorijum"
+
+#. GNOME radiobutton
+#: ../SparkleShare/SparkleSetup.cs:211
+msgid "The GNOME Project"
+msgstr "Пројекат ГНОМ"
+
+#: ../SparkleShare/SparkleSetup.cs:213
+msgid "GNOME is an easy to understand interface to your computer."
+msgstr "ГНОМ је лако разумљиво сучеље за Ваш рачунар."
+
+#: ../SparkleShare/SparkleSetup.cs:214
+msgid "Select this option if you’re a developer or designer working on GNOME."
+msgstr ""
+"Одаберите ову опцију ако сте програмер или дизајнер који ради на ГНОМ-у."
+
+#: ../SparkleShare/SparkleSetup.cs:223
+msgid "Project"
+msgstr "Projekat"
+
+#: ../SparkleShare/SparkleSetup.cs:233
+msgid "Folder Name:"
+msgstr "Назив датотеке:"
+
+#. Cancel button
+#: ../SparkleShare/SparkleSetup.cs:261
+msgid "Cancel"
+msgstr "Одустани"
+
+#. Sync button
+#: ../SparkleShare/SparkleSetup.cs:269
+msgid "Sync"
+msgstr "Синхронизуј"
+
+#: ../SparkleShare/SparkleSetup.cs:297
+#, csharp-format
+msgid "Syncing folder ‘{0}’…"
+msgstr "Синхронизујем директоријум ‘{0}’…"
+
+#: ../SparkleShare/SparkleSetup.cs:298
+msgid "This may take a while."
+msgstr "Ово може да потраје."
+
+#: ../SparkleShare/SparkleSetup.cs:299
+msgid "Are you sure it’s not coffee o'clock?"
+msgstr "Да ли сте сигурни да није време за кафу?"
+
+#: ../SparkleShare/SparkleSetup.cs:303 ../SparkleShare/SparkleSetup.cs:388
+msgid "Finish"
+msgstr "Заврши"
+
+#: ../SparkleShare/SparkleSetup.cs:333
+msgid "Something went wrong"
+msgstr "Нешто је пошло наопако"
+
+#: ../SparkleShare/SparkleSetup.cs:353
+msgid "Try Again"
+msgstr "Покушај поново"
+
+#: ../SparkleShare/SparkleSetup.cs:372
+#, csharp-format
+msgid "‘{0}’ has been successfully added"
+msgstr "‘{0}’ успешно додато"
+
+#: ../SparkleShare/SparkleSetup.cs:378
+msgid "Folder synced successfully!"
+msgstr "Директоријум је успешно синхронизован!"
+
+#: ../SparkleShare/SparkleSetup.cs:379
+msgid "Access the synced files from your SparkleShare folder."
+msgstr ""
+"Приступи синхорнонизованим датотекам из Вашег СпарклШер директоријума."
+
+#. A button that opens the synced folder
+#: ../SparkleShare/SparkleSetup.cs:382
+msgid "Open Folder"
+msgstr "Отвори директоријум"
+
+#: ../SparkleShare/SparkleSetupWindow.cs:45
+msgid "SparkleShare Setup"
+msgstr "СпарклШер подешавања"
+
+#: ../SparkleShare/SparkleShare.cs:53
+msgid "Sorry, you can't run SparkleShare with these permissions."
+msgstr "Нажалост, не можете покренути СпарклШер са овим дозволама."
+
+#: ../SparkleShare/SparkleShare.cs:54
+msgid "Things would go utterly wrong."
+msgstr "Ствари би кренуле потпуно погрешно."
+
+#: ../SparkleShare/SparkleShare.cs:61
+msgid "Print version information"
+msgstr "Исписује информацију о верзији"
+
+#: ../SparkleShare/SparkleShare.cs:62
+msgid "Show this help text"
+msgstr "Приказује овај текст помоћи"
+
+#: ../SparkleShare/SparkleShare.cs:109
+msgid "SparkleShare, a collaboration and sharing tool."
+msgstr "СпарклШер, алатка за сарадњу и дељење."
+
+#: ../SparkleShare/SparkleShare.cs:110
+msgid "Copyright (C) 2010 Hylke Bons"
+msgstr "Copyright (C) 2010 Hylke Bons"
+
+#: ../SparkleShare/SparkleShare.cs:112
+msgid "This program comes with ABSOLUTELY NO WARRANTY."
+msgstr "Овај програм долази БЕЗ ИКАКВЕ ГАРАНЦИЈЕ."
+
+#: ../SparkleShare/SparkleShare.cs:114
+msgid "This is free software, and you are welcome to redistribute it "
+msgstr "Ово је слободан софтвер, и можете га редистрибуирати"
+
+#: ../SparkleShare/SparkleShare.cs:115
+msgid "under certain conditions. Please read the GNU GPLv3 for details."
+msgstr "под одређеним условима. Молимо прочитајте ГНУ ОЈЛв3 за више детаља."
+
+#: ../SparkleShare/SparkleShare.cs:117
+msgid "SparkleShare automatically syncs Git repositories in "
+msgstr "СпарклШер аутоматски синхронизује Гит ризнице у"
+
+#: ../SparkleShare/SparkleShare.cs:118
+msgid "the ~/SparkleShare folder with their remote origins."
+msgstr "директоријуму ~/SparkleShare са њиховим удаљеним изворима."
+
+#: ../SparkleShare/SparkleShare.cs:120
+msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..."
+msgstr "Употреба: sparkleshare [start|stop|restart] [OPTION]..."
+
+#: ../SparkleShare/SparkleShare.cs:121
+msgid "Sync SparkleShare folder with remote repositories."
+msgstr "Синхронизуј СпарклШер директоријум са удаљеним ризницама."
+
+#: ../SparkleShare/SparkleShare.cs:123
+msgid "Arguments:"
+msgstr "Аргументи:"
+
+#: ../SparkleShare/SparkleShare.cs:133
+msgid "SparkleShare "
+msgstr "СпарклШер"
+
+#: ../SparkleShare/SparkleStatusIcon.cs:208
+msgid "No Remote Folders Yet"
+msgstr "Још нема удаљених директоријума"
+
+#. Opens the wizard to add a new remote folder
+#: ../SparkleShare/SparkleStatusIcon.cs:218
+msgid "Add Remote Folder…"
+msgstr "Додај удањени директоријум..."
+
+#: ../SparkleShare/SparkleStatusIcon.cs:242
+msgid "Show Recent Events"
+msgstr "Прикажи скорашње догађаје"
+
+#: ../SparkleShare/SparkleStatusIcon.cs:262
+msgid "Turn Notifications Off"
+msgstr "Угаси обавештења"
+
+#: ../SparkleShare/SparkleStatusIcon.cs:264
+msgid "Turn Notifications On"
+msgstr "Укључи обавештења"
+
+#. A menu item that quits the application
+#: ../SparkleShare/SparkleStatusIcon.cs:291
+msgid "Quit"
+msgstr "Крај рада"
+
+
diff --git a/po/sv.po b/po/sv.po
old mode 100644
new mode 100755
index 8367981a..2ecaa164
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,50 +1,48 @@
# This file is distributed under the same license as the Sparkleshare package.
#
-# WARNING: Due to the nature of Transifex all translation file headers were lost
-# we apologise for any incovenience this may have caused and we hope to bring them
-# back in the future.
-#
-# , 2011.
-# , 2011.
-# , 2011.
+# Translators:
+# Jan Lindblom , 2011.
+# Robin Jakobsson , 2011.
# smygrokarn , 2011.
+# , 2011.
msgid ""
msgstr ""
"Project-Id-Version: SparkleShare\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-29 11:38+0200\n"
-"PO-Revision-Date: 2011-07-07 18:57+0000\n"
-"Last-Translator: janerictobias \n"
-"Language-Team: LANGUAGE \n"
+"POT-Creation-Date: 2011-09-16 16:10+0200\n"
+"PO-Revision-Date: 2011-09-21 08:31+0000\n"
+"Last-Translator: rjakobsson \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:337
-#: ../SparkleShare/SparkleIntro.cs:67 ../SparkleShare/SparkleStatusIcon.cs:345
-msgid "Welcome to SparkleShare!"
-msgstr "Välkommen till SparkleShare!"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:348
-#: ../SparkleShare/SparkleStatusIcon.cs:357
-msgid "Not everything is synced"
-msgstr "Inte allt har synkroniserats"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:358
-#: ../SparkleShare/SparkleStatusIcon.cs:367
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:69
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:86
+#: ../SparkleShare/SparkleStatusIcon.cs:74
+#: ../SparkleShare/SparkleStatusIcon.cs:88
msgid "Up to date"
msgstr "Aktuell"
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:374
-#: ../SparkleShare/SparkleStatusIcon.cs:383
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:84
+#: ../SparkleShare/SparkleSetup.cs:67 ../SparkleShare/SparkleStatusIcon.cs:86
+msgid "Welcome to SparkleShare!"
+msgstr "Välkommen till SparkleShare!"
+
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:95
+#: ../SparkleShare/SparkleStatusIcon.cs:103
msgid "Syncing…"
msgstr "Synkroniserar…"
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:105
+#: ../SparkleShare/SparkleStatusIcon.cs:113
+msgid "Not everything is synced"
+msgstr "Inte allt har synkroniserats"
+
#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
msgid "Copy Web Link"
-msgstr "Kopiera Webblänk"
+msgstr "Kopiera webblänk"
#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:114
msgid "Copy the web address of this file to the clipboard"
@@ -52,7 +50,7 @@ msgstr "Kopiera URL för denna fil till klippbordet"
#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:147
msgid "Get Earlier Version"
-msgstr "Hämta Tidigare Version"
+msgstr "Hämta tidigare version"
#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:148
msgid "Make a copy of an earlier version in this folder"
@@ -62,71 +60,133 @@ msgstr "Gör en kopia av en tidigare version i denna katalog"
msgid "Select to get a copy of this version"
msgstr "Välj för att få en kopia av den här versionen"
+#: ../SparkleShare/Program.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/Program.cs:54
+msgid "Things would go utterly wrong."
+msgstr "Detta kan gå helt fel."
+
+#: ../SparkleShare/Program.cs:61
+msgid "Print version information"
+msgstr "Skriv ut versionsinformation"
+
+#: ../SparkleShare/Program.cs:62
+msgid "Show this help text"
+msgstr "Visa denna hjälp-text"
+
+#: ../SparkleShare/Program.cs:109
+msgid "SparkleShare, a collaboration and sharing tool."
+msgstr "SparkleShare, ett verktyg för samarbete och delning"
+
+#: ../SparkleShare/Program.cs:110
+msgid "Copyright (C) 2010 Hylke Bons"
+msgstr "Copyright (C) 2010 Hylke Bons"
+
+#: ../SparkleShare/Program.cs:112
+msgid "This program comes with ABSOLUTELY NO WARRANTY."
+msgstr "Detta program kommer utan några som helst garantier."
+
+#: ../SparkleShare/Program.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/Program.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/Program.cs:117
+msgid "SparkleShare automatically syncs Git repositories in "
+msgstr "SparkleShare synkroniserar automatiskt Git-källor i "
+
+#: ../SparkleShare/Program.cs:118
+msgid "the ~/SparkleShare folder with their remote origins."
+msgstr "katalogen ~/SparkleShare med deras fjärrkällor."
+
+#: ../SparkleShare/Program.cs:120
+msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..."
+msgstr "Användning: sparkleshare [start|stop|restart] [VÄXEL]"
+
+#: ../SparkleShare/Program.cs:121
+msgid "Sync SparkleShare folder with remote repositories."
+msgstr "Synkronisera SparkleShare mappen med fjärrkällor."
+
+#: ../SparkleShare/Program.cs:123
+msgid "Arguments:"
+msgstr "Argument:"
+
+#: ../SparkleShare/Program.cs:133
+msgid "SparkleShare "
+msgstr "SparkleShare"
+
#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:46 ../SparkleShare/SparkleStatusIcon.cs:275
+#: ../SparkleShare/SparkleAbout.cs:53 ../SparkleShare/SparkleStatusIcon.cs:292
msgid "About SparkleShare"
msgstr "Om SparkleShare"
-#: ../SparkleShare/SparkleAbout.cs:53
-msgid "A newer version is available"
-msgstr "En ny version finns tillgänglig"
+#: ../SparkleShare/SparkleAbout.cs:70
+#, csharp-format
+msgid "A newer version ({0}) is available!"
+msgstr "En nyare version ({0}) är tillgänglig!"
-#: ../SparkleShare/SparkleAbout.cs:60
+#: ../SparkleShare/SparkleAbout.cs:79
msgid "You are running the latest version."
msgstr "Du kör den senaste versionen"
-#: ../SparkleShare/SparkleAbout.cs:87
+#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:113
msgid "Checking for updates..."
msgstr "Söker uppdateringar..."
-#: ../SparkleShare/SparkleAbout.cs:116
-msgid "_Show Credits"
-msgstr "_Visa erkännande"
-
-#: ../SparkleShare/SparkleAbout.cs:129
-msgid "_Visit Website"
-msgstr "_Besök Webbsida"
-
-#: ../SparkleShare/SparkleController.cs:455
-msgid "ddd MMM d, yyyy"
+#: ../SparkleShare/SparkleController.cs:488
+msgid "dddd, MMMM d, yyyy"
msgstr "ddd MMM d, åååå"
-#: ../SparkleShare/SparkleController.cs:460
-msgid "ddd MMM d"
-msgstr "ddd MMM d"
+#: ../SparkleShare/SparkleController.cs:494
+msgid "dddd, MMMM d"
+msgstr "ddd, MMM, d"
-#: ../SparkleShare/SparkleController.cs:661
+#: ../SparkleShare/SparkleController.cs:702
#, csharp-format
msgid "added ‘{0}’"
msgstr "la till '{0}'"
-#: ../SparkleShare/SparkleController.cs:666
+#: ../SparkleShare/SparkleController.cs:707
#, csharp-format
msgid "moved ‘{0}’"
msgstr "flyttat '{0}'"
-#: ../SparkleShare/SparkleController.cs:671
+#: ../SparkleShare/SparkleController.cs:712
#, csharp-format
msgid "edited ‘{0}’"
msgstr "redigerade '{0}'"
-#: ../SparkleShare/SparkleController.cs:676
+#: ../SparkleShare/SparkleController.cs:717
#, csharp-format
msgid "deleted ‘{0}’"
msgstr "tog bort '{0}'"
-#: ../SparkleShare/SparkleController.cs:685
+#: ../SparkleShare/SparkleController.cs:726
#, csharp-format
msgid "and {0} more"
msgid_plural "and {0} more"
msgstr[0] "och {0} fler"
msgstr[1] "och {0} fler"
-#: ../SparkleShare/SparkleController.cs:689
+#: ../SparkleShare/SparkleController.cs:730
msgid "did something magical"
msgstr "gjorde något magiskt"
-#: ../SparkleShare/SparkleIntro.cs:73
+#: ../SparkleShare/SparkleEventLog.cs:58
+msgid "Recent Events"
+msgstr "Senaste händelser"
+
+#: ../SparkleShare/SparkleEventLog.cs:169
+#: ../SparkleShare/SparkleEventLog.cs:188
+msgid "All Folders"
+msgstr "Alla kataloger"
+
+#: ../SparkleShare/SparkleSetup.cs:68
msgid ""
"Before we can create a SparkleShare folder on this computer, we need a few "
"bits of information from you."
@@ -134,296 +194,167 @@ msgstr ""
"Innan vi kan skapa en SparkleShare-katalog på den här datorn så behöver vi "
"lite information från dig."
-#: ../SparkleShare/SparkleIntro.cs:83
+#: ../SparkleShare/SparkleSetup.cs:75
msgid "Full Name:"
msgstr "För- och efternamn:"
-#: ../SparkleShare/SparkleIntro.cs:98
+#: ../SparkleShare/SparkleSetup.cs:90
msgid "Email:"
-msgstr "Email:"
+msgstr "E-postadress:"
-#: ../SparkleShare/SparkleIntro.cs:109
+#: ../SparkleShare/SparkleSetup.cs:100
msgid "Next"
msgstr "Nästa"
-#: ../SparkleShare/SparkleIntro.cs:115
-msgid "Configuring…"
-msgstr "Konfigurerar..."
-
-#: ../SparkleShare/SparkleIntro.cs:161
+#: ../SparkleShare/SparkleSetup.cs:121
msgid "Where is your remote folder?"
msgstr "Var är din fjärrkatalog?"
-#: ../SparkleShare/SparkleIntro.cs:174
-msgid "address-to-server.com"
-msgstr "adress-till-servern.com"
-
-#: ../SparkleShare/SparkleIntro.cs:179
+#. Own server radiobutton
+#: ../SparkleShare/SparkleSetup.cs:130
msgid "On my own server:"
msgstr "På min egen server"
-#: ../SparkleShare/SparkleIntro.cs:186
-msgid "Free hosting for Free and Open Source Software projects."
-msgstr "Gratis tjänst för Fria- och Öppen Källkodprojekt."
+#: ../SparkleShare/SparkleSetup.cs:135 ../SparkleShare/SparkleSetup.cs:237
+msgid "Folder"
+msgstr "Katalog"
-#: ../SparkleShare/SparkleIntro.cs:187
+#: ../SparkleShare/SparkleSetup.cs:162
+msgid "address-to-server.com"
+msgstr "adress-till-servern.se"
+
+#: ../SparkleShare/SparkleSetup.cs:177
+msgid "Free hosting for Free and Open Source Software projects."
+msgstr "Gratistjänst för fria- och öppna källkodsprojekt."
+
+#: ../SparkleShare/SparkleSetup.cs:178
msgid "Also has paid accounts for extra private space and bandwidth."
msgstr "Har också betaltjänster för extra privat utrymme och bandbredd."
-#: ../SparkleShare/SparkleIntro.cs:195
+#: ../SparkleShare/SparkleSetup.cs:187
+msgid "Username/Folder"
+msgstr "Användarnamn/Katalog"
+
+#. Gitorious radiobutton
+#: ../SparkleShare/SparkleSetup.cs:192
+msgid "Gitorious"
+msgstr "Gitorious"
+
+#: ../SparkleShare/SparkleSetup.cs:194
+msgid "Completely Free as in Freedom infrastructure."
+msgstr "Fullständigt fritt "
+
+#: ../SparkleShare/SparkleSetup.cs:195
+msgid "Free accounts for Free and Open Source projects."
+msgstr "Gratiskonton för fria- och öppna källkodsprojekt"
+
+#: ../SparkleShare/SparkleSetup.cs:204
+msgid "Project/Folder"
+msgstr "Projekt/Katalog"
+
+#. GNOME radiobutton
+#: ../SparkleShare/SparkleSetup.cs:209
msgid "The GNOME Project"
msgstr "GNOME-projektet"
-#: ../SparkleShare/SparkleIntro.cs:197
+#: ../SparkleShare/SparkleSetup.cs:211
msgid "GNOME is an easy to understand interface to your computer."
msgstr "GNOME är ett enkelt gränssnitt till din dator."
-#: ../SparkleShare/SparkleIntro.cs:198
+#: ../SparkleShare/SparkleSetup.cs:212
msgid "Select this option if you’re a developer or designer working on GNOME."
msgstr ""
"Välj detta om du är en utvecklare eller designer som arbetar med GNOME."
-#: ../SparkleShare/SparkleIntro.cs:206
-msgid "Gitorious"
-msgstr "Gitorious"
-
-#: ../SparkleShare/SparkleIntro.cs:208
-msgid "Completely Free as in Freedom infrastructure."
-msgstr "Fullständigt Fritt "
-
-#: ../SparkleShare/SparkleIntro.cs:209
-msgid "Free accounts for Free and Open Source projects."
-msgstr "Gratis konton för Fria och Öppen källkodsprojekt"
-
-#: ../SparkleShare/SparkleIntro.cs:220
-msgid "Username/Folder"
-msgstr "Användarnamn/Katalog"
-
-#: ../SparkleShare/SparkleIntro.cs:225
-msgid "Project/Folder"
-msgstr "Projekt/Katalog"
-
-#: ../SparkleShare/SparkleIntro.cs:230
+#: ../SparkleShare/SparkleSetup.cs:221
msgid "Project"
msgstr "Projekt"
-#: ../SparkleShare/SparkleIntro.cs:235 ../SparkleShare/SparkleIntro.cs:254
-msgid "Folder"
-msgstr "Katalog"
-
-#: ../SparkleShare/SparkleIntro.cs:259 ../SparkleShare/SparkleIntro.cs:377
+#: ../SparkleShare/SparkleSetup.cs:231
msgid "Folder Name:"
msgstr "Katalognamn:"
-#: ../SparkleShare/SparkleIntro.cs:269
-msgid "Sync"
-msgstr "Synkronisera"
-
-#: ../SparkleShare/SparkleIntro.cs:312
+#. Cancel button
+#: ../SparkleShare/SparkleSetup.cs:259 ../SparkleShare/SparkleSetup.cs:305
msgid "Cancel"
msgstr "Avbryt"
-#: ../SparkleShare/SparkleIntro.cs:320
-msgid "Skip"
-msgstr "Hoppa över"
+#. Sync button
+#: ../SparkleShare/SparkleSetup.cs:267
+msgid "Sync"
+msgstr "Synkronisera"
-#: ../SparkleShare/SparkleIntro.cs:347
-msgid "Invitation received!"
-msgstr "Inbjudning mottagen!"
-
-#: ../SparkleShare/SparkleIntro.cs:353
-msgid ""
-"You've received an invitation to join a shared folder.\n"
-"We're ready to hook you up immediately if you wish."
-msgstr ""
-"Du har mottagit en inbjudan till en delad katalog.\n"
-"Om du önskar så kan du ta del av katalogen direkt."
-
-#: ../SparkleShare/SparkleIntro.cs:359
-msgid "Do you accept this invitation?"
-msgstr "Accepterar du inbjudan?"
-
-#: ../SparkleShare/SparkleIntro.cs:368
-msgid "Server Address:"
-msgstr "Serveradress:"
-
-#: ../SparkleShare/SparkleIntro.cs:391
-msgid "Reject"
-msgstr "Avvisa"
-
-#: ../SparkleShare/SparkleIntro.cs:392
-msgid "Accept and Sync"
-msgstr "Acceptera och synkronisera"
-
-#: ../SparkleShare/SparkleIntro.cs:442
-msgid "Something went wrong…"
-msgstr "Något blev fel..."
-
-#: ../SparkleShare/SparkleIntro.cs:448
-msgid "Try Again"
-msgstr "Försök igen"
-
-#: ../SparkleShare/SparkleIntro.cs:473
-#, csharp-format
-msgid "‘{0}’ has been successfully added"
-msgstr "'{0}' har lagts till korrekt"
-
-#: ../SparkleShare/SparkleIntro.cs:482
-msgid "Folder synced successfully!"
-msgstr "Katalogen synkroniserades framgångsrikt!"
-
-#: ../SparkleShare/SparkleIntro.cs:489
-#, csharp-format
-msgid ""
-"Now you can access the synced files from ‘{0}’ in your SparkleShare folder."
-msgstr ""
-"Nu kan du nå de synkroniserade filerna från '{0}' i din SparkleShare-"
-"katalog."
-
-#. A button that opens the synced folder
-#: ../SparkleShare/SparkleIntro.cs:497
-msgid "Open Folder"
-msgstr "Öppna katalog"
-
-#: ../SparkleShare/SparkleIntro.cs:503 ../SparkleShare/SparkleIntro.cs:543
-#: ../SparkleShare/SparkleIntro.cs:604
-msgid "Finish"
-msgstr "Slutför"
-
-#: ../SparkleShare/SparkleIntro.cs:528
+#: ../SparkleShare/SparkleSetup.cs:295
#, csharp-format
msgid "Syncing folder ‘{0}’…"
msgstr "Synkroniserar katalog ‘{0}’…"
-#: ../SparkleShare/SparkleIntro.cs:535
-msgid "This may take a while.\n"
-msgstr "Det här kan ta en stund.\n"
+#: ../SparkleShare/SparkleSetup.cs:296
+msgid "This may take a while."
+msgstr "Det här kan ta en stund."
-#: ../SparkleShare/SparkleIntro.cs:536
+#: ../SparkleShare/SparkleSetup.cs:297
msgid "Are you sure it’s not coffee o'clock?"
msgstr "Är du säker på att det inte är fikadags?"
-#: ../SparkleShare/SparkleIntro.cs:579
-msgid "SparkleShare is ready to go!"
-msgstr "SparkleShare är redo!"
+#: ../SparkleShare/SparkleSetup.cs:301 ../SparkleShare/SparkleSetup.cs:417
+msgid "Finish"
+msgstr "Slutför"
-#: ../SparkleShare/SparkleIntro.cs:585
-msgid ""
-"Now you can start accepting invitations from others. \n"
-"Just click on invitations you get by email and we will take care of the rest."
-msgstr ""
-"Nu kan du börja acceptera inbjudningar från andra.\n"
-"Klicka bara på inbjudningar som du får med epost så tar vi hand om resten."
+#: ../SparkleShare/SparkleSetup.cs:334
+msgid "Something went wrong"
+msgstr "Något blev fel"
-#: ../SparkleShare/SparkleIntro.cs:596
-msgid "Learn how to host your own SparkleServer"
-msgstr "Lär dig hur du sätter upp en egen SparkleServer"
+#: ../SparkleShare/SparkleSetup.cs:382
+msgid "Try Again…"
+msgstr "Försök igen..."
-#: ../SparkleShare/SparkleEventLog.cs:61
-msgid "Recent Events"
-msgstr "Senaste händelser"
+#: ../SparkleShare/SparkleSetup.cs:401
+#, csharp-format
+msgid "‘{0}’ has been successfully added"
+msgstr "'{0}' har lagts till korrekt"
-#: ../SparkleShare/SparkleEventLog.cs:148
-#: ../SparkleShare/SparkleEventLog.cs:173
-msgid "All Folders"
-msgstr "Alla kataloger"
+#: ../SparkleShare/SparkleSetup.cs:407
+msgid "Folder synced successfully!"
+msgstr "Katalogen synkroniserades framgångsrikt!"
-#: ../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/SparkleSetup.cs:408
+msgid "Access the synced files from your SparkleShare folder."
+msgstr "Nå de synkroniserade filerna från din SparkleShare-mapp."
-#: ../SparkleShare/SparkleShare.cs:54
-msgid "Things would go utterly wrong."
-msgstr "Detta kan gå helt fel."
+#. A button that opens the synced folder
+#: ../SparkleShare/SparkleSetup.cs:411
+msgid "Open Folder"
+msgstr "Öppna katalog"
-#: ../SparkleShare/SparkleShare.cs:61
-msgid "Print version information"
-msgstr "Skriv ut versionsinformation"
+#: ../SparkleShare/SparkleSetupWindow.cs:45
+msgid "SparkleShare Setup"
+msgstr "SparkleShare-inställningar"
-#: ../SparkleShare/SparkleShare.cs:62
-msgid "Show this help text"
-msgstr "Visa denna hjälp-text"
-
-#: ../SparkleShare/SparkleShare.cs:109
-msgid "SparkleShare, a collaboration and sharing tool."
-msgstr "SparkleShare, ett verktyg för samarbete och delning"
-
-#: ../SparkleShare/SparkleShare.cs:110
-msgid "Copyright (C) 2010 Hylke Bons"
-msgstr "Copyright (C) 2010 Hylke Bons"
-
-#: ../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: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: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:117
-msgid "SparkleShare automatically syncs Git repositories in "
-msgstr "SparkleShare synkroniserar automatiskt Git-källor i "
-
-#: ../SparkleShare/SparkleShare.cs:118
-msgid "the ~/SparkleShare folder with their remote origins."
-msgstr "katalogen ~/SparkleShare med deras fjärrkällor."
-
-#: ../SparkleShare/SparkleShare.cs:120
-msgid "Usage: sparkleshare [start|stop|restart] [OPTION]..."
-msgstr "Användning: sparkleshare [start|stop|restart] [VÄXEL]"
-
-#: ../SparkleShare/SparkleShare.cs:121
-msgid "Sync SparkleShare folder with remote repositories."
-msgstr "Synkronisera SparkleShare mappen med fjärrkällor."
-
-#: ../SparkleShare/SparkleShare.cs:123
-msgid "Arguments:"
-msgstr "Argument:"
-
-#: ../SparkleShare/SparkleShare.cs:133
-msgid "SparkleShare "
-msgstr "SparkleShare"
-
-#: ../SparkleShare/SparkleStatusIcon.cs:208
+#: ../SparkleShare/SparkleStatusIcon.cs:225
msgid "No Remote Folders Yet"
msgstr "Inga fjärrkataloger ännu"
#. Opens the wizard to add a new remote folder
-#: ../SparkleShare/SparkleStatusIcon.cs:218
+#: ../SparkleShare/SparkleStatusIcon.cs:235
msgid "Add Remote Folder…"
msgstr "Lägg till fjärrkatalog"
-#: ../SparkleShare/SparkleStatusIcon.cs:242
+#: ../SparkleShare/SparkleStatusIcon.cs:259
msgid "Show Recent Events"
msgstr "Visa senaste händelser"
-#: ../SparkleShare/SparkleStatusIcon.cs:262
+#: ../SparkleShare/SparkleStatusIcon.cs:279
msgid "Turn Notifications Off"
msgstr "Stäng av notifieringar"
-#: ../SparkleShare/SparkleStatusIcon.cs:264
+#: ../SparkleShare/SparkleStatusIcon.cs:281
msgid "Turn Notifications On"
msgstr "Sätt på notifieringar"
#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:286
+#: ../SparkleShare/SparkleStatusIcon.cs:308
msgid "Quit"
msgstr "Avsluta"
-#: ../SparkleShare/SparkleUI.cs:99
-msgid "Ouch! Mid-air collision!"
-msgstr "Ouch! Kollision mitt i luften!"
-
-#: ../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."
-
-#: ../SparkleShare/SparkleWindow.cs:41
-msgid "SparkleShare Setup"
-msgstr "SparkleShare-inställningar"
-
diff --git a/po/te.po b/po/te.po
old mode 100644
new mode 100755
index 8b1e0052..2190c533
--- a/po/te.po
+++ b/po/te.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: SparkleShare\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-29 11:38+0200\n"
-"PO-Revision-Date: 2011-06-26 09:22+0000\n"
+"POT-Creation-Date: 2011-07-19 07:04+0200\n"
+"PO-Revision-Date: 2011-07-19 05:10+0000\n"
"Last-Translator: deejay1 \n"
"Language-Team: LANGUAGE \n"
"MIME-Version: 1.0\n"
@@ -18,26 +18,27 @@ msgstr ""
"Language: te\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:337
-#: ../SparkleShare/SparkleIntro.cs:67 ../SparkleShare/SparkleStatusIcon.cs:345
-msgid "Welcome to SparkleShare!"
-msgstr "స్పార్కిల్షేర్కి స్వాగతం!"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:348
-#: ../SparkleShare/SparkleStatusIcon.cs:357
-msgid "Not everything is synced"
-msgstr ""
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:358
-#: ../SparkleShare/SparkleStatusIcon.cs:367
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:69
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:86
+#: ../SparkleShare/SparkleStatusIcon.cs:372
msgid "Up to date"
msgstr ""
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:374
-#: ../SparkleShare/SparkleStatusIcon.cs:383
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:84
+#: ../SparkleShare/SparkleSetup.cs:69 ../SparkleShare/SparkleStatusIcon.cs:350
+msgid "Welcome to SparkleShare!"
+msgstr "స్పార్కిల్షేర్కి స్వాగతం!"
+
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:95
+#: ../SparkleShare/SparkleStatusIcon.cs:388
msgid "Syncing…"
msgstr ""
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:105
+#: ../SparkleShare/SparkleStatusIcon.cs:362
+msgid "Not everything is synced"
+msgstr ""
+
#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
msgid "Copy Web Link"
msgstr ""
@@ -59,253 +60,62 @@ msgid "Select to get a copy of this version"
msgstr ""
#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:46 ../SparkleShare/SparkleStatusIcon.cs:275
+#: ../SparkleShare/SparkleAbout.cs:54 ../SparkleShare/SparkleStatusIcon.cs:275
msgid "About SparkleShare"
msgstr ""
-#: ../SparkleShare/SparkleAbout.cs:53
-msgid "A newer version is available"
+#: ../SparkleShare/SparkleAbout.cs:72
+#, csharp-format
+msgid "A newer version ({0}) is available!"
msgstr ""
-#: ../SparkleShare/SparkleAbout.cs:60
+#: ../SparkleShare/SparkleAbout.cs:80
msgid "You are running the latest version."
msgstr ""
-#: ../SparkleShare/SparkleAbout.cs:87
+#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:110
msgid "Checking for updates..."
msgstr ""
-#: ../SparkleShare/SparkleAbout.cs:116
-msgid "_Show Credits"
+#: ../SparkleShare/SparkleController.cs:446
+msgid "dddd, MMMM d, yyyy"
msgstr ""
-#: ../SparkleShare/SparkleAbout.cs:129
-msgid "_Visit Website"
+#: ../SparkleShare/SparkleController.cs:451
+msgid "dddd, MMMM d"
msgstr ""
-#: ../SparkleShare/SparkleController.cs:455
-msgid "ddd MMM d, yyyy"
-msgstr ""
-
-#: ../SparkleShare/SparkleController.cs:460
-msgid "ddd MMM d"
-msgstr ""
-
-#: ../SparkleShare/SparkleController.cs:661
+#: ../SparkleShare/SparkleController.cs:660
#, csharp-format
msgid "added ‘{0}’"
msgstr ""
-#: ../SparkleShare/SparkleController.cs:666
+#: ../SparkleShare/SparkleController.cs:665
#, csharp-format
msgid "moved ‘{0}’"
msgstr ""
-#: ../SparkleShare/SparkleController.cs:671
+#: ../SparkleShare/SparkleController.cs:670
#, csharp-format
msgid "edited ‘{0}’"
msgstr ""
-#: ../SparkleShare/SparkleController.cs:676
+#: ../SparkleShare/SparkleController.cs:675
#, csharp-format
msgid "deleted ‘{0}’"
msgstr ""
-#: ../SparkleShare/SparkleController.cs:685
+#: ../SparkleShare/SparkleController.cs:684
#, csharp-format
msgid "and {0} more"
msgid_plural "and {0} more"
msgstr[0] ""
msgstr[1] ""
-#: ../SparkleShare/SparkleController.cs:689
+#: ../SparkleShare/SparkleController.cs:688
msgid "did something magical"
msgstr ""
-#: ../SparkleShare/SparkleIntro.cs:73
-msgid ""
-"Before we can create a SparkleShare folder on this computer, we need a few "
-"bits of information from you."
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:83
-msgid "Full Name:"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:98
-msgid "Email:"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:109
-msgid "Next"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:115
-msgid "Configuring…"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:161
-msgid "Where is your remote folder?"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:174
-msgid "address-to-server.com"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:179
-msgid "On my own server:"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:186
-msgid "Free hosting for Free and Open Source Software projects."
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:187
-msgid "Also has paid accounts for extra private space and bandwidth."
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:195
-msgid "The GNOME Project"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:197
-msgid "GNOME is an easy to understand interface to your computer."
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:198
-msgid "Select this option if you’re a developer or designer working on GNOME."
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:206
-msgid "Gitorious"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:208
-msgid "Completely Free as in Freedom infrastructure."
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:209
-msgid "Free accounts for Free and Open Source projects."
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:220
-msgid "Username/Folder"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:225
-msgid "Project/Folder"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:230
-msgid "Project"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:235 ../SparkleShare/SparkleIntro.cs:254
-msgid "Folder"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:259 ../SparkleShare/SparkleIntro.cs:377
-msgid "Folder Name:"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:269
-msgid "Sync"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:312
-msgid "Cancel"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:320
-msgid "Skip"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:347
-msgid "Invitation received!"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:353
-msgid ""
-"You've received an invitation to join a shared folder.\n"
-"We're ready to hook you up immediately if you wish."
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:359
-msgid "Do you accept this invitation?"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:368
-msgid "Server Address:"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:391
-msgid "Reject"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:392
-msgid "Accept and Sync"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:442
-msgid "Something went wrong…"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:448
-msgid "Try Again"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:473
-#, csharp-format
-msgid "‘{0}’ has been successfully added"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:482
-msgid "Folder synced successfully!"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:489
-#, csharp-format
-msgid ""
-"Now you can access the synced files from ‘{0}’ in your SparkleShare folder."
-msgstr ""
-
-#. A button that opens the synced folder
-#: ../SparkleShare/SparkleIntro.cs:497
-msgid "Open Folder"
-msgstr "సంచయాన్ని తెరువు"
-
-#: ../SparkleShare/SparkleIntro.cs:503 ../SparkleShare/SparkleIntro.cs:543
-#: ../SparkleShare/SparkleIntro.cs:604
-msgid "Finish"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:528
-#, csharp-format
-msgid "Syncing folder ‘{0}’…"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:535
-msgid "This may take a while.\n"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:536
-msgid "Are you sure it’s not coffee o'clock?"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:579
-msgid "SparkleShare is ready to go!"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:585
-msgid ""
-"Now you can start accepting invitations from others. \n"
-"Just click on invitations you get by email and we will take care of the rest."
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:596
-msgid "Learn how to host your own SparkleServer"
-msgstr ""
-
#: ../SparkleShare/SparkleEventLog.cs:61
msgid "Recent Events"
msgstr ""
@@ -315,6 +125,148 @@ msgstr ""
msgid "All Folders"
msgstr ""
+#: ../SparkleShare/SparkleSetup.cs:70
+msgid ""
+"Before we can create a SparkleShare folder on this computer, we need a few "
+"bits of information from you."
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:77
+msgid "Full Name:"
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:92
+msgid "Email:"
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:102
+msgid "Next"
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:122
+msgid "Where is your remote folder?"
+msgstr ""
+
+#. Own server radiobutton
+#: ../SparkleShare/SparkleSetup.cs:131
+msgid "On my own server:"
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:136 ../SparkleShare/SparkleSetup.cs:238
+msgid "Folder"
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:163
+msgid "address-to-server.com"
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:178
+msgid "Free hosting for Free and Open Source Software projects."
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:179
+msgid "Also has paid accounts for extra private space and bandwidth."
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:188
+msgid "Username/Folder"
+msgstr ""
+
+#. Gitorious radiobutton
+#: ../SparkleShare/SparkleSetup.cs:193
+msgid "Gitorious"
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:195
+msgid "Completely Free as in Freedom infrastructure."
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:196
+msgid "Free accounts for Free and Open Source projects."
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:205
+msgid "Project/Folder"
+msgstr ""
+
+#. GNOME radiobutton
+#: ../SparkleShare/SparkleSetup.cs:210
+msgid "The GNOME Project"
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:212
+msgid "GNOME is an easy to understand interface to your computer."
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:213
+msgid "Select this option if you’re a developer or designer working on GNOME."
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:222
+msgid "Project"
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:232
+msgid "Folder Name:"
+msgstr ""
+
+#. Cancel button
+#: ../SparkleShare/SparkleSetup.cs:251
+msgid "Cancel"
+msgstr ""
+
+#. Sync button
+#: ../SparkleShare/SparkleSetup.cs:259
+msgid "Sync"
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:286
+#, csharp-format
+msgid "Syncing folder ‘{0}’…"
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:287
+msgid "This may take a while."
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:288
+msgid "Are you sure it’s not coffee o'clock?"
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:292 ../SparkleShare/SparkleSetup.cs:375
+msgid "Finish"
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:321
+msgid "Something went wrong"
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:341
+msgid "Try Again"
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:359
+#, csharp-format
+msgid "‘{0}’ has been successfully added"
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:365
+msgid "Folder synced successfully!"
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:366
+msgid "Access the synced files from your SparkleShare folder."
+msgstr ""
+
+#. A button that opens the synced folder
+#: ../SparkleShare/SparkleSetup.cs:369
+msgid "Open Folder"
+msgstr "సంచయాన్ని తెరువు"
+
+#: ../SparkleShare/SparkleSetupWindow.cs:45
+msgid "SparkleShare Setup"
+msgstr ""
+
#: ../SparkleShare/SparkleShare.cs:53
msgid "Sorry, you can't run SparkleShare with these permissions."
msgstr ""
@@ -397,20 +349,8 @@ msgid "Turn Notifications On"
msgstr ""
#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:286
+#: ../SparkleShare/SparkleStatusIcon.cs:291
msgid "Quit"
msgstr "చాలించు"
-#: ../SparkleShare/SparkleUI.cs:99
-msgid "Ouch! Mid-air collision!"
-msgstr ""
-
-#: ../SparkleShare/SparkleUI.cs:100
-msgid "Don't worry, SparkleShare made a copy of each conflicting file."
-msgstr ""
-
-#: ../SparkleShare/SparkleWindow.cs:41
-msgid "SparkleShare Setup"
-msgstr ""
-
diff --git a/po/uk.po b/po/uk.po
old mode 100644
new mode 100755
index 86b5f54b..f68db8e3
--- a/po/uk.po
+++ b/po/uk.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: SparkleShare\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-29 11:38+0200\n"
-"PO-Revision-Date: 2011-06-26 09:22+0000\n"
+"POT-Creation-Date: 2011-07-19 07:04+0200\n"
+"PO-Revision-Date: 2011-07-19 05:10+0000\n"
"Last-Translator: deejay1 \n"
"Language-Team: LANGUAGE \n"
"MIME-Version: 1.0\n"
@@ -19,26 +19,27 @@ msgstr ""
"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:337
-#: ../SparkleShare/SparkleIntro.cs:67 ../SparkleShare/SparkleStatusIcon.cs:345
-msgid "Welcome to SparkleShare!"
-msgstr "Ласкаво просимо до SparkleShare!"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:348
-#: ../SparkleShare/SparkleStatusIcon.cs:357
-msgid "Not everything is synced"
-msgstr "Ще не все синхронізовано"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:358
-#: ../SparkleShare/SparkleStatusIcon.cs:367
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:69
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:86
+#: ../SparkleShare/SparkleStatusIcon.cs:372
msgid "Up to date"
msgstr "Оновлено"
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:374
-#: ../SparkleShare/SparkleStatusIcon.cs:383
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:84
+#: ../SparkleShare/SparkleSetup.cs:69 ../SparkleShare/SparkleStatusIcon.cs:350
+msgid "Welcome to SparkleShare!"
+msgstr "Ласкаво просимо до SparkleShare!"
+
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:95
+#: ../SparkleShare/SparkleStatusIcon.cs:388
msgid "Syncing…"
msgstr "Синхронізація..."
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:105
+#: ../SparkleShare/SparkleStatusIcon.cs:362
+msgid "Not everything is synced"
+msgstr "Ще не все синхронізовано"
+
#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
msgid "Copy Web Link"
msgstr "Копіювати веб-посилання"
@@ -60,59 +61,52 @@ msgid "Select to get a copy of this version"
msgstr "Вибрати та отримати копію цієї версії"
#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:46 ../SparkleShare/SparkleStatusIcon.cs:275
+#: ../SparkleShare/SparkleAbout.cs:54 ../SparkleShare/SparkleStatusIcon.cs:275
msgid "About SparkleShare"
msgstr "Про SparkleShare"
-#: ../SparkleShare/SparkleAbout.cs:53
-msgid "A newer version is available"
+#: ../SparkleShare/SparkleAbout.cs:72
+#, csharp-format
+msgid "A newer version ({0}) is available!"
msgstr ""
-#: ../SparkleShare/SparkleAbout.cs:60
+#: ../SparkleShare/SparkleAbout.cs:80
msgid "You are running the latest version."
msgstr ""
-#: ../SparkleShare/SparkleAbout.cs:87
+#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:110
msgid "Checking for updates..."
msgstr ""
-#: ../SparkleShare/SparkleAbout.cs:116
-msgid "_Show Credits"
-msgstr "_Показати авторів"
+#: ../SparkleShare/SparkleController.cs:446
+msgid "dddd, MMMM d, yyyy"
+msgstr ""
-#: ../SparkleShare/SparkleAbout.cs:129
-msgid "_Visit Website"
-msgstr "_Відвідати веб-сайт"
+#: ../SparkleShare/SparkleController.cs:451
+msgid "dddd, MMMM d"
+msgstr ""
-#: ../SparkleShare/SparkleController.cs:455
-msgid "ddd MMM d, yyyy"
-msgstr "ddd d MMM yyyy"
-
-#: ../SparkleShare/SparkleController.cs:460
-msgid "ddd MMM d"
-msgstr "ddd d MMM"
-
-#: ../SparkleShare/SparkleController.cs:661
+#: ../SparkleShare/SparkleController.cs:660
#, csharp-format
msgid "added ‘{0}’"
msgstr "додано «{0}»"
-#: ../SparkleShare/SparkleController.cs:666
+#: ../SparkleShare/SparkleController.cs:665
#, csharp-format
msgid "moved ‘{0}’"
msgstr ""
-#: ../SparkleShare/SparkleController.cs:671
+#: ../SparkleShare/SparkleController.cs:670
#, csharp-format
msgid "edited ‘{0}’"
msgstr "змінено «{0}»"
-#: ../SparkleShare/SparkleController.cs:676
+#: ../SparkleShare/SparkleController.cs:675
#, csharp-format
msgid "deleted ‘{0}’"
msgstr "вилучено «{0}»"
-#: ../SparkleShare/SparkleController.cs:685
+#: ../SparkleShare/SparkleController.cs:684
#, csharp-format
msgid "and {0} more"
msgid_plural "and {0} more"
@@ -120,205 +114,10 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../SparkleShare/SparkleController.cs:689
+#: ../SparkleShare/SparkleController.cs:688
msgid "did something magical"
msgstr ""
-#: ../SparkleShare/SparkleIntro.cs:73
-msgid ""
-"Before we can create a SparkleShare folder on this computer, we need a few "
-"bits of information from you."
-msgstr ""
-"Щоб створити теку SparkleShare на цьому комп'ютері, потрібна деяка "
-"інформація про вас."
-
-#: ../SparkleShare/SparkleIntro.cs:83
-msgid "Full Name:"
-msgstr "Повне ім'я:"
-
-#: ../SparkleShare/SparkleIntro.cs:98
-msgid "Email:"
-msgstr "Ел. адреса:"
-
-#: ../SparkleShare/SparkleIntro.cs:109
-msgid "Next"
-msgstr "Далі"
-
-#: ../SparkleShare/SparkleIntro.cs:115
-msgid "Configuring…"
-msgstr "Налаштування..."
-
-#: ../SparkleShare/SparkleIntro.cs:161
-msgid "Where is your remote folder?"
-msgstr "Де ваша віддалена тека?"
-
-#: ../SparkleShare/SparkleIntro.cs:174
-msgid "address-to-server.com"
-msgstr "адреса-на-server.com"
-
-#: ../SparkleShare/SparkleIntro.cs:179
-msgid "On my own server:"
-msgstr "На моєму власному сервері:"
-
-#: ../SparkleShare/SparkleIntro.cs:186
-msgid "Free hosting for Free and Open Source Software projects."
-msgstr "Безкоштовний хостинг для вільних програм та Open Source проектів."
-
-#: ../SparkleShare/SparkleIntro.cs:187
-msgid "Also has paid accounts for extra private space and bandwidth."
-msgstr ""
-"Також має платні облікові записи з високою пропускною здатністю та з "
-"отриманням додаткового місця."
-
-#: ../SparkleShare/SparkleIntro.cs:195
-msgid "The GNOME Project"
-msgstr "Проект GNOME"
-
-#: ../SparkleShare/SparkleIntro.cs:197
-msgid "GNOME is an easy to understand interface to your computer."
-msgstr "Легкий для розуміння інтерфейс GNOME для вашого комп'ютера."
-
-#: ../SparkleShare/SparkleIntro.cs:198
-msgid "Select this option if you’re a developer or designer working on GNOME."
-msgstr "Виберіть цей варіант, якщо ви розробник або дизайнер GNOME."
-
-#: ../SparkleShare/SparkleIntro.cs:206
-msgid "Gitorious"
-msgstr "Gitorious"
-
-#: ../SparkleShare/SparkleIntro.cs:208
-msgid "Completely Free as in Freedom infrastructure."
-msgstr "Цілком вільний як і в інфраструктурі Freedom."
-
-#: ../SparkleShare/SparkleIntro.cs:209
-msgid "Free accounts for Free and Open Source projects."
-msgstr ""
-"Безкоштовні облікові записи для вільних програм та Open Source проектів."
-
-#: ../SparkleShare/SparkleIntro.cs:220
-msgid "Username/Folder"
-msgstr "Користувач/Тека"
-
-#: ../SparkleShare/SparkleIntro.cs:225
-msgid "Project/Folder"
-msgstr "Проект/Тека"
-
-#: ../SparkleShare/SparkleIntro.cs:230
-msgid "Project"
-msgstr "Проект"
-
-#: ../SparkleShare/SparkleIntro.cs:235 ../SparkleShare/SparkleIntro.cs:254
-msgid "Folder"
-msgstr "Тека"
-
-#: ../SparkleShare/SparkleIntro.cs:259 ../SparkleShare/SparkleIntro.cs:377
-msgid "Folder Name:"
-msgstr "Назва теки:"
-
-#: ../SparkleShare/SparkleIntro.cs:269
-msgid "Sync"
-msgstr "Синхронізувати"
-
-#: ../SparkleShare/SparkleIntro.cs:312
-msgid "Cancel"
-msgstr "Скасувати"
-
-#: ../SparkleShare/SparkleIntro.cs:320
-msgid "Skip"
-msgstr "Пропустити"
-
-#: ../SparkleShare/SparkleIntro.cs:347
-msgid "Invitation received!"
-msgstr "Запрошення отримане!"
-
-#: ../SparkleShare/SparkleIntro.cs:353
-msgid ""
-"You've received an invitation to join a shared folder.\n"
-"We're ready to hook you up immediately if you wish."
-msgstr ""
-"Ви отримали запрошення для приєднання до спільної теки.\n"
-"Якщо хочете, можете приєднатись до неї негайно."
-
-#: ../SparkleShare/SparkleIntro.cs:359
-msgid "Do you accept this invitation?"
-msgstr "Ви приймаєте це запрошення?"
-
-#: ../SparkleShare/SparkleIntro.cs:368
-msgid "Server Address:"
-msgstr "Адреса сервера:"
-
-#: ../SparkleShare/SparkleIntro.cs:391
-msgid "Reject"
-msgstr "Відхилити"
-
-#: ../SparkleShare/SparkleIntro.cs:392
-msgid "Accept and Sync"
-msgstr "Прийняти та синхронізувати"
-
-#: ../SparkleShare/SparkleIntro.cs:442
-msgid "Something went wrong…"
-msgstr "Виникла помилка..."
-
-#: ../SparkleShare/SparkleIntro.cs:448
-msgid "Try Again"
-msgstr "Спробувати знову"
-
-#: ../SparkleShare/SparkleIntro.cs:473
-#, csharp-format
-msgid "‘{0}’ has been successfully added"
-msgstr "‘{0}’ успішно додано"
-
-#: ../SparkleShare/SparkleIntro.cs:482
-msgid "Folder synced successfully!"
-msgstr "Тека синхронізована успішно!"
-
-#: ../SparkleShare/SparkleIntro.cs:489
-#, csharp-format
-msgid ""
-"Now you can access the synced files from ‘{0}’ in your SparkleShare folder."
-msgstr ""
-"Зараз можете отримати синхронізовані файли з ‘{0}’ у своїй теці "
-"SparkleShare."
-
-#. A button that opens the synced folder
-#: ../SparkleShare/SparkleIntro.cs:497
-msgid "Open Folder"
-msgstr "Відкрити теку"
-
-#: ../SparkleShare/SparkleIntro.cs:503 ../SparkleShare/SparkleIntro.cs:543
-#: ../SparkleShare/SparkleIntro.cs:604
-msgid "Finish"
-msgstr "Завершити"
-
-#: ../SparkleShare/SparkleIntro.cs:528
-#, csharp-format
-msgid "Syncing folder ‘{0}’…"
-msgstr "Синхронізація теки ‘{0}’…"
-
-#: ../SparkleShare/SparkleIntro.cs:535
-msgid "This may take a while.\n"
-msgstr "Це може тривати деякий час.\n"
-
-#: ../SparkleShare/SparkleIntro.cs:536
-msgid "Are you sure it’s not coffee o'clock?"
-msgstr "А чи не здається вам, що настав час для кави?"
-
-#: ../SparkleShare/SparkleIntro.cs:579
-msgid "SparkleShare is ready to go!"
-msgstr "SparkleShare готова до роботи!"
-
-#: ../SparkleShare/SparkleIntro.cs:585
-msgid ""
-"Now you can start accepting invitations from others. \n"
-"Just click on invitations you get by email and we will take care of the rest."
-msgstr ""
-"Зараз ви можете схвалювати запрошення від інших. \n"
-"Просто клацніть на запрошенні, яке ви отримали поштою, а ми зробимо все інше."
-
-#: ../SparkleShare/SparkleIntro.cs:596
-msgid "Learn how to host your own SparkleServer"
-msgstr "Дізнайтеся, як створити свій власний сервер SparkleServer"
-
#: ../SparkleShare/SparkleEventLog.cs:61
msgid "Recent Events"
msgstr ""
@@ -328,6 +127,153 @@ msgstr ""
msgid "All Folders"
msgstr ""
+#: ../SparkleShare/SparkleSetup.cs:70
+msgid ""
+"Before we can create a SparkleShare folder on this computer, we need a few "
+"bits of information from you."
+msgstr ""
+"Щоб створити теку SparkleShare на цьому комп'ютері, потрібна деяка "
+"інформація про вас."
+
+#: ../SparkleShare/SparkleSetup.cs:77
+msgid "Full Name:"
+msgstr "Повне ім'я:"
+
+#: ../SparkleShare/SparkleSetup.cs:92
+msgid "Email:"
+msgstr "Ел. адреса:"
+
+#: ../SparkleShare/SparkleSetup.cs:102
+msgid "Next"
+msgstr "Далі"
+
+#: ../SparkleShare/SparkleSetup.cs:122
+msgid "Where is your remote folder?"
+msgstr "Де ваша віддалена тека?"
+
+#. Own server radiobutton
+#: ../SparkleShare/SparkleSetup.cs:131
+msgid "On my own server:"
+msgstr "На моєму власному сервері:"
+
+#: ../SparkleShare/SparkleSetup.cs:136 ../SparkleShare/SparkleSetup.cs:238
+msgid "Folder"
+msgstr "Тека"
+
+#: ../SparkleShare/SparkleSetup.cs:163
+msgid "address-to-server.com"
+msgstr "адреса-на-server.com"
+
+#: ../SparkleShare/SparkleSetup.cs:178
+msgid "Free hosting for Free and Open Source Software projects."
+msgstr "Безкоштовний хостинг для вільних програм та Open Source проектів."
+
+#: ../SparkleShare/SparkleSetup.cs:179
+msgid "Also has paid accounts for extra private space and bandwidth."
+msgstr ""
+"Також має платні облікові записи з високою пропускною здатністю та з "
+"отриманням додаткового місця."
+
+#: ../SparkleShare/SparkleSetup.cs:188
+msgid "Username/Folder"
+msgstr "Користувач/Тека"
+
+#. Gitorious radiobutton
+#: ../SparkleShare/SparkleSetup.cs:193
+msgid "Gitorious"
+msgstr "Gitorious"
+
+#: ../SparkleShare/SparkleSetup.cs:195
+msgid "Completely Free as in Freedom infrastructure."
+msgstr "Цілком вільний як і в інфраструктурі Freedom."
+
+#: ../SparkleShare/SparkleSetup.cs:196
+msgid "Free accounts for Free and Open Source projects."
+msgstr ""
+"Безкоштовні облікові записи для вільних програм та Open Source проектів."
+
+#: ../SparkleShare/SparkleSetup.cs:205
+msgid "Project/Folder"
+msgstr "Проект/Тека"
+
+#. GNOME radiobutton
+#: ../SparkleShare/SparkleSetup.cs:210
+msgid "The GNOME Project"
+msgstr "Проект GNOME"
+
+#: ../SparkleShare/SparkleSetup.cs:212
+msgid "GNOME is an easy to understand interface to your computer."
+msgstr "Легкий для розуміння інтерфейс GNOME для вашого комп'ютера."
+
+#: ../SparkleShare/SparkleSetup.cs:213
+msgid "Select this option if you’re a developer or designer working on GNOME."
+msgstr "Виберіть цей варіант, якщо ви розробник або дизайнер GNOME."
+
+#: ../SparkleShare/SparkleSetup.cs:222
+msgid "Project"
+msgstr "Проект"
+
+#: ../SparkleShare/SparkleSetup.cs:232
+msgid "Folder Name:"
+msgstr "Назва теки:"
+
+#. Cancel button
+#: ../SparkleShare/SparkleSetup.cs:251
+msgid "Cancel"
+msgstr "Скасувати"
+
+#. Sync button
+#: ../SparkleShare/SparkleSetup.cs:259
+msgid "Sync"
+msgstr "Синхронізувати"
+
+#: ../SparkleShare/SparkleSetup.cs:286
+#, csharp-format
+msgid "Syncing folder ‘{0}’…"
+msgstr "Синхронізація теки ‘{0}’…"
+
+#: ../SparkleShare/SparkleSetup.cs:287
+msgid "This may take a while."
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:288
+msgid "Are you sure it’s not coffee o'clock?"
+msgstr "А чи не здається вам, що настав час для кави?"
+
+#: ../SparkleShare/SparkleSetup.cs:292 ../SparkleShare/SparkleSetup.cs:375
+msgid "Finish"
+msgstr "Завершити"
+
+#: ../SparkleShare/SparkleSetup.cs:321
+msgid "Something went wrong"
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:341
+msgid "Try Again"
+msgstr "Спробувати знову"
+
+#: ../SparkleShare/SparkleSetup.cs:359
+#, csharp-format
+msgid "‘{0}’ has been successfully added"
+msgstr "‘{0}’ успішно додано"
+
+#: ../SparkleShare/SparkleSetup.cs:365
+msgid "Folder synced successfully!"
+msgstr "Тека синхронізована успішно!"
+
+#: ../SparkleShare/SparkleSetup.cs:366
+msgid "Access the synced files from your SparkleShare folder."
+msgstr ""
+
+#. A button that opens the synced folder
+#: ../SparkleShare/SparkleSetup.cs:369
+msgid "Open Folder"
+msgstr "Відкрити теку"
+
+#: ../SparkleShare/SparkleSetupWindow.cs:45
+msgid "SparkleShare Setup"
+msgstr ""
+
#: ../SparkleShare/SparkleShare.cs:53
msgid "Sorry, you can't run SparkleShare with these permissions."
msgstr ""
@@ -411,21 +357,8 @@ msgid "Turn Notifications On"
msgstr "Увімкнути сповіщення"
#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:286
+#: ../SparkleShare/SparkleStatusIcon.cs:291
msgid "Quit"
msgstr "Вийти"
-#: ../SparkleShare/SparkleUI.cs:99
-msgid "Ouch! Mid-air collision!"
-msgstr "Отакої! Зіткнення в повітрі!"
-
-#: ../SparkleShare/SparkleUI.cs:100
-msgid "Don't worry, SparkleShare made a copy of each conflicting file."
-msgstr ""
-"Не хвилюйтесь, SparkleShare створює копію кожного суперечливого файла."
-
-#: ../SparkleShare/SparkleWindow.cs:41
-msgid "SparkleShare Setup"
-msgstr ""
-
diff --git a/po/zh_CN.po b/po/zh_CN.po
old mode 100644
new mode 100755
index cae11497..1a2e3a0f
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: SparkleShare\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-29 11:38+0200\n"
-"PO-Revision-Date: 2011-06-26 09:22+0000\n"
+"POT-Creation-Date: 2011-07-19 07:04+0200\n"
+"PO-Revision-Date: 2011-07-19 05:10+0000\n"
"Last-Translator: deejay1 \n"
"Language-Team: LANGUAGE \n"
"MIME-Version: 1.0\n"
@@ -19,26 +19,27 @@ msgstr ""
"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0\n"
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:337
-#: ../SparkleShare/SparkleIntro.cs:67 ../SparkleShare/SparkleStatusIcon.cs:345
-msgid "Welcome to SparkleShare!"
-msgstr "欢迎使用 SparkleShare!"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:348
-#: ../SparkleShare/SparkleStatusIcon.cs:357
-msgid "Not everything is synced"
-msgstr ""
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:358
-#: ../SparkleShare/SparkleStatusIcon.cs:367
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:69
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:86
+#: ../SparkleShare/SparkleStatusIcon.cs:372
msgid "Up to date"
msgstr ""
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:374
-#: ../SparkleShare/SparkleStatusIcon.cs:383
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:84
+#: ../SparkleShare/SparkleSetup.cs:69 ../SparkleShare/SparkleStatusIcon.cs:350
+msgid "Welcome to SparkleShare!"
+msgstr "欢迎使用 SparkleShare!"
+
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:95
+#: ../SparkleShare/SparkleStatusIcon.cs:388
msgid "Syncing…"
msgstr "同步中..."
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:105
+#: ../SparkleShare/SparkleStatusIcon.cs:362
+msgid "Not everything is synced"
+msgstr ""
+
#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
msgid "Copy Web Link"
msgstr "复制Web链接"
@@ -60,252 +61,61 @@ msgid "Select to get a copy of this version"
msgstr "获取该版本的复制"
#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:46 ../SparkleShare/SparkleStatusIcon.cs:275
+#: ../SparkleShare/SparkleAbout.cs:54 ../SparkleShare/SparkleStatusIcon.cs:275
msgid "About SparkleShare"
msgstr "关于 SparkleShare"
-#: ../SparkleShare/SparkleAbout.cs:53
-msgid "A newer version is available"
+#: ../SparkleShare/SparkleAbout.cs:72
+#, csharp-format
+msgid "A newer version ({0}) is available!"
msgstr ""
-#: ../SparkleShare/SparkleAbout.cs:60
+#: ../SparkleShare/SparkleAbout.cs:80
msgid "You are running the latest version."
msgstr ""
-#: ../SparkleShare/SparkleAbout.cs:87
+#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:110
msgid "Checking for updates..."
msgstr ""
-#: ../SparkleShare/SparkleAbout.cs:116
-msgid "_Show Credits"
+#: ../SparkleShare/SparkleController.cs:446
+msgid "dddd, MMMM d, yyyy"
msgstr ""
-#: ../SparkleShare/SparkleAbout.cs:129
-msgid "_Visit Website"
+#: ../SparkleShare/SparkleController.cs:451
+msgid "dddd, MMMM d"
msgstr ""
-#: ../SparkleShare/SparkleController.cs:455
-msgid "ddd MMM d, yyyy"
-msgstr ""
-
-#: ../SparkleShare/SparkleController.cs:460
-msgid "ddd MMM d"
-msgstr ""
-
-#: ../SparkleShare/SparkleController.cs:661
+#: ../SparkleShare/SparkleController.cs:660
#, csharp-format
msgid "added ‘{0}’"
msgstr ""
-#: ../SparkleShare/SparkleController.cs:666
+#: ../SparkleShare/SparkleController.cs:665
#, csharp-format
msgid "moved ‘{0}’"
msgstr ""
-#: ../SparkleShare/SparkleController.cs:671
+#: ../SparkleShare/SparkleController.cs:670
#, csharp-format
msgid "edited ‘{0}’"
msgstr ""
-#: ../SparkleShare/SparkleController.cs:676
+#: ../SparkleShare/SparkleController.cs:675
#, csharp-format
msgid "deleted ‘{0}’"
msgstr ""
-#: ../SparkleShare/SparkleController.cs:685
+#: ../SparkleShare/SparkleController.cs:684
#, csharp-format
msgid "and {0} more"
msgid_plural "and {0} more"
msgstr[0] ""
-#: ../SparkleShare/SparkleController.cs:689
+#: ../SparkleShare/SparkleController.cs:688
msgid "did something magical"
msgstr ""
-#: ../SparkleShare/SparkleIntro.cs:73
-msgid ""
-"Before we can create a SparkleShare folder on this computer, we need a few "
-"bits of information from you."
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:83
-msgid "Full Name:"
-msgstr "全名:"
-
-#: ../SparkleShare/SparkleIntro.cs:98
-msgid "Email:"
-msgstr "电子邮件"
-
-#: ../SparkleShare/SparkleIntro.cs:109
-msgid "Next"
-msgstr "下一步"
-
-#: ../SparkleShare/SparkleIntro.cs:115
-msgid "Configuring…"
-msgstr "正在配置"
-
-#: ../SparkleShare/SparkleIntro.cs:161
-msgid "Where is your remote folder?"
-msgstr "远程文件夹在什么地方?"
-
-#: ../SparkleShare/SparkleIntro.cs:174
-msgid "address-to-server.com"
-msgstr "address-to-server.com"
-
-#: ../SparkleShare/SparkleIntro.cs:179
-msgid "On my own server:"
-msgstr "在我自己的服务器上:"
-
-#: ../SparkleShare/SparkleIntro.cs:186
-msgid "Free hosting for Free and Open Source Software projects."
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:187
-msgid "Also has paid accounts for extra private space and bandwidth."
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:195
-msgid "The GNOME Project"
-msgstr "GMOME项目"
-
-#: ../SparkleShare/SparkleIntro.cs:197
-msgid "GNOME is an easy to understand interface to your computer."
-msgstr "GNOME是一个简单易懂的计算机使用界面"
-
-#: ../SparkleShare/SparkleIntro.cs:198
-msgid "Select this option if you’re a developer or designer working on GNOME."
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:206
-msgid "Gitorious"
-msgstr "Gitorious"
-
-#: ../SparkleShare/SparkleIntro.cs:208
-msgid "Completely Free as in Freedom infrastructure."
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:209
-msgid "Free accounts for Free and Open Source projects."
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:220
-msgid "Username/Folder"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:225
-msgid "Project/Folder"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:230
-msgid "Project"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:235 ../SparkleShare/SparkleIntro.cs:254
-msgid "Folder"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:259 ../SparkleShare/SparkleIntro.cs:377
-msgid "Folder Name:"
-msgstr "文件夹名称:"
-
-#: ../SparkleShare/SparkleIntro.cs:269
-msgid "Sync"
-msgstr "同步"
-
-#: ../SparkleShare/SparkleIntro.cs:312
-msgid "Cancel"
-msgstr "取消"
-
-#: ../SparkleShare/SparkleIntro.cs:320
-msgid "Skip"
-msgstr "跳过"
-
-#: ../SparkleShare/SparkleIntro.cs:347
-msgid "Invitation received!"
-msgstr "收到邀请"
-
-#: ../SparkleShare/SparkleIntro.cs:353
-msgid ""
-"You've received an invitation to join a shared folder.\n"
-"We're ready to hook you up immediately if you wish."
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:359
-msgid "Do you accept this invitation?"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:368
-msgid "Server Address:"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:391
-msgid "Reject"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:392
-msgid "Accept and Sync"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:442
-msgid "Something went wrong…"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:448
-msgid "Try Again"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:473
-#, csharp-format
-msgid "‘{0}’ has been successfully added"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:482
-msgid "Folder synced successfully!"
-msgstr "文件夹同步成功"
-
-#: ../SparkleShare/SparkleIntro.cs:489
-#, csharp-format
-msgid ""
-"Now you can access the synced files from ‘{0}’ in your SparkleShare folder."
-msgstr ""
-
-#. A button that opens the synced folder
-#: ../SparkleShare/SparkleIntro.cs:497
-msgid "Open Folder"
-msgstr "打开文件夹"
-
-#: ../SparkleShare/SparkleIntro.cs:503 ../SparkleShare/SparkleIntro.cs:543
-#: ../SparkleShare/SparkleIntro.cs:604
-msgid "Finish"
-msgstr "完成"
-
-#: ../SparkleShare/SparkleIntro.cs:528
-#, csharp-format
-msgid "Syncing folder ‘{0}’…"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:535
-msgid "This may take a while.\n"
-msgstr "请稍等。\n"
-
-#: ../SparkleShare/SparkleIntro.cs:536
-msgid "Are you sure it’s not coffee o'clock?"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:579
-msgid "SparkleShare is ready to go!"
-msgstr "SparkleShare准备完毕!"
-
-#: ../SparkleShare/SparkleIntro.cs:585
-msgid ""
-"Now you can start accepting invitations from others. \n"
-"Just click on invitations you get by email and we will take care of the rest."
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:596
-msgid "Learn how to host your own SparkleServer"
-msgstr "学习如何设置自己的SparkleServer"
-
#: ../SparkleShare/SparkleEventLog.cs:61
msgid "Recent Events"
msgstr ""
@@ -315,6 +125,148 @@ msgstr ""
msgid "All Folders"
msgstr ""
+#: ../SparkleShare/SparkleSetup.cs:70
+msgid ""
+"Before we can create a SparkleShare folder on this computer, we need a few "
+"bits of information from you."
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:77
+msgid "Full Name:"
+msgstr "全名:"
+
+#: ../SparkleShare/SparkleSetup.cs:92
+msgid "Email:"
+msgstr "电子邮件"
+
+#: ../SparkleShare/SparkleSetup.cs:102
+msgid "Next"
+msgstr "下一步"
+
+#: ../SparkleShare/SparkleSetup.cs:122
+msgid "Where is your remote folder?"
+msgstr "远程文件夹在什么地方?"
+
+#. Own server radiobutton
+#: ../SparkleShare/SparkleSetup.cs:131
+msgid "On my own server:"
+msgstr "在我自己的服务器上:"
+
+#: ../SparkleShare/SparkleSetup.cs:136 ../SparkleShare/SparkleSetup.cs:238
+msgid "Folder"
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:163
+msgid "address-to-server.com"
+msgstr "address-to-server.com"
+
+#: ../SparkleShare/SparkleSetup.cs:178
+msgid "Free hosting for Free and Open Source Software projects."
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:179
+msgid "Also has paid accounts for extra private space and bandwidth."
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:188
+msgid "Username/Folder"
+msgstr ""
+
+#. Gitorious radiobutton
+#: ../SparkleShare/SparkleSetup.cs:193
+msgid "Gitorious"
+msgstr "Gitorious"
+
+#: ../SparkleShare/SparkleSetup.cs:195
+msgid "Completely Free as in Freedom infrastructure."
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:196
+msgid "Free accounts for Free and Open Source projects."
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:205
+msgid "Project/Folder"
+msgstr ""
+
+#. GNOME radiobutton
+#: ../SparkleShare/SparkleSetup.cs:210
+msgid "The GNOME Project"
+msgstr "GMOME项目"
+
+#: ../SparkleShare/SparkleSetup.cs:212
+msgid "GNOME is an easy to understand interface to your computer."
+msgstr "GNOME是一个简单易懂的计算机使用界面"
+
+#: ../SparkleShare/SparkleSetup.cs:213
+msgid "Select this option if you’re a developer or designer working on GNOME."
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:222
+msgid "Project"
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:232
+msgid "Folder Name:"
+msgstr "文件夹名称:"
+
+#. Cancel button
+#: ../SparkleShare/SparkleSetup.cs:251
+msgid "Cancel"
+msgstr "取消"
+
+#. Sync button
+#: ../SparkleShare/SparkleSetup.cs:259
+msgid "Sync"
+msgstr "同步"
+
+#: ../SparkleShare/SparkleSetup.cs:286
+#, csharp-format
+msgid "Syncing folder ‘{0}’…"
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:287
+msgid "This may take a while."
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:288
+msgid "Are you sure it’s not coffee o'clock?"
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:292 ../SparkleShare/SparkleSetup.cs:375
+msgid "Finish"
+msgstr "完成"
+
+#: ../SparkleShare/SparkleSetup.cs:321
+msgid "Something went wrong"
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:341
+msgid "Try Again"
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:359
+#, csharp-format
+msgid "‘{0}’ has been successfully added"
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:365
+msgid "Folder synced successfully!"
+msgstr "文件夹同步成功"
+
+#: ../SparkleShare/SparkleSetup.cs:366
+msgid "Access the synced files from your SparkleShare folder."
+msgstr ""
+
+#. A button that opens the synced folder
+#: ../SparkleShare/SparkleSetup.cs:369
+msgid "Open Folder"
+msgstr "打开文件夹"
+
+#: ../SparkleShare/SparkleSetupWindow.cs:45
+msgid "SparkleShare Setup"
+msgstr "SparkleShare "
+
#: ../SparkleShare/SparkleShare.cs:53
msgid "Sorry, you can't run SparkleShare with these permissions."
msgstr "对不起,您不能在这些许可下运行 SparkleShare。"
@@ -397,20 +349,8 @@ msgid "Turn Notifications On"
msgstr ""
#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:286
+#: ../SparkleShare/SparkleStatusIcon.cs:291
msgid "Quit"
msgstr "退出"
-#: ../SparkleShare/SparkleUI.cs:99
-msgid "Ouch! Mid-air collision!"
-msgstr ""
-
-#: ../SparkleShare/SparkleUI.cs:100
-msgid "Don't worry, SparkleShare made a copy of each conflicting file."
-msgstr ""
-
-#: ../SparkleShare/SparkleWindow.cs:41
-msgid "SparkleShare Setup"
-msgstr "SparkleShare "
-
diff --git a/po/zh_TW.po b/po/zh_TW.po
old mode 100644
new mode 100755
index 4d5d83cc..1e03237b
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: SparkleShare\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-29 11:38+0200\n"
-"PO-Revision-Date: 2011-06-26 09:22+0000\n"
+"POT-Creation-Date: 2011-07-19 07:04+0200\n"
+"PO-Revision-Date: 2011-07-19 05:10+0000\n"
"Last-Translator: deejay1 \n"
"Language-Team: LANGUAGE \n"
"MIME-Version: 1.0\n"
@@ -18,26 +18,27 @@ msgstr ""
"Language: zh_TW\n"
"Plural-Forms: nplurals=1; plural=0\n"
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:337
-#: ../SparkleShare/SparkleIntro.cs:67 ../SparkleShare/SparkleStatusIcon.cs:345
-msgid "Welcome to SparkleShare!"
-msgstr "歡迎使用 SparkleShare!"
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:348
-#: ../SparkleShare/SparkleStatusIcon.cs:357
-msgid "Not everything is synced"
-msgstr ""
-
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:358
-#: ../SparkleShare/SparkleStatusIcon.cs:367
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:69
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:86
+#: ../SparkleShare/SparkleStatusIcon.cs:372
msgid "Up to date"
msgstr "更新"
-#: ../SparkleShare/Mac/SparkleStatusIcon.cs:374
-#: ../SparkleShare/SparkleStatusIcon.cs:383
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:84
+#: ../SparkleShare/SparkleSetup.cs:69 ../SparkleShare/SparkleStatusIcon.cs:350
+msgid "Welcome to SparkleShare!"
+msgstr "歡迎使用 SparkleShare!"
+
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:95
+#: ../SparkleShare/SparkleStatusIcon.cs:388
msgid "Syncing…"
msgstr "同步中…"
+#: ../SparkleShare/Mac/SparkleStatusIcon.cs:105
+#: ../SparkleShare/SparkleStatusIcon.cs:362
+msgid "Not everything is synced"
+msgstr ""
+
#: ../SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in:113
msgid "Copy Web Link"
msgstr "複製網頁鏈結"
@@ -59,256 +60,61 @@ msgid "Select to get a copy of this version"
msgstr "選擇以取得該版本的複本"
#. A menu item that takes the user to http://www.sparkleshare.org/
-#: ../SparkleShare/SparkleAbout.cs:46 ../SparkleShare/SparkleStatusIcon.cs:275
+#: ../SparkleShare/SparkleAbout.cs:54 ../SparkleShare/SparkleStatusIcon.cs:275
msgid "About SparkleShare"
msgstr ""
-#: ../SparkleShare/SparkleAbout.cs:53
-msgid "A newer version is available"
+#: ../SparkleShare/SparkleAbout.cs:72
+#, csharp-format
+msgid "A newer version ({0}) is available!"
msgstr ""
-#: ../SparkleShare/SparkleAbout.cs:60
+#: ../SparkleShare/SparkleAbout.cs:80
msgid "You are running the latest version."
msgstr ""
-#: ../SparkleShare/SparkleAbout.cs:87
+#: ../SparkleShare/SparkleAbout.cs:88 ../SparkleShare/SparkleAbout.cs:110
msgid "Checking for updates..."
msgstr ""
-#: ../SparkleShare/SparkleAbout.cs:116
-msgid "_Show Credits"
+#: ../SparkleShare/SparkleController.cs:446
+msgid "dddd, MMMM d, yyyy"
msgstr ""
-#: ../SparkleShare/SparkleAbout.cs:129
-msgid "_Visit Website"
+#: ../SparkleShare/SparkleController.cs:451
+msgid "dddd, MMMM d"
msgstr ""
-#: ../SparkleShare/SparkleController.cs:455
-msgid "ddd MMM d, yyyy"
-msgstr ""
-
-#: ../SparkleShare/SparkleController.cs:460
-msgid "ddd MMM d"
-msgstr ""
-
-#: ../SparkleShare/SparkleController.cs:661
+#: ../SparkleShare/SparkleController.cs:660
#, csharp-format
msgid "added ‘{0}’"
msgstr ""
-#: ../SparkleShare/SparkleController.cs:666
+#: ../SparkleShare/SparkleController.cs:665
#, csharp-format
msgid "moved ‘{0}’"
msgstr ""
-#: ../SparkleShare/SparkleController.cs:671
+#: ../SparkleShare/SparkleController.cs:670
#, csharp-format
msgid "edited ‘{0}’"
msgstr ""
-#: ../SparkleShare/SparkleController.cs:676
+#: ../SparkleShare/SparkleController.cs:675
#, csharp-format
msgid "deleted ‘{0}’"
msgstr ""
-#: ../SparkleShare/SparkleController.cs:685
+#: ../SparkleShare/SparkleController.cs:684
#, csharp-format
msgid "and {0} more"
msgid_plural "and {0} more"
msgstr[0] ""
-#: ../SparkleShare/SparkleController.cs:689
+#: ../SparkleShare/SparkleController.cs:688
msgid "did something magical"
msgstr ""
-#: ../SparkleShare/SparkleIntro.cs:73
-msgid ""
-"Before we can create a SparkleShare folder on this computer, we need a few "
-"bits of information from you."
-msgstr "我們在這臺電腦中可以建立 SparkleShare 資料夾之前,我們需要您的幾點資訊。"
-
-#: ../SparkleShare/SparkleIntro.cs:83
-msgid "Full Name:"
-msgstr "全名:"
-
-#: ../SparkleShare/SparkleIntro.cs:98
-msgid "Email:"
-msgstr "電子郵件:"
-
-#: ../SparkleShare/SparkleIntro.cs:109
-msgid "Next"
-msgstr "下一步"
-
-#: ../SparkleShare/SparkleIntro.cs:115
-msgid "Configuring…"
-msgstr "設定中…"
-
-#: ../SparkleShare/SparkleIntro.cs:161
-msgid "Where is your remote folder?"
-msgstr "遠端資料夾在什麼地方?"
-
-#: ../SparkleShare/SparkleIntro.cs:174
-msgid "address-to-server.com"
-msgstr "address-to-server.com"
-
-#: ../SparkleShare/SparkleIntro.cs:179
-msgid "On my own server:"
-msgstr "在我自己的伺服器上:"
-
-#: ../SparkleShare/SparkleIntro.cs:186
-msgid "Free hosting for Free and Open Source Software projects."
-msgstr "提供給自由和開放原始碼軟體專案的免費主機。"
-
-#: ../SparkleShare/SparkleIntro.cs:187
-msgid "Also has paid accounts for extra private space and bandwidth."
-msgstr "也有付款帳號可提供額外私人空間和頻寬。"
-
-#: ../SparkleShare/SparkleIntro.cs:195
-msgid "The GNOME Project"
-msgstr "GNOME 專案"
-
-#: ../SparkleShare/SparkleIntro.cs:197
-msgid "GNOME is an easy to understand interface to your computer."
-msgstr "GNOME 是一個簡單易懂的電腦使用介面"
-
-#: ../SparkleShare/SparkleIntro.cs:198
-msgid "Select this option if you’re a developer or designer working on GNOME."
-msgstr "如果您是 GNOME 開發人員或設計者就選取這個選項。"
-
-#: ../SparkleShare/SparkleIntro.cs:206
-msgid "Gitorious"
-msgstr "Gitorious"
-
-#: ../SparkleShare/SparkleIntro.cs:208
-msgid "Completely Free as in Freedom infrastructure."
-msgstr "如同在自由基礎架構中的完全自由。"
-
-#: ../SparkleShare/SparkleIntro.cs:209
-msgid "Free accounts for Free and Open Source projects."
-msgstr "提供給自由和開放原始碼專案的免費帳號。"
-
-#: ../SparkleShare/SparkleIntro.cs:220
-msgid "Username/Folder"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:225
-msgid "Project/Folder"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:230
-msgid "Project"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:235 ../SparkleShare/SparkleIntro.cs:254
-msgid "Folder"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:259 ../SparkleShare/SparkleIntro.cs:377
-msgid "Folder Name:"
-msgstr "資料夾名稱:"
-
-#: ../SparkleShare/SparkleIntro.cs:269
-msgid "Sync"
-msgstr "同步"
-
-#: ../SparkleShare/SparkleIntro.cs:312
-msgid "Cancel"
-msgstr "取消"
-
-#: ../SparkleShare/SparkleIntro.cs:320
-msgid "Skip"
-msgstr "跳過"
-
-#: ../SparkleShare/SparkleIntro.cs:347
-msgid "Invitation received!"
-msgstr "收到邀請!"
-
-#: ../SparkleShare/SparkleIntro.cs:353
-msgid ""
-"You've received an invitation to join a shared folder.\n"
-"We're ready to hook you up immediately if you wish."
-msgstr ""
-"您已收到加入共享資料夾的邀請。\n"
-"如果您願意的話,我們可以立刻將您聯結。"
-
-#: ../SparkleShare/SparkleIntro.cs:359
-msgid "Do you accept this invitation?"
-msgstr "您接受這個邀請嗎?"
-
-#: ../SparkleShare/SparkleIntro.cs:368
-msgid "Server Address:"
-msgstr "伺服器位址:"
-
-#: ../SparkleShare/SparkleIntro.cs:391
-msgid "Reject"
-msgstr "拒絕"
-
-#: ../SparkleShare/SparkleIntro.cs:392
-msgid "Accept and Sync"
-msgstr "接受並同步"
-
-#: ../SparkleShare/SparkleIntro.cs:442
-msgid "Something went wrong…"
-msgstr "有些地方發生了錯誤…"
-
-#: ../SparkleShare/SparkleIntro.cs:448
-msgid "Try Again"
-msgstr "再試一次"
-
-#: ../SparkleShare/SparkleIntro.cs:473
-#, csharp-format
-msgid "‘{0}’ has been successfully added"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:482
-msgid "Folder synced successfully!"
-msgstr "資料夾同步成功!"
-
-#: ../SparkleShare/SparkleIntro.cs:489
-#, csharp-format
-msgid ""
-"Now you can access the synced files from ‘{0}’ in your SparkleShare folder."
-msgstr "現在您可以在 SparkleShare 資料夾中「{0}」存取同步的檔案。"
-
-#. A button that opens the synced folder
-#: ../SparkleShare/SparkleIntro.cs:497
-msgid "Open Folder"
-msgstr "開啟資料夾"
-
-#: ../SparkleShare/SparkleIntro.cs:503 ../SparkleShare/SparkleIntro.cs:543
-#: ../SparkleShare/SparkleIntro.cs:604
-msgid "Finish"
-msgstr "完成"
-
-#: ../SparkleShare/SparkleIntro.cs:528
-#, csharp-format
-msgid "Syncing folder ‘{0}’…"
-msgstr "正在同步資料夾「{0}」…"
-
-#: ../SparkleShare/SparkleIntro.cs:535
-msgid "This may take a while.\n"
-msgstr "這也許會花費一點時間。\n"
-
-#: ../SparkleShare/SparkleIntro.cs:536
-msgid "Are you sure it’s not coffee o'clock?"
-msgstr ""
-
-#: ../SparkleShare/SparkleIntro.cs:579
-msgid "SparkleShare is ready to go!"
-msgstr "SparkleShare 準備啟用!"
-
-#: ../SparkleShare/SparkleIntro.cs:585
-msgid ""
-"Now you can start accepting invitations from others. \n"
-"Just click on invitations you get by email and we will take care of the rest."
-msgstr ""
-"現在您可以開始接受其他人的邀請。\n"
-"只要在您的電子郵件邀請上按一下,我們就會做好其餘的工作。"
-
-#: ../SparkleShare/SparkleIntro.cs:596
-msgid "Learn how to host your own SparkleServer"
-msgstr "學習如何照料自己的 SparkleServer"
-
#: ../SparkleShare/SparkleEventLog.cs:61
msgid "Recent Events"
msgstr ""
@@ -318,6 +124,148 @@ msgstr ""
msgid "All Folders"
msgstr ""
+#: ../SparkleShare/SparkleSetup.cs:70
+msgid ""
+"Before we can create a SparkleShare folder on this computer, we need a few "
+"bits of information from you."
+msgstr "我們在這臺電腦中可以建立 SparkleShare 資料夾之前,我們需要您的幾點資訊。"
+
+#: ../SparkleShare/SparkleSetup.cs:77
+msgid "Full Name:"
+msgstr "全名:"
+
+#: ../SparkleShare/SparkleSetup.cs:92
+msgid "Email:"
+msgstr "電子郵件:"
+
+#: ../SparkleShare/SparkleSetup.cs:102
+msgid "Next"
+msgstr "下一步"
+
+#: ../SparkleShare/SparkleSetup.cs:122
+msgid "Where is your remote folder?"
+msgstr "遠端資料夾在什麼地方?"
+
+#. Own server radiobutton
+#: ../SparkleShare/SparkleSetup.cs:131
+msgid "On my own server:"
+msgstr "在我自己的伺服器上:"
+
+#: ../SparkleShare/SparkleSetup.cs:136 ../SparkleShare/SparkleSetup.cs:238
+msgid "Folder"
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:163
+msgid "address-to-server.com"
+msgstr "address-to-server.com"
+
+#: ../SparkleShare/SparkleSetup.cs:178
+msgid "Free hosting for Free and Open Source Software projects."
+msgstr "提供給自由和開放原始碼軟體專案的免費主機。"
+
+#: ../SparkleShare/SparkleSetup.cs:179
+msgid "Also has paid accounts for extra private space and bandwidth."
+msgstr "也有付款帳號可提供額外私人空間和頻寬。"
+
+#: ../SparkleShare/SparkleSetup.cs:188
+msgid "Username/Folder"
+msgstr ""
+
+#. Gitorious radiobutton
+#: ../SparkleShare/SparkleSetup.cs:193
+msgid "Gitorious"
+msgstr "Gitorious"
+
+#: ../SparkleShare/SparkleSetup.cs:195
+msgid "Completely Free as in Freedom infrastructure."
+msgstr "如同在自由基礎架構中的完全自由。"
+
+#: ../SparkleShare/SparkleSetup.cs:196
+msgid "Free accounts for Free and Open Source projects."
+msgstr "提供給自由和開放原始碼專案的免費帳號。"
+
+#: ../SparkleShare/SparkleSetup.cs:205
+msgid "Project/Folder"
+msgstr ""
+
+#. GNOME radiobutton
+#: ../SparkleShare/SparkleSetup.cs:210
+msgid "The GNOME Project"
+msgstr "GNOME 專案"
+
+#: ../SparkleShare/SparkleSetup.cs:212
+msgid "GNOME is an easy to understand interface to your computer."
+msgstr "GNOME 是一個簡單易懂的電腦使用介面"
+
+#: ../SparkleShare/SparkleSetup.cs:213
+msgid "Select this option if you’re a developer or designer working on GNOME."
+msgstr "如果您是 GNOME 開發人員或設計者就選取這個選項。"
+
+#: ../SparkleShare/SparkleSetup.cs:222
+msgid "Project"
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:232
+msgid "Folder Name:"
+msgstr "資料夾名稱:"
+
+#. Cancel button
+#: ../SparkleShare/SparkleSetup.cs:251
+msgid "Cancel"
+msgstr "取消"
+
+#. Sync button
+#: ../SparkleShare/SparkleSetup.cs:259
+msgid "Sync"
+msgstr "同步"
+
+#: ../SparkleShare/SparkleSetup.cs:286
+#, csharp-format
+msgid "Syncing folder ‘{0}’…"
+msgstr "正在同步資料夾「{0}」…"
+
+#: ../SparkleShare/SparkleSetup.cs:287
+msgid "This may take a while."
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:288
+msgid "Are you sure it’s not coffee o'clock?"
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:292 ../SparkleShare/SparkleSetup.cs:375
+msgid "Finish"
+msgstr "完成"
+
+#: ../SparkleShare/SparkleSetup.cs:321
+msgid "Something went wrong"
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:341
+msgid "Try Again"
+msgstr "再試一次"
+
+#: ../SparkleShare/SparkleSetup.cs:359
+#, csharp-format
+msgid "‘{0}’ has been successfully added"
+msgstr ""
+
+#: ../SparkleShare/SparkleSetup.cs:365
+msgid "Folder synced successfully!"
+msgstr "資料夾同步成功!"
+
+#: ../SparkleShare/SparkleSetup.cs:366
+msgid "Access the synced files from your SparkleShare folder."
+msgstr ""
+
+#. A button that opens the synced folder
+#: ../SparkleShare/SparkleSetup.cs:369
+msgid "Open Folder"
+msgstr "開啟資料夾"
+
+#: ../SparkleShare/SparkleSetupWindow.cs:45
+msgid "SparkleShare Setup"
+msgstr ""
+
#: ../SparkleShare/SparkleShare.cs:53
msgid "Sorry, you can't run SparkleShare with these permissions."
msgstr "抱歉,您不能以此權限執行 SparkleShare。"
@@ -400,20 +348,8 @@ msgid "Turn Notifications On"
msgstr ""
#. A menu item that quits the application
-#: ../SparkleShare/SparkleStatusIcon.cs:286
+#: ../SparkleShare/SparkleStatusIcon.cs:291
msgid "Quit"
msgstr "離開"
-#: ../SparkleShare/SparkleUI.cs:99
-msgid "Ouch! Mid-air collision!"
-msgstr "噢!半空中相撞!"
-
-#: ../SparkleShare/SparkleUI.cs:100
-msgid "Don't worry, SparkleShare made a copy of each conflicting file."
-msgstr "別擔心,SparkleShare 對每個衝突檔案都會製作複本。"
-
-#: ../SparkleShare/SparkleWindow.cs:41
-msgid "SparkleShare Setup"
-msgstr ""
-