simias-svn Mailing List for simias (Page 8)
Brought to you by:
srinidhi_bs
Menu
▾
▴
simias-svn
You can subscribe to this list here.
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(6) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2010 |
Jan
|
Feb
(16) |
Mar
(9) |
Apr
(20) |
May
(24) |
Jun
(30) |
Jul
(29) |
Aug
(47) |
Sep
(11) |
Oct
(5) |
Nov
(3) |
Dec
(1) |
| 2011 |
Jan
(5) |
Feb
(2) |
Mar
(6) |
Apr
(15) |
May
(3) |
Jun
(2) |
Jul
(2) |
Aug
(5) |
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
(1) |
Apr
(5) |
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
(6) |
Sep
(20) |
Oct
(5) |
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
(3) |
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
(4) |
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2017 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <jj...@us...> - 2010-07-14 07:00:06
|
Revision: 7430
http://simias.svn.sourceforge.net/simias/?rev=7430&view=rev
Author: jjohnny
Date: 2010-07-14 07:00:00 +0000 (Wed, 14 Jul 2010)
Log Message:
-----------
ID: Bug #588607
Reviewers: Anil
Localization Required: No
Documentation Required: No
Description: In ifolder_shutdown filter out grep when doing a ps.
Modified Paths:
--------------
trunk/src/server/setup/ifolder_shutdown
Modified: trunk/src/server/setup/ifolder_shutdown
===================================================================
--- trunk/src/server/setup/ifolder_shutdown 2010-07-14 06:59:30 UTC (rev 7429)
+++ trunk/src/server/setup/ifolder_shutdown 2010-07-14 07:00:00 UTC (rev 7430)
@@ -47,7 +47,7 @@
/opt/novell/ifolder3/mono/bin/mod-mono-server2 --filename /tmp/mod_mono_server_ifolder --terminate
for (( i = 0 ; i < 4; i++ ))
do
- SimiasProcess=`ps -ef | grep -c mod_mono_server_simias10`
+ SimiasProcess=`ps -ef | grep -c mod_mono_server_simias1[0]`
if [ $SimiasProcess -gt 0 ]; then
sleep 5
/opt/novell/ifolder3/mono/bin/mod-mono-server2 --filename /tmp/mod_mono_server_simias10 --terminate
@@ -64,7 +64,7 @@
mod-mono-server2 --filename /tmp/mod_mono_server_ifolder --terminate
for (( i = 0 ; i < 4; i++ ))
do
- SimiasProcess=`ps -ef | grep -c mod_mono_server_simias10`
+ SimiasProcess=`ps -ef | grep -c mod_mono_server_simias1[0]`
if [ $SimiasProcess -gt 0 ]; then
sleep 5
mod-mono-server2 --filename /tmp/mod_mono_server_simias10 --terminate
@@ -74,7 +74,7 @@
done
fi
-SimiasProcess=`ps -ef | grep -c mod_mono_server_simias10`
+SimiasProcess=`ps -ef | grep -c mod_mono_server_simias1[0]`
if [ $SimiasProcess -gt 0 ]; then
PID=`ps -ef | grep mod_mono_server_simias10 | grep wwwrun | awk '{ print $2 }'`
kill -9 $PID
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jj...@us...> - 2010-07-14 06:59:40
|
Revision: 7429
http://simias.svn.sourceforge.net/simias/?rev=7429&view=rev
Author: jjohnny
Date: 2010-07-14 06:59:30 +0000 (Wed, 14 Jul 2010)
Log Message:
-----------
ID: Bug #614131
Reviewers: Ramesh
Localization Required: No
Documentation Required: No
Description: Supress Local Domain, Local Database and Notificaiton Log collection's start / stop events in client.
Modified Paths:
--------------
trunk/src/core/Notifications/Notification.cs
trunk/src/core/SimiasClient/NodeTypes.cs
trunk/src/core/Sync/SyncClient.cs
Modified: trunk/src/core/Notifications/Notification.cs
===================================================================
--- trunk/src/core/Notifications/Notification.cs 2010-07-14 04:02:30 UTC (rev 7428)
+++ trunk/src/core/Notifications/Notification.cs 2010-07-14 06:59:30 UTC (rev 7429)
@@ -116,7 +116,7 @@
}
else
{
- notificationLog = new NotificationLog( store, "NotificationLog", Guid.NewGuid().ToString(), "NotificationLog", store.LocalDomain );
+ notificationLog = new NotificationLog( store, "NotificationLog", Guid.NewGuid().ToString(), NodeTypes.NotificationLogType, store.LocalDomain );
}
if ( neArgs != null )
@@ -1257,7 +1257,7 @@
NotificationLog notificationLog = null;
// Get the notifications collection.
- ICSList list = store.GetCollectionsByType( "NotificationLog" );
+ ICSList list = store.GetCollectionsByType( NodeTypes.NotificationLogType );
if ( list.Count > 1 )
{
// Shouldn't have more than one notification collection.
Modified: trunk/src/core/SimiasClient/NodeTypes.cs
===================================================================
--- trunk/src/core/SimiasClient/NodeTypes.cs 2010-07-14 04:02:30 UTC (rev 7428)
+++ trunk/src/core/SimiasClient/NodeTypes.cs 2010-07-14 06:59:30 UTC (rev 7429)
@@ -103,6 +103,11 @@
Node,
/// <summary>
+ /// NotificationLog
+ /// </summary>
+ NotificationLog,
+
+ /// <summary>
/// POBox
/// </summary>
POBox,
@@ -222,6 +227,14 @@
}
/// <summary>
+ /// Gets the NotificationLog class name.
+ /// </summary>
+ static public string NotificationLogType
+ {
+ get { return NodeTypeEnum.NotificationLog.ToString(); }
+ }
+
+ /// <summary>
/// Gets the POBox class name.
/// </summary>
static public string POBoxType
Modified: trunk/src/core/Sync/SyncClient.cs
===================================================================
--- trunk/src/core/Sync/SyncClient.cs 2010-07-14 04:02:30 UTC (rev 7428)
+++ trunk/src/core/Sync/SyncClient.cs 2010-07-14 06:59:30 UTC (rev 7429)
@@ -1045,18 +1045,37 @@
firstSync = true;
}
+
/// <summary>
+ /// Checks if the collection is a LocalDomain, LocalDatabase or a NotificationLog type.
+ /// </summary>
+ private static bool IsLocalDomainOrDb (string ID)
+ {
+ Store store = Store.GetStore();
+ Collection col = store.GetCollectionByID(ID);
+
+ return (col.IsType (NodeTypes.LocalDatabaseType) || //LocalDatabase
+ (col.IsBaseType (NodeTypes.DomainType) && col.Role == SyncRoles.Local) || //Local Domain
+ col.IsBaseType (NodeTypes.NotificationLogType)); //Notification Logs.
+ }
+
+ /// <summary>
/// Called to synchronize this collection.
/// </summary>
public void SyncNow()
{
log.Debug("In sync now...");
// Assume the server is alive.
- bool sAlive = false;
+ bool sAlive = false;
bool nopassphrase = false;
+
+ //Note : Suppress events emitted for LocalDatabase and Local domain when simias is running as client.
+ bool publishEvent = (!Store.IsEnterpriseServer && !IsLocalDomainOrDb (collection.ID));
try
{
- eventPublisher.RaiseEvent(new CollectionSyncEventArgs(collection.Name, collection.ID, Simias.Client.Event.Action.StartLocalSync, true, false));
+ if (publishEvent)
+ eventPublisher.RaiseEvent(new CollectionSyncEventArgs(collection.Name, collection.ID, Simias.Client.Event.Action.StartLocalSync, true, false));
+
syncStartTime = DateTime.Now;
queuedChanges = false;
running = true;
@@ -1364,7 +1383,7 @@
serverAlive = sAlive;
running = false;
fileMonitor.ToDredge = false;
- if( !nopassphrase)
+ if( !nopassphrase && publishEvent)
eventPublisher.RaiseEvent(new CollectionSyncEventArgs(collection.Name, collection.ID, Simias.Client.Event.Action.StopSync, sAlive, yielded));
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sb...@us...> - 2010-07-14 04:02:37
|
Revision: 7428
http://simias.svn.sourceforge.net/simias/?rev=7428&view=rev
Author: sbipin
Date: 2010-07-14 04:02:30 +0000 (Wed, 14 Jul 2010)
Log Message:
-----------
ID: #535525
Reviewer: Shane
Localization Required: No
Documentation Required: No
Description: Removed redundant colons on iFolder Details page.
This fix is done for all languages.
Modified Paths:
--------------
trunk/src/webaccess/iFolderWeb.cs.resx
trunk/src/webaccess/iFolderWeb.de.resx
trunk/src/webaccess/iFolderWeb.es.resx
trunk/src/webaccess/iFolderWeb.fr.resx
trunk/src/webaccess/iFolderWeb.hu.resx
trunk/src/webaccess/iFolderWeb.it.resx
trunk/src/webaccess/iFolderWeb.ja.resx
trunk/src/webaccess/iFolderWeb.pl.resx
trunk/src/webaccess/iFolderWeb.pt-BR.resx
trunk/src/webaccess/iFolderWeb.ru.resx
trunk/src/webaccess/iFolderWeb.sk.resx
trunk/src/webaccess/iFolderWeb.zh-CN.resx
trunk/src/webaccess/iFolderWeb.zh-TW.resx
Modified: trunk/src/webaccess/iFolderWeb.cs.resx
===================================================================
--- trunk/src/webaccess/iFolderWeb.cs.resx 2010-07-13 13:00:24 UTC (rev 7427)
+++ trunk/src/webaccess/iFolderWeb.cs.resx 2010-07-14 04:02:30 UTC (rev 7428)
@@ -122,7 +122,7 @@
<value>Japonština</value>
</data>
<data name="NAME">
- <value>Název:</value>
+ <value>Název</value>
</data>
<data name="TODAY">
<value>Dnes</value>
@@ -527,7 +527,7 @@
<value>Němčina</value>
</data>
<data name="DESCRIPTION">
- <value>Popis:</value>
+ <value>Popis</value>
</data>
<data name="IFOLDER.IFOLDERS">
<value>Složky iFolder:</value>
Modified: trunk/src/webaccess/iFolderWeb.de.resx
===================================================================
--- trunk/src/webaccess/iFolderWeb.de.resx 2010-07-13 13:00:24 UTC (rev 7427)
+++ trunk/src/webaccess/iFolderWeb.de.resx 2010-07-14 04:02:30 UTC (rev 7428)
@@ -122,7 +122,7 @@
<value>Japanisch</value>
</data>
<data name="NAME">
- <value>Name:</value>
+ <value>Name</value>
</data>
<data name="TODAY">
<value>Heute</value>
@@ -527,7 +527,7 @@
<value>Deutsch</value>
</data>
<data name="DESCRIPTION">
- <value>Beschreibung:</value>
+ <value>Beschreibung</value>
</data>
<data name="IFOLDER.IFOLDERS">
<value>iFolder-Ordner:</value>
Modified: trunk/src/webaccess/iFolderWeb.es.resx
===================================================================
--- trunk/src/webaccess/iFolderWeb.es.resx 2010-07-13 13:00:24 UTC (rev 7427)
+++ trunk/src/webaccess/iFolderWeb.es.resx 2010-07-14 04:02:30 UTC (rev 7428)
@@ -122,7 +122,7 @@
<value>Japonés</value>
</data>
<data name="NAME">
- <value>Nombre:</value>
+ <value>Nombre</value>
</data>
<data name="TODAY">
<value>Hoy</value>
@@ -527,7 +527,7 @@
<value>Alemán</value>
</data>
<data name="DESCRIPTION">
- <value>Descripción:</value>
+ <value>Descripción</value>
</data>
<data name="IFOLDER.IFOLDERS">
<value>Carpetas iFolder:</value>
Modified: trunk/src/webaccess/iFolderWeb.fr.resx
===================================================================
--- trunk/src/webaccess/iFolderWeb.fr.resx 2010-07-13 13:00:24 UTC (rev 7427)
+++ trunk/src/webaccess/iFolderWeb.fr.resx 2010-07-14 04:02:30 UTC (rev 7428)
@@ -122,7 +122,7 @@
<value>Japonais</value>
</data>
<data name="NAME">
- <value>Nom :</value>
+ <value>Nom </value>
</data>
<data name="TODAY">
<value>Aujourd'hui</value>
@@ -527,7 +527,7 @@
<value>Allemand</value>
</data>
<data name="DESCRIPTION">
- <value>Description :</value>
+ <value>Description </value>
</data>
<data name="IFOLDER.IFOLDERS">
<value>Dossiers iFolder :</value>
Modified: trunk/src/webaccess/iFolderWeb.hu.resx
===================================================================
--- trunk/src/webaccess/iFolderWeb.hu.resx 2010-07-13 13:00:24 UTC (rev 7427)
+++ trunk/src/webaccess/iFolderWeb.hu.resx 2010-07-14 04:02:30 UTC (rev 7428)
@@ -122,7 +122,7 @@
<value>japán</value>
</data>
<data name="NAME">
- <value>Név:</value>
+ <value>Név</value>
</data>
<data name="TODAY">
<value>ma</value>
@@ -527,7 +527,7 @@
<value>német</value>
</data>
<data name="DESCRIPTION">
- <value>Leírás:</value>
+ <value>Leírás</value>
</data>
<data name="IFOLDER.IFOLDERS">
<value>iFolder mappák:</value>
Modified: trunk/src/webaccess/iFolderWeb.it.resx
===================================================================
--- trunk/src/webaccess/iFolderWeb.it.resx 2010-07-13 13:00:24 UTC (rev 7427)
+++ trunk/src/webaccess/iFolderWeb.it.resx 2010-07-14 04:02:30 UTC (rev 7428)
@@ -122,7 +122,7 @@
<value>Giapponese</value>
</data>
<data name="NAME">
- <value>Nome:</value>
+ <value>Nome</value>
</data>
<data name="TODAY">
<value>Oggi</value>
@@ -527,7 +527,7 @@
<value>Tedesco</value>
</data>
<data name="DESCRIPTION">
- <value>Descrizione:</value>
+ <value>Descrizione</value>
</data>
<data name="IFOLDER.IFOLDERS">
<value>iFolder:</value>
Modified: trunk/src/webaccess/iFolderWeb.ja.resx
===================================================================
--- trunk/src/webaccess/iFolderWeb.ja.resx 2010-07-13 13:00:24 UTC (rev 7427)
+++ trunk/src/webaccess/iFolderWeb.ja.resx 2010-07-14 04:02:30 UTC (rev 7428)
@@ -122,7 +122,7 @@
<value>日本語</value>
</data>
<data name="NAME">
- <value>名前:</value>
+ <value>名前</value>
</data>
<data name="TODAY">
<value>今日</value>
@@ -527,7 +527,7 @@
<value>ドイツ語</value>
</data>
<data name="DESCRIPTION">
- <value>説明:</value>
+ <value>説明</value>
</data>
<data name="IFOLDER.IFOLDERS">
<value>iFolder:</value>
Modified: trunk/src/webaccess/iFolderWeb.pl.resx
===================================================================
--- trunk/src/webaccess/iFolderWeb.pl.resx 2010-07-13 13:00:24 UTC (rev 7427)
+++ trunk/src/webaccess/iFolderWeb.pl.resx 2010-07-14 04:02:30 UTC (rev 7428)
@@ -122,7 +122,7 @@
<value>Japoński</value>
</data>
<data name="NAME">
- <value>Nazwa:</value>
+ <value>Nazwa</value>
</data>
<data name="TODAY">
<value>Dzisiaj</value>
@@ -527,7 +527,7 @@
<value>Niemiecki</value>
</data>
<data name="DESCRIPTION">
- <value>Opis:</value>
+ <value>Opis</value>
</data>
<data name="IFOLDER.IFOLDERS">
<value>iFoldery:</value>
Modified: trunk/src/webaccess/iFolderWeb.pt-BR.resx
===================================================================
--- trunk/src/webaccess/iFolderWeb.pt-BR.resx 2010-07-13 13:00:24 UTC (rev 7427)
+++ trunk/src/webaccess/iFolderWeb.pt-BR.resx 2010-07-14 04:02:30 UTC (rev 7428)
@@ -122,7 +122,7 @@
<value>Japonês</value>
</data>
<data name="NAME">
- <value>Nome:</value>
+ <value>Nome</value>
</data>
<data name="TODAY">
<value>Hoje</value>
@@ -527,7 +527,7 @@
<value>Alemão</value>
</data>
<data name="DESCRIPTION">
- <value>Descrição:</value>
+ <value>Descrição</value>
</data>
<data name="IFOLDER.IFOLDERS">
<value>Pastas do iFolder:</value>
Modified: trunk/src/webaccess/iFolderWeb.ru.resx
===================================================================
--- trunk/src/webaccess/iFolderWeb.ru.resx 2010-07-13 13:00:24 UTC (rev 7427)
+++ trunk/src/webaccess/iFolderWeb.ru.resx 2010-07-14 04:02:30 UTC (rev 7428)
@@ -122,7 +122,7 @@
<value>Японский</value>
</data>
<data name="NAME">
- <value>Имя:</value>
+ <value>Имя</value>
</data>
<data name="TODAY">
<value>Сегодня</value>
@@ -527,7 +527,7 @@
<value>Немецкий</value>
</data>
<data name="DESCRIPTION">
- <value>Описание:</value>
+ <value>Описание</value>
</data>
<data name="IFOLDER.IFOLDERS">
<value>Папки iFolder:</value>
Modified: trunk/src/webaccess/iFolderWeb.sk.resx
===================================================================
--- trunk/src/webaccess/iFolderWeb.sk.resx 2010-07-13 13:00:24 UTC (rev 7427)
+++ trunk/src/webaccess/iFolderWeb.sk.resx 2010-07-14 04:02:30 UTC (rev 7428)
@@ -122,7 +122,7 @@
<value>japončina</value>
</data>
<data name="NAME">
- <value>Názov:</value>
+ <value>Názov</value>
</data>
<data name="TODAY">
<value>Dnes</value>
@@ -527,7 +527,7 @@
<value>nemčina</value>
</data>
<data name="DESCRIPTION">
- <value>Popis:</value>
+ <value>Popis</value>
</data>
<data name="IFOLDER.IFOLDERS">
<value>Priečinky iFolder:</value>
Modified: trunk/src/webaccess/iFolderWeb.zh-CN.resx
===================================================================
--- trunk/src/webaccess/iFolderWeb.zh-CN.resx 2010-07-13 13:00:24 UTC (rev 7427)
+++ trunk/src/webaccess/iFolderWeb.zh-CN.resx 2010-07-14 04:02:30 UTC (rev 7428)
@@ -122,7 +122,7 @@
<value>日语</value>
</data>
<data name="NAME">
- <value>名称：</value>
+ <value>名称</value>
</data>
<data name="TODAY">
<value>今天</value>
@@ -527,7 +527,7 @@
<value>德语</value>
</data>
<data name="DESCRIPTION">
- <value>说明：</value>
+ <value>说明</value>
</data>
<data name="IFOLDER.IFOLDERS">
<value>iFolder：</value>
Modified: trunk/src/webaccess/iFolderWeb.zh-TW.resx
===================================================================
--- trunk/src/webaccess/iFolderWeb.zh-TW.resx 2010-07-13 13:00:24 UTC (rev 7427)
+++ trunk/src/webaccess/iFolderWeb.zh-TW.resx 2010-07-14 04:02:30 UTC (rev 7428)
@@ -122,7 +122,7 @@
<value>日文</value>
</data>
<data name="NAME">
- <value>名稱：</value>
+ <value>名稱</value>
</data>
<data name="TODAY">
<value>今天</value>
@@ -527,7 +527,7 @@
<value>德文</value>
</data>
<data name="DESCRIPTION">
- <value>說明：</value>
+ <value>說明</value>
</data>
<data name="IFOLDER.IFOLDERS">
<value>iFolder：</value>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ra...@us...> - 2010-07-08 05:29:14
|
Revision: 7426
http://simias.svn.sourceforge.net/simias/?rev=7426&view=rev
Author: ravim85
Date: 2010-07-08 05:29:08 +0000 (Thu, 08 Jul 2010)
Log Message:
-----------
Fixed build issues for 11.2 and factory. Reviewed by Srinidhi. Built and
tested on BuildService
Modified Paths:
--------------
trunk/package/linux/simias.spec.in
Modified: trunk/package/linux/simias.spec.in
===================================================================
--- trunk/package/linux/simias.spec.in 2010-07-07 05:42:03 UTC (rev 7425)
+++ trunk/package/linux/simias.spec.in 2010-07-08 05:29:08 UTC (rev 7426)
@@ -113,7 +113,8 @@
%{__rm} -rf $RPM_BUILD_ROOT
#=============================================================================
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
#=============================================================================
%preun
@@ -127,7 +128,8 @@
fi
#=============================================================================
-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig
#=============================================================================
%files
@@ -146,8 +148,6 @@
%{prefix}/%_lib/libsimias-manager.a
%{prefix}/%_lib/libsimias-event.so.0
%{prefix}/%_lib/libsimias-event.so.0.0.0
-%{prefix}/%_lib/libsimias-manager.so.0
-%{prefix}/%_lib/libsimias-manager.so.0.0.0
%{prefix}/%_lib/libsimias.so
%{prefix}/%_lib/libsimias.so.0
%{prefix}/%_lib/libsimias.so.0.0.0
@@ -162,7 +162,6 @@
%endif
%{prefix}/%_lib/libFlaimWrapper.so
%{prefix}/%_lib/libsimias-event.so
-%{prefix}/%_lib/libsimias-manager.so
%{prefix}/%_lib/libsimias.so
%{prefix}/%_lib/pkgconfig/*
%dir %{prefix}/include/simias/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sb...@us...> - 2010-07-07 05:42:10
|
Revision: 7425
http://simias.svn.sourceforge.net/simias/?rev=7425&view=rev
Author: sbipin
Date: 2010-07-07 05:42:03 +0000 (Wed, 07 Jul 2010)
Log Message:
-----------
ID: #613203
Reviewer: Shane
Localization Required: No
Documentation Required: No
Description: Included localized files.
Modified Paths:
--------------
trunk/src/admin/iFolderAdmin.cs.resx
trunk/src/admin/iFolderAdmin.de.resx
trunk/src/admin/iFolderAdmin.es.resx
trunk/src/admin/iFolderAdmin.fr.resx
trunk/src/admin/iFolderAdmin.hu.resx
trunk/src/admin/iFolderAdmin.it.resx
trunk/src/admin/iFolderAdmin.ja.resx
trunk/src/admin/iFolderAdmin.pl.resx
trunk/src/admin/iFolderAdmin.pt-BR.resx
trunk/src/admin/iFolderAdmin.ru.resx
trunk/src/admin/iFolderAdmin.sk.resx
trunk/src/admin/iFolderAdmin.zh-CN.resx
trunk/src/admin/iFolderAdmin.zh-TW.resx
trunk/src/webaccess/iFolderWeb.cs.resx
trunk/src/webaccess/iFolderWeb.de.resx
trunk/src/webaccess/iFolderWeb.es.resx
trunk/src/webaccess/iFolderWeb.fr.resx
trunk/src/webaccess/iFolderWeb.hu.resx
trunk/src/webaccess/iFolderWeb.it.resx
trunk/src/webaccess/iFolderWeb.ja.resx
trunk/src/webaccess/iFolderWeb.pl.resx
trunk/src/webaccess/iFolderWeb.pt-BR.resx
trunk/src/webaccess/iFolderWeb.ru.resx
trunk/src/webaccess/iFolderWeb.sk.resx
trunk/src/webaccess/iFolderWeb.zh-CN.resx
trunk/src/webaccess/iFolderWeb.zh-TW.resx
Modified: trunk/src/admin/iFolderAdmin.cs.resx
===================================================================
--- trunk/src/admin/iFolderAdmin.cs.resx 2010-07-06 08:13:30 UTC (rev 7424)
+++ trunk/src/admin/iFolderAdmin.cs.resx 2010-07-07 05:42:03 UTC (rev 7425)
@@ -160,9 +160,6 @@
<data name="SERVERLOGS">
<value>Protokoly serveru</value>
</data>
- <data name="ALLADMINS">
- <value>Všichni správci</value>
- </data>
<data name="PRIVATEURI">
<value>Privátní URL:</value>
</data>
@@ -202,14 +199,14 @@
<data name="REPROVISOINSTATE">
<value>Stav opakovaného poskytování</value>
</data>
- <data name="SPANISH">
- <value>Španělština</value>
+ <data name="CHANGEMASTERFAILED">
+ <value>Nelze změnit hlavní a podřízený server. Další informace zjistíte v souborech protokolu.</value>
</data>
<data name="COMPLETEDTAG">
<value>Dokončeno:</value>
</data>
- <data name="ERRORIFOLDERTRANSFEREXCEPTION">
- <value>Vlastnictví nelze převést, protože překračujete počet složek iFolder nastavený správcem.</value>
+ <data name="ENTERLDAPDETAILS">
+ <value>Zadejte pověření správce LDAP</value>
</data>
<data name="MEMBERTYPELDAPGROUP">
<value>Skupina LDAP</value>
@@ -223,15 +220,21 @@
<data name="USEDTAG">
<value>Využité:</value>
</data>
+ <data name="NEEDSREPAIR">
+ <value>Opravit server</value>
+ </data>
<data name="MEMBERTYPETAG">
<value>Typ člena:</value>
</data>
<data name="NONE">
<value>Žádné</value>
</data>
- <data name="GROUPRIGHTSADDFAILURE">
- <value>Uživatele {0}{1}{2} nebylo možné přidat jako správce pro skupinu {3}{4}{5}. Klepnutím na možnost Opakovat lze znovu přidat skupinu. Klepnutím na tlačítko OK se vrátíte na stránku Systémy. </value>
+ <data name="ERRORIFOLDERTRANSFEREXCEPTION">
+ <value>Vlastnictví nelze převést, protože překračujete počet složek iFolder nastavený správcem.</value>
</data>
+ <data name="running">
+ <value>běží</value>
+ </data>
<data name="ERRORCANNOTDELETESECONDARYADMIN">
<value>Nelze odstranit sekundárního správce {0}.</value>
</data>
@@ -262,9 +265,15 @@
<data name="ERRORCANNOTCHANGERIGHTS">
<value>Není možné změnit členská práva uživatele {0}.</value>
</data>
+ <data name="CHANGEMASTER">
+ <value>Nastavit jako hlavní</value>
+ </data>
<data name="FULLNAME">
<value>Celé jméno</value>
</data>
+ <data name="sleeping">
+ <value>spánek</value>
+ </data>
<data name="LOGINNOCOOKIES">
<value>Musíte ve svém prohlížeči zapnout cookies.</value>
</data>
@@ -274,6 +283,9 @@
<data name="WEEKLY">
<value>Týdně</value>
</data>
+ <data name="shutdown">
+ <value>ukončování</value>
+ </data>
<data name="REPORTIFOLDERTAG">
<value>Složka iFolder:</value>
</data>
@@ -301,12 +313,15 @@
<data name="USERS">
<value>Uživatelé</value>
</data>
- <data name="SET">
- <value>Nastavit</value>
+ <data name="ALLADMINS">
+ <value>Všichni správci</value>
</data>
<data name="LASTPAGE">
<value>Poslední stránka</value>
</data>
+ <data name="CANNOTSETQUOTAPERUSERERROR">
+ <value>Tento limit nelze nastavit, protože celková přidělená disková kvóta na uživatele překračuje kvótu skupiny.</value>
+ </data>
<data name="ERRORDETAIL">
<value>Podrobnosti o chybě</value>
</data>
@@ -319,8 +334,8 @@
<data name="SIZETAG">
<value>Velikost:</value>
</data>
- <data name="FILENAME">
- <value>Název souboru</value>
+ <data name="GENERATEWEEKLYREPORT">
+ <value>Generovat zprávu každý {0} v {1} do {2}</value>
</data>
<data name="LOGINNOSCRIPT">
<value>Musíte ve svém prohlížeči zapnout skripty.</value>
@@ -388,6 +403,9 @@
<data name="GROUPLISTTAG">
<value>Skupiny uživatelů:</value>
</data>
+ <data name="ADDADMINS">
+ <value>Přidat správce</value>
+ </data>
<data name="MINUTES">
<value>Minut</value>
</data>
@@ -406,8 +424,8 @@
<data name="SERVERNAMETAG">
<value>Server:</value>
</data>
- <data name="GROUPRIGHTSEDITSUCCESSFUL">
- <value>Práva správce {0}{1}{2} byla úspěšně upravena pro skupinu {3}{4}{5}. Klepnutím na tlačítko Opakovat provedete operace u dalších skupin stejného správce. Klepnutím na tlačítko OK se vrátíte na stránku Systémy.</value>
+ <data name="ERRORTYPE">
+ <value>Neočekávaná chyba</value>
</data>
<data name="SECONDARY">
<value>Sekundární</value>
@@ -439,14 +457,14 @@
<data name="LOGINERROR">
<value>Chyba:</value>
</data>
- <data name="SELECTGROUPTODELETE">
- <value>Vybrat skupiny k odstranění</value>
+ <data name="CHANGEMASTERNOINFOFAILED">
+ <value>Nelze získat ID serveru a novou veřejnou adresu URL serveru.</value>
</data>
<data name="OWNED">
<value>Vlastněno</value>
</data>
- <data name="ACCOUNT">
- <value>Účet</value>
+ <data name="CHANGEMASTERRETRY">
+ <value>Nelze aktualizovat atribut hlavního uzlu v hlavním nebo podřízeném objektu. Opakujte operaci.</value>
</data>
<data name="USERSTAG">
<value>Uživatelé:</value>
@@ -490,6 +508,9 @@
<data name="ALLOWMODIFYSHARINGPOLICY">
<value>Povolit změny zásad sdílení</value>
</data>
+ <data name="REPORTS">
+ <value>Oznámení</value>
+ </data>
<data name="NOTMOUNTED">
<value>Nepřipojeno</value>
</data>
@@ -508,12 +529,18 @@
<data name="READONLY">
<value>Pouze pro čtení</value>
</data>
+ <data name="ERRORINVALIDIDSYNCINTERVAL">
+ <value>Byl zadán neplatný synchronizační interval. Hodnota musí být v rozmezí 5 až 10080.</value>
+ </data>
<data name="LDAPSERVER">
<value>Server LDAP:</value>
</data>
<data name="IFOLDERUSERS">
<value>Uživatelé aplikace iFolder</value>
</data>
+ <data name="waiting">
+ <value>čeká</value>
+ </data>
<data name="INVALIDFULLPATH">
<value>Zadaná úplná cesta je neplatná, zkontrolujte ji a znovu ji zapište.</value>
</data>
@@ -544,8 +571,8 @@
<data name="SELECTEDUSERS">
<value>Vybraní uživatelé</value>
</data>
- <data name="RESTARTSERVER">
- <value>Informace byly aktualizovány. Tyto změny se projeví až po opětovném spuštění serveru iFolder. </value>
+ <data name="CHINESE-SIMPLIFIED">
+ <value>Zjednodušená čínština</value>
</data>
<data name="PUBLICURI">
<value>Veřejná URL:</value>
@@ -559,9 +586,6 @@
<data name="SERVERDETAILS">
<value>Podrobnosti o serveru</value>
</data>
- <data name="LDAPUPSINCE">
- <value>Do:</value>
- </data>
<data name="USERLOGINDISABLED">
<value>Vypnout přihlášení uživatele</value>
</data>
@@ -658,8 +682,8 @@
<data name="ALLOWMODIFYENCRYPTIONPOLICY">
<value>Povolit změny zásad šifrování</value>
</data>
- <data name="REPROVISIONBUTTON">
- <value>Stav opakovaného poskytování</value>
+ <data name="MEMBER">
+ <value>Člen</value>
</data>
<data name="FILES">
<value>Soubory:</value>
@@ -667,6 +691,9 @@
<data name="ERRORCANNOTREMOVEADMIN">
<value>Není možné odebrat uživatele {0} jako správce.</value>
</data>
+ <data name="CHANGEMASTERWITHWARNING">
+ <value>Byl inovován server {0} jako hlavní server s výjimkami. Další informace najdete v protokolu Simias.log. Restartujte všechny servery, aby se změny projevily.</value>
+ </data>
<data name="PASSWORDSDONOTMATCH">
<value>Zadaná hesla nejsou stejná.</value>
</data>
@@ -688,14 +715,11 @@
<data name="ERRORLOCKEXCEPTION">
<value>Operace byla zrušena protože složka iFolder byla uzamčena/zablokována správcem.</value>
</data>
- <data name="ENTERLDAPDETAILS">
- <value>Zadejte pověření správce LDAP</value>
- </data>
<data name="PASSWORDTAG">
<value>Heslo:</value>
</data>
<data name="SESSIONCLOSED">
- <value>Vaše relace byla ukončena. Znovu se přihlaste.</value>
+ <value>Zadané uživatelské jméno a heslo není správné. Přihlaste se prosím.</value>
</data>
<data name="DNSNAMETAG">
<value>Název DNS:</value>
@@ -784,9 +808,15 @@
<data name="TIME">
<value>Čas</value>
</data>
+ <data name="CONFIGFILEUPDATEFAILED">
+ <value>Nelze aktualizovat konfigurační soubor. Aktualizujte soubor simias.config ručně.</value>
+ </data>
<data name="LOGINSECUREFAILED">
<value>Se serverem iFolder není možné bezpečně komunikovat.</value>
</data>
+ <data name="CONFIRMCHANGEMASTER">
+ <value>Vybraný server bude vyhrazen jako hlavní server. Chcete pokračovat? Klepnutím na tlačítko OK budete pokračovat a klepnutím na tlačítko Storno akci ukončíte.</value>
+ </data>
<data name="LOGINPASSWORD">
<value>Heslo:</value>
</data>
@@ -826,6 +856,9 @@
<data name="ADMINISTRATORS">
<value>Správci</value>
</data>
+ <data name="SELECTGROUPTODELETE">
+ <value>Vybrat skupiny k odstranění</value>
+ </data>
<data name="FORMATTAG">
<value>Formát:</value>
</data>
@@ -862,15 +895,15 @@
<data name="TOTALUSERSTAG">
<value>Celkem uživatelů:</value>
</data>
+ <data name="WEBACCESSLOGFILE">
+ <value>Aplikace Web Access</value>
+ </data>
<data name="ERRORUSERDOESNOTEXIST">
<value>Uvedený uživatel složky iFolder neexistuje.</value>
</data>
<data name="LOGINCOPYRIGHT">
- <value>&copy; Copyright 2009 Novell, Inc. Všechna práva vyhrazena.</value>
+ <value>&copy; Copyright 2010 Novell, Inc. Všechna práva vyhrazena.</value>
</data>
- <data name="GENERATEWEEKLYREPORT">
- <value>Generovat zprávu každý {0} v {1} do {2}</value>
- </data>
<data name="VIEW">
<value>Zobrazit</value>
</data>
@@ -880,12 +913,9 @@
<data name="GENERATEDAILYREPORT">
<value>Generovat zprávu každý den v {0} do {1}</value>
</data>
- <data name="ERRORINSTRUCTIONS">
- <value><p>Aplikace iFolder Web Access zaznamenala neočekávanou chybu.</p> <p>Omlouváme se za veškeré nepříjemnosti a žádáme vás, abyste se odhlásili a zkusili to znovu.</p></value>
+ <data name="MASTERNODEUPDATEWAIT">
+ <value>Čekání na synchronizaci atributu hlavního uzlu s hlavním a podřízenými objekty.</value>
</data>
- <data name="MEMBER">
- <value>Člen</value>
- </data>
<data name="ERRORCANNOTDELETEUSER">
<value>Není možné odstranit ID uživatele {0}.</value>
</data>
@@ -916,8 +946,8 @@
<data name="SELECTMEMBERTOADD">
<value>Vyberte nového sekundárního správce.</value>
</data>
- <data name="ERRORINVALIDIDSYNCINTERVAL">
- <value>Byl zadán neplatný synchronizační interval. Hodnota musí být v rozmezí 5 až 10080.</value>
+ <data name="VOLUME">
+ <value>Svazek</value>
</data>
<data name="IDENTITYSYNCTAG">
<value>Synchronizace identifikačních dat:</value>
@@ -934,9 +964,15 @@
<data name="ADD">
<value>Přidat</value>
</data>
+ <data name="MB">
+ <value>MB</value>
+ </data>
<data name="DISABLE">
<value>Vypnout</value>
</data>
+ <data name="disabled">
+ <value>vypnuto</value>
+ </data>
<data name="ENABLEREPORTING">
<value>Zapnout hlášení</value>
</data>
@@ -946,6 +982,9 @@
<data name="SLOVAK">
<value>Slovenština</value>
</data>
+ <data name="UPDATEMASTERURLONSLAVESFAILED">
+ <value>Nelze aktualizovat hlavní adresu URL na serveru {0}. Aktualizujte hlavní adresu IP na tomto serveru ručně.</value>
+ </data>
<data name="ONLINE">
<value>Online</value>
</data>
@@ -976,17 +1015,23 @@
<data name="COMPLETED">
<value>Dokončeno</value>
</data>
+ <data name="RESTARTSERVER">
+ <value>Informace byly aktualizovány. Tyto změny se projeví až po opětovném spuštění serveru iFolder. </value>
+ </data>
<data name="CZECH">
<value>Čeština</value>
</data>
+ <data name="GROUPQUOTARESTRICTION">
+ <value>Správa používání kvóty skupiny: </value>
+ </data>
<data name="MEMBERLISTTAG">
<value>Členové skupiny:</value>
</data>
<data name="ERRORCANNOTADDADMIN">
<value>Není možné přidat člena {0} jako správce.</value>
</data>
- <data name="ADDADMINS">
- <value>Přidat správce</value>
+ <data name="LDAPUPSINCE">
+ <value>Do:</value>
</data>
<data name="DAYTAG">
<value>Den:</value>
@@ -1018,6 +1063,9 @@
<data name="ERRORINVALIDSYNCINTERVAL">
<value>Byl zadán neplatný synchronizační interval. Hodnota musí být v rozmezí 5 až 999.</value>
</data>
+ <data name="REPROVISIONBUTTON">
+ <value>Stav opakovaného poskytování</value>
+ </data>
<data name="MEMBERTYPELOCALGROUP">
<value>Místní skupina</value>
</data>
@@ -1033,8 +1081,8 @@
<data name="FULLCONTROL">
<value>Úplné řízení</value>
</data>
- <data name="CANNOTSETQUOTAPERUSERERROR">
- <value>Tento limit nelze nastavit, protože celková přidělená disková kvóta na uživatele překračuje kvótu skupiny.</value>
+ <data name="GENERATEMONTHLYREPORT">
+ <value>Generovat zprávu {0}. den každého měsíce v {1} do {2}</value>
</data>
<data name="REPORTDIRECTORY">
<value>Adresář hlášení</value>
@@ -1042,11 +1090,14 @@
<data name="ATTAG">
<value>V:</value>
</data>
+ <data name="SPANISH">
+ <value>Španělština</value>
+ </data>
<data name="ELLIPSES">
<value> . . .</value>
</data>
- <data name="NEWIFOLDERDESCRIPTIONTAG">
- <value>Popis složky iFolder:</value>
+ <data name="ERRORINSTRUCTIONS">
+ <value><p>Aplikace iFolder Web Access zaznamenala neočekávanou chybu.</p> <p>Omlouváme se za veškeré nepříjemnosti a žádáme vás, abyste se odhlásili a zkusili to znovu.</p></value>
</data>
<data name="POLISH">
<value>Polština</value>
@@ -1054,12 +1105,12 @@
<data name="FULLNAMETAG">
<value>Celé jméno:</value>
</data>
- <data name="ERRORTYPE">
- <value>Neočekávaná chyba</value>
- </data>
<data name="ERRORCANNOTSETDESCRIPTION">
<value>Není možné nastavit popis složky iFolder.</value>
</data>
+ <data name="REVERTSHARINGCONNECTFAILED">
+ <value>Nelze se připojit k serveru iFolder. Jakmile bude server dosažitelný, odvolejte sdílení.</value>
+ </data>
<data name="LOGINUNAUTHORIZED">
<value>Zadejte znovu vaše uživatelské jméno a heslo.</value>
</data>
@@ -1069,8 +1120,8 @@
<data name="PENDING">
<value>Probíhající</value>
</data>
- <data name="REPORTS">
- <value>Oznámení</value>
+ <data name="FILENAME">
+ <value>Název souboru</value>
</data>
<data name="ENFORCED">
<value>Vynuceno </value>
@@ -1090,8 +1141,8 @@
<data name="LDAPSSL">
<value>LDAP SSL:</value>
</data>
- <data name="MINIMALINFO">
- <value>Zobrazení minimálních informací</value>
+ <data name="NEWIFOLDERDESCRIPTIONTAG">
+ <value>Popis složky iFolder:</value>
</data>
<data name="CREATEUSER">
<value>Vytvořit uživatele</value>
@@ -1105,6 +1156,9 @@
<data name="FREESPACE">
<value>Volné místo</value>
</data>
+ <data name="CHANGEMASTERSUCCESSFUL">
+ <value>Byl inovován server {0} na hlavní server. Restartujte všechny servery, aby se změna projevila.</value>
+ </data>
<data name="LOGTAG">
<value>Protokol</value>
</data>
@@ -1120,9 +1174,6 @@
<data name="IFOLDERDETAILS">
<value>Podrobnosti o složce iFolder</value>
</data>
- <data name="CHINESE-SIMPLIFIED">
- <value>Zjednodušená čínština</value>
- </data>
<data name="UNKNOWNERROR">
<value>Došlo k neznáme chybě. Nebyla určena žádná výjimka.</value>
</data>
@@ -1141,8 +1192,8 @@
<data name="POLICIES">
<value>Zásady</value>
</data>
- <data name="GROUPQUOTARESTRICTION">
- <value>Správa používání kvóty skupiny: </value>
+ <data name="CONNECTIONFAILED">
+ <value>Nelze se připojit k serveru {0}.</value>
</data>
<data name="NONSSLSTRING">
<value>NONSSL</value>
@@ -1159,14 +1210,17 @@
<data name="PORTUGUESE-BRAZIL">
<value>Brazilská portugalština</value>
</data>
+ <data name="ENCRYPTION">
+ <value>Šifrování heslem</value>
+ </data>
<data name="BEGINSWITH">
<value>Začíná</value>
</data>
- <data name="MB">
- <value>MB</value>
+ <data name="DOWNLOAD">
+ <value>Stáhnout</value>
</data>
<data name="ERRORCANNOTDELETEIFOLDER">
- <value>Složku iFolder nelze odstranit.</value>
+ <value>Nemáte oprávnění odstranit {0}.</value>
</data>
<data name="DISKSPACEAVAILABLETAG">
<value>Volný diskový prostor:</value>
@@ -1180,6 +1234,12 @@
<data name="TRANSFERING">
<value>Přenášení</value>
</data>
+ <data name="ALLOWDELETEIFOLDERRIGHTS">
+ <value>Povolit oprávnění k odstranění složek iFolder</value>
+ </data>
+ <data name="SET">
+ <value>Nastavit</value>
+ </data>
<data name="LDAPADMINPWD">
<value>Heslo správce LDAP:</value>
</data>
@@ -1192,8 +1252,8 @@
<data name="STATUSTAG">
<value>Stav:</value>
</data>
- <data name="ENCRYPTION">
- <value>Šifrování heslem</value>
+ <data name="MINIMALINFO">
+ <value>Zobrazení minimálních informací</value>
</data>
<data name="LOGLEVELTAG">
<value>Úroveň protokolu</value>
@@ -1204,6 +1264,9 @@
<data name="CONTAINS">
<value>Obsahuje</value>
</data>
+ <data name="GROUPRIGHTSEDITSUCCESSFUL">
+ <value>Práva správce {0}{1}{2} byla úspěšně upravena pro skupinu {3}{4}{5}. Klepnutím na tlačítko Opakovat provedete operace u dalších skupin stejného správce. Klepnutím na tlačítko OK se vrátíte na stránku Systémy.</value>
+ </data>
<data name="LDAPMEMBERDELETE">
<value>Odstranit člena</value>
</data>
@@ -1213,6 +1276,9 @@
<data name="ERRORUNKNOWNERROR">
<value>Došlo k neznámé chybě.</value>
</data>
+ <data name="GROUPRIGHTSADDFAILURE">
+ <value>Uživatele {0}{1}{2} nebylo možné přidat jako správce pro skupinu {3}{4}{5}. Klepnutím na možnost Opakovat lze znovu přidat skupinu. Klepnutím na tlačítko OK se vrátíte na stránku Systémy. </value>
+ </data>
<data name="NAMETAG">
<value>Název:</value>
</data>
@@ -1252,12 +1318,9 @@
<data name="RIGHTS">
<value>Práva</value>
</data>
- <data name="WEBACCESSLOGFILE">
- <value>Aplikace Web Access</value>
+ <data name="ACCOUNT">
+ <value>Účet</value>
</data>
- <data name="GENERATEMONTHLYREPORT">
- <value>Generovat zprávu {0}. den každého měsíce v {1} do {2}</value>
- </data>
<data name="ADDROOT">
<value>Přidat kořen</value>
</data>
@@ -1288,9 +1351,6 @@
<data name="REPROVISOINSTATETAG">
<value>Stav opakovaného poskytování:</value>
</data>
- <data name="DOWNLOAD">
- <value>Stáhnout</value>
- </data>
<data name="DELETESECONDARYADMIN">
<value>Odstranit sekundárního správce: </value>
</data>
@@ -1315,13 +1375,13 @@
<data name="GROUPDISKQUOTA">
<value>Disková kvóta skupiny: </value>
</data>
+ <data name="UNABLETOSETASSLAVE">
+ <value>Nelze nastavit jako podřízený server. Opakujte operaci.</value>
+ </data>
<data name="LOGINUSERNAME">
<value>Uživatelské jméno:</value>
</data>
- <data name="VOLUME">
- <value>Svazek</value>
- </data>
<data name="UNLIMITED">
<value>Neomezeno</value>
</data>
-</root>
+</root>
\ No newline at end of file
Modified: trunk/src/admin/iFolderAdmin.de.resx
===================================================================
--- trunk/src/admin/iFolderAdmin.de.resx 2010-07-06 08:13:30 UTC (rev 7424)
+++ trunk/src/admin/iFolderAdmin.de.resx 2010-07-07 05:42:03 UTC (rev 7425)
@@ -160,9 +160,6 @@
<data name="SERVERLOGS">
<value>Serverprotokolle</value>
</data>
- <data name="ALLADMINS">
- <value>Alle Admins</value>
- </data>
<data name="PRIVATEURI">
<value>Private URL:</value>
</data>
@@ -202,14 +199,14 @@
<data name="REPROVISOINSTATE">
<value>Wiederbereitstellungsstatus</value>
</data>
- <data name="SPANISH">
- <value>Spanisch</value>
+ <data name="CHANGEMASTERFAILED">
+ <value>Master und Slave können nicht geändert werden. Weitere Informationen finden Sie in den Protokolldateien.</value>
</data>
<data name="COMPLETEDTAG">
<value>Abgeschlossen:</value>
</data>
- <data name="ERRORIFOLDERTRANSFEREXCEPTION">
- <value>Die Eigentümerschaft konnte nicht übertragen werden, da hierdurch die vom Administrator festgelegte Höchstzahl an iFolder-Ordnern überschritten wird.</value>
+ <data name="ENTERLDAPDETAILS">
+ <value>LDAP-Administrator-Berechtigungsnachweis eingeben</value>
</data>
<data name="MEMBERTYPELDAPGROUP">
<value>LDAP-Gruppe</value>
@@ -223,15 +220,21 @@
<data name="USEDTAG">
<value>Belegt:</value>
</data>
+ <data name="NEEDSREPAIR">
+ <value>Server reparieren</value>
+ </data>
<data name="MEMBERTYPETAG">
<value>Mitgliedstyp:</value>
</data>
<data name="NONE">
<value>Keine</value>
</data>
- <data name="GROUPRIGHTSADDFAILURE">
- <value>Benutzer {0}{1}{2} konnte nicht als Administrator für Gruppe {3}{4}{5} hinzugefügt werden. Klicken Sie auf "Erneut versuchen", um die Gruppen erneut hinzufügen. Klicken Sie auf "OK", um zur Systemseite zurückzukehren. </value>
+ <data name="ERRORIFOLDERTRANSFEREXCEPTION">
+ <value>Die Eigentümerschaft konnte nicht übertragen werden, da hierdurch die vom Administrator festgelegte Höchstzahl an iFolder-Ordnern überschritten wird.</value>
</data>
+ <data name="running">
+ <value>wird ausgeführt</value>
+ </data>
<data name="ERRORCANNOTDELETESECONDARYADMIN">
<value>Sekundärer Administrator {0} kann nicht gelöscht werden.</value>
</data>
@@ -262,9 +265,15 @@
<data name="ERRORCANNOTCHANGERIGHTS">
<value>Mitgliedsrechte für Benutzer {0} können nicht geändert werden.</value>
</data>
+ <data name="CHANGEMASTER">
+ <value>Als Master festlegen</value>
+ </data>
<data name="FULLNAME">
<value>Vollständiger Name</value>
</data>
+ <data name="sleeping">
+ <value>inaktiv</value>
+ </data>
<data name="LOGINNOCOOKIES">
<value>Sie müssen Cookies in Ihrem Browser aktivieren.</value>
</data>
@@ -274,6 +283,9 @@
<data name="WEEKLY">
<value>Wöchentlich</value>
</data>
+ <data name="shutdown">
+ <value>herunterfahren</value>
+ </data>
<data name="REPORTIFOLDERTAG">
<value>iFolder:</value>
</data>
@@ -301,12 +313,15 @@
<data name="USERS">
<value>Benutzern</value>
</data>
- <data name="SET">
- <value>Festlegen</value>
+ <data name="ALLADMINS">
+ <value>Alle Admins</value>
</data>
<data name="LASTPAGE">
<value>Letzte Seite</value>
</data>
+ <data name="CANNOTSETQUOTAPERUSERERROR">
+ <value>Diese Beschränkung kann nicht festgelegt werden, da die gesamte zugewiesene Speicherplatzquote pro Benutzer größer ist als die Gruppenquote.</value>
+ </data>
<data name="ERRORDETAIL">
<value>Fehlerdetails</value>
</data>
@@ -319,8 +334,8 @@
<data name="SIZETAG">
<value>Größe:</value>
</data>
- <data name="FILENAME">
- <value>Dateiname</value>
+ <data name="GENERATEWEEKLYREPORT">
+ <value>Bericht erstellen alle {0} um {1} in {2}</value>
</data>
<data name="LOGINNOSCRIPT">
<value>Sie müssen Skripts in Ihrem Browser aktivieren.</value>
@@ -388,6 +403,9 @@
<data name="GROUPLISTTAG">
<value>Benutzergruppen:</value>
</data>
+ <data name="ADDADMINS">
+ <value>Administratoren hinzufügen</value>
+ </data>
<data name="MINUTES">
<value>Minute(n)</value>
</data>
@@ -406,8 +424,8 @@
<data name="SERVERNAMETAG">
<value>Server:</value>
</data>
- <data name="GROUPRIGHTSEDITSUCCESSFUL">
- <value>Die Rechte des Administrators {0}{1}{2} wurden für Gruppe {3}{4}{5} erfolgreich bearbeitet. Klicken Sie auf "Wiederholen", um weitere Gruppen für diesen Administrator zu bearbeiten. Klicken Sie auf "OK", um zur Systemseite zurückzukehren.</value>
+ <data name="ERRORTYPE">
+ <value>Unerwarteter Fehler</value>
</data>
<data name="SECONDARY">
<value>Sekundär</value>
@@ -439,14 +457,14 @@
<data name="LOGINERROR">
<value>Fehler:</value>
</data>
- <data name="SELECTGROUPTODELETE">
- <value>Gruppe(n) zum Löschen auswählen</value>
+ <data name="CHANGEMASTERNOINFOFAILED">
+ <value>Die Server-ID und öffentliche URL des neuen Servers können nicht abgerufen werden.</value>
</data>
<data name="OWNED">
<value>Gehört zu</value>
</data>
- <data name="ACCOUNT">
- <value>Konto</value>
+ <data name="CHANGEMASTERRETRY">
+ <value>Das Masterknotenattribut konnte nicht auf Master und Slave aktualisiert werden. Versuchen Sie den Vorgang erneut.</value>
</data>
<data name="USERSTAG">
<value>Benutzer:</value>
@@ -490,6 +508,9 @@
<data name="ALLOWMODIFYSHARINGPOLICY">
<value>Bearbeitung der Freigaberichtlinien zulassen</value>
</data>
+ <data name="REPORTS">
+ <value>Berichte</value>
+ </data>
<data name="NOTMOUNTED">
<value>Nicht gemountet</value>
</data>
@@ -508,12 +529,18 @@
<data name="READONLY">
<value>Schreibgeschützt</value>
</data>
+ <data name="ERRORINVALIDIDSYNCINTERVAL">
+ <value>Das angegebene Synchronisierungsintervall ist ungültig. Der Wert muss zwischen 5 und 10080 liegen.</value>
+ </data>
<data name="LDAPSERVER">
<value>LDAP-Server:</value>
</data>
<data name="IFOLDERUSERS">
<value>iFolder-Benutzer</value>
</data>
+ <data name="waiting">
+ <value>System wartet</value>
+ </data>
<data name="INVALIDFULLPATH">
<value>Der angegebene vollständige Pfad ist ungültig, bitte überprüfen und erneut eingeben.</value>
</data>
@@ -544,8 +571,8 @@
<data name="SELECTEDUSERS">
<value>Ausgewählte Benutzer</value>
</data>
- <data name="RESTARTSERVER">
- <value>Informationen aktualisiert. Diese Änderungen treten beim Neustart des iFolder-Servers in Kraft. </value>
+ <data name="CHINESE-SIMPLIFIED">
+ <value>Chinesisch vereinfacht</value>
</data>
<data name="PUBLICURI">
<value>Öffentliche URL:</value>
@@ -559,9 +586,6 @@
<data name="SERVERDETAILS">
<value>Server-Details</value>
</data>
- <data name="LDAPUPSINCE">
- <value>Hochgefahren seit:</value>
- </data>
<data name="USERLOGINDISABLED">
<value>Benutzeranmeldung deaktivieren</value>
</data>
@@ -658,8 +682,8 @@
<data name="ALLOWMODIFYENCRYPTIONPOLICY">
<value>Bearbeitung der Verschlüsselungsrichtlinien zulassen</value>
</data>
- <data name="REPROVISIONBUTTON">
- <value>Wiederbereitstellungsstatus</value>
+ <data name="MEMBER">
+ <value>Mitglied</value>
</data>
<data name="FILES">
<value>Dateien</value>
@@ -667,6 +691,9 @@
<data name="ERRORCANNOTREMOVEADMIN">
<value>Benutzer {0} kann nicht als Administrator entfernt werden.</value>
</data>
+ <data name="CHANGEMASTERWITHWARNING">
+ <value>{0} mit Ausnahmen als Masterserver aufgerüstet. Weitere Informationen finden Sie in der Datei 'Simias.log'. Starten Sie alle Server neu, damit die Änderungen wirksam werden.</value>
+ </data>
<data name="PASSWORDSDONOTMATCH">
<value>Die Passwörter stimmen nicht überein.</value>
</data>
@@ -688,14 +715,11 @@
<data name="ERRORLOCKEXCEPTION">
<value>Der Vorgang wurde abgebrochen, weil der iFolder-Ordner vom Administrator gesperrt/deaktiviert wurde.</value>
</data>
- <data name="ENTERLDAPDETAILS">
- <value>LDAP-Administrator-Berechtigungsnachweis eingeben</value>
- </data>
<data name="PASSWORDTAG">
<value>Passwort:</value>
</data>
<data name="SESSIONCLOSED">
- <value>Ihre Sitzung wurde geschlossen. Bitte melden Sie sich an.</value>
+ <value>Der eingegebene Benutzername oder das eingegebene Passwort ist falsch. Melden Sie sich an.</value>
</data>
<data name="DNSNAMETAG">
<value>DNS-Name:</value>
@@ -784,9 +808,15 @@
<data name="TIME">
<value>Zeit</value>
</data>
+ <data name="CONFIGFILEUPDATEFAILED">
+ <value>Konfigurationsdatei kann nicht aktualisiert werden. Aktualisieren Sie die Datei 'simias.config' manuell.</value>
+ </data>
<data name="LOGINSECUREFAILED">
<value>Sichere Kommunikation mit dem iFolder-Server nicht möglich.</value>
</data>
+ <data name="CONFIRMCHANGEMASTER">
+ <value>Der ausgewählte Server wird als Masterserver festgelegt. Weiter? Klicken Sie 'OK' zum Fortfahren oder 'Abbrechen' zum Beenden.</value>
+ </data>
<data name="LOGINPASSWORD">
<value>Passwort:</value>
</data>
@@ -826,6 +856,9 @@
<data name="ADMINISTRATORS">
<value>Administratoren</value>
</data>
+ <data name="SELECTGROUPTODELETE">
+ <value>Gruppe(n) zum Löschen auswählen</value>
+ </data>
<data name="FORMATTAG">
<value>Format:</value>
</data>
@@ -862,15 +895,15 @@
<data name="TOTALUSERSTAG">
<value>Benutzer insgesamt:</value>
</data>
+ <data name="WEBACCESSLOGFILE">
+ <value>Web-Zugriff</value>
+ </data>
<data name="ERRORUSERDOESNOTEXIST">
<value>Der angegebene iFolder-Benutzer existiert nicht.</value>
</data>
<data name="LOGINCOPYRIGHT">
- <value>&copy; Copyright 2009 Novell, Inc. Alle Rechte vorbehalten.</value>
+ <value>&copy; Copyright 2010 Novell, Inc. Alle Rechte vorbehalten.</value>
</data>
- <data name="GENERATEWEEKLYREPORT">
- <value>Bericht erstellen alle {0} um {1} in {2}</value>
- </data>
<data name="VIEW">
<value>Anzeigen</value>
</data>
@@ -880,12 +913,9 @@
<data name="GENERATEDAILYREPORT">
<value>Täglich Bericht erstellen um {0} im {1}</value>
</data>
- <data name="ERRORINSTRUCTIONS">
- <value><p>Unerwarteter iFolder Web Access-Fehler.</p> <p>Bitte entschuldigen Sie eventuelle Unannehmlichkeiten. Melden Sie sich bitte ab und wieder an.</p></value>
+ <data name="MASTERNODEUPDATEWAIT">
+ <value>System wartet auf Synchronisierung des Masterknotenattributs mit dem neuen Master und den neuen Slaves.</value>
</data>
- <data name="MEMBER">
- <value>Mitglied</value>
- </data>
<data name="ERRORCANNOTDELETEUSER">
<value>Benutzer-ID {0} kann nicht gelöscht werden.</value>
</data>
@@ -916,8 +946,8 @@
<data name="SELECTMEMBERTOADD">
<value>Neuen sekundären Administrator auswählen</value>
</data>
- <data name="ERRORINVALIDIDSYNCINTERVAL">
- <value>Das angegebene Synchronisierungsintervall ist ungültig. Der Wert muss zwischen 5 und 10080 liegen.</value>
+ <data name="VOLUME">
+ <value>Laufwerk</value>
</data>
<data name="IDENTITYSYNCTAG">
<value>Identity-Synchronisierung:</value>
@@ -934,9 +964,15 @@
<data name="ADD">
<value>Hinzufügen</value>
</data>
+ <data name="MB">
+ <value>MB</value>
+ </data>
<data name="DISABLE">
<value>Deaktivieren</value>
</data>
+ <data name="disabled">
+ <value>deaktiviert</value>
+ </data>
<data name="ENABLEREPORTING">
<value>Berichterstellung aktivieren</value>
</data>
@@ -946,6 +982,9 @@
<data name="SLOVAK">
<value>Slowakisch</value>
</data>
+ <data name="UPDATEMASTERURLONSLAVESFAILED">
+ <value>Die Master-URL kann auf Server {0} nicht aktualisiert werden. Aktualisieren Sie die Master-IP auf diesem Server manuell.</value>
+ </data>
<data name="ONLINE">
<value>Online</value>
</data>
@@ -976,17 +1015,23 @@
<data name="COMPLETED">
<value>Abgeschlossen</value>
</data>
+ <data name="RESTARTSERVER">
+ <value>Informationen aktualisiert. Diese Änderungen treten beim Neustart des iFolder-Servers in Kraft. </value>
+ </data>
<data name="CZECH">
<value>Tschechisch</value>
</data>
+ <data name="GROUPQUOTARESTRICTION">
+ <value>Gruppenquote verwalten durch: </value>
+ </data>
<data name="MEMBERLISTTAG">
<value>Gruppenmitglieder:</value>
</data>
<data name="ERRORCANNOTADDADMIN">
<value>Mitglied {0} kann nicht als Administrator hinzugefügt werden.</value>
</data>
- <data name="ADDADMINS">
- <value>Administratoren hinzufügen</value>
+ <data name="LDAPUPSINCE">
+ <value>Hochgefahren seit:</value>
</data>
<data name="DAYTAG">
<value>Tag:</value>
@@ -1018,6 +1063,9 @@
<data name="ERRORINVALIDSYNCINTERVAL">
<value>Ungültiges Synchronisierungsintervall. Wert muss zwischen 5 und 999 liegen.</value>
</data>
+ <data name="REPROVISIONBUTTON">
+ <value>Wiederbereitstellungsstatus</value>
+ </data>
<data name="MEMBERTYPELOCALGROUP">
<value>Lokale Gruppe</value>
</data>
@@ -1033,8 +1081,8 @@
<data name="FULLCONTROL">
<value>Vollständige Kontrolle</value>
</data>
- <data name="CANNOTSETQUOTAPERUSERERROR">
- <value>Diese Beschränkung kann nicht festgelegt werden, da die gesamte zugewiesene Speicherplatzquote pro Benutzer größer ist als die Gruppenquote.</value>
+ <data name="GENERATEMONTHLYREPORT">
+ <value>Bericht am {0} Tag jeden Monats um {1} im {2} generieren.</value>
</data>
<data name="REPORTDIRECTORY">
<value>Berichtsverzeichnis</value>
@@ -1042,11 +1090,14 @@
<data name="ATTAG">
<value>Um:</value>
</data>
+ <data name="SPANISH">
+ <value>Spanisch</value>
+ </data>
<data name="ELLIPSES">
<value> . . .</value>
</data>
- <data name="NEWIFOLDERDESCRIPTIONTAG">
- <value>iFolder-Beschreibung:</value>
+ <data name="ERRORINSTRUCTIONS">
+ <value><p>Unerwarteter iFolder Web Access-Fehler.</p> <p>Bitte entschuldigen Sie eventuelle Unannehmlichkeiten. Melden Sie sich bitte ab und wieder an.</p></value>
</data>
<data name="POLISH">
<value>Polnisch</value>
@@ -1054,12 +1105,12 @@
<data name="FULLNAMETAG">
<value>Vollständiger Name:</value>
</data>
- <data name="ERRORTYPE">
- <value>Unerwarteter Fehler</value>
- </data>
<data name="ERRORCANNOTSETDESCRIPTION">
<value>Festlegen der iFolder-Beschreibung nicht möglich.</value>
</data>
+ <data name="REVERTSHARINGCONNECTFAILED">
+ <value>Die Verbindung zum iFolder-Server kann nicht aufgebaut werden. Heben Sie die Freigabe auf, wenn der Server erreichbar ist.</value>
+ </data>
<data name="LOGINUNAUTHORIZED">
<value>Geben Sie Benutzernamen und Passwort erneut ein.</value>
</data>
@@ -1069,8 +1120,8 @@
<data name="PENDING">
<value>Ausstehend</value>
</data>
- <data name="REPORTS">
- <value>Berichte</value>
+ <data name="FILENAME">
+ <value>Dateiname</value>
</data>
<data name="ENFORCED">
<value>Erzwungen </value>
@@ -1090,8 +1141,8 @@
<data name="LDAPSSL">
<value>LDAP SSL:</value>
</data>
- <data name="MINIMALINFO">
- <value>Mindestdaten werden angezeigt</value>
+ <data name="NEWIFOLDERDESCRIPTIONTAG">
+ <value>iFolder-Beschreibung:</value>
</data>
<data name="CREATEUSER">
<value>Benutzer erstellen</value>
@@ -1105,6 +1156,9 @@
<data name="FREESPACE">
<value>Freier Speicherplatz</value>
</data>
+ <data name="CHANGEMASTERSUCCESSFUL">
+ <value>{0} als Masterserver aufgerüstet. Starten Sie alle Server neu, damit die Änderungen übernommen werden.</value>
+ </data>
<data name="LOGTAG">
<value>Protokoll</value>
</data>
@@ -1120,9 +1174,6 @@
<data name="IFOLDERDETAILS">
<value>iFolder-Details</value>
</data>
- <data name="CHINESE-SIMPLIFIED">
- <value>Chinesisch vereinfacht</value>
- </data>
<data name="UNKNOWNERROR">
<value>Unbekannter Fehler. Es wurde keine Ausnahme angegeben.</value>
</data>
@@ -1141,8 +1192,8 @@
<data name="POLICIES">
<value>Richtlinien</value>
</data>
- <data name="GROUPQUOTARESTRICTION">
- <value>Gruppenquote verwalten durch: </value>
+ <data name="CONNECTIONFAILED">
+ <value>Die Verbindung zum Server {0} kann nicht aufgebaut werden.</value>
</data>
<data name="NONSSLSTRING">
<value>NONSSL</value>
@@ -1159,14 +1210,17 @@
<data name="PORTUGUESE-BRAZIL">
<value>Portugiesisch Brasilien</value>
</data>
+ <data name="ENCRYPTION">
+ <value>Passwortsatz-basierte Verschlüsselung</value>
+ </data>
<data name="BEGINSWITH">
<value>Beginnt mit</value>
</data>
- <data name="MB">
- <value>MB</value>
+ <data name="DOWNLOAD">
+ <value>Herunterladen</value>
</data>
<data name="ERRORCANNOTDELETEIFOLDER">
- <value>iFolder-Ordner kann nicht gelöscht werden.</value>
+ <value>Sie haben nicht die Berechtigungen zum Löschen von {0}.</value>
</data>
<data name="DISKSPACEAVAILABLETAG">
<value>Verfügbarer Speicherplatz:</value>
@@ -1180,6 +1234,12 @@
<data name="TRANSFERING">
<value>Übertragung</value>
</data>
+ <data name="ALLOWDELETEIFOLDERRIGHTS">
+ <value>Berechtigung zum Löschen von iFolder-Ordnern</value>
+ </data>
+ <data name="SET">
+ <value>Festlegen</value>
+ </data>
<data name="LDAPADMINPWD">
<value>LDAP-Administratorpasswort:</value>
</data>
@@ -1192,8 +1252,8 @@
<data name="STATUSTAG">
<value>Zustand:</value>
</data>
- <data name="ENCRYPTION">
- <value>Passwortsatz-basierte Verschlüsselung</value>
+ <data name="MINIMALINFO">
+ <value>Mindestdaten werden angezeigt</value>
</data>
<data name="LOGLEVELTAG">
<value>Protokollierumfang</value>
@@ -1204,6 +1264,9 @@
<data name="CONTAINS">
<value>Enthält</value>
</data>
+ <data name="GROUPRIGHTSEDITSUCCESSFUL">
+ <value>Die Rechte des Administrators {0}{1}{2} wurden für Gruppe {3}{4}{5} erfolgreich bearbeitet. Klicken Sie auf "Wiederholen", um weitere Gruppen für diesen Administrator zu bearbeiten. Klicken Sie auf "OK", um zur Systemseite zurückzukehren.</value>
+ </data>
<data name="LDAPMEMBERDELETE">
<value>Mitglied löschen</value>
</data>
@@ -1213,6 +1276,9 @@
<data name="ERRORUNKNOWNERROR">
<value>Unbekannter Fehler.</value>
</data>
+ <data name="GROUPRIGHTSADDFAILURE">
+ <value>Benutzer {0}{1}{2} konnte nicht als Administrator für Gruppe {3}{4}{5} hinzugefügt werden. Klicken Sie auf "Erneut versuchen", um die Gruppen erneut hinzufügen. Klicken Sie auf "OK", um zur Systemseite zurückzukehren. </value>
+ </data>
<data name="NAMETAG">
<value>Name:</value>
</data>
@@ -1252,12 +1318,9 @@
<data name="RIGHTS">
<value>Rechte</value>
</data>
- <data name="WEBACCESSLOGFILE">
- <value>Web-Zugriff</value>
+ <data name="ACCOUNT">
+ <value>Konto</value>
</data>
- <data name="GENERATEMONTHLYREPORT">
- <value>Bericht am {0} Tag jeden Monats um {1} im {2} generieren.</value>
- </data>
<data name="ADDROOT">
<value>Root hinzufügen</value>
</data>
@@ -1288,9 +1351,6 @@
<data name="REPROVISOINSTATETAG">
<value>Wiederbereitstellungsstatus:</value>
</data>
- <data name="DOWNLOAD">
- <value>Herunterladen</value>
- </data>
<data name="DELETESECONDARYADMIN">
<value>Sekundären Administrator löschen: </value>
</data>
@@ -1315,13 +1375,13 @@
<data name="GROUPDISKQUOTA">
<value>Speicherplatzquote der Gruppe: </value>
</data>
+ <data name="UNABLETOSETASSLAVE">
+ <value>Kann nicht als Slave-Server festgelegt werden. Versuchen Sie den Vorgang erneut.</value>
+ </data>
<data name="LOGINUSERNAME">
<value>Benutzername:</value>
</data>
- <data name="VOLUME">
- <value>Laufwerk</value>
- </data>
<data name="UNLIMITED">
<value>Unbegrenzt</value>
</data>
-</root>
+</root>
\ No newline at end of file
Modified: trunk/src/admin/iFolderAdmin.es.resx
===================================================================
--- trunk/src/admin/iFolderAdmin.es.resx 2010-07-06 08:13:30 UTC (rev 7424)
+++ trunk/src/admin/iFolderAdmin.es.resx 2010-07-07 05:42:03 UTC (rev 7425)
@@ -160,9 +160,6 @@
<data name="SERVERLOGS">
<value>Registros del servidor</value>
</data>
- <data name="ALLADMINS">
- <value>Todos los administradores</value>
- </data>
<data name="PRIVATEURI">
<value>URL privada:</value>
</data>
@@ -202,14 +199,14 @@
<data name="REPROVISOINSTATE">
<value>Estado de la nueva provisión</value>
</data>
- <data name="SPANISH">
- <value>Español</value>
+ <data name="CHANGEMASTERFAILED">
+ <value>No es posible cambiar el Principal y el Esclavo. Consulte los archivos de registro para más información.</value>
</data>
<data name="COMPLETEDTAG">
<value>Completado:</value>
</data>
- <data name="ERRORIFOLDERTRANSFEREXCEPTION">
- <value>No es posible transferir la propiedad puesto que se ha excedido el límite de carpetas iFolder establecido por el administrador.</value>
+ <data name="ENTERLDAPDETAILS">
+ <value>Introducir credenciales del administrador LDAP</value>
</data>
<data name="MEMBERTYPELDAPGROUP">
<value>Grupo LDAP</value>
@@ -223,15 +220,21 @@
<data name="USEDTAG">
<value>Utilizado:</value>
</data>
+ <data name="NEEDSREPAIR">
+ <value>Reparar servidor</value>
+ </data>
<data name="MEMBERTYPETAG">
<value>Tipo de miembro:</value>
</data>
<data name="NONE">
<value>Ninguno</value>
</data>
- <data name="GROUPRIGHTSADDFAILURE">
- <value>El usuario {0}{1}{2} no ha podido añadirse como administrador para el grupo {3}{4}{5}. Haga clic en Volver a intentarlo para añadir el grupo de nuevo. Haga clic en Aceptar para volver a la página de sistemas. </value>
+ <data name="ERRORIFOLDERTRANSFEREXCEPTION">
+ <value>No es posible transferir la propiedad puesto que se ha excedido el límite de carpetas iFolder establecido por el administrador.</value>
</data>
+ <data name="running">
+ <value>en ejecución</value>
+ </data>
<data name="ERRORCANNOTDELETESECONDARYADMIN">
<value>No es posible suprimir este administrador secundario {0}.</value>
</data>
@@ -262,9 +265,15 @@
<data name="ERRORCANNOTCHANGERIGHTS">
<value>No es posible cambiar los derechos de pertenencia del usuario {0}.</value>
</data>
+ <data name="CHANGEMASTER">
+ <value>Definir como principal</value>
+ </data>
<data name="FULLNAME">
<value>Nombre completo</value>
</data>
+ <data name="sleeping">
+ <value>en reposo</value>
+ </data>
<data name="LOGINNOCOOKIES">
<value>Es necesario habilitar las cookies en el navegador.</value>
</data>
@@ -274,6 +283,9 @@
<data name="WEEKLY">
<value>Semanalmente</value>
</data>
+ <data name="shutdown">
+ <value>apagar</value>
+ </data>
<data name="REPORTIFOLDERTAG">
<value>iFolder:</value>
</data>
@@ -301,12 +313,15 @@
<data name="USERS">
<value>Usuarios</value>
</data>
- <data name="SET">
- <value>Definir</value>
+ <data name="ALLADMINS">
+ <value>Todos los administradores</value>
</data>
<data name="LASTPAGE">
<value>Última página</value>
</data>
+ <data name="CANNOTSETQUOTAPERUSERERROR">
+ <value>No es posible establecer este límite porque la cuota de disco asignada por miembro supera la cuota de grupo.</value>
+ </data>
<data name="ERRORDETAIL">
<value>Información del error</value>
</data>
@@ -319,8 +334,8 @@
<data name="SIZETAG">
<value>Tamaño:</value>
</data>
- <data name="FILENAME">
- <value>Nombre de archivo</value>
+ <data name="GENERATEWEEKLYREPORT">
+ <value>Generar informe cada {0} a las {1} para el {2}</value>
</data>
<data name="LOGINNOSCRIPT">
<value>Es necesario habilitar los guiones en el navegador.</value>
@@ -388,6 +403,9 @@
<data name="GROUPLISTTAG">
<value>Grupos de usuarios:</value>
</data>
+ <data name="ADDADMINS">
+ <value>Añadir administradores</value>
+ </data>
<data name="MINUTES">
<value>Minuto(s)</value>
</data>
@@ -406,8 +424,8 @@
<data name="SERVERNAMETAG">
<value>Servidor:</value>
</data>
- <data name="GROUPRIGHTSEDITSUCCESSFUL">
- <value>Los derechos de {0}{1}{2} del administrador se han editado correctamente para el grupo {3}{4}{5}. Haga clic en Repetir para operar con el mismo administrador en varios grupos. Haga clic en Aceptar para volver a la página de sistemas.</value>
+ <data name="ERRORTYPE">
+ <value>Error inesperado</value>
</data>
<data name="SECONDARY">
<value>Secundario</value>
@@ -439,14 +457,14 @@
<data name="LOGINERROR">
<value>Error:</value>
</data>
- <data name="SELECTGROUPTODELETE">
- <value>Seleccionar grupo(s) para suprimir</value>
+ <data name="CHANGEMASTERNOINFOFAILED">
+ <value>No es posible obtener una ID del servidor y una nueva URL pública de servidor.</value>
</data>
<data name="OWNED">
<value>En propiedad</value>
</data>
- <data name="ACCOUNT">
- <value>Cuenta</value>
+ <data name="CHANGEMASTERRETRY">
+ <value>No es posible actualizar el atributo de nodo principal en el Principal y Esclavo. Intente de nuevo la operación.</value>
</data>
<data name="USERSTAG">
<value>Usuarios:</value>
@@ -490,6 +508,9 @@
<data name="ALLOWMODIFYSHARINGPOLICY">
<value>Permitir modificación de directivas de compartición</value>
</data>
+ <data name="REPORTS">
+ <value>Informes</value>
+ </data>
<data name="NOTMOUNTED">
<value>No montado</value>
</data>
@@ -508,12 +529,18 @@
<data name="READONLY">
<value>Sólo lectura</value>
</data>
+ <data name="ERRORINVALIDIDSYNCINTERVAL">
+ <value>Se ha especificado un intervalo de sincronización no válido. El valor debe encontrarse entre 5 y 10080.</value>
+ </data>
<data name="LDAPSERVER">
<value>Servidor LDAP:</value>
</data>
<data name="IFOLDERUSERS">
<value>Usuarios de iFolder</value>
</data>
+ <data name="waiting">
+ <value>en espera</value>
+ </data>
<data name="INVALIDFULLPATH">
<value>La vía completa especificada no es válida; compruébela y vuelva a especificarla.</value>
</data>
@@ -544,8 +571,8 @@
<data name="SELECTEDUSERS">
<value>Usuarios seleccionados</value>
</data>
- <data name="RESTARTSERVER">
- <value>Información actualizada. Estos cambios serán efectivos cuando vuelva a iniciar el servidor iFolder. </value>
+ <data name="CHINESE-SIMPLIFIED">
+ <value>Chino simplificado</value>
</data>
<data name="PUBLICURI">
<value>URL pública:</value>
@@ -559,9 +586,6 @@
<data name="SERVERDETAILS">
<value>Información del servidor</value>
</data>
- <data name="LDAPUPSINCE">
- <value>Activo desde:</value>
- </data>
<data name="USERLOGINDISABLED">
<value>Inhabilitar entrada de usuario</value>
</data>
@@ -658,8 +682,8 @@
<data name="ALLOWMODIFYENCRYPTIONPOLICY">
<value>Permitir modificación de directiva de cifrado</value>
</data>
- <data name="REPROVISIONBUTTON">
- <value>Estado de la nueva provisión</value>
+ <data name="MEMBER">
+ <value>Miembro</value>
</data>
<data name="FILES">
<value>Archivos</value>
@@ -667,6 +691,9 @@
<data name="ERRORCANNOTREMOVEADMIN">
<value>No es posible eliminar el usuario {0} como administrador.</value>
</data>
+ <data name="CHANGEMASTERWITHWARNING">
+ <value>Se ha actualizado {0} como servidor principal con excepciones. Consulte Simias.log para obtener más información. Reinicie todos los servidores para que los cambios surtan efecto.</value>
+ </data>
<data name="PASSWORDSDONOTMATCH">
<value>Las contraseñas no coinciden.</value>
</data>
@@ -688,14 +715,11 @@
<data name="ERRORLOCKEXCEPTION">
<value>Se ha cancelado la operación debido a que el administrador ha bloqueado o inhabilitado la carpeta iFolder.</value>
</data>
- <data name="ENTERLDAPDETAILS">
- <value>Introducir credenciales del administrador LDAP</value>
- </data>
<data name="PASSWORDTAG">
<value>Contraseña:</value>
</data>
<data name="SESSIONCLOSED">
- <value>Se ha cerrado la sesión. Entre a la sesión.</value>
+ <value>El nombre de usuario o la contraseña que ha introducido no es correcto. Entre a la sesión.</value>
</data>
<data name="DNSNAMETAG">
<value>Nombre DNS:</value>
@@ -784,9 +808,15 @@
<data name="TIME">
<value>Tiempo</value>
</data>
+ <data name="CONFIGFILEUPDATEFAILED">
+ <value>No es posible actualizar el archivo de configuración. Actualice manualmente el archivo simias.config.</value>
+ </data>
<data name="LOGINSECUREFAILED">
<value>No es posible establecer una comunicación segura con el servidor iFolder.</value>
</data>
+ <data name="CONFIRMCHANGEMASTER">
+ <value>El servidor seleccionado se designará como Servidor principal. ¿Desea continuar? Pulse en Aceptar para continuar o en Cancelar para salir.</value>
+ </data>
<data name="LOGINPASSWORD">
<value>Contraseña:</value>
</data>
@@ -826,6 +856,9 @@
<data name="ADMINISTRATORS">
<value>Administradores</value>
</data>
+ <data name="SELECTGROUPTODELETE">
+ <value>Seleccionar grupo(s) para suprimir</value>
+ </data>
<data name="FORMATTAG">
<value>Formato:</value>
</data>
@@ -862,15 +895,15 @@
<data name="TOTALUSERSTAG">
<value>Total de usuarios:</value>
</data>
+ <data name="WEBACCESSLOGFILE">
+ <value>Acceso Web</value>
+ </data>
<data name="ERRORUSERDOESNOTEXIST">
<value>El usuario de iFolder especificado no existe.</value>
</data>
<data name="LOGINCOPYRIGHT">
- <value>&copy; Copyright 2009 Novell, Inc. Reservados todos los derechos.</value>
+ <value>&copy; Copyright 2010 Novell, Inc. Reservados todos los derechos.</value>
</data>
- <data name="GENERATEWEEKLYREPORT">
- <value>Generar informe cada {0} a las {1} para el {2}</value>
- </data>
<data name="VIEW">
<value>Ver</value>
</data>
@@ -880,12 +913,9 @@
<data name="GENERATEDAILYREPORT">
<value>Generar informe cada día a las {0} para el {1}</value>
</data>
- <data name="ERRORINSTRUCTIONS">
- <value><p>Web Access de iFolder ha detectado un error inesperado.</p> <p>Le rogamos que nos disculpe por las molestias causadas y le agradeceríamos que saliera de la sesión y lo intentara de nuevo.</p></value>
+ <data name="MASTERNODEUPDATEWAIT">
+ <value>Esperando la sincronización del atributo de nodo principal con los nuevos esclavos y principales.</value>
</data>
- <data name="MEMBER">
- <value>Miembro</value>
- </data>
<data name="ERRORCANNOTDELETEUSER">
<value>No es posible suprimir el ID de usuario {0}.</value>
</data>
@@ -916,8 +946,8 @@
<data name="SELECTMEMBERTOADD">
<value>Seleccionar un nuevo administrador secundario</value>
</data>
- <data name="ERRORINVALIDIDSYNCINTERVAL">
- <value>Se ha especificado un intervalo de sincronización no válido. El valor debe encontrarse entre 5 y 10080.</value>
+ <data name="VOLUME">
+ <value>Volumen</value>
</data>
<data name="IDENTITYSYNCTAG">
<value>Sincronización de identidad:</value>
@@ -934,9 +964,15 @@
<data name="ADD">
<value>Añadir</value>
</data>
+ <data name="MB">
+ <value>MB</value>
+ </data>
<data name="DISABLE">
<value>Inhabilitar</value>
</data>
+ <data name="disabled">
+ <value>inhabilitado</value>
+ </data>
<data name="ENABLEREPORTING">
<value>Habilitar informes</value>
</data>
@@ -946,6 +982,9 @@
<data name="SLOVAK">
<value>Eslovaco</value>
</data>
+ <data name="UPDATEMASTERURLONSLAVESFAILED">
+ <value>No es posible actualizar la URL de nuevo principal en el servidor {0}. Actualice manualmente la IP de principal en este servidor.</value>
+ </data>
<data name="ONLINE">
<value>Conectado</value>
</data>
@@ -976,17 +1015,23 @@
<data name="COMPLETED">
<value>Completado</value>
</data>
+ <data name="RESTARTSERVER">
+ <value>Información actualizada. Estos cambios serán efectivos cuando vuelva a iniciar el servidor iFolder. </value>
+ </data>
<data name="CZECH">
<value>Checo</value>
</data>
+ <data name="GROUPQUOTARESTRICTION">
+ <value>Administrar el uso de cuotas de grupo: </value>
+ </data>
<data name="MEMBERLISTTAG">
<value>Miembros del grupo:</value>
</data>
<data name="ERRORCANNOTADDADMIN">
<value>No es posible añadir el miembro {0} como administrador.</value>
</data>
- <data name="ADDADMINS">
- <value>Añadir administradores</value>
+ <data name="LDAPUPSINCE">
+ <value>Activo desde:</value>
</data>
<data name="DAYTAG">
<value>Día:</value>
@@ -1018,6 +1063,9 @@
<data name="ERRORINVALIDSYNCINTERVAL">
<value>Se ha especificado un intervalo de sincronización no válido. El valor debe encontrarse entre 5 y 999.</value>
</data>
+ <data name="REPROVISIONBUTTON">
+ <value>Estado de la nueva provisión</value>
+ </data>
<data name="MEMBERTYPELOCALGROUP">
<value>Grupo local</value>
</data>
@@ -1033,8 +1081,8 @@
<data name="FULLCONTROL">
<value>Control completo</value>
</data>
- <data name="CANNOTSETQUOTAPERUSERERROR">
- <value>No es posible establecer este límite porque la cuota de disco asignada por miembro supera la cuota de grupo.</value>
+ <data name="GENERATEMONTHLYREPORT">
+ <value>Generar informe el día {0} de cada mes a las {1} para el {2}</value>
</data>
<data name="REPORTDIRECTORY">
<value>Directorio de informe</value>
@@ -1042,11 +1090,14 @@
<data name="ATTAG">
<value>En:</value>
</data>
+ <data name="SPANISH">
+ <value>Español</value>
+ </data>
<data name="ELLIPSES">
<value> . . .</value>
</data>
- <data name="NEWIFOLDERDESCRIPTIONTAG">
- <value>Descripción de la carpeta iFolder:</value>
+ <data name="ERRORINSTRUCTIONS">
+ <value><p>Web Access de iFolder ha detectado un error inesperado.</p> <p>Le rogamos que nos disculpe por las molestias causadas y le agradeceríamos que saliera de la sesión y lo intentara de nuevo.</p></value>
</data>
<data name="POLISH">
<value>Polaco</value>
@@ -1054,12 +1105,12 @@
<data name="FULLNAMETAG">
<value>Nombre completo:</value>
</data>
- <data name="ERRORTYPE">
- <value>Error inesperado</value>
- </data>
<data name="ERRORCANNOTSETDESCRIPTION">
<value>No es posible definir la descripción de la carpeta iFolder.</value>
</data>
+ <data name="REVERTSHARINGCONNECTFAILED">
+ <value>No es posible la conexión con el servidor iFolder. Revoque la función de compartir una vez que se pueda acceder al servidor.</value>
+ </data>
<data name="LOGINUNAUTHORIZED">
<value>Introduzca de nuevo el nombre de usuario y la contraseña.</value>
</data>
@@ -1069,8 +1120,8 @@
<data name="PENDING">
<value>Pendiente</value>
</data>
- <data name="REPORTS">
- <value>Informes</value>
+ <data name="FILENAME">
+ <value>Nombre de archivo</value>
</data>
<data name="ENFORCED">
<value>Aplicado </value>
@@ -1090,8 +1141,8 @@
<data name="LDAPSSL">
<value>SSL LDAP:</value>
</data>
- <data name="MINIMALINFO">
- <value>Mostrando información mínima</value>
+ <data name="NEWIFOLDERDESCRIPTIONTAG">
+ <value>Descripción de la carpeta iFolder:</value>
</data>
<data name="CREATEUSER">
<value>Crear usuario</value>
@@ -1105,6 +1156,9 @@
<data name="FREESPACE">
<value>Espacio libre</value>
</data>
+ <data name="CHANGEMASTERSUCCESSFUL">
+ <value>Se ha actualizado {0} como servidor principal. Reinicie todos los servidores para que los cambios surtan efecto.</value>
+ </data>
<data name="LOGTAG">
<value>Registro</value>
</data>
@@ -1120,9 +1174,6 @@
<data name="IFOLDERDETAILS">
<value>Información de iFolder</value>
</data>
- <data name="CHINESE-SIMPLIFIED">
- <value>Chino simplificado</value>
- </data>
<data name="UNKNOWNERROR">
<value>Se ha producido un error desconocido. No se ha especificado ninguna excepción.</value>
</data>
@@ -1141,8 +1192,8 @@
<data name="POLICIES">
<value>Directivas</value>
</data>
- <data name="GROUPQUOTARESTRICTION">
- <value>Administrar el uso de cuotas de grupo: </value>
+ <data name="CONNECTIONFAILED">
+ <value>No es posible la conexión al servidor {0}.</value>
</data>
<data name="NONSSLSTRING">
<value>NONSSL</value>
@@ -1159,14 +1210,17 @@
<data name="PORTUGUESE-BRAZIL">
<value>Portugués brasileño</value>
</data>
+ <data name="ENCRYPTION">
+ <value>Cifrado basado en contraseña codificada</value>
+ </data>
<data name="BEGINSWITH">
<value>Empieza por</value>
</data>
- <data name="MB">
- <value>MB</value>
+ <data name="DOWNLOAD">
+ <value>Descargar</value>
</data>
<data name="ERRORCANNOTDELETEIFOLDER">
- <value>No es posible suprimir esta carpeta iFolder.</value>
+ <value>No tiene permiso para suprimir {0}.</value>
</data>
<data name="DISKSPACEAVAILABLETAG">
<value>Espacio de disco disponible:</value>
@@ -1180,6 +1234,12 @@
<data name="TRANSFERING">
<value>Transfiriendo</value>
</data>
+ <data name="ALLOWDELETEIFOLDERRIGHTS">
+ <value>Dar permiso para suprimir iFolders</value>
+ </data>
+ <data name="SET">
+ <value>Definir</value>
+ </data>
<data name="LDAPADMINPWD">
<value>Contraseña del administrador LDAP:</value>
</data>
@@ -1192,8 +1252,8 @@
<data name="STATUSTAG">
<value>Estado:</value>
</data>
- <data name="ENCRYPTION">
- <value>Cifrado basado en contraseña codificada</value>
+ <data name="MINIMALINFO">
+ <value>Mostrando información mínima</value>
</data>
<data name="LOGLEVELTAG">
<value>Nivel de registro</value>
@@ -1204,6 +1264,9 @@
<data name="CONTAINS">
<value>Contiene</value>
</data>
+ <data name="GROUPRIGHTSEDITSUCCESSFUL">
+ <value>Los derechos de {0}{1}{2} del administrador se han editado correctamente para el grupo {3}{4}{5}. Haga clic en Repetir para operar con el mismo administrador en varios grupos. Haga clic en Aceptar para volver a la página de sistemas.</value>
+ </data>
<data name="LDAPMEMBERDELETE">
<value>Suprimir miembro</value>
</data>
@@ -1213,6 +1276,9 @@
<data name="ERRORUNKNOWNERROR">
<value>Se ha producido un error desconocido.</value>
</data>
+ <data name="GROUPRIGHTSADDFAILURE">
+ <value>El usuario {0}{1}{2} no ha podido añadirse como administrador para el grupo {3}{4}{5}. Haga clic en Volver a intentarlo para añadir el grupo de nuevo. Haga clic en Aceptar para volver a la página de sistemas. </value>
+ </data>
<data name="NAMETAG">
<value>Nombre:</value>
</data>
@@ -1252,12 +1318,9 @@
<data name="RIGHTS">
<value>Derechos</value>
</data>
- <data name="WEBACCESSLOGFILE">
- <value>Acceso Web</value>
+ <data name="ACCOUNT">
+ <value>Cuenta</value>
</data>
- <data name="GENERATEMONTHLYREPORT">
- <value>Generar informe el día {0} de cada mes a las {1} para el {2}</value>
- </data>
<data name="ADDROOT">
<value>Añadir raíz</value>
</data>
@@ -1288,9 +1351,6 @@
<data name="REPROVISOINSTATETAG">
<value>Estado de la nueva provisión:</value>
</data>
- <data name="DOWNLOAD">
- <value>Descargar</value>
- </data>
<data name="DELETESECONDARYADMIN">
<value>Suprimir administrador secundario: </value>
</data>
@@ -1315,13 +1375,13 @@
<data name="GROUPDISKQUOTA">
<value>Cuota de disco de grupo: </value>
</data>
+ <data name="UNABLETOSETASSLAVE">
+ <value>No es posible definir como servidor esclavo. Intente de nuevo la operación.</value>
+ </data>
<data name="LOGINUSERNAME">
<value>Nombre de usuario:</value>
</data>
- <data name="VOLUME">
- <value>Volumen</value>
- </data>
<data name="UNLIMITED">
<value>Ilimitado</value>
</data>
-</root>
+</root>
\ No newline at end of file
Modified: trunk/src/admin/iFolderAdmin.fr.resx
===============...
[truncated message content] |
|
From: <jj...@us...> - 2010-07-06 08:13:36
|
Revision: 7424
http://simias.svn.sourceforge.net/simias/?rev=7424&view=rev
Author: jjohnny
Date: 2010-07-06 08:13:30 +0000 (Tue, 06 Jul 2010)
Log Message:
-----------
ID: Bug #601327
Reviewers: Ramesh
Localization Required: No
Documentation Required: No
Description: HostNodes should not be processed for orphaned collections.
After decommisioning a slave server, the stale slave entries would be removed from web admin page.
Modified Paths:
--------------
trunk/src/core/CollectionStore/Collection.cs
Modified: trunk/src/core/CollectionStore/Collection.cs
===================================================================
--- trunk/src/core/CollectionStore/Collection.cs 2010-07-02 10:56:40 UTC (rev 7423)
+++ trunk/src/core/CollectionStore/Collection.cs 2010-07-06 08:13:30 UTC (rev 7424)
@@ -3152,10 +3152,8 @@
/// <param name="node">Node for which orphan collections has to be made.</param>
public void OrphanCollections(Node node)
{
- if(node == null || ! (node.IsBaseType(NodeTypes.MemberType) ))
- {
+ if(node == null || !(node.IsBaseType(NodeTypes.MemberType)) || node.IsType (HostNode.HostNodeType) )
return ;
- }
// Convert this node to a member node.
Member member = new Member( node );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sb...@us...> - 2010-07-02 10:56:46
|
Revision: 7423
http://simias.svn.sourceforge.net/simias/?rev=7423&view=rev
Author: sbipin
Date: 2010-07-02 10:56:40 +0000 (Fri, 02 Jul 2010)
Log Message:
-----------
ID: #00000
Reviewer: Self
Localization Required: No
Documentation Required: No
Description: Tagging sources submitted for July 2010 patch.
Added Paths:
-----------
tags/iFolder_3.8.0_july2010_patch/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mv...@us...> - 2010-07-01 18:09:47
|
Revision: 7422
http://simias.svn.sourceforge.net/simias/?rev=7422&view=rev
Author: mvikash
Date: 2010-07-01 17:14:12 +0000 (Thu, 01 Jul 2010)
Log Message:
-----------
bump version 3.8.0.3 to 3.8.0.4
Modified Paths:
--------------
branches/iFolder_3.8.0_updates/src/core/FlaimProvider/FlaimWrapper/FlaimWrapper.vcproj
Modified: branches/iFolder_3.8.0_updates/src/core/FlaimProvider/FlaimWrapper/FlaimWrapper.vcproj
===================================================================
--- branches/iFolder_3.8.0_updates/src/core/FlaimProvider/FlaimWrapper/FlaimWrapper.vcproj 2010-07-01 17:09:13 UTC (rev 7421)
+++ branches/iFolder_3.8.0_updates/src/core/FlaimProvider/FlaimWrapper/FlaimWrapper.vcproj 2010-07-01 17:14:12 UTC (rev 7422)
@@ -84,7 +84,7 @@
Name="VCLinkerTool"
AdditionalDependencies="rpcrt4.lib ws2_32.lib odbc32.lib odbccp32.lib flaim.lib msvcrt.lib"
OutputFile=".\Release/FlaimWrapper.dll"
- Version="3.8.0.3"
+ Version="3.8.0.4"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=""$(SolutionDir)..\..\dependencies\external\libflaim\win32""
@@ -186,7 +186,7 @@
Name="VCLinkerTool"
AdditionalDependencies="rpcrt4.lib ws2_32.lib odbc32.lib odbccp32.lib dbghelp.lib flaim.lib flaimtk.lib msvcrt.lib"
OutputFile=".\Release/FlaimWrapper.dll"
- Version="3.8.0.3"
+ Version="3.8.0.4"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=""$(SolutionDir)..\..\dependencies\external\libflaim\win64""
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mv...@us...> - 2010-07-01 17:09:19
|
Revision: 7421
http://simias.svn.sourceforge.net/simias/?rev=7421&view=rev
Author: mvikash
Date: 2010-07-01 17:09:13 +0000 (Thu, 01 Jul 2010)
Log Message:
-----------
bump version 3.8.0.3 to 3.8.0.4
Modified Paths:
--------------
branches/iFolder_3.8.0_updates/src/server/Simias.ClientUpdate/version.config
Modified: branches/iFolder_3.8.0_updates/src/server/Simias.ClientUpdate/version.config
===================================================================
--- branches/iFolder_3.8.0_updates/src/server/Simias.ClientUpdate/version.config 2010-07-01 15:56:59 UTC (rev 7420)
+++ branches/iFolder_3.8.0_updates/src/server/Simias.ClientUpdate/version.config 2010-07-01 17:09:13 UTC (rev 7421)
@@ -4,15 +4,15 @@
with the one specified here by 'filename'. -->
<versioninfo>
<distribution match="windows32">
- <version>3.8.0.3</version>
+ <version>3.8.0.4</version>
<filename>ifolder3-windows.exe</filename>
</distribution>
<distribution match="windows64">
- <version>3.8.0.3</version>
+ <version>3.8.0.4</version>
<filename>ifolder3-windows-x64.exe</filename>
</distribution>
<distribution match="DEFAULT">
- <version>3.8.0.3</version>
+ <version>3.8.0.4</version>
<filename>ifolder3-windows.exe</filename>
</distribution>
</versioninfo>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mv...@us...> - 2010-07-01 15:57:05
|
Revision: 7420
http://simias.svn.sourceforge.net/simias/?rev=7420&view=rev
Author: mvikash
Date: 2010-07-01 15:56:59 +0000 (Thu, 01 Jul 2010)
Log Message:
-----------
Fix for not allowing member nodes to be deleted on the server as part of domain sync.
Modified Paths:
--------------
trunk/src/core/Storage/PropertyTags.cs
trunk/src/core/Sync/SyncService.cs
Modified: trunk/src/core/Storage/PropertyTags.cs
===================================================================
--- trunk/src/core/Storage/PropertyTags.cs 2010-07-01 15:54:16 UTC (rev 7419)
+++ trunk/src/core/Storage/PropertyTags.cs 2010-07-01 15:56:59 UTC (rev 7420)
@@ -512,9 +512,13 @@
/// <summary>
/// Well known property name.
/// </summary>
- static public string AggregateDiskQuota = "AggregateDiskQuota";
+ static public string AggregateDiskQuota = "AggregateDiskQuota";
+
+ /// <summary>
+ /// Well known property name.
+ /// </summary>
+ static public string DomainTypeNameSpaceProperty = "Simias.Storage.Domain";
-
/// <summary>
/// Hashtable providing quick lookup to well-known system properties.
/// </summary>
Modified: trunk/src/core/Sync/SyncService.cs
===================================================================
--- trunk/src/core/Sync/SyncService.cs 2010-07-01 15:54:16 UTC (rev 7419)
+++ trunk/src/core/Sync/SyncService.cs 2010-07-01 15:56:59 UTC (rev 7420)
@@ -1031,7 +1031,17 @@
public SyncNodeStatus[] DeleteNodes(string[] nodeIDs)
{
if (cLock == null || !IsAccessAllowed(Access.Rights.ReadWrite))
- return null;
+ return null;
+
+ /// If This is a Domain collection then don't let the deletion to proceed...
+
+ string ColType = collection.GetType().ToString();
+ bool IsDomainType = ColType.Equals(PropertyTags.DomainTypeNameSpaceProperty) || ColType.Equals(PropertyTags.Domain);
+ if (IsDomainType)
+ {
+ log.Fatal("Attempt to delete users as part of domain sync. Rejecting the delete request.");
+ return null;
+ }
SyncNodeStatus[] statusArray = new SyncNodeStatus[nodeIDs.Length];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mv...@us...> - 2010-07-01 15:54:22
|
Revision: 7419
http://simias.svn.sourceforge.net/simias/?rev=7419&view=rev
Author: mvikash
Date: 2010-07-01 15:54:16 +0000 (Thu, 01 Jul 2010)
Log Message:
-----------
Fix for not allowing member nodes to be deleted on the server as part of domain sync.
Modified Paths:
--------------
branches/iFolder_3.8.0_updates/src/core/Storage/PropertyTags.cs
branches/iFolder_3.8.0_updates/src/core/Sync/SyncService.cs
Modified: branches/iFolder_3.8.0_updates/src/core/Storage/PropertyTags.cs
===================================================================
--- branches/iFolder_3.8.0_updates/src/core/Storage/PropertyTags.cs 2010-07-01 15:23:16 UTC (rev 7418)
+++ branches/iFolder_3.8.0_updates/src/core/Storage/PropertyTags.cs 2010-07-01 15:54:16 UTC (rev 7419)
@@ -483,7 +483,12 @@
/// <summary>
/// Well known property name.
/// </summary>
- static public string AggregateDiskQuota = "AggregateDiskQuota";
+ static public string AggregateDiskQuota = "AggregateDiskQuota";
+
+ /// <summary>
+ /// Well known property name.
+ /// </summary>
+ static public string DomainTypeNameSpaceProperty = "Simias.Storage.Domain";
/// <summary>
Modified: branches/iFolder_3.8.0_updates/src/core/Sync/SyncService.cs
===================================================================
--- branches/iFolder_3.8.0_updates/src/core/Sync/SyncService.cs 2010-07-01 15:23:16 UTC (rev 7418)
+++ branches/iFolder_3.8.0_updates/src/core/Sync/SyncService.cs 2010-07-01 15:54:16 UTC (rev 7419)
@@ -1031,7 +1031,17 @@
public SyncNodeStatus[] DeleteNodes(string[] nodeIDs)
{
if (cLock == null || !IsAccessAllowed(Access.Rights.ReadWrite))
- return null;
+ return null;
+
+ /// If This is a Domain collection then don't let the deletion to proceed...
+
+ string ColType = collection.GetType().ToString();
+ bool IsDomainType = ColType.Equals(PropertyTags.DomainTypeNameSpaceProperty) || ColType.Equals(PropertyTags.Domain);
+ if (IsDomainType)
+ {
+ log.Fatal("Attempt to delete users as part of domain sync. Rejecting the delete request.");
+ return null;
+ }
SyncNodeStatus[] statusArray = new SyncNodeStatus[nodeIDs.Length];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mv...@us...> - 2010-07-01 15:23:22
|
Revision: 7418
http://simias.svn.sourceforge.net/simias/?rev=7418&view=rev
Author: mvikash
Date: 2010-07-01 15:23:16 +0000 (Thu, 01 Jul 2010)
Log Message:
-----------
Fix for copying the whole file on the server locally for file rename, in case of an encrypted iFolders.
Modified Paths:
--------------
trunk/src/core/Sync/ClientFile.cs
trunk/src/core/Sync/SyncFile.cs
Modified: trunk/src/core/Sync/ClientFile.cs
===================================================================
--- trunk/src/core/Sync/ClientFile.cs 2010-07-01 15:18:37 UTC (rev 7417)
+++ trunk/src/core/Sync/ClientFile.cs 2010-07-01 15:23:16 UTC (rev 7418)
@@ -1472,12 +1472,7 @@
writeArray.Add(new OffsetSegment(sizeToSync, 0));
}
else
- {
- copyArray.Clear();
- writeArray.Clear();
- //Nothing to upload since the file data is modified (might have been 'touch'ed
sizeToSync = 0;
- }
}
}
Modified: trunk/src/core/Sync/SyncFile.cs
===================================================================
--- trunk/src/core/Sync/SyncFile.cs 2010-07-01 15:18:37 UTC (rev 7417)
+++ trunk/src/core/Sync/SyncFile.cs 2010-07-01 15:23:16 UTC (rev 7418)
@@ -1147,7 +1147,7 @@
Store store = Store.GetStore();
string Passphrase = store.GetPassPhrase(collection.Domain);
- Log.log.Debug("GetCryptoKey: passphrase:{0} -- domain:{1}", Passphrase, collection.Domain.ToString());
+ //Log.log.Debug("GetCryptoKey: passphrase:{0} -- domain:{1}", Passphrase, collection.Domain.ToString());
if(Passphrase ==null)
throw new CollectionStoreException("Passphrase not provided");
@@ -1156,9 +1156,9 @@
byte[] passphrase = hash.HashPassPhrase(Passphrase);
Key key = new Key(EncryptedKey);//send the key size and algorithm
- Log.log.Debug("DecryptKey called");
+ //Log.log.Debug("DecryptKey called");
key.DecrypytKey(passphrase, out EncryptionKey);//send the passphrase to decrypt the key
- Log.log.Debug("Encryption key is :{0}", EncryptionKey.ToString());
+ //Log.log.Debug("Encryption key is :{0}", EncryptionKey.ToString());
p = collection.Properties.FindSingleValue(PropertyTags.EncryptionBlob);
string EncryptionBlob = (p!=null) ? (string) p.Value as string : null;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mv...@us...> - 2010-07-01 15:18:48
|
Revision: 7417
http://simias.svn.sourceforge.net/simias/?rev=7417&view=rev
Author: mvikash
Date: 2010-07-01 15:18:37 +0000 (Thu, 01 Jul 2010)
Log Message:
-----------
Fix for copying the whole file on the server locally for file rename, in case of an encrypted iFolders.
Modified Paths:
--------------
branches/iFolder_3.8.0_updates/src/core/Sync/ClientFile.cs
Modified: branches/iFolder_3.8.0_updates/src/core/Sync/ClientFile.cs
===================================================================
--- branches/iFolder_3.8.0_updates/src/core/Sync/ClientFile.cs 2010-07-01 13:17:03 UTC (rev 7416)
+++ branches/iFolder_3.8.0_updates/src/core/Sync/ClientFile.cs 2010-07-01 15:18:37 UTC (rev 7417)
@@ -1449,12 +1449,7 @@
writeArray.Add(new OffsetSegment(sizeToSync, 0));
}
else
- {
- copyArray.Clear();
- writeArray.Clear();
- //Nothing to upload since the file data is modified (might have been 'touch'ed
sizeToSync = 0;
- }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mv...@us...> - 2010-07-01 13:17:12
|
Revision: 7416
http://simias.svn.sourceforge.net/simias/?rev=7416&view=rev
Author: mvikash
Date: 2010-07-01 13:17:03 +0000 (Thu, 01 Jul 2010)
Log Message:
-----------
version bump from 3.8.0.3 to 3.8.0.4
Modified Paths:
--------------
branches/iFolder_3.8.0_updates/src/core/POBoxWS/Properties/AssemblyInfo.cs
branches/iFolder_3.8.0_updates/src/core/Properties/AssemblyInfo.cs
branches/iFolder_3.8.0_updates/src/core/SimiasApp/Properties/AssemblyInfo.cs
branches/iFolder_3.8.0_updates/src/core/SimiasClient/Properties/AssemblyInfo.cs
branches/iFolder_3.8.0_updates/src/core/SyncService/Properties/AssemblyInfo.cs
branches/iFolder_3.8.0_updates/src/core/WebService/Properties/AssemblyInfo.cs
branches/iFolder_3.8.0_updates/src/server/Simias.ClientUpdate/mac-version.config
branches/iFolder_3.8.0_updates/src/server/Simias.ClientUpdate/unix-version.config
Modified: branches/iFolder_3.8.0_updates/src/core/POBoxWS/Properties/AssemblyInfo.cs
===================================================================
--- branches/iFolder_3.8.0_updates/src/core/POBoxWS/Properties/AssemblyInfo.cs 2010-06-30 15:26:56 UTC (rev 7415)
+++ branches/iFolder_3.8.0_updates/src/core/POBoxWS/Properties/AssemblyInfo.cs 2010-07-01 13:17:03 UTC (rev 7416)
@@ -28,6 +28,6 @@
// Minor Version
// Build Number
// Revision
-//
-[assembly: AssemblyVersion("3.8.0.3")]
-[assembly: AssemblyFileVersion("3.8.0.3")]
+//
+[assembly: AssemblyVersion("3.8.0.4")]
+[assembly: AssemblyFileVersion("3.8.0.4")]
Modified: branches/iFolder_3.8.0_updates/src/core/Properties/AssemblyInfo.cs
===================================================================
--- branches/iFolder_3.8.0_updates/src/core/Properties/AssemblyInfo.cs 2010-06-30 15:26:56 UTC (rev 7415)
+++ branches/iFolder_3.8.0_updates/src/core/Properties/AssemblyInfo.cs 2010-07-01 13:17:03 UTC (rev 7416)
@@ -28,6 +28,6 @@
// Minor Version
// Build Number
// Revision
-//
-[assembly: AssemblyVersion("3.8.0.3")]
-[assembly: AssemblyFileVersion("3.8.0.3")]
+//
+[assembly: AssemblyVersion("3.8.0.4")]
+[assembly: AssemblyFileVersion("3.8.0.4")]
Modified: branches/iFolder_3.8.0_updates/src/core/SimiasApp/Properties/AssemblyInfo.cs
===================================================================
--- branches/iFolder_3.8.0_updates/src/core/SimiasApp/Properties/AssemblyInfo.cs 2010-06-30 15:26:56 UTC (rev 7415)
+++ branches/iFolder_3.8.0_updates/src/core/SimiasApp/Properties/AssemblyInfo.cs 2010-07-01 13:17:03 UTC (rev 7416)
@@ -28,6 +28,6 @@
// Minor Version
// Build Number
// Revision
-//
-[assembly: AssemblyVersion("3.8.0.3")]
-[assembly: AssemblyFileVersion("3.8.0.3")]
+//
+[assembly: AssemblyVersion("3.8.0.4")]
+[assembly: AssemblyFileVersion("3.8.0.4")]
Modified: branches/iFolder_3.8.0_updates/src/core/SimiasClient/Properties/AssemblyInfo.cs
===================================================================
--- branches/iFolder_3.8.0_updates/src/core/SimiasClient/Properties/AssemblyInfo.cs 2010-06-30 15:26:56 UTC (rev 7415)
+++ branches/iFolder_3.8.0_updates/src/core/SimiasClient/Properties/AssemblyInfo.cs 2010-07-01 13:17:03 UTC (rev 7416)
@@ -28,6 +28,6 @@
// Minor Version
// Build Number
// Revision
-//
-[assembly: AssemblyVersion("3.8.0.3")]
-[assembly: AssemblyFileVersion("3.8.0.3")]
+//
+[assembly: AssemblyVersion("3.8.0.4")]
+[assembly: AssemblyFileVersion("3.8.0.4")]
Modified: branches/iFolder_3.8.0_updates/src/core/SyncService/Properties/AssemblyInfo.cs
===================================================================
--- branches/iFolder_3.8.0_updates/src/core/SyncService/Properties/AssemblyInfo.cs 2010-06-30 15:26:56 UTC (rev 7415)
+++ branches/iFolder_3.8.0_updates/src/core/SyncService/Properties/AssemblyInfo.cs 2010-07-01 13:17:03 UTC (rev 7416)
@@ -28,6 +28,6 @@
// Minor Version
// Build Number
// Revision
-//
-[assembly: AssemblyVersion("3.8.0.3")]
-[assembly: AssemblyFileVersion("3.8.0.3")]
+//
+[assembly: AssemblyVersion("3.8.0.4")]
+[assembly: AssemblyFileVersion("3.8.0.4")]
Modified: branches/iFolder_3.8.0_updates/src/core/WebService/Properties/AssemblyInfo.cs
===================================================================
--- branches/iFolder_3.8.0_updates/src/core/WebService/Properties/AssemblyInfo.cs 2010-06-30 15:26:56 UTC (rev 7415)
+++ branches/iFolder_3.8.0_updates/src/core/WebService/Properties/AssemblyInfo.cs 2010-07-01 13:17:03 UTC (rev 7416)
@@ -28,6 +28,6 @@
// Minor Version
// Build Number
// Revision
-//
-[assembly: AssemblyVersion("3.8.0.3")]
-[assembly: AssemblyFileVersion("3.8.0.3")]
+//
+[assembly: AssemblyVersion("3.8.0.4")]
+[assembly: AssemblyFileVersion("3.8.0.4")]
Modified: branches/iFolder_3.8.0_updates/src/server/Simias.ClientUpdate/mac-version.config
===================================================================
--- branches/iFolder_3.8.0_updates/src/server/Simias.ClientUpdate/mac-version.config 2010-06-30 15:26:56 UTC (rev 7415)
+++ branches/iFolder_3.8.0_updates/src/server/Simias.ClientUpdate/mac-version.config 2010-07-01 13:17:03 UTC (rev 7416)
@@ -7,7 +7,7 @@
<!-- Put Version string here. Should be in the format of
Major Version.Minor Version.Build Version.Revision
Example: <version>1.0.1817.29628</version> -->
- <version>3.8.0.3</version>
+ <version>3.8.0.4</version>
<!-- Put name of Mac ifolder client application file
to be upgraded here. The specified file must be in
Modified: branches/iFolder_3.8.0_updates/src/server/Simias.ClientUpdate/unix-version.config
===================================================================
--- branches/iFolder_3.8.0_updates/src/server/Simias.ClientUpdate/unix-version.config 2010-06-30 15:26:56 UTC (rev 7415)
+++ branches/iFolder_3.8.0_updates/src/server/Simias.ClientUpdate/unix-version.config 2010-07-01 13:17:03 UTC (rev 7416)
@@ -24,7 +24,7 @@
you are doing.
-->
<distribution match="DEFAULT">
- <version>3.8.0.3</version>
+ <version>3.8.0.4</version>
<download-directory>default</download-directory>
</distribution>
@@ -51,17 +51,17 @@
-->
<distribution match="SUSE Linux Enterprise Desktop 10">
- <version>3.8.0.3</version>
+ <version>3.8.0.4</version>
<download-directory>suse-linux-10.0</download-directory>
</distribution>
<distribution match="SUSE Linux Enterprise Desktop 11">
- <version>3.8.0.3</version>
+ <version>3.8.0.4</version>
<download-directory>suse-linux-11.0</download-directory>
</distribution>
<distribution match="openSUSE">
- <version>3.8.0.3</version>
+ <version>3.8.0.4</version>
<download-directory>opensuse-linux</download-directory>
</distribution>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jj...@us...> - 2010-06-30 15:27:02
|
Revision: 7415
http://simias.svn.sourceforge.net/simias/?rev=7415&view=rev
Author: jjohnny
Date: 2010-06-30 15:26:56 +0000 (Wed, 30 Jun 2010)
Log Message:
-----------
ID: Bug #558617
Reviewers: Ravi
Localization Required: No
Documentation Required: No
Description: WebAdmin - Changed non editable fields from a textbox to label in serverdetails page.
Modified Paths:
--------------
trunk/src/admin/ServerDetails.aspx
trunk/src/admin/ServerDetails.aspx.cs
Modified: trunk/src/admin/ServerDetails.aspx
===================================================================
--- trunk/src/admin/ServerDetails.aspx 2010-06-30 14:03:11 UTC (rev 7414)
+++ trunk/src/admin/ServerDetails.aspx 2010-06-30 15:26:56 UTC (rev 7415)
@@ -421,11 +421,10 @@
</th>
<td>
- <asp:TextBox
+ <asp:Literal
ID="LdapServer"
Runat="server"
- CssClass="syncnowtextbox"
- Enabled="false" />
+ />
</td>
</tr>
@@ -449,44 +448,23 @@
</th>
<td>
- <asp:TextBox
+ <asp:Literal
ID="LdapProxyUser"
Runat="server"
- Enabled="false"
/>
</td>
</tr>
- <tr>
- <th>
- <%= GetString( "LDAPPROXYUSERPWD" ) %>
- </th>
-
- <td>
- <asp:TextBox
- ID="LdapProxyUserPwd"
- TextMode="Password"
- Enabled="false"
- Runat="server"
- />
- </td>
- </tr>
-
<tr>
<th>
<%= GetString( "LDAPCONTEXTTAG" ) %>
</th>
<td>
- <textarea
+ <asp:Literal
ID="LdapSearchContext"
- runat="server"
- class="edittext"
- readonly="true"
- wrap="soft"
- rows="2"
- cols="25"
- ></textarea>
+ Runat="server"
+ />
</td>
</tr>
Modified: trunk/src/admin/ServerDetails.aspx.cs
===================================================================
--- trunk/src/admin/ServerDetails.aspx.cs 2010-06-30 14:03:11 UTC (rev 7414)
+++ trunk/src/admin/ServerDetails.aspx.cs 2010-06-30 15:26:56 UTC (rev 7415)
@@ -201,7 +201,7 @@
/// <summary>
/// LDAP Server name.
/// </summary>
- protected TextBox LdapServer;
+ protected Literal LdapServer;
/// <summary>
/// LDAP Cycles
@@ -216,14 +216,9 @@
/// <summary>
/// LDAP Proxy User
/// </summary>
- protected TextBox LdapProxyUser;
+ protected Literal LdapProxyUser;
/// <summary>
- /// LDAP Proxy User
- /// </summary>
- protected TextBox LdapProxyUserPwd;
-
- /// <summary>
/// LDAP SSL
/// </summary>
protected Literal LdapSsl;
@@ -231,7 +226,7 @@
/// <summary>
/// External Identity Sync Interval
/// </summary>
- protected HtmlTextArea LdapSearchContext;
+ protected Literal LdapSearchContext;
/// <summary>
/// Member Delete Grace Interval
@@ -745,9 +740,8 @@
//Pick information from IdentityProvider
LdapInfo ldapInfo = remoteweb.GetLdapDetails();
LdapServer.Text = ldapInfo.Host ;
- LdapSearchContext.Value = ldapInfo.SearchContexts;
+ LdapSearchContext.Text = ldapInfo.SearchContexts;
LdapProxyUser.Text = ldapInfo.ProxyDN;
- LdapProxyUserPwd.Text = ldapInfo.ProxyPassword;
LdapSsl.Text = ldapInfo.SSL ? GetString ("YES") : GetString ("NO");
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jj...@us...> - 2010-06-30 14:03:19
|
Revision: 7414
http://simias.svn.sourceforge.net/simias/?rev=7414&view=rev
Author: jjohnny
Date: 2010-06-30 14:03:11 +0000 (Wed, 30 Jun 2010)
Log Message:
-----------
ID: Bug #610148
Reviewers: GG
Localization Required: No
Documentation Required: No
Description: use simiasconfdir instead of sysconf/"simias" in simias-server-setup
Modified Paths:
--------------
trunk/src/server/setup/SimiasServerSetup.cs
Modified: trunk/src/server/setup/SimiasServerSetup.cs
===================================================================
--- trunk/src/server/setup/SimiasServerSetup.cs 2010-06-30 14:02:42 UTC (rev 7413)
+++ trunk/src/server/setup/SimiasServerSetup.cs 2010-06-30 14:03:11 UTC (rev 7414)
@@ -1074,22 +1074,55 @@
}
/// <summary>
+ /// Combines strings into a path.
+ /// </summary>
+ private static string PathCombine (params string [] paths)
+ {
+ //TODO : Move this API to a common utils class?
+ //Note : This API was Stolen from Mono - System.IO/Path.cs.
+ //Path.Combine (params string []) is not available untill 4.0 (Mono 2.8)
+
+ if (paths == null)
+ throw new ArgumentNullException ("paths");
+
+ bool need_sep;
+ var ret = new StringBuilder ();
+ int pathsLen = paths.Length;
+ int slen;
+ foreach (var s in paths) {
+ need_sep = false;
+ if (s == null)
+ throw new ArgumentNullException ("One of the paths contains a null value", "paths");
+ if (s.IndexOfAny (Path.GetInvalidPathChars()) != -1)
+ throw new ArgumentException ("Illegal characters in path.");
+
+ pathsLen--;
+ if (Path.IsPathRooted (s))
+ ret.Length = 0;
+
+ ret.Append (s);
+ slen = s.Length;
+ if (slen > 0 && pathsLen > 0) {
+ char p1end = s [slen - 1];
+ if (p1end != Path.DirectorySeparatorChar && p1end != Path.AltDirectorySeparatorChar && p1end != Path.VolumeSeparatorChar)
+ need_sep = true;
+ }
+
+ if (need_sep)
+ ret.Append (Path.DirectorySeparatorChar.ToString());
+ }
+
+ return ret.ToString ();
+ }
+
+ /// <summary>
/// Setup User Move Plugin
/// </summary>
bool SetupUserMovePlugin()
{
Console.WriteLine("Configuring User Movement plugin..\n");
- string usermoveModuleConfigPath = String.Format( "{0}{1}{2}{3}{4}{5}{6}{7}{8}",
- SimiasSetup.sysconfdir,
- Path.DirectorySeparatorChar.ToString(),
- "simias",
- Path.DirectorySeparatorChar.ToString(),
- "bill",
- Path.DirectorySeparatorChar.ToString(),
- ModulesDir,
- Path.DirectorySeparatorChar.ToString(),
- UserMoveModule );
+ string usermoveModuleConfigPath = PathCombine (SimiasSetup.simiasconfdir, "bill", ModulesDir, UserMoveModule);
if ( File.Exists( usermoveModuleConfigPath ) == false )
{
@@ -1130,17 +1163,9 @@
"../..",
Path.DirectorySeparatorChar.ToString()
);
- string ldapModuleConfigPath = String.Format( "{0}{1}{2}{3}{4}{5}{6}{7}{8}",
- SimiasSetup.sysconfdir,
- Path.DirectorySeparatorChar.ToString(),
- "simias",
- Path.DirectorySeparatorChar.ToString(),
- "bill",
- Path.DirectorySeparatorChar.ToString(),
- ModulesDir,
- Path.DirectorySeparatorChar.ToString(),
- LdapModule );
+ string ldapModuleConfigPath = PathCombine (SimiasSetup.simiasconfdir, "bill", ModulesDir, LdapModule);
+
if ( File.Exists( ldapModuleConfigPath ) == false )
{
Console.WriteLine("Failed to find the Ldap plugin configuration files..");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jj...@us...> - 2010-06-30 14:02:48
|
Revision: 7413
http://simias.svn.sourceforge.net/simias/?rev=7413&view=rev
Author: jjohnny
Date: 2010-06-30 14:02:42 +0000 (Wed, 30 Jun 2010)
Log Message:
-----------
ID: Bug #614704
Reviewers:GG
Localization Required: Yes
Documentation Required: No
Description: WebAdmin - When there are no policies in the list, display the right string "No policies available"
Modified Paths:
--------------
trunk/src/admin/FileTypeFilter.ascx.cs
trunk/src/admin/ListFooter.ascx.cs
trunk/src/admin/iFolderAdmin.resx
Modified: trunk/src/admin/FileTypeFilter.ascx.cs
===================================================================
--- trunk/src/admin/FileTypeFilter.ascx.cs 2010-06-30 14:02:10 UTC (rev 7412)
+++ trunk/src/admin/FileTypeFilter.ascx.cs 2010-06-30 14:02:42 UTC (rev 7413)
@@ -425,6 +425,9 @@
TotalFiles,
GetString( "FILES" ),
GetString( "FILE" ) );
+
+ if (TotalFiles == 0)
+ FileTypeListFooter.SetPageText (GetString ("NOPOLICIESAVAILABLE"));
}
/// <summary>
Modified: trunk/src/admin/ListFooter.ascx.cs
===================================================================
--- trunk/src/admin/ListFooter.ascx.cs 2010-06-30 14:02:10 UTC (rev 7412)
+++ trunk/src/admin/ListFooter.ascx.cs 2010-06-30 14:02:42 UTC (rev 7413)
@@ -237,6 +237,15 @@
#region Public Methods
/// <summary>
+ /// Sets the text to be displayed at the botton of the list
+ /// </summary>
+ /// <param name="footerText"> Text to be displayed at the botton of the list</param>
+ public void SetPageText( string footerText )
+ {
+ PageText.Text = footerText;
+ }
+
+ /// <summary>
/// Enables or disables the search navigation buttons depending on the display data index.
/// </summary>
/// <param name="dataGrid"></param>
Modified: trunk/src/admin/iFolderAdmin.resx
===================================================================
--- trunk/src/admin/iFolderAdmin.resx 2010-06-30 14:02:10 UTC (rev 7412)
+++ trunk/src/admin/iFolderAdmin.resx 2010-06-30 14:02:42 UTC (rev 7413)
@@ -1267,6 +1267,9 @@
<data name="NOMEMBERAVAILABLE">
<value>No member available</value>
</data>
+ <data name="NOPOLICIESAVAILABLE">
+ <value>No policies available</value>
+ </data>
<data name="SAVETO">
<value>Save to</value>
</data>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jj...@us...> - 2010-06-30 14:02:16
|
Revision: 7412
http://simias.svn.sourceforge.net/simias/?rev=7412&view=rev
Author: jjohnny
Date: 2010-06-30 14:02:10 +0000 (Wed, 30 Jun 2010)
Log Message:
-----------
ID: Bug #613247
Reviewers:GG
Localization Required: No
Documentation Required: No
Description:[SimiasServerSetup] Changed default proxy user to iFolderProxy.
Modified Paths:
--------------
trunk/src/server/setup/SimiasServerSetup.cs
Modified: trunk/src/server/setup/SimiasServerSetup.cs
===================================================================
--- trunk/src/server/setup/SimiasServerSetup.cs 2010-06-30 09:22:31 UTC (rev 7411)
+++ trunk/src/server/setup/SimiasServerSetup.cs 2010-06-30 14:02:10 UTC (rev 7412)
@@ -267,7 +267,7 @@
/// <summary>
/// LDAP Proxy DN
/// </summary>
- public Option ldapProxyDN = new Option("ldap-proxy-dn", "LDAP Proxy DN", "An LDAP user that will be used to provision the users between Simias and the LDAP server. If this user does not already exist in the LDAP tree it will be created and granted read rights at the root of the tree. The user's dn and password are stored by Simias.", false, "cn=SimiasProxy,o=novell");
+ public Option ldapProxyDN = new Option("ldap-proxy-dn", "LDAP Proxy DN", "An LDAP user that will be used to provision the users between Simias and the LDAP server. If this user does not already exist in the LDAP tree it will be created and granted read rights at the root of the tree. The user's dn and password are stored by Simias.", false, "cn=iFolderProxy,o=novell");
/// <summary>
/// LDAP Proxy Password
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sp...@us...> - 2010-06-30 09:22:40
|
Revision: 7411
http://simias.svn.sourceforge.net/simias/?rev=7411&view=rev
Author: spkumar
Date: 2010-06-30 09:22:31 +0000 (Wed, 30 Jun 2010)
Log Message:
-----------
Included a limit on the number of retries to create a proxy user during
the simias server setup
Modified Paths:
--------------
trunk/src/server/setup/SimiasServerSetup.cs
Modified: trunk/src/server/setup/SimiasServerSetup.cs
===================================================================
--- trunk/src/server/setup/SimiasServerSetup.cs 2010-06-28 10:30:37 UTC (rev 7410)
+++ trunk/src/server/setup/SimiasServerSetup.cs 2010-06-30 09:22:31 UTC (rev 7411)
@@ -86,6 +86,7 @@
private static string oldConfigPath = "/var/lib/wwwrun/.local/share/simias/";
private static string TemplateScriptFile = "simias-server";
+ private static readonly int MAX_PROXY_RETRY_COUNT = 5;
//Invalid Character List.
public static char[] InvalidChars = {'\\', ':', '*', '?', '\"', '<', '>', '|', ' '};
@@ -112,9 +113,9 @@
string NonSsl = "NONSSL";
- /// <summary>
- /// BOTH option for setting simias server communication method
- /// </summary>
+ /// <summary>
+ /// BOTH option for setting simias server communication method
+ /// </summary>
string Both = "BOTH";
int UpgradeFrom = 0;
@@ -174,7 +175,7 @@
/// <summary>
/// Use SSL;
- /// </summary>
+ /// </summary>
public Option useSsl = new Option("use-ssl", "SSL", "Select SSL/NONSSL communication for this server. Options are SSL, NONSSL or BOTH", true, "SSL");
/// <summary>
@@ -398,9 +399,9 @@
#endregion
#region Option Handlers
- /// <summary>
- /// To handle of SSL option is selected
- /// </summary>
+ /// <summary>
+ /// To handle of SSL option is selected
+ /// </summary>
/// <returns>true if changes are set successfully</returns>
private bool OnUseSSL()
{
@@ -430,9 +431,9 @@
return true;
}
- /// <summary>
- /// to check if ldap proxy DN is present
- /// </summary>
+ /// <summary>
+ /// to check if ldap proxy DN is present
+ /// </summary>
/// <returns>true if ldapproxy Dn is present</returns>
private bool OnldapProxyDN()
{
@@ -440,9 +441,9 @@
isLdapProxySet = true;
return true;
}
- /// <summary>
- /// check if ldap admin DN is present
- /// </summary>
+ /// <summary>
+ /// check if ldap admin DN is present
+ /// </summary>
/// <returns>true if ldap admin DN is present</returns>
private bool OnldapAdminDN()
{
@@ -451,9 +452,9 @@
return true;
}
- /// <summary>
- /// check if ldap admin password is present
- /// </summary>
+ /// <summary>
+ /// check if ldap admin password is present
+ /// </summary>
/// <returns>true if ldapadmin password field is non-null</returns>
private bool OnldapAdminPassword()
{
@@ -462,9 +463,9 @@
return true;
}
- /// <summary>
- /// check whether store path exists or not and take appropriate action
- /// </summary>
+ /// <summary>
+ /// check whether store path exists or not and take appropriate action
+ /// </summary>
/// <returns>true if path exists and updation by default value is done</returns>
private bool OnPath()
{
@@ -509,9 +510,9 @@
return true;
}
- /// <summary>
- /// check whether server name can be prompted or not
- /// </summary>
+ /// <summary>
+ /// check whether server name can be prompted or not
+ /// </summary>
/// <returns>true if servername prompt can be shown</returns>
private bool OnServerName()
{
@@ -553,9 +554,9 @@
}
*/
- /// <summary>
- /// if useldap value is true then ask for ldap attributes
- /// </summary>
+ /// <summary>
+ /// if useldap value is true then ask for ldap attributes
+ /// </summary>
/// <returns>true if useldap is true</returns>
private bool OnLdap()
{
@@ -572,9 +573,9 @@
return true;
}
- /// <summary>
- /// whether use RA is specified or not
- /// </summary>
+ /// <summary>
+ /// whether use RA is specified or not
+ /// </summary>
/// <returns>true if asked to use RA</returns>
private bool OnRA()
{
@@ -586,9 +587,9 @@
return true;
}
- /// <summary>
- /// if RA path is given, then it is called
- /// </summary>
+ /// <summary>
+ /// if RA path is given, then it is called
+ /// </summary>
/// <returns>if the given path exists, return true</returns>
private bool OnRAPath()
{
@@ -596,9 +597,9 @@
return System.IO.Directory.Exists( raPath );
}
- /// <summary>
- /// whether this server is slave
- /// </summary>
+ /// <summary>
+ /// whether this server is slave
+ /// </summary>
/// <returns>true if slave, and ask for accepting ldap certificate</returns>
private bool OnSlave()
{
@@ -624,9 +625,9 @@
return true;
}
- /// <summary>
- /// prompting for using apache
- /// </summary>
+ /// <summary>
+ /// prompting for using apache
+ /// </summary>
/// <returns>true if using apache was selected</returns>
private bool OnApache()
{
@@ -637,9 +638,9 @@
return true;
}
- /// <summary>
- /// called during public URL selection
- /// </summary>
+ /// <summary>
+ /// called during public URL selection
+ /// </summary>
/// <returns>true if public url is set successfully</returns>
private bool OnPublicUrl()
{
@@ -670,9 +671,9 @@
return true;
}
- /// <summary>
- /// called during prompt for private url
- /// </summary>
+ /// <summary>
+ /// called during prompt for private url
+ /// </summary>
/// <returns>true if private url set successfully</returns>
private bool OnPrivateUrl()
{
@@ -694,9 +695,9 @@
return true;
}
- /// <summary>
- /// called during prompt for master address
- /// </summary>
+ /// <summary>
+ /// called during prompt for master address
+ /// </summary>
/// <returns>true if all parameters set successfully, false if master address was null</returns>
private bool OnMasterAddress()
{
@@ -756,10 +757,10 @@
}
#endregion
- /// <summary>
- /// add simias10 to given path
- /// </summary>
- /// <param name="path">path which is to be added</param>
+ /// <summary>
+ /// add simias10 to given path
+ /// </summary>
+ /// <param name="path">path which is to be added</param>
/// <returns>newly formed string</returns>
private string AddVirtualPath( string path )
{
@@ -772,9 +773,9 @@
return path;
}
- /// <summary>
- /// get the hostadmin service object
- /// </summary>
+ /// <summary>
+ /// get the hostadmin service object
+ /// </summary>
/// <returns>an object of type HostAdmin</returns>
private HostAdmin GetHostAdminService()
{
@@ -783,9 +784,9 @@
return adminService;
}
- /// <summary>
- /// Initialize the service URL
- /// </summary>
+ /// <summary>
+ /// Initialize the service URL
+ /// </summary>
/// <param name="service">service objects with all fields set</param>
private void InitializeServiceUrl( System.Web.Services.Protocols.WebClientProtocol service )
{
@@ -800,8 +801,8 @@
Console.WriteLine("Url {0}", service.Url);
}
- /// <summary>
- /// setup the ssl
+ /// <summary>
+ /// setup the ssl
/// </summary>
void SetupSSL()
{
@@ -920,9 +921,9 @@
}
- /// <summary>
- /// configure the plugins
- /// </summary>
+ /// <summary>
+ /// configure the plugins
+ /// </summary>
/// <returns>true if configured successfully</returns>
bool Configure()
{
@@ -1365,9 +1366,9 @@
Console.WriteLine();
}
- /// <summary>
- /// check for the config filename
- /// </summary>
+ /// <summary>
+ /// check for the config filename
+ /// </summary>
/// <returns>true if configured correctly</returns>
private bool OnConfigurePlugins()
{
@@ -1406,9 +1407,9 @@
return true;
}
- /// <summary>
- /// called when remove server is called
- /// </summary>
+ /// <summary>
+ /// called when remove server is called
+ /// </summary>
/// <returns>true if fields of simias-server-setup set successfully</returns>
private bool OnRemove()
{
@@ -1421,9 +1422,9 @@
return true;
}
- /// <summary>
- /// called when port is specified
- /// </summary>
+ /// <summary>
+ /// called when port is specified
+ /// </summary>
/// <returns>true if url is built successfully</returns>
private bool OnPort()
{
@@ -1446,9 +1447,9 @@
return true;
}
- /// <summary>
- /// called when update ldap is called
- /// </summary>
+ /// <summary>
+ /// called when update ldap is called
+ /// </summary>
/// <returns>true</returns>
private bool OnUpdateLdap()
{
@@ -1483,9 +1484,9 @@
- /// <summary>
- /// called when migrate option is slelected
- /// </summary>
+ /// <summary>
+ /// called when migrate option is slelected
+ /// </summary>
/// <returns>true</returns>
private bool OnMigrate()
{
@@ -1508,9 +1509,9 @@
return true;
}
- /// <summary>
- /// called when upgrade is called
- /// </summary>
+ /// <summary>
+ /// called when upgrade is called
+ /// </summary>
/// <returns>true</returns>
private bool OnUpgrade()
{
@@ -1535,9 +1536,9 @@
return true;
}
- /// <summary>
- /// called when upgrade of OES2 is to be done
- /// </summary>
+ /// <summary>
+ /// called when upgrade of OES2 is to be done
+ /// </summary>
/// <returns>true if all fields are set successfully</returns>
private bool PerformOES2Upgrade()
{
@@ -1589,9 +1590,9 @@
return true;
}
- /// <summary>
- /// called if upgrade of OES is called
- /// </summary>
+ /// <summary>
+ /// called if upgrade of OES is called
+ /// </summary>
/// <returns>true if all fields are set successfully</returns>
private bool PerformOES1Upgrade()
{
@@ -1858,13 +1859,13 @@
catch{}
}
- /// <summary>
- /// set the value inside config file
- /// </summary>
- /// <param name="document">XML document to be changed</param>
- /// <param name="section">section name to be changed</param>
- /// <param name="key">key to be changes</param>
- /// <param name="configValue">value for the key</param>
+ /// <summary>
+ /// set the value inside config file
+ /// </summary>
+ /// <param name="document">XML document to be changed</param>
+ /// <param name="section">section name to be changed</param>
+ /// <param name="key">key to be changes</param>
+ /// <param name="configValue">value for the key</param>
/// <returns>true if set successfully</returns>
private bool SetConfigValue(XmlDocument document, string section, string key, string configValue)
{
@@ -1913,9 +1914,9 @@
return status;
}
- /// <summary>
- /// commit the document
- /// </summary>
+ /// <summary>
+ /// commit the document
+ /// </summary>
/// <param name="document">XML document</param>
private void CommitConfiguration( XmlDocument document )
{
@@ -2199,7 +2200,7 @@
// system
SetConfigValue( document, "EnterpriseDomain", "SystemName", systemName.Value );
SetConfigValue( document, "EnterpriseDomain", "Description", systemDescription.Value );
- SetConfigValue( document, "EnterpriseDomain", "DomainID", domainID.Value );
+ SetConfigValue( document, "EnterpriseDomain", "DomainID", domainID.Value );
if (String.Compare(useSsl.Value, NonSsl, true) == 0 || String.Compare(useSsl.Value, Both, true) == 0)
SetConfigValue( document, "Authentication", "SimiasRequireSSL", "no");
else
@@ -2510,6 +2511,7 @@
void SetupLdap()
{
LdapUtility ldapUtility;
+ LdapUtility ldapUtility2 = null;
UriBuilder newUri = new UriBuilder();
if(ldapServer.Value.Equals("localhost"))
@@ -2572,6 +2574,7 @@
if ( directoryType.Equals( LdapDirectoryType.Unknown ) )
{
+ ldapUtility.Disconnect();
throw new Exception( string.Format( "Unable to determine directory type for {0}", ldapUtility.Host ) );
}
@@ -2613,6 +2616,7 @@
{
if ( !ldapUtility.ValidateSearchContext( context ) )
{
+ ldapUtility.Disconnect();
throw new Exception( string.Format( "Invalid context entered: {0}", context ) );
}
Console.WriteLine("Granting Read Rights to {0} on {1}...", proxyDN, context);
@@ -2636,6 +2640,7 @@
{
if ( !ldapUtility.ValidateSearchContext( context ) )
{
+ ldapUtility.Disconnect();
throw new Exception( string.Format( "Invalid context entered: {0}", context ) );
}
Console.WriteLine("Granting Read Rights to {0} on {1}...", proxyDN, context);
@@ -2654,7 +2659,7 @@
{
// check proxy if proxy user is already present and password is incorrect - workaround for 298762
Console.WriteLine("Checking {0}...", proxyDN);
- LdapUtility ldapUtility2 = new LdapUtility(ldapUrl.ToString(), proxyDN, ldapProxyPassword.Value);
+ ldapUtility2 = new LdapUtility(ldapUrl.ToString(), proxyDN, ldapProxyPassword.Value);
ldapUtility2.Connect();
if ( ldapUtility.DirectoryType.Equals( LdapDirectoryType.eDirectory ) )
{
@@ -2668,6 +2673,8 @@
{
if ( !ldapUtility.ValidateSearchContext( context ) )
{
+ ldapUtility.Disconnect();
+ ldapUtility2.Disconnect();
throw new Exception( string.Format( "Invalid context entered: {0}", context ) );
}
Console.WriteLine("Granting Read Rights to {0} on {1}...", proxyDN, context);
@@ -2684,22 +2691,29 @@
}
}
}
+ ldapUtility2.Disconnect();
created = true;
Console.WriteLine("Done");
Console.WriteLine("Skipped (User Exists)");
}
catch(Exception)
{
+ if(i > MAX_PROXY_RETRY_COUNT) {
+ ldapUtility.Disconnect();
+ if( ldapUtility2 != null)
+ ldapUtility2.Disconnect();
+ throw new Exception( string.Format( "Failed to create Proxy user {0}",proxyDN ) );
+ }
//proxy user password is incorrect, create a new ID
string[] dnSegs = proxyDN.Split(new char[] {',', '=', '.'});
string old_proxy = dnSegs[1];
- Console.WriteLine("Old Proxy user {0}...", dnSegs[1]);
+ Console.WriteLine("Failed to connect using the Proxy user {0}, creating a new proxy user...", proxyDN);
+ Console.WriteLine("Old Proxy user {0}...", proxyDN);
dnSegs[1] = String.Concat(dnSegs[1], i.ToString());
- Console.WriteLine("new Proxy user {0}...", dnSegs[1]);
proxyDN = proxyDN.Replace(old_proxy, dnSegs[1]);
+ Console.WriteLine("New Proxy user {0}...", proxyDN);
ldapProxyDN.Value = proxyDN;
- Console.WriteLine("Checked2 {0}...", proxyDN);
- }
+ }
}
}
}
@@ -2781,8 +2795,8 @@
Console.WriteLine( "Done" );
}
- /// <summary>
- /// setup the config files, e.g log4net etc
+ /// <summary>
+ /// setup the config files, e.g log4net etc
/// </summary>
private void SetupConfigFiles()
{
@@ -2834,9 +2848,9 @@
Console.WriteLine( "Done" );
}
- /// <summary>
- /// Method to discover the path to the default config files
- /// </summary>
+ /// <summary>
+ /// Method to discover the path to the default config files
+ /// </summary>
/// <returns></returns>
private bool SetupDefaultConfigPath()
{
@@ -2917,8 +2931,8 @@
return false;
}
- /// <summary>
- /// setup the permissions isnide simias dir
+ /// <summary>
+ /// setup the permissions isnide simias dir
/// </summary>
private void SetupPermissions()
{
@@ -2949,7 +2963,7 @@
}
/// <summary>
- /// setup the script files into store path
+ /// setup the script files into store path
/// </summary>
private void SetupScriptFiles()
{
@@ -2991,8 +3005,8 @@
Console.WriteLine( "Run {0} script to load the server", scriptPath );
}
- /// <summary>
- /// setup log4net for logging framework
+ /// <summary>
+ /// setup log4net for logging framework
/// </summary>
private void SetupLog4Net()
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sb...@us...> - 2010-06-28 10:30:44
|
Revision: 7410
http://simias.svn.sourceforge.net/simias/?rev=7410&view=rev
Author: sbipin
Date: 2010-06-28 10:30:37 +0000 (Mon, 28 Jun 2010)
Log Message:
-----------
ID: #616747
Reviewer: GG
Localization Required: No
Documentation Required: No
Description: Bumped version from 1.8.4 to 1.8.5
Modified Paths:
--------------
trunk/package/windows/simias-msm-x64.ism
trunk/package/windows/simias-msm.ism
Modified: trunk/package/windows/simias-msm-x64.ism
===================================================================
--- trunk/package/windows/simias-msm-x64.ism 2010-06-25 04:25:42 UTC (rev 7409)
+++ trunk/package/windows/simias-msm-x64.ism 2010-06-28 10:30:37 UTC (rev 7410)
@@ -1186,7 +1186,7 @@
<col key="yes" def="s72">ModuleID</col>
<col key="yes" def="i2">Language</col>
<col def="s32">Version</col>
- <row><td>simias.B290460E_BC60_4D53_8B2E_9B6E7FE9D8EF</td><td>0</td><td>1.8.4</td></row>
+ <row><td>simias.B290460E_BC60_4D53_8B2E_9B6E7FE9D8EF</td><td>0</td><td>1.8.5</td></row>
</table>
<table name="ModuleSubstitution">
Modified: trunk/package/windows/simias-msm.ism
===================================================================
--- trunk/package/windows/simias-msm.ism 2010-06-25 04:25:42 UTC (rev 7409)
+++ trunk/package/windows/simias-msm.ism 2010-06-28 10:30:37 UTC (rev 7410)
@@ -1181,7 +1181,7 @@
<col key="yes" def="s72">ModuleID</col>
<col key="yes" def="i2">Language</col>
<col def="s32">Version</col>
- <row><td>simias.B290460E_BC60_4D53_8B2E_9B6E7FE9D8EF</td><td>0</td><td>1.8.4</td></row>
+ <row><td>simias.B290460E_BC60_4D53_8B2E_9B6E7FE9D8EF</td><td>0</td><td>1.8.5</td></row>
</table>
<table name="ModuleSubstitution">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sb...@us...> - 2010-06-25 04:25:48
|
Revision: 7409
http://simias.svn.sourceforge.net/simias/?rev=7409&view=rev
Author: sbipin
Date: 2010-06-25 04:25:42 +0000 (Fri, 25 Jun 2010)
Log Message:
-----------
ID: #00000
Reviewer: Self
Localization Required: No
Documentation Required: No
Description:
* Added novell-oes-install to BuildRequires.
* Suffixed .gz to ifolder-data-recovery.8 for fixing build error.
Modified Paths:
--------------
trunk/package/linux/ifolder3-enterprise.spec.autobuild
Modified: trunk/package/linux/ifolder3-enterprise.spec.autobuild
===================================================================
--- trunk/package/linux/ifolder3-enterprise.spec.autobuild 2010-06-23 15:08:53 UTC (rev 7408)
+++ trunk/package/linux/ifolder3-enterprise.spec.autobuild 2010-06-25 04:25:42 UTC (rev 7409)
@@ -18,7 +18,7 @@
Name: ifolder3-enterprise
-BuildRequires: compat-libstdc++ e2fsprogs e2fsprogs-devel gcc-c++ glib2 glib2-devel libflaim libflaim-devel libstdc++ libstdc++-devel libxml2 libxml2-devel log4net novell-ifolder-mono novell-ifolder-mono-devel novell-NLDAPbase novell-NLDAPsdk-devel pkgconfig
+BuildRequires: compat-libstdc++ e2fsprogs e2fsprogs-devel gcc-c++ glib2 glib2-devel libflaim libflaim-devel libstdc++ libstdc++-devel libxml2 libxml2-devel log4net novell-ifolder-mono novell-ifolder-mono-devel novell-NLDAPbase novell-NLDAPsdk-devel pkgconfig novell-oes-install
%define buildnum @@BUILDNUM@@
%define novellmandir /opt/novell/man/
@@ -192,7 +192,7 @@
%{prefix}/etc/simias/defaults.config
%{prefix}/etc/novell-ifolder3.conf
/etc/ld.so.conf.d/novell-ifolder3.conf
-%{novellmandir}/man8/ifolder-data-recovery.8
+%{novellmandir}/man8/ifolder-data-recovery.8.gz
%ghost %{OES_LOG}/adminweb.log
%changelog
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2010-06-23 15:09:00
|
Revision: 7408
http://simias.svn.sourceforge.net/simias/?rev=7408&view=rev
Author: hegdegg
Date: 2010-06-23 15:08:53 +0000 (Wed, 23 Jun 2010)
Log Message:
-----------
Bumped the version to 3.8.2.0
Modified Paths:
--------------
trunk/configure.in
trunk/package/linux/ifolder3-enterprise.spec.autobuild
trunk/package/linux/ifolder3-enterprise.spec.in
trunk/package/linux/simias.spec.autobuild
trunk/package/linux/simias.spec.in
trunk/src/server/Simias.ClientUpdate/mac-version.config
trunk/src/server/Simias.ClientUpdate/unix-version.config
trunk/src/server/Simias.ClientUpdate/version.config
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2010-06-23 12:50:18 UTC (rev 7407)
+++ trunk/configure.in 2010-06-23 15:08:53 UTC (rev 7408)
@@ -5,7 +5,7 @@
#if test "$BUILDNUM" = ""; then
# let "BUILDNUM=`date +%G%j`-2000000"
#fi
-ASSEMBLY_VERSION=4
+ASSEMBLY_VERSION=5
VERSION=$VERSION.$ASSEMBLY_VERSION.0
AM_MAINTAINER_MODE
AC_PROG_CC
Modified: trunk/package/linux/ifolder3-enterprise.spec.autobuild
===================================================================
--- trunk/package/linux/ifolder3-enterprise.spec.autobuild 2010-06-23 12:50:18 UTC (rev 7407)
+++ trunk/package/linux/ifolder3-enterprise.spec.autobuild 2010-06-23 15:08:53 UTC (rev 7408)
@@ -34,7 +34,7 @@
Requires: log4net >= 1.2.9
Requires: novell-NLDAPbase
#Obsoletes: %{name} < %{version}
-Version: 3.8.1.@@BUILDNUM@@.1
+Version: 3.8.2.@@BUILDNUM@@.1
Release: 0.2
Summary: Novell iFolder 3 Enterprise
Source: ifolder3-enterprise.tar.gz
Modified: trunk/package/linux/ifolder3-enterprise.spec.in
===================================================================
--- trunk/package/linux/ifolder3-enterprise.spec.in 2010-06-23 12:50:18 UTC (rev 7407)
+++ trunk/package/linux/ifolder3-enterprise.spec.in 2010-06-23 15:08:53 UTC (rev 7408)
@@ -42,7 +42,7 @@
Requires: mono-web >= 2.4.2.3
Requires: log4net >= 1.2.10
Requires: apache2-mod_mono >= 2.4
-Version: 3.8.1.@@BUILDNUM@@.1
+Version: 3.8.2.@@BUILDNUM@@.1
Release: 0.2
Summary: Novell iFolder 3 Enterprise
Source: ifolder3-enterprise.tar.gz
Modified: trunk/package/linux/simias.spec.autobuild
===================================================================
--- trunk/package/linux/simias.spec.autobuild 2010-06-23 12:50:18 UTC (rev 7407)
+++ trunk/package/linux/simias.spec.autobuild 2010-06-23 15:08:53 UTC (rev 7408)
@@ -44,7 +44,7 @@
Requires: log4net >= 1.2.9
Requires: xsp >= 1.2.5
#Obsoletes: %{name} < %{version}
-Version: 1.8.4.@@BUILDNUM@@.1
+Version: 1.8.5.@@BUILDNUM@@.1
Release: 0.3
Summary: Collection-Oriented Data Storage
Source: simias.tar.gz
Modified: trunk/package/linux/simias.spec.in
===================================================================
--- trunk/package/linux/simias.spec.in 2010-06-23 12:50:18 UTC (rev 7407)
+++ trunk/package/linux/simias.spec.in 2010-06-23 15:08:53 UTC (rev 7408)
@@ -38,7 +38,7 @@
Requires: log4net >= 1.2.9
Requires: xsp >= 1.2.5
#Obsoletes: %{name} < 1.8.2.@@BUILDNUM@@.1
-Version: 1.8.4.@@BUILDNUM@@.1
+Version: 1.8.5.@@BUILDNUM@@.1
Release: 0.3
Summary: Collection-Oriented Data Storage
Source: simias.tar.gz
Modified: trunk/src/server/Simias.ClientUpdate/mac-version.config
===================================================================
--- trunk/src/server/Simias.ClientUpdate/mac-version.config 2010-06-23 12:50:18 UTC (rev 7407)
+++ trunk/src/server/Simias.ClientUpdate/mac-version.config 2010-06-23 15:08:53 UTC (rev 7408)
@@ -7,7 +7,7 @@
<!-- Put Version string here. Should be in the format of
Major Version.Minor Version.Build Version.Revision
Example: <version>1.0.1817.29628</version> -->
- <version>3.8.1.0</version>
+ <version>3.8.2.0</version>
<!-- Put name of Mac ifolder client application file
to be upgraded here. The specified file must be in
Modified: trunk/src/server/Simias.ClientUpdate/unix-version.config
===================================================================
--- trunk/src/server/Simias.ClientUpdate/unix-version.config 2010-06-23 12:50:18 UTC (rev 7407)
+++ trunk/src/server/Simias.ClientUpdate/unix-version.config 2010-06-23 15:08:53 UTC (rev 7408)
@@ -24,7 +24,7 @@
you are doing.
-->
<distribution match="DEFAULT">
- <version>3.8.1.0</version>
+ <version>3.8.2.0</version>
<download-directory>default</download-directory>
</distribution>
@@ -51,17 +51,17 @@
-->
<distribution match="SUSE Linux Enterprise Desktop 10">
- <version>3.8.1.0</version>
+ <version>3.8.2.0</version>
<download-directory>suse-linux-10.0</download-directory>
</distribution>
<distribution match="SUSE Linux Enterprise Desktop 11">
- <version>3.8.1.0</version>
+ <version>3.8.2.0</version>
<download-directory>suse-linux-11.0</download-directory>
</distribution>
<distribution match="openSUSE">
- <version>3.8.1.0</version>
+ <version>3.8.2.0</version>
<download-directory>opensuse-linux</download-directory>
</distribution>
Modified: trunk/src/server/Simias.ClientUpdate/version.config
===================================================================
--- trunk/src/server/Simias.ClientUpdate/version.config 2010-06-23 12:50:18 UTC (rev 7407)
+++ trunk/src/server/Simias.ClientUpdate/version.config 2010-06-23 15:08:53 UTC (rev 7408)
@@ -4,15 +4,15 @@
with the one specified here by 'filename'. -->
<versioninfo>
<distribution match="windows32">
- <version>3.8.1.0</version>
+ <version>3.8.2.0</version>
<filename>ifolder3-windows.exe</filename>
</distribution>
<distribution match="windows64">
- <version>3.8.1.0</version>
+ <version>3.8.2.0</version>
<filename>ifolder3-windows-x64.exe</filename>
</distribution>
<distribution match="DEFAULT">
- <version>3.8.1.0</version>
+ <version>3.8.2.0</version>
<filename>ifolder3-windows.exe</filename>
</distribution>
</versioninfo>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spr...@us...> - 2010-06-23 12:50:29
|
Revision: 7407
http://simias.svn.sourceforge.net/simias/?rev=7407&view=rev
Author: spratima
Date: 2010-06-23 12:50:18 +0000 (Wed, 23 Jun 2010)
Log Message:
-----------
Bumping version in windows client simias to 3.8.2.0
Modified Paths:
--------------
trunk/src/core/POBoxWS/Properties/AssemblyInfo.cs
Modified: trunk/src/core/POBoxWS/Properties/AssemblyInfo.cs
===================================================================
--- trunk/src/core/POBoxWS/Properties/AssemblyInfo.cs 2010-06-23 11:24:59 UTC (rev 7406)
+++ trunk/src/core/POBoxWS/Properties/AssemblyInfo.cs 2010-06-23 12:50:18 UTC (rev 7407)
@@ -30,4 +30,4 @@
// Revision
//
[assembly: AssemblyVersion("3.8.2.0")]
-[assembly: AssemblyFileVersion("3.8..0")]
+[assembly: AssemblyFileVersion("3.8.2.0")]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spr...@us...> - 2010-06-23 11:25:04
|
Revision: 7406
http://simias.svn.sourceforge.net/simias/?rev=7406&view=rev
Author: spratima
Date: 2010-06-23 11:24:59 +0000 (Wed, 23 Jun 2010)
Log Message:
-----------
Bumping version in windows client simias to 3.8.2.0
Modified Paths:
--------------
trunk/src/core/WebService/Properties/AssemblyInfo.cs
Modified: trunk/src/core/WebService/Properties/AssemblyInfo.cs
===================================================================
--- trunk/src/core/WebService/Properties/AssemblyInfo.cs 2010-06-23 11:24:17 UTC (rev 7405)
+++ trunk/src/core/WebService/Properties/AssemblyInfo.cs 2010-06-23 11:24:59 UTC (rev 7406)
@@ -29,5 +29,5 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("3.8.1.0")]
-[assembly: AssemblyFileVersion("3.8.1.0")]
+[assembly: AssemblyVersion("3.8.2.0")]
+[assembly: AssemblyFileVersion("3.8.2.0")]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spr...@us...> - 2010-06-23 11:24:23
|
Revision: 7405
http://simias.svn.sourceforge.net/simias/?rev=7405&view=rev
Author: spratima
Date: 2010-06-23 11:24:17 +0000 (Wed, 23 Jun 2010)
Log Message:
-----------
Bumping version in windows client simias to 3.8.2.0
Modified Paths:
--------------
trunk/src/core/SyncService/Properties/AssemblyInfo.cs
Modified: trunk/src/core/SyncService/Properties/AssemblyInfo.cs
===================================================================
--- trunk/src/core/SyncService/Properties/AssemblyInfo.cs 2010-06-23 11:23:32 UTC (rev 7404)
+++ trunk/src/core/SyncService/Properties/AssemblyInfo.cs 2010-06-23 11:24:17 UTC (rev 7405)
@@ -29,5 +29,5 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("3.8.1.0")]
-[assembly: AssemblyFileVersion("3.8.1.0")]
+[assembly: AssemblyVersion("3.8.2.0")]
+[assembly: AssemblyFileVersion("3.8.2.0")]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
