diff --git a/.tx/config b/.tx/config
index 2fc60bd1b12adbbd6d28262b007c8a0bc4f90d40..72cb9fcd089ba53cbf87b607b903eeec5aed7701 100644
--- a/.tx/config
+++ b/.tx/config
@@ -2,24 +2,24 @@
host = https://www.transifex.net
[FusionDirectory.fusiondirectory-core]
-source_file = locale/messages.po
+source_file = locale/fusiondirectory.po
source_lang = en
-trans.ca = locale/ca/messages.po
-trans.cs_CZ = locale/cs_CZ/messages.po
-trans.de = locale/de/messages.po
-trans.es = locale/es/messages.po
-trans.es_VE = locale/es_VE/messages.po
-trans.fa_IR = locale/fa_IR/messages.po
-trans.fr = locale/fr/messages.po
-trans.id_ID = locale/id_ID/messages.po
-trans.it = locale/it/messages.po
-trans.nl = locale/nl/messages.po
-trans.nb = locale/nb/messages.po
-trans.pl = locale/pl/messages.po
-trans.pt = locale/pt/messages.po
-trans.ru = locale/ru/messages.po
-trans.ug = locale/ug/messages.po
-trans.vi = locale/vi/messages.po
-trans.zh = locale/zh/messages.po
+trans.ca = locale/ca/fusiondirectory.po
+trans.cs_CZ = locale/cs_CZ/fusiondirectory.po
+trans.de = locale/de/fusiondirectory.po
+trans.es = locale/es/fusiondirectory.po
+trans.es_VE = locale/es_VE/fusiondirectory.po
+trans.fa_IR = locale/fa_IR/fusiondirectory.po
+trans.fr = locale/fr/fusiondirectory.po
+trans.id_ID = locale/id_ID/fusiondirectory.po
+trans.it = locale/it/fusiondirectory.po
+trans.nl = locale/nl/fusiondirectory.po
+trans.nb = locale/nb/fusiondirectory.po
+trans.pl = locale/pl/fusiondirectory.po
+trans.pt = locale/pt/fusiondirectory.po
+trans.ru = locale/ru/fusiondirectory.po
+trans.ug = locale/ug/fusiondirectory.po
+trans.vi = locale/vi/fusiondirectory.po
+trans.zh = locale/zh/fusiondirectory.po
type = PO
diff --git a/locale/ca/messages.po b/locale/ca/fusiondirectory.po
similarity index 94%
rename from locale/ca/messages.po
rename to locale/ca/fusiondirectory.po
index 55c444bbc6ebe8bbe15f318c57826108228516a1..e371c5e445a7ba522d3d6b07e8b94c2ba6be96f6 100644
--- a/locale/ca/messages.po
+++ b/locale/ca/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-24 14:48+0100\n"
-"PO-Revision-Date: 2013-03-06 21:40+0000\n"
+"POT-Creation-Date: 2013-04-14 20:13+0200\n"
+"PO-Revision-Date: 2013-03-24 15:00+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: ca\n"
@@ -18,39 +18,39 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: html/main.php:140 html/class_passwordRecovery.inc:226
+#: html/main.php:135 html/class_passwordRecovery.inc:226
#: include/class_xml.inc:60 include/functions.inc:509
#: plugins/admin/departments/class_department.inc:431
msgid "Fatal error"
msgstr "Error fatal"
-#: html/main.php:141
+#: html/main.php:136
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr ""
-#: html/main.php:162
+#: html/main.php:157
msgid "PHP configuration"
msgstr "Configuració del PHP"
-#: html/main.php:163
+#: html/main.php:158
msgid ""
"Fatal error: Register globals is on. FusionDirectory will refuse to login "
"unless this is fixed by an administrator."
msgstr ""
-#: html/main.php:192 ihtml/themes/default/password.tpl:40
-#: plugins/admin/users/class_userManagement.inc:393
+#: html/main.php:187 ihtml/themes/default/password.tpl:40
+#: plugins/admin/users/class_userManagement.inc:390
#: plugins/personal/password/class_password.inc:156
#: plugins/personal/password/class_password.inc:162
msgid "Password change"
msgstr "Canvi de contrasenya"
-#: html/main.php:192
+#: html/main.php:187
msgid "Your password is about to expire, please change your password!"
msgstr ""
-#: html/main.php:261 html/class_passwordRecovery.inc:301 html/index.php:147
+#: html/main.php:256 html/class_passwordRecovery.inc:296 html/index.php:147
#: html/index.php:208 include/class_SnapshotHandler.inc:57
#: include/class_SnapshotHandler.inc:70 include/class_SnapshotHandler.inc:88
#: include/class_pluglist.inc:272 include/functions.inc:933
@@ -64,30 +64,30 @@ msgstr ""
msgid "Configuration error"
msgstr "Error de la configuració"
-#: html/main.php:261
+#: html/main.php:256
msgid "Running out of memory!"
msgstr "S'està exhaurint la memòria!"
-#: html/main.php:316
+#: html/main.php:311
msgid "User ACL checks disabled"
msgstr "S'han inhabilitat les comprovacions de les ACL dels usuaris"
-#: html/main.php:362
+#: html/main.php:357
msgid "Plugin"
msgstr "Connector"
-#: html/main.php:363
+#: html/main.php:358
#, php-format
msgid ""
"Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not "
"a file)!"
msgstr ""
-#: html/main.php:378
+#: html/main.php:373
msgid "Configuration Error"
msgstr ""
-#: html/main.php:379
+#: html/main.php:374
#, php-format
msgid ""
"Fatal error: not all POST variables have been transfered by PHP - please "
@@ -103,19 +103,19 @@ msgstr "Mètode de contrasenya"
msgid "Error: Password method not available!"
msgstr ""
-#: html/class_passwordRecovery.inc:227 html/index.php:147
+#: html/class_passwordRecovery.inc:227
#, php-format
msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
msgstr ""
"La configuració %s/%s del FusionDirectori no és llegible. S'està avortant."
-#: html/class_passwordRecovery.inc:302 html/setup.php:63 html/index.php:163
+#: html/class_passwordRecovery.inc:297 html/setup.php:63 html/index.php:163
#, php-format
msgid "Directory '%s' specified as compile directory is not accessible!"
msgstr ""
-#: html/class_passwordRecovery.inc:407
-#: plugins/admin/users/class_userManagement.inc:309
+#: html/class_passwordRecovery.inc:402
+#: plugins/admin/users/class_userManagement.inc:306
#: plugins/personal/password/class_password.inc:113
msgid ""
"The passwords you've entered as 'New password' and 'Repeated new password' "
@@ -124,13 +124,13 @@ msgstr ""
"Les contrasenyes que heu introduït com a «Contrasenya nova» i «Contrasenya "
"nova repetida» no concorden."
-#: html/class_passwordRecovery.inc:409 ihtml/themes/default/password.tpl:81
+#: html/class_passwordRecovery.inc:404 ihtml/themes/default/password.tpl:81
#: ihtml/themes/default/password.tpl:82
#: ihtml/themes/default/accountexpired.tpl:32
#: ihtml/themes/default/accountexpired.tpl:36
#: ihtml/themes/default/recovery.tpl:93 ihtml/themes/default/recovery.tpl:94
#: plugins/admin/users/password.tpl:17 plugins/admin/users/password.tpl:60
-#: plugins/admin/users/class_userManagement.inc:312
+#: plugins/admin/users/class_userManagement.inc:309
#: plugins/personal/password/password.tpl:27
#: plugins/personal/password/password.tpl:78
#: plugins/personal/generic/password.tpl:22
@@ -138,16 +138,16 @@ msgstr ""
msgid "New password"
msgstr "Contrasenya nova"
-#: html/class_passwordRecovery.inc:411
+#: html/class_passwordRecovery.inc:406
msgid "The password used as new is too short."
msgstr ""
-#: html/class_passwordRecovery.inc:413
+#: html/class_passwordRecovery.inc:408
#: plugins/personal/password/class_password.inc:121
msgid "The password contains possibly problematic Unicode characters!"
msgstr ""
-#: html/class_passwordRecovery.inc:437 html/index.php:58 html/index.php:64
+#: html/class_passwordRecovery.inc:432 html/index.php:58 html/index.php:64
#: html/index.php:403 ihtml/themes/default/conflict.tpl:6
#: ihtml/themes/default/islocked.tpl:6 ihtml/themes/default/remove.tpl:2
#: ihtml/themes/default/msg_dialog.tpl:59
@@ -170,39 +170,39 @@ msgstr ""
msgid "Warning"
msgstr "AvÃs"
-#: html/class_passwordRecovery.inc:438
+#: html/class_passwordRecovery.inc:433
msgid "Session will not be encrypted."
msgstr "No es xifrarà la sessió."
-#: html/class_passwordRecovery.inc:440
+#: html/class_passwordRecovery.inc:435
msgid "Enter SSL session"
msgstr "Entreu a la sessió amb SSL"
-#: html/class_passwordRecovery.inc:481
+#: html/class_passwordRecovery.inc:476
#, php-format
msgid "Did not found account %s"
msgstr ""
-#: html/class_passwordRecovery.inc:484
+#: html/class_passwordRecovery.inc:479
#, php-format
msgid "Found multiple accounts %s"
msgstr ""
-#: html/class_passwordRecovery.inc:498 ihtml/themes/default/recovery.tpl:142
+#: html/class_passwordRecovery.inc:493 ihtml/themes/default/recovery.tpl:142
msgid "Adresse mail"
msgstr ""
-#: html/class_passwordRecovery.inc:515
+#: html/class_passwordRecovery.inc:510
#, php-format
msgid "There is no account using email %s"
msgstr ""
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:513
#, php-format
msgid "There are several accounts using email %s"
msgstr ""
-#: html/class_passwordRecovery.inc:543 html/index.php:257 html/index.php:269
+#: html/class_passwordRecovery.inc:538 html/index.php:257 html/index.php:269
#: html/index.php:282 setup/class_setupStep_Migrate.inc:1138
#: setup/class_setupStep_Migrate.inc:1164
#: setup/class_setupStep_Migrate.inc:1213
@@ -214,20 +214,17 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:2549
#: setup/class_setupStep_Migrate.inc:2896
#: setup/class_setupStep_Migrate.inc:2910
-#: include/class_SnapshotHandler.inc:150 include/class_SnapshotHandler.inc:329
-#: include/class_SnapshotHandler.inc:378 include/class_SnapshotHandler.inc:382
-#: include/class_SnapshotHandler.inc:402 include/class_SnapshotHandler.inc:445
-#: include/class_SnapshotHandler.inc:508 include/class_SnapshotHandler.inc:577
-#: include/class_SnapshotHandler.inc:592 include/functions.inc:547
+#: include/class_SnapshotHandler.inc:150 include/class_SnapshotHandler.inc:335
+#: include/class_SnapshotHandler.inc:388 include/class_SnapshotHandler.inc:392
+#: include/class_SnapshotHandler.inc:412 include/class_SnapshotHandler.inc:455
+#: include/class_SnapshotHandler.inc:518 include/class_SnapshotHandler.inc:587
+#: include/class_SnapshotHandler.inc:602 include/functions.inc:547
#: include/functions.inc:583 include/functions.inc:591
#: include/functions.inc:639 include/functions.inc:948
#: include/functions.inc:998 include/functions.inc:1058
#: include/functions.inc:1113 include/functions.inc:3244
-#: include/functions.inc:3509 include/class_config.inc:330
-#: include/class_plugin.inc:1500 include/class_plugin.inc:1550
-#: include/class_plugin.inc:1554 include/class_plugin.inc:1574
-#: include/class_plugin.inc:1621 include/class_plugin.inc:1681
-#: include/class_plugin.inc:1751 include/class_plugin.inc:1766
+#: include/functions.inc:3514 include/class_SnapShotDialog.inc:104
+#: include/class_SnapShotDialog.inc:177 include/class_config.inc:330
#: include/class_acl.inc:1308 include/class_acl.inc:1413
#: include/class_ldap.inc:934 include/class_ldap.inc:1421
#: plugins/admin/acl/class_aclRole.inc:613
@@ -246,19 +243,19 @@ msgstr ""
msgid "LDAP error"
msgstr "Error d'LDAP"
-#: html/class_passwordRecovery.inc:566
+#: html/class_passwordRecovery.inc:561
msgid "Contact your administrator, there was a problem with mail server"
msgstr ""
-#: html/class_passwordRecovery.inc:577
+#: html/class_passwordRecovery.inc:572
msgid "This token is invalid"
msgstr ""
-#: html/class_passwordRecovery.inc:615
+#: html/class_passwordRecovery.inc:610
msgid "External password changer reported a problem: "
msgstr ""
-#: html/class_passwordRecovery.inc:640
+#: html/class_passwordRecovery.inc:635
msgid "There was a problem with mail server, confirmation email not sent"
msgstr ""
@@ -276,6 +273,14 @@ msgid ""
"overridden by php.ini settings."
msgstr ""
+#: html/index.php:147
+#, fuzzy, php-format
+msgid ""
+"FusionDirectory configuration %s/%s is not readable. Please run "
+"fusiondirectory-setup --check-config to fix this."
+msgstr ""
+"La configuració %s/%s del FusionDirectori no és llegible. S'està avortant."
+
#: html/index.php:163
msgid "Smarty error"
msgstr ""
@@ -290,22 +295,22 @@ msgstr ""
#: setup/setup_checks.tpl:91 setup/class_setupStep_Migrate.inc:1127
#: include/class_xml.inc:57 include/class_tabs.inc:74
#: include/class_management.inc:507 include/class_management.inc:657
-#: include/functions.inc:3613 include/functions.inc:3633
-#: include/functions.inc:3663 include/functions.inc:3671
-#: include/functions.inc:3683 include/functions.inc:3687
-#: include/functions.inc:3702 include/functions.inc:3711
-#: include/functions.inc:3779 include/class_listing.inc:522
+#: include/functions.inc:3618 include/functions.inc:3638
+#: include/functions.inc:3668 include/functions.inc:3676
+#: include/functions.inc:3688 include/functions.inc:3692
+#: include/functions.inc:3707 include/functions.inc:3716
+#: include/functions.inc:3784 include/class_listing.inc:521
#: include/class_config.inc:483 include/class_CopyPasteHandler.inc:264
#: include/password-methods/class_password-methods-sasl.inc:51
#: include/password-methods/class_password-methods-sasl.inc:63
#: include/password-methods/class_password-methods.inc:342
#: include/password-methods/class_password-methods.inc:447
#: include/password-methods/class_password-methods.inc:458
-#: include/class_plugin.inc:1368 include/class_plugin.inc:1843
-#: include/class_msg_dialog.inc:128 include/class_msgPool.inc:215
-#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:680 include/class_msgPool.inc:711
-#: include/class_msgPool.inc:738 include/class_databaseManagement.inc:78
+#: include/class_plugin.inc:1367 include/class_msg_dialog.inc:128
+#: include/class_msgPool.inc:215 include/class_msgPool.inc:235
+#: include/class_msgPool.inc:265 include/class_msgPool.inc:680
+#: include/class_msgPool.inc:711 include/class_msgPool.inc:738
+#: include/class_databaseManagement.inc:78
#: plugins/admin/acl/class_aclRole.inc:681
#: plugins/admin/groups/class_group.inc:521
#: plugins/admin/groups/class_group.inc:527
@@ -971,131 +976,128 @@ msgid ""
"databases."
msgstr ""
-#: setup/class_setupStep_Checks.inc:136
-msgid "MDB2 mysql"
-msgstr ""
-
-#: setup/class_setupStep_Checks.inc:137
+#: setup/class_setupStep_Checks.inc:134
msgid ""
-"FusionDirectory requires this module to communicate with mysql databases."
+"If you do not want to install MDB2 and won't use databases, remove the "
+"class_databaseManagement.inc file."
msgstr ""
-#: setup/class_setupStep_Checks.inc:143
+#: setup/class_setupStep_Checks.inc:138
msgid "imagick"
msgstr ""
-#: setup/class_setupStep_Checks.inc:144
+#: setup/class_setupStep_Checks.inc:139
msgid "FusionDirectory requires this extension to handle images."
msgstr ""
-#: setup/class_setupStep_Checks.inc:159
+#: setup/class_setupStep_Checks.inc:154
msgid "compression module"
msgstr ""
-#: setup/class_setupStep_Checks.inc:160
+#: setup/class_setupStep_Checks.inc:155
msgid "FusionDirectory requires this extension to handle snapshots."
msgstr ""
-#: setup/class_setupStep_Checks.inc:171
+#: setup/class_setupStep_Checks.inc:166
msgid ""
"register_globals is a PHP mechanism to register all global variables to be "
"accessible from scripts without changing the scope. This may be a security "
"risk."
msgstr ""
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStep_Checks.inc:167
msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:180
+#: setup/class_setupStep_Checks.inc:175
msgid "PHP uses this value for the garbage collector to delete old sessions."
msgstr ""
-#: setup/class_setupStep_Checks.inc:181
+#: setup/class_setupStep_Checks.inc:176
msgid ""
"Setting this value to one day will prevent loosing session and cookies "
"before they really timeout."
msgstr ""
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStep_Checks.inc:177
msgid ""
"Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
"higher."
msgstr ""
-#: setup/class_setupStep_Checks.inc:189 setup/class_setupStep_Checks.inc:205
-#: setup/class_setupStep_Checks.inc:221 setup/class_setupStep_Checks.inc:229
+#: setup/class_setupStep_Checks.inc:184 setup/class_setupStep_Checks.inc:200
+#: setup/class_setupStep_Checks.inc:216 setup/class_setupStep_Checks.inc:224
msgid "Off"
msgstr ""
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStep_Checks.inc:185
msgid ""
"In Order to use FusionDirectory without any trouble, the session.auto_start "
"option in your php.ini should be set to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStep_Checks.inc:186
msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStep_Checks.inc:193
msgid ""
"FusionDirectory needs at least 128MB of memory. Setting it below this limit "
"may cause errors that are not reproducable! Increase it for larger setups."
msgstr ""
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStep_Checks.inc:194
msgid ""
"Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
msgstr ""
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStep_Checks.inc:201
msgid ""
"This option influences the PHP output handling. Turn this Option off, to "
"increase performance."
msgstr ""
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStep_Checks.inc:202
msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStep_Checks.inc:209
msgid "The Execution time should be at least 30 seconds."
msgstr ""
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStep_Checks.inc:210
msgid ""
"Search for 'max_execution_time' in your php.ini and set it to '30' or higher."
msgstr ""
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStep_Checks.inc:217
msgid ""
"Increase the server security by setting expose_php to 'off'. PHP won't send "
"any information about the server you are running in this case."
msgstr ""
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStep_Checks.inc:218
msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:230
+#: setup/class_setupStep_Checks.inc:225
msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:231
+#: setup/class_setupStep_Checks.inc:226
msgid ""
"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:241
+#: setup/class_setupStep_Checks.inc:236
msgid "Configuration writeable"
msgstr ""
-#: setup/class_setupStep_Checks.inc:242
+#: setup/class_setupStep_Checks.inc:237
msgid "The configuration file can't be written"
msgstr ""
-#: setup/class_setupStep_Checks.inc:243
+#: setup/class_setupStep_Checks.inc:238
#, php-format
msgid ""
"FusionDirectory reads its configuration from a file located in (%s/%s). The "
@@ -1643,7 +1645,7 @@ msgstr ""
#: plugins/admin/departments/class_organizationGeneric.inc:115
#: plugins/admin/departments/class_organizationGeneric.inc:118
#: plugins/personal/generic/class_user.inc:1395
-#: plugins/personal/generic/generic.tpl:300
+#: plugins/personal/generic/generic.tpl:277
msgid "Organization"
msgstr "Organització"
@@ -1653,8 +1655,8 @@ msgstr "Organització"
#: plugins/admin/acl/class_aclRole.inc:702
#: plugins/admin/acl/class_aclRole.inc:715
#: plugins/admin/acl/class_aclRole.inc:725
-#: plugins/admin/users/class_userManagement.inc:545
-#: plugins/admin/users/class_userManagement.inc:592
+#: plugins/admin/users/class_userManagement.inc:542
+#: plugins/admin/users/class_userManagement.inc:589
#: plugins/admin/users/user-filter.tpl:26
#: plugins/admin/groups/group-filter.tpl:21
#: plugins/admin/groups/userSelect/user-filter.tpl:17
@@ -1735,7 +1737,7 @@ msgid ""
msgstr ""
#: setup/setup_feedback.tpl:52
-#: plugins/admin/users/class_userManagement.inc:903
+#: plugins/admin/users/class_userManagement.inc:900
#: plugins/admin/groups/class_group.inc:1106
#: plugins/admin/departments/class_department.inc:653
#: plugins/admin/ogroups/class_ogroup.inc:895
@@ -1875,7 +1877,7 @@ msgstr ""
#: setup/setup_migrate.tpl:101 setup/setup_migrate.tpl:153
#: setup/setup_migrate.tpl:320 setup/setup_migrate.tpl:373
#: setup/setup_migrate.tpl:416 setup/setup_migrate.tpl:459
-#: setup/setup_migrate.tpl:503 include/class_listing.inc:352
+#: setup/setup_migrate.tpl:503 include/class_listing.inc:351
msgid "Select all"
msgstr ""
@@ -2343,7 +2345,7 @@ msgid "Group will be moved from"
msgstr ""
#: setup/class_setupStep_Migrate.inc:1175
-#: setup/class_setupStep_Migrate.inc:1223 include/class_plugin.inc:2083
+#: setup/class_setupStep_Migrate.inc:1223 include/class_plugin.inc:1675
msgid "to"
msgstr ""
@@ -2418,8 +2420,7 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:2647 include/class_msgPool.inc:495
#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:83
#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:138
-#: plugins/personal/generic/generic.tpl:251
-#: plugins/personal/generic/generic.tpl:270
+#: plugins/personal/generic/generic.tpl:249
#, php-format
msgid "Add"
msgstr ""
@@ -2540,28 +2541,25 @@ msgstr ""
#: include/class_management.inc:333 include/class_management.inc:483
#: include/class_management.inc:536 include/class_management.inc:576
#: include/class_management.inc:590 include/class_CopyPasteHandler.inc:223
-#: include/class_plugin.inc:1791 include/class_plugin.inc:1803
-#: include/class_plugin.inc:1818 include/class_plugin.inc:1831
-#: plugins/admin/users/class_userManagement.inc:205
-#: plugins/admin/users/class_userManagement.inc:761
+#: plugins/admin/users/class_userManagement.inc:202
+#: plugins/admin/users/class_userManagement.inc:758
msgid "Permission"
msgstr ""
#: include/class_management.inc:403
-#: plugins/admin/acl/class_aclManagement.inc:100
-#: plugins/admin/users/class_userManagement.inc:719
-#: plugins/admin/users/class_userManagement.inc:723
+#: plugins/admin/acl/class_aclManagement.inc:101
+#: plugins/admin/users/class_userManagement.inc:716
+#: plugins/admin/users/class_userManagement.inc:720
msgid "Permission error"
msgstr ""
-#: include/class_management.inc:483 include/class_plugin.inc:1791
+#: include/class_management.inc:483
#, php-format
msgid "You are not allowed to create a snapshot for %s."
msgstr ""
#: include/class_management.inc:536 include/class_management.inc:576
-#: include/class_management.inc:590 include/class_plugin.inc:1803
-#: include/class_plugin.inc:1818 include/class_plugin.inc:1831
+#: include/class_management.inc:590
#, php-format
msgid "You are not allowed to restore a snapshot for %s."
msgstr ""
@@ -2762,87 +2760,87 @@ msgid ""
"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
msgstr ""
-#: include/functions.inc:3613 include/functions.inc:3633
-#: include/functions.inc:3671 include/functions.inc:3683
-#: include/functions.inc:3687 include/functions.inc:3702
-#: include/functions.inc:3711
+#: include/functions.inc:3618 include/functions.inc:3638
+#: include/functions.inc:3676 include/functions.inc:3688
+#: include/functions.inc:3692 include/functions.inc:3707
+#: include/functions.inc:3716
msgid "Cannot allocate a free ID:"
msgstr ""
-#: include/functions.inc:3613
+#: include/functions.inc:3618
msgid "unknown idAllocation method!"
msgstr ""
-#: include/functions.inc:3633
+#: include/functions.inc:3638
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3663
+#: include/functions.inc:3668
msgid "Cannot create sambaUnixIdPool entry!"
msgstr ""
-#: include/functions.inc:3671
+#: include/functions.inc:3676
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3683 include/functions.inc:3687
+#: include/functions.inc:3688 include/functions.inc:3692
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3711
+#: include/functions.inc:3716
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3779
+#: include/functions.inc:3784
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/class_listing.inc:291 include/class_listing.inc:1099
-#: include/class_listing.inc:1101 include/class_sortableListing.inc:343
+#: include/class_listing.inc:290 include/class_listing.inc:1105
+#: include/class_listing.inc:1107 include/class_sortableListing.inc:343
#: include/class_acl.inc:504 plugins/admin/acl/class_aclRole.inc:372
msgid "Up"
msgstr ""
-#: include/class_listing.inc:291 include/class_sortableListing.inc:343
+#: include/class_listing.inc:290 include/class_sortableListing.inc:343
#: include/class_acl.inc:506 plugins/admin/acl/class_aclRole.inc:374
msgid "Down"
msgstr ""
-#: include/class_listing.inc:564
+#: include/class_listing.inc:563
msgid "created by"
msgstr ""
-#: include/class_listing.inc:1091
+#: include/class_listing.inc:1097
msgid "Go to root department"
msgstr ""
-#: include/class_listing.inc:1091 include/class_listing.inc:1093
+#: include/class_listing.inc:1097 include/class_listing.inc:1099
#: include/class_baseSelector.inc:205
msgid "Root"
msgstr ""
-#: include/class_listing.inc:1099
+#: include/class_listing.inc:1105
msgid "Go up one department"
msgstr ""
-#: include/class_listing.inc:1107
+#: include/class_listing.inc:1113
msgid "Go to users department"
msgstr ""
-#: include/class_listing.inc:1107 include/class_listing.inc:1109
+#: include/class_listing.inc:1113 include/class_listing.inc:1115
msgid "Home"
msgstr ""
-#: include/class_listing.inc:1114
+#: include/class_listing.inc:1120
msgid "Reload list"
msgstr ""
-#: include/class_listing.inc:1114 include/class_baseSelector.inc:252
+#: include/class_listing.inc:1120 include/class_baseSelector.inc:252
msgid "Submit"
msgstr ""
-#: include/class_listing.inc:1211 plugins/admin/acl/acl-list.xml:65
+#: include/class_listing.inc:1217 plugins/admin/acl/acl-list.xml:65
#: plugins/admin/users/user-list.xml:78 plugins/admin/groups/group-list.xml:79
#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:64
#: plugins/admin/departments/dep-list.xml:87
@@ -2850,65 +2848,62 @@ msgstr ""
msgid "Actions"
msgstr ""
-#: include/class_listing.inc:1495 include/class_listing.inc:1545
-#: include/class_plugin.inc:2228
+#: include/class_listing.inc:1501 include/class_listing.inc:1551
msgid "Copy"
msgstr ""
-#: include/class_listing.inc:1501 include/class_listing.inc:1535
-#: include/class_plugin.inc:2232
+#: include/class_listing.inc:1507 include/class_listing.inc:1541
msgid "Cut"
msgstr ""
-#: include/class_listing.inc:1509 include/class_listing.inc:1511
-#: include/class_CopyPasteHandler.inc:400 include/class_plugin.inc:2239
-#: include/class_plugin.inc:2242
+#: include/class_listing.inc:1515 include/class_listing.inc:1517
+#: include/class_CopyPasteHandler.inc:400
msgid "Paste"
msgstr ""
-#: include/class_listing.inc:1535 include/class_plugin.inc:2186
+#: include/class_listing.inc:1541
msgid "Cut this entry"
msgstr ""
-#: include/class_listing.inc:1545 include/class_plugin.inc:2194
+#: include/class_listing.inc:1551
msgid "Copy this entry"
msgstr ""
-#: include/class_listing.inc:1577 include/class_listing.inc:1579
+#: include/class_listing.inc:1583 include/class_listing.inc:1585
msgid "Restore snapshots"
msgstr ""
-#: include/class_listing.inc:1593
+#: include/class_listing.inc:1599
msgid "Export list"
msgstr ""
-#: include/class_listing.inc:1628 include/class_listing.inc:1629
-#: include/class_SnapShotDialog.inc:153 include/class_plugin.inc:2160
+#: include/class_listing.inc:1634 include/class_listing.inc:1635
+#: include/class_SnapShotDialog.inc:298
msgid "Restore snapshot"
msgstr ""
-#: include/class_listing.inc:1638 include/class_plugin.inc:2167
+#: include/class_listing.inc:1644
msgid "Create snapshot"
msgstr ""
-#: include/class_listing.inc:1639 include/class_plugin.inc:2168
+#: include/class_listing.inc:1645
msgid "Create a new snapshot from this object"
msgstr ""
-#: include/class_SnapShotDialog.inc:99
+#: include/class_SnapShotDialog.inc:244
#, php-format
msgid "You're about to delete the snapshot '%s'."
msgstr ""
-#: include/class_SnapShotDialog.inc:155
+#: include/class_SnapShotDialog.inc:300
msgid "Remove snapshot"
msgstr ""
-#: include/class_SnapShotDialog.inc:157 include/class_SnapShotDialog.inc:177
+#: include/class_SnapShotDialog.inc:302 include/class_SnapShotDialog.inc:322
msgid "Y-m-d, H:i:s"
msgstr ""
-#: include/class_SnapShotDialog.inc:191 plugins/admin/acl/acl-list.xml:57
+#: include/class_SnapShotDialog.inc:336 plugins/admin/acl/acl-list.xml:57
#: plugins/admin/acl/acl_role.tpl:17 plugins/admin/acl/class_aclRole.inc:704
#: plugins/admin/groups/class_group.inc:1114
#: plugins/admin/groups/group-list.xml:66 plugins/admin/groups/generic.tpl:24
@@ -2983,32 +2978,20 @@ msgstr ""
msgid "Cannot find a suitable password method for the current hash!"
msgstr ""
-#: include/class_plugin.inc:563
+#: include/class_plugin.inc:562
msgid ""
"The object has changed since opened in FusionDirectory. All changes that may "
"be done by others get lost if you save this entry!"
msgstr ""
-#: include/class_plugin.inc:2082
+#: include/class_plugin.inc:1674
msgid "Changing ACL dn"
msgstr ""
-#: include/class_plugin.inc:2082
+#: include/class_plugin.inc:1674
msgid "from"
msgstr ""
-#: include/class_plugin.inc:2136 include/class_plugin.inc:2138
-msgid "Restore"
-msgstr ""
-
-#: include/class_plugin.inc:2186
-msgid "cut"
-msgstr ""
-
-#: include/class_plugin.inc:2194
-msgid "copy"
-msgstr ""
-
#: include/class_sortableListing.inc:303
msgid "Sortable list"
msgstr ""
@@ -3880,15 +3863,14 @@ msgstr ""
msgid "List of acls"
msgstr ""
-#: plugins/admin/acl/acl-list.xml:15
+#: plugins/admin/acl/acl-list.xml:15 plugins/admin/acl/acl-list.xml:82
#: plugins/admin/acl/class_aclManagement.inc:36
msgid "Acl"
msgstr ""
-#: plugins/admin/acl/acl-list.xml:23 plugins/admin/acl/acl-list.xml:82
-#: plugins/admin/acl/class_aclRole.inc:695
+#: plugins/admin/acl/acl-list.xml:23 plugins/admin/acl/class_aclRole.inc:695
#: plugins/personal/generic/class_user.inc:1367
-#: plugins/personal/generic/generic.tpl:515
+#: plugins/personal/generic/generic.tpl:492
msgid "Role"
msgstr ""
@@ -3928,7 +3910,7 @@ msgstr ""
msgid "Access control list management"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:160
+#: plugins/admin/acl/class_aclManagement.inc:161
msgid "ACL Assignment"
msgstr ""
@@ -4053,7 +4035,7 @@ msgid ""
msgstr ""
#: plugins/admin/users/template.tpl:15
-#: plugins/admin/users/class_userManagement.inc:542
+#: plugins/admin/users/class_userManagement.inc:539
#: plugins/admin/users/templatize.tpl:15 plugins/admin/users/user-list.xml:15
#: plugins/admin/users/user-list.xml:102
msgid "Template"
@@ -4088,23 +4070,23 @@ msgstr "Entrada"
msgid "Manage users"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:344
+#: plugins/admin/users/class_userManagement.inc:341
#: plugins/personal/password/class_password.inc:136
#, php-format
msgid "Check-hook reported a problem: %s. Password change canceled!"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:394
+#: plugins/admin/users/class_userManagement.inc:391
msgid "You have no permission to change this users password!"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:470
-#: plugins/admin/users/class_userManagement.inc:504
-#: plugins/admin/users/class_userManagement.inc:535
+#: plugins/admin/users/class_userManagement.inc:467
+#: plugins/admin/users/class_userManagement.inc:501
+#: plugins/admin/users/class_userManagement.inc:532
msgid "none"
msgstr "cap"
-#: plugins/admin/users/class_userManagement.inc:548
+#: plugins/admin/users/class_userManagement.inc:545
#: plugins/admin/users/user-list.xml:57
#: plugins/admin/groups/userSelect/user-list.xml:40
#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
@@ -4114,26 +4096,26 @@ msgstr "cap"
msgid "Given name"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:799
+#: plugins/admin/users/class_userManagement.inc:796
msgid "Account locking"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:800
+#: plugins/admin/users/class_userManagement.inc:797
#, php-format
msgid ""
"Password method '%s' does not support locking. Account (%s) has not been "
"locked!"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:873
+#: plugins/admin/users/class_userManagement.inc:870
msgid "Unlock account"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:875
+#: plugins/admin/users/class_userManagement.inc:872
msgid "Lock account"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:903
+#: plugins/admin/users/class_userManagement.inc:900
#, fuzzy
msgid "Generic properties"
msgstr "Informació genèrica de l'usuari"
@@ -4223,8 +4205,9 @@ msgid "Remove user"
msgstr ""
#: plugins/admin/password/class_recoveryConfig.inc:35
-msgid "Password recovery config"
-msgstr ""
+#, fuzzy
+msgid "Password recovery"
+msgstr "Canvi de contrasenya"
#: plugins/admin/password/class_recoveryConfig.inc:36
msgid "Settings for the password recovery feature"
@@ -4539,7 +4522,6 @@ msgstr ""
#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:23
#: plugins/admin/ogroups/class_ogroupManagement.inc:187
#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:79
-#: plugins/admin/ogroups/ogroup-list.xml:79
#: plugins/generic/references/class_reference.inc:55
#: plugins/personal/posix/groupSelect/group-list.xml:15
msgid "Group"
@@ -4631,8 +4613,8 @@ msgstr ""
#: plugins/generic/references/class_reference.inc:59
#: plugins/personal/posix/trustSelect/class_trustSelect.inc:81
#: plugins/personal/generic/class_user.inc:1180
-#: plugins/personal/generic/generic.tpl:399
-#: plugins/personal/generic/generic.tpl:586
+#: plugins/personal/generic/generic.tpl:376
+#: plugins/personal/generic/generic.tpl:563
msgid "Phone"
msgstr "Telèfon"
@@ -4731,7 +4713,7 @@ msgstr "Localitat"
#: plugins/admin/departments/generic.tpl:91
#: plugins/admin/departments/class_organizationGeneric.inc:129
#: plugins/personal/generic/class_user.inc:1410
-#: plugins/personal/generic/generic.tpl:448
+#: plugins/personal/generic/generic.tpl:425
msgid "Location"
msgstr "Localització"
@@ -4748,8 +4730,8 @@ msgstr "Localització"
#: plugins/admin/departments/generic.tpl:51
#: plugins/admin/departments/class_organizationGeneric.inc:126
#: plugins/personal/generic/class_user.inc:1399
-#: plugins/personal/generic/generic.tpl:341
-#: plugins/personal/generic/generic.tpl:362
+#: plugins/personal/generic/generic.tpl:318
+#: plugins/personal/generic/generic.tpl:339
msgid "Manager"
msgstr "Responsable"
@@ -4887,7 +4869,7 @@ msgstr ""
#: plugins/admin/departments/generic.tpl:83
#: plugins/admin/departments/class_organizationGeneric.inc:128
#: plugins/personal/generic/class_user.inc:1409
-#: plugins/personal/generic/generic.tpl:456
+#: plugins/personal/generic/generic.tpl:433
msgid "State"
msgstr "ProvÃncia"
@@ -4905,7 +4887,7 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:667
#: plugins/admin/departments/generic.tpl:99
#: plugins/personal/generic/generic.tpl:181
-#: plugins/personal/generic/generic.tpl:464
+#: plugins/personal/generic/generic.tpl:441
msgid "Address"
msgstr "Adreça"
@@ -4925,8 +4907,8 @@ msgstr ""
#: plugins/admin/departments/generic.tpl:114
#: plugins/admin/departments/class_organizationGeneric.inc:132
#: plugins/personal/generic/class_user.inc:1183
-#: plugins/personal/generic/generic.tpl:430
-#: plugins/personal/generic/generic.tpl:598
+#: plugins/personal/generic/generic.tpl:407
+#: plugins/personal/generic/generic.tpl:575
msgid "Fax"
msgstr "Fax"
@@ -4977,7 +4959,7 @@ msgstr "Estat"
#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:15
#: plugins/generic/references/class_reference.inc:57
#: plugins/personal/generic/class_user.inc:1396
-#: plugins/personal/generic/generic.tpl:308
+#: plugins/personal/generic/generic.tpl:285
msgid "Department"
msgstr "Departament"
@@ -5281,6 +5263,11 @@ msgstr ""
msgid "List of object groups"
msgstr ""
+#: plugins/admin/ogroups/ogroup-list.xml:79
+#, fuzzy
+msgid "Objectgroup"
+msgstr "Objecte"
+
#: plugins/admin/ogroups/ogroup-list.xml:106
msgid "Send message"
msgstr ""
@@ -5352,7 +5339,8 @@ msgstr ""
#: plugins/config/class_configInLdap.inc:82
msgid ""
-"Default language to be used if the one asked by the browser is not available"
+"Language of the application. If 'automatic' or not available, the one asked "
+"by the browser will be used. This setting can be overriden per user."
msgstr ""
#: plugins/config/class_configInLdap.inc:87
@@ -5368,7 +5356,7 @@ msgid "Schema setup"
msgstr ""
#: plugins/config/class_configInLdap.inc:103
-msgid "rfc237bis"
+msgid "rfc2307bis"
msgstr ""
#: plugins/config/class_configInLdap.inc:104
@@ -6070,12 +6058,12 @@ msgid "Homepage"
msgstr "PÃ gina principal"
#: plugins/personal/generic/class_user.inc:1186
-#: plugins/personal/generic/generic.tpl:411
+#: plugins/personal/generic/generic.tpl:388
msgid "Mobile"
msgstr "Mòbil"
#: plugins/personal/generic/class_user.inc:1189
-#: plugins/personal/generic/generic.tpl:422
+#: plugins/personal/generic/generic.tpl:399
msgid "Pager"
msgstr "Buscapersones"
@@ -6086,57 +6074,57 @@ msgid "Date of birth"
msgstr "Data de naixement"
#: plugins/personal/generic/class_user.inc:1357
-#: plugins/personal/generic/generic.tpl:538
+#: plugins/personal/generic/generic.tpl:515
msgid "Unit"
msgstr ""
#: plugins/personal/generic/class_user.inc:1358
-#: plugins/personal/generic/generic.tpl:563
+#: plugins/personal/generic/generic.tpl:540
msgid "House identifier"
msgstr ""
#: plugins/personal/generic/class_user.inc:1359
-#: plugins/personal/generic/generic.tpl:480
+#: plugins/personal/generic/generic.tpl:457
msgid "Vocation"
msgstr ""
#: plugins/personal/generic/class_user.inc:1360
-#: plugins/personal/generic/generic.tpl:607
+#: plugins/personal/generic/generic.tpl:584
msgid "Last delivery"
msgstr ""
#: plugins/personal/generic/class_user.inc:1361
-#: plugins/personal/generic/generic.tpl:529
+#: plugins/personal/generic/generic.tpl:506
msgid "Person locality"
msgstr ""
#: plugins/personal/generic/class_user.inc:1362
-#: plugins/personal/generic/generic.tpl:488
+#: plugins/personal/generic/generic.tpl:465
msgid "Unit description"
msgstr ""
#: plugins/personal/generic/class_user.inc:1363
-#: plugins/personal/generic/generic.tpl:497
+#: plugins/personal/generic/generic.tpl:474
msgid "Subject area"
msgstr ""
#: plugins/personal/generic/class_user.inc:1364
-#: plugins/personal/generic/generic.tpl:506
+#: plugins/personal/generic/generic.tpl:483
msgid "Functional title"
msgstr ""
#: plugins/personal/generic/class_user.inc:1365
-#: plugins/personal/generic/generic.tpl:616
+#: plugins/personal/generic/generic.tpl:593
msgid "Public visible"
msgstr ""
#: plugins/personal/generic/class_user.inc:1366
-#: plugins/personal/generic/generic.tpl:547
+#: plugins/personal/generic/generic.tpl:524
msgid "Street"
msgstr ""
#: plugins/personal/generic/class_user.inc:1368
-#: plugins/personal/generic/generic.tpl:555
+#: plugins/personal/generic/generic.tpl:532
msgid "Postal code"
msgstr ""
@@ -6185,7 +6173,7 @@ msgid "Employee number"
msgstr "Número d'empleat"
#: plugins/personal/generic/class_user.inc:1401
-#: plugins/personal/generic/generic.tpl:332
+#: plugins/personal/generic/generic.tpl:309
msgid "Employee type"
msgstr "Categoria professional"
@@ -6266,29 +6254,28 @@ msgstr "Emmagatzematge de contrasenyes"
msgid "Restrict login to"
msgstr "Restringeix l'entrada a"
-#: plugins/personal/generic/generic.tpl:248
-#: plugins/personal/generic/generic.tpl:267
+#: plugins/personal/generic/generic.tpl:246
msgid "IP or network"
msgstr "IP o xarxa"
-#: plugins/personal/generic/generic.tpl:288
+#: plugins/personal/generic/generic.tpl:265
msgid "Organizational information"
msgstr ""
-#: plugins/personal/generic/generic.tpl:316
+#: plugins/personal/generic/generic.tpl:293
msgid "Department No."
msgstr "Núm de department"
-#: plugins/personal/generic/generic.tpl:324
+#: plugins/personal/generic/generic.tpl:301
msgid "Employee No."
msgstr "Núm d'empleat"
-#: plugins/personal/generic/generic.tpl:390
-#: plugins/personal/generic/generic.tpl:578
+#: plugins/personal/generic/generic.tpl:367
+#: plugins/personal/generic/generic.tpl:555
msgid "Room No."
msgstr "Núm de sala"
-#: plugins/personal/generic/generic.tpl:592
+#: plugins/personal/generic/generic.tpl:569
msgid "Please use the phone tab"
msgstr ""
diff --git a/locale/cs_CZ/messages.po b/locale/cs_CZ/fusiondirectory.po
similarity index 95%
rename from locale/cs_CZ/messages.po
rename to locale/cs_CZ/fusiondirectory.po
index 4612940c09b762fbfbb26bf21a1fc46269cec4ab..9b0d3cb185bbc5d859fc05c78eb2e4c8ea464c08 100644
--- a/locale/cs_CZ/messages.po
+++ b/locale/cs_CZ/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-24 14:48+0100\n"
-"PO-Revision-Date: 2013-03-06 21:40+0000\n"
+"POT-Creation-Date: 2013-04-14 20:13+0200\n"
+"PO-Revision-Date: 2013-03-24 15:00+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/"
"FusionDirectory/language/cs_CZ/)\n"
@@ -19,23 +19,23 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: html/main.php:140 html/class_passwordRecovery.inc:226
+#: html/main.php:135 html/class_passwordRecovery.inc:226
#: include/class_xml.inc:60 include/functions.inc:509
#: plugins/admin/departments/class_department.inc:431
msgid "Fatal error"
msgstr "fatálnà chyba"
-#: html/main.php:141
+#: html/main.php:136
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr ""
"Nemohu nalézt soubor '%s' – opravte to prosÃm spuÅ¡tÄ›nÃm '%s' (na serveru)."
-#: html/main.php:162
+#: html/main.php:157
msgid "PHP configuration"
msgstr "nastavenà PHP"
-#: html/main.php:163
+#: html/main.php:158
msgid ""
"Fatal error: Register globals is on. FusionDirectory will refuse to login "
"unless this is fixed by an administrator."
@@ -43,18 +43,18 @@ msgstr ""
"Fatálnà chyba: v PHP je zapnuto 'register globals'. Dokud to Váš správce "
"systémů neopravÃ, nebude možné se pÅ™ihlásit do FusionDirectory."
-#: html/main.php:192 ihtml/themes/default/password.tpl:40
-#: plugins/admin/users/class_userManagement.inc:393
+#: html/main.php:187 ihtml/themes/default/password.tpl:40
+#: plugins/admin/users/class_userManagement.inc:390
#: plugins/personal/password/class_password.inc:156
#: plugins/personal/password/class_password.inc:162
msgid "Password change"
msgstr "změna hesla"
-#: html/main.php:192
+#: html/main.php:187
msgid "Your password is about to expire, please change your password!"
msgstr "Platnost VaÅ¡eho hesla již brzy skonÄà – změňte ho prosÃm!"
-#: html/main.php:261 html/class_passwordRecovery.inc:301 html/index.php:147
+#: html/main.php:256 html/class_passwordRecovery.inc:296 html/index.php:147
#: html/index.php:208 include/class_SnapshotHandler.inc:57
#: include/class_SnapshotHandler.inc:70 include/class_SnapshotHandler.inc:88
#: include/class_pluglist.inc:272 include/functions.inc:933
@@ -68,30 +68,30 @@ msgstr "Platnost VaÅ¡eho hesla již brzy skonÄà – změňte ho prosÃm!"
msgid "Configuration error"
msgstr "chyba v nastavenÃ"
-#: html/main.php:261
+#: html/main.php:256
msgid "Running out of memory!"
msgstr "Docházà volná kapacita operaÄnà pamÄ›ti!"
-#: html/main.php:316
+#: html/main.php:311
msgid "User ACL checks disabled"
msgstr "kontrola dle ACL je vypnuta"
-#: html/main.php:362
+#: html/main.php:357
msgid "Plugin"
msgstr "zásuvný modul"
-#: html/main.php:363
+#: html/main.php:358
#, php-format
msgid ""
"Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not "
"a file)!"
msgstr ""
-#: html/main.php:378
+#: html/main.php:373
msgid "Configuration Error"
msgstr "chyba v nastavenÃ"
-#: html/main.php:379
+#: html/main.php:374
#, php-format
msgid ""
"Fatal error: not all POST variables have been transfered by PHP - please "
@@ -109,32 +109,32 @@ msgstr "způsob uloženà hesla"
msgid "Error: Password method not available!"
msgstr "Chyba: tento způsob uloženà hesla nenà k dispozici!"
-#: html/class_passwordRecovery.inc:227 html/index.php:147
+#: html/class_passwordRecovery.inc:227
#, php-format
msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
msgstr "Nastavenà %s/%s FusionDirectory nenà Äitelné. Akce byla zruÅ¡ena."
-#: html/class_passwordRecovery.inc:302 html/setup.php:63 html/index.php:163
+#: html/class_passwordRecovery.inc:297 html/setup.php:63 html/index.php:163
#, php-format
msgid "Directory '%s' specified as compile directory is not accessible!"
msgstr ""
"Adresář '%s', nastavený jako mÃsto pro provedenà kompilace, nenà pÅ™Ãstupný!"
-#: html/class_passwordRecovery.inc:407
-#: plugins/admin/users/class_userManagement.inc:309
+#: html/class_passwordRecovery.inc:402
+#: plugins/admin/users/class_userManagement.inc:306
#: plugins/personal/password/class_password.inc:113
msgid ""
"The passwords you've entered as 'New password' and 'Repeated new password' "
"do not match."
msgstr "Zadánà v 'nové heslo' a 'zopakovánà nového hesla' se neshodujÃ!"
-#: html/class_passwordRecovery.inc:409 ihtml/themes/default/password.tpl:81
+#: html/class_passwordRecovery.inc:404 ihtml/themes/default/password.tpl:81
#: ihtml/themes/default/password.tpl:82
#: ihtml/themes/default/accountexpired.tpl:32
#: ihtml/themes/default/accountexpired.tpl:36
#: ihtml/themes/default/recovery.tpl:93 ihtml/themes/default/recovery.tpl:94
#: plugins/admin/users/password.tpl:17 plugins/admin/users/password.tpl:60
-#: plugins/admin/users/class_userManagement.inc:312
+#: plugins/admin/users/class_userManagement.inc:309
#: plugins/personal/password/password.tpl:27
#: plugins/personal/password/password.tpl:78
#: plugins/personal/generic/password.tpl:22
@@ -142,18 +142,18 @@ msgstr "Zadánà v 'nové heslo' a 'zopakovánà nového hesla' se neshodujÃ!"
msgid "New password"
msgstr "nové heslo"
-#: html/class_passwordRecovery.inc:411
+#: html/class_passwordRecovery.inc:406
msgid "The password used as new is too short."
msgstr ""
-#: html/class_passwordRecovery.inc:413
+#: html/class_passwordRecovery.inc:408
#: plugins/personal/password/class_password.inc:121
msgid "The password contains possibly problematic Unicode characters!"
msgstr ""
"Heslo obsahuje znaky, které mohou být problematické (např. se nenacházejà "
"pÅ™Ãmo na klávesnici)."
-#: html/class_passwordRecovery.inc:437 html/index.php:58 html/index.php:64
+#: html/class_passwordRecovery.inc:432 html/index.php:58 html/index.php:64
#: html/index.php:403 ihtml/themes/default/conflict.tpl:6
#: ihtml/themes/default/islocked.tpl:6 ihtml/themes/default/remove.tpl:2
#: ihtml/themes/default/msg_dialog.tpl:59
@@ -176,39 +176,39 @@ msgstr ""
msgid "Warning"
msgstr "varovánÃ"
-#: html/class_passwordRecovery.inc:438
+#: html/class_passwordRecovery.inc:433
msgid "Session will not be encrypted."
msgstr "Relace nebude šifrována."
-#: html/class_passwordRecovery.inc:440
+#: html/class_passwordRecovery.inc:435
msgid "Enter SSL session"
msgstr "otevÅ™Ãt relaci Å¡ifrovanou pomocà protokolu SSL"
-#: html/class_passwordRecovery.inc:481
+#: html/class_passwordRecovery.inc:476
#, php-format
msgid "Did not found account %s"
msgstr "nepodaÅ™ilo se nalézt úÄet %s"
-#: html/class_passwordRecovery.inc:484
+#: html/class_passwordRecovery.inc:479
#, php-format
msgid "Found multiple accounts %s"
msgstr "bylo nalezeno vÃcero úÄtů s názvem %s"
-#: html/class_passwordRecovery.inc:498 ihtml/themes/default/recovery.tpl:142
+#: html/class_passwordRecovery.inc:493 ihtml/themes/default/recovery.tpl:142
msgid "Adresse mail"
msgstr ""
-#: html/class_passwordRecovery.inc:515
+#: html/class_passwordRecovery.inc:510
#, php-format
msgid "There is no account using email %s"
msgstr "neexistuje úÄet použÃvajÃcà e-mailovou adresu %s"
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:513
#, php-format
msgid "There are several accounts using email %s"
msgstr "e-mailová adresa %s je využÃvána vÃce úÄty"
-#: html/class_passwordRecovery.inc:543 html/index.php:257 html/index.php:269
+#: html/class_passwordRecovery.inc:538 html/index.php:257 html/index.php:269
#: html/index.php:282 setup/class_setupStep_Migrate.inc:1138
#: setup/class_setupStep_Migrate.inc:1164
#: setup/class_setupStep_Migrate.inc:1213
@@ -220,20 +220,17 @@ msgstr "e-mailová adresa %s je využÃvána vÃce úÄty"
#: setup/class_setupStep_Migrate.inc:2549
#: setup/class_setupStep_Migrate.inc:2896
#: setup/class_setupStep_Migrate.inc:2910
-#: include/class_SnapshotHandler.inc:150 include/class_SnapshotHandler.inc:329
-#: include/class_SnapshotHandler.inc:378 include/class_SnapshotHandler.inc:382
-#: include/class_SnapshotHandler.inc:402 include/class_SnapshotHandler.inc:445
-#: include/class_SnapshotHandler.inc:508 include/class_SnapshotHandler.inc:577
-#: include/class_SnapshotHandler.inc:592 include/functions.inc:547
+#: include/class_SnapshotHandler.inc:150 include/class_SnapshotHandler.inc:335
+#: include/class_SnapshotHandler.inc:388 include/class_SnapshotHandler.inc:392
+#: include/class_SnapshotHandler.inc:412 include/class_SnapshotHandler.inc:455
+#: include/class_SnapshotHandler.inc:518 include/class_SnapshotHandler.inc:587
+#: include/class_SnapshotHandler.inc:602 include/functions.inc:547
#: include/functions.inc:583 include/functions.inc:591
#: include/functions.inc:639 include/functions.inc:948
#: include/functions.inc:998 include/functions.inc:1058
#: include/functions.inc:1113 include/functions.inc:3244
-#: include/functions.inc:3509 include/class_config.inc:330
-#: include/class_plugin.inc:1500 include/class_plugin.inc:1550
-#: include/class_plugin.inc:1554 include/class_plugin.inc:1574
-#: include/class_plugin.inc:1621 include/class_plugin.inc:1681
-#: include/class_plugin.inc:1751 include/class_plugin.inc:1766
+#: include/functions.inc:3514 include/class_SnapShotDialog.inc:104
+#: include/class_SnapShotDialog.inc:177 include/class_config.inc:330
#: include/class_acl.inc:1308 include/class_acl.inc:1413
#: include/class_ldap.inc:934 include/class_ldap.inc:1421
#: plugins/admin/acl/class_aclRole.inc:613
@@ -252,21 +249,21 @@ msgstr "e-mailová adresa %s je využÃvána vÃce úÄty"
msgid "LDAP error"
msgstr "chyba LDAPu"
-#: html/class_passwordRecovery.inc:566
+#: html/class_passwordRecovery.inc:561
msgid "Contact your administrator, there was a problem with mail server"
msgstr ""
"Nastal problém s poÅ¡tovnÃm serverem – obraÅ¥te se prosÃm na svého správce "
"systémů."
-#: html/class_passwordRecovery.inc:577
+#: html/class_passwordRecovery.inc:572
msgid "This token is invalid"
msgstr "tato poukázka (token) je neplatná"
-#: html/class_passwordRecovery.inc:615
+#: html/class_passwordRecovery.inc:610
msgid "External password changer reported a problem: "
msgstr "Externà program pro úpravu hesel ohlásil problém:"
-#: html/class_passwordRecovery.inc:640
+#: html/class_passwordRecovery.inc:635
msgid "There was a problem with mail server, confirmation email not sent"
msgstr ""
@@ -286,6 +283,13 @@ msgstr ""
"Nastavenà doby udržovánà relace bude bráno z php.ini namÃsto z VaÅ¡eho "
"fusiondirectory.conf. "
+#: html/index.php:147
+#, fuzzy, php-format
+msgid ""
+"FusionDirectory configuration %s/%s is not readable. Please run "
+"fusiondirectory-setup --check-config to fix this."
+msgstr "Nastavenà %s/%s FusionDirectory nenà Äitelné. Akce byla zruÅ¡ena."
+
#: html/index.php:163
msgid "Smarty error"
msgstr "chyba ve Smarty"
@@ -300,22 +304,22 @@ msgstr "Vyskytl se problém s nastavenÃm ověřovánÃ!"
#: setup/setup_checks.tpl:91 setup/class_setupStep_Migrate.inc:1127
#: include/class_xml.inc:57 include/class_tabs.inc:74
#: include/class_management.inc:507 include/class_management.inc:657
-#: include/functions.inc:3613 include/functions.inc:3633
-#: include/functions.inc:3663 include/functions.inc:3671
-#: include/functions.inc:3683 include/functions.inc:3687
-#: include/functions.inc:3702 include/functions.inc:3711
-#: include/functions.inc:3779 include/class_listing.inc:522
+#: include/functions.inc:3618 include/functions.inc:3638
+#: include/functions.inc:3668 include/functions.inc:3676
+#: include/functions.inc:3688 include/functions.inc:3692
+#: include/functions.inc:3707 include/functions.inc:3716
+#: include/functions.inc:3784 include/class_listing.inc:521
#: include/class_config.inc:483 include/class_CopyPasteHandler.inc:264
#: include/password-methods/class_password-methods-sasl.inc:51
#: include/password-methods/class_password-methods-sasl.inc:63
#: include/password-methods/class_password-methods.inc:342
#: include/password-methods/class_password-methods.inc:447
#: include/password-methods/class_password-methods.inc:458
-#: include/class_plugin.inc:1368 include/class_plugin.inc:1843
-#: include/class_msg_dialog.inc:128 include/class_msgPool.inc:215
-#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:680 include/class_msgPool.inc:711
-#: include/class_msgPool.inc:738 include/class_databaseManagement.inc:78
+#: include/class_plugin.inc:1367 include/class_msg_dialog.inc:128
+#: include/class_msgPool.inc:215 include/class_msgPool.inc:235
+#: include/class_msgPool.inc:265 include/class_msgPool.inc:680
+#: include/class_msgPool.inc:711 include/class_msgPool.inc:738
+#: include/class_databaseManagement.inc:78
#: plugins/admin/acl/class_aclRole.inc:681
#: plugins/admin/groups/class_group.inc:521
#: plugins/admin/groups/class_group.inc:527
@@ -1057,32 +1061,29 @@ msgstr ""
"FusionDirectory tento modul potřebuje pro komunikaci s databázemi, které "
"podporuje."
-#: setup/class_setupStep_Checks.inc:136
-msgid "MDB2 mysql"
-msgstr ""
-
-#: setup/class_setupStep_Checks.inc:137
+#: setup/class_setupStep_Checks.inc:134
msgid ""
-"FusionDirectory requires this module to communicate with mysql databases."
+"If you do not want to install MDB2 and won't use databases, remove the "
+"class_databaseManagement.inc file."
msgstr ""
-#: setup/class_setupStep_Checks.inc:143
+#: setup/class_setupStep_Checks.inc:138
msgid "imagick"
msgstr "ImageMagick"
-#: setup/class_setupStep_Checks.inc:144
+#: setup/class_setupStep_Checks.inc:139
msgid "FusionDirectory requires this extension to handle images."
msgstr "FusionDirectory jej potřebuje pro práci s obrázky."
-#: setup/class_setupStep_Checks.inc:159
+#: setup/class_setupStep_Checks.inc:154
msgid "compression module"
msgstr "kompresnà modul"
-#: setup/class_setupStep_Checks.inc:160
+#: setup/class_setupStep_Checks.inc:155
msgid "FusionDirectory requires this extension to handle snapshots."
msgstr "FusionDirectory toto rozÅ¡ÃÅ™enà potÅ™ebuje pro práci se snÃmky."
-#: setup/class_setupStep_Checks.inc:171
+#: setup/class_setupStep_Checks.inc:166
msgid ""
"register_globals is a PHP mechanism to register all global variables to be "
"accessible from scripts without changing the scope. This may be a security "
@@ -1092,19 +1093,19 @@ msgstr ""
"proměnných, které jsou tak dostupné ze skriptů aniž by bylo třeba měnit "
"jejich rozsah. Jenže to může rizikové z hlediska zabezpeÄenÃ."
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStep_Checks.inc:167
msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
msgstr ""
"Vyhledejte ve svém php.ini parametr 'register_globals' a nastavte jej na "
"'off'. "
-#: setup/class_setupStep_Checks.inc:180
+#: setup/class_setupStep_Checks.inc:175
msgid "PHP uses this value for the garbage collector to delete old sessions."
msgstr ""
"PHP tuto hodnotu použÃvá pro „úklid“ (garbage collector) pÅ™i odstraňovánà "
"starých relacÃ."
-#: setup/class_setupStep_Checks.inc:181
+#: setup/class_setupStep_Checks.inc:176
msgid ""
"Setting this value to one day will prevent loosing session and cookies "
"before they really timeout."
@@ -1112,7 +1113,7 @@ msgstr ""
"Nastavenà této hodnoty na jeden den zabránà ztrátÄ› relace a cookies dÅ™Ãve, "
"než skuteÄnÄ› vyprÅ¡Ã nastavený Äasový limit."
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStep_Checks.inc:177
msgid ""
"Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
"higher."
@@ -1120,35 +1121,35 @@ msgstr ""
"Vyhledejte ve svém php.ini parametr 'session.gc_maxlifetime' a nastavte jej "
"na hodnotu '86400' a vyÅ¡Å¡Ã."
-#: setup/class_setupStep_Checks.inc:189 setup/class_setupStep_Checks.inc:205
-#: setup/class_setupStep_Checks.inc:221 setup/class_setupStep_Checks.inc:229
+#: setup/class_setupStep_Checks.inc:184 setup/class_setupStep_Checks.inc:200
+#: setup/class_setupStep_Checks.inc:216 setup/class_setupStep_Checks.inc:224
msgid "Off"
msgstr "vypnuto"
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStep_Checks.inc:185
msgid ""
"In Order to use FusionDirectory without any trouble, the session.auto_start "
"option in your php.ini should be set to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStep_Checks.inc:186
msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
msgstr ""
"Vyhledejte ve svém php.ini parametr 'session.auto_start' a nastavte jej na "
"'off'."
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStep_Checks.inc:193
msgid ""
"FusionDirectory needs at least 128MB of memory. Setting it below this limit "
"may cause errors that are not reproducable! Increase it for larger setups."
msgstr ""
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStep_Checks.inc:194
msgid ""
"Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
msgstr ""
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStep_Checks.inc:201
msgid ""
"This option influences the PHP output handling. Turn this Option off, to "
"increase performance."
@@ -1156,23 +1157,23 @@ msgstr ""
"Tato volba ovlivňuje to, jak PHP zacházàs výstupem. Pro zvýšenà výkonu "
"nastavte na 'vypnuto'."
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStep_Checks.inc:202
msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
msgstr ""
"Vyhledejte ve svém php.ini parametr 'implicit_flush' a nastavte jej na 'off'."
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStep_Checks.inc:209
msgid "The Execution time should be at least 30 seconds."
msgstr "PHP skripty by mÄ›ly dostat Äas alespoň 30 vteÅ™in na to, aby probÄ›hly."
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStep_Checks.inc:210
msgid ""
"Search for 'max_execution_time' in your php.ini and set it to '30' or higher."
msgstr ""
"Vyhledejte ve svém php.ini parametr 'max_execution_time' a nastavte jej na "
"hodnotu '30' a vyÅ¡Å¡Ã."
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStep_Checks.inc:217
msgid ""
"Increase the server security by setting expose_php to 'off'. PHP won't send "
"any information about the server you are running in this case."
@@ -1180,33 +1181,33 @@ msgstr ""
"Pro zlepÅ¡enà zabezpeÄenà nastavte PHP tak, aby neposkytovalo jakékoli "
"informace o serveru, na kterém běžÃ."
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStep_Checks.inc:218
msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
msgstr ""
"Vyhledejte ve svém php.ini parametr 'expose_php' a nastavte jej na 'off'."
-#: setup/class_setupStep_Checks.inc:230
+#: setup/class_setupStep_Checks.inc:225
msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
msgstr ""
"Výkonnost VaÅ¡eho serveru můžete zlepÅ¡it nastavenÃm parametru "
"'magic_quotes_gpc' na 'off'."
-#: setup/class_setupStep_Checks.inc:231
+#: setup/class_setupStep_Checks.inc:226
msgid ""
"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to 'Off'."
msgstr ""
"Vyhledejte ve svém php.ini parametr 'zend.ze1_compatibility_mode' a nastavte "
"jej na 'off'."
-#: setup/class_setupStep_Checks.inc:241
+#: setup/class_setupStep_Checks.inc:236
msgid "Configuration writeable"
msgstr "do nastavenà lze zapisovat"
-#: setup/class_setupStep_Checks.inc:242
+#: setup/class_setupStep_Checks.inc:237
msgid "The configuration file can't be written"
msgstr "Nelze zapisovat do souboru s nastavenÃmi."
-#: setup/class_setupStep_Checks.inc:243
+#: setup/class_setupStep_Checks.inc:238
#, php-format
msgid ""
"FusionDirectory reads its configuration from a file located in (%s/%s). The "
@@ -1792,7 +1793,7 @@ msgstr "přihlásit se do e-mailové konference fusiondirectory-users"
#: plugins/admin/departments/class_organizationGeneric.inc:115
#: plugins/admin/departments/class_organizationGeneric.inc:118
#: plugins/personal/generic/class_user.inc:1395
-#: plugins/personal/generic/generic.tpl:300
+#: plugins/personal/generic/generic.tpl:277
msgid "Organization"
msgstr "organizace"
@@ -1802,8 +1803,8 @@ msgstr "organizace"
#: plugins/admin/acl/class_aclRole.inc:702
#: plugins/admin/acl/class_aclRole.inc:715
#: plugins/admin/acl/class_aclRole.inc:725
-#: plugins/admin/users/class_userManagement.inc:545
-#: plugins/admin/users/class_userManagement.inc:592
+#: plugins/admin/users/class_userManagement.inc:542
+#: plugins/admin/users/class_userManagement.inc:589
#: plugins/admin/users/user-filter.tpl:26
#: plugins/admin/groups/group-filter.tpl:21
#: plugins/admin/groups/userSelect/user-filter.tpl:17
@@ -1886,7 +1887,7 @@ msgstr ""
"www.fusiondirectory.org a anonymně zde předat Vámi vyplněný formulář."
#: setup/setup_feedback.tpl:52
-#: plugins/admin/users/class_userManagement.inc:903
+#: plugins/admin/users/class_userManagement.inc:900
#: plugins/admin/groups/class_group.inc:1106
#: plugins/admin/departments/class_department.inc:653
#: plugins/admin/ogroups/class_ogroup.inc:895
@@ -2035,7 +2036,7 @@ msgstr "pÅ™esunout vybrané skupiny do pÅ™ÃsluÅ¡ného stromu"
#: setup/setup_migrate.tpl:101 setup/setup_migrate.tpl:153
#: setup/setup_migrate.tpl:320 setup/setup_migrate.tpl:373
#: setup/setup_migrate.tpl:416 setup/setup_migrate.tpl:459
-#: setup/setup_migrate.tpl:503 include/class_listing.inc:352
+#: setup/setup_migrate.tpl:503 include/class_listing.inc:351
msgid "Select all"
msgstr "vybrat vše"
@@ -2539,7 +2540,7 @@ msgid "Group will be moved from"
msgstr "skupina bude přesunuta z"
#: setup/class_setupStep_Migrate.inc:1175
-#: setup/class_setupStep_Migrate.inc:1223 include/class_plugin.inc:2083
+#: setup/class_setupStep_Migrate.inc:1223 include/class_plugin.inc:1675
msgid "to"
msgstr "do"
@@ -2619,8 +2620,7 @@ msgstr "Je třeba zmigrovat tyto služby %s."
#: setup/class_setupStep_Migrate.inc:2647 include/class_msgPool.inc:495
#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:83
#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:138
-#: plugins/personal/generic/generic.tpl:251
-#: plugins/personal/generic/generic.tpl:270
+#: plugins/personal/generic/generic.tpl:249
#, php-format
msgid "Add"
msgstr "přidat"
@@ -2748,28 +2748,25 @@ msgstr "Filtr je neúplný!"
#: include/class_management.inc:333 include/class_management.inc:483
#: include/class_management.inc:536 include/class_management.inc:576
#: include/class_management.inc:590 include/class_CopyPasteHandler.inc:223
-#: include/class_plugin.inc:1791 include/class_plugin.inc:1803
-#: include/class_plugin.inc:1818 include/class_plugin.inc:1831
-#: plugins/admin/users/class_userManagement.inc:205
-#: plugins/admin/users/class_userManagement.inc:761
+#: plugins/admin/users/class_userManagement.inc:202
+#: plugins/admin/users/class_userManagement.inc:758
msgid "Permission"
msgstr "oprávnÄ›nÃ"
#: include/class_management.inc:403
-#: plugins/admin/acl/class_aclManagement.inc:100
-#: plugins/admin/users/class_userManagement.inc:719
-#: plugins/admin/users/class_userManagement.inc:723
+#: plugins/admin/acl/class_aclManagement.inc:101
+#: plugins/admin/users/class_userManagement.inc:716
+#: plugins/admin/users/class_userManagement.inc:720
msgid "Permission error"
msgstr "chyba v oprávnÄ›nÃ"
-#: include/class_management.inc:483 include/class_plugin.inc:1791
+#: include/class_management.inc:483
#, php-format
msgid "You are not allowed to create a snapshot for %s."
msgstr "Nejste oprávnÄ›n(a) vytvoÅ™it snÃmek %s."
#: include/class_management.inc:536 include/class_management.inc:576
-#: include/class_management.inc:590 include/class_plugin.inc:1803
-#: include/class_plugin.inc:1818 include/class_plugin.inc:1831
+#: include/class_management.inc:590
#, php-format
msgid "You are not allowed to restore a snapshot for %s."
msgstr "Nejste oprávnÄ›n(a) k obnovenà %s ze snÃmku."
@@ -2998,87 +2995,87 @@ msgstr ""
"PÅ™Ãkaz '%s', zadaný jako POSTMODIFY (spusÅ¥ po dokonÄenà úpravy) pro zásuvný "
"modul '%s' zdá se neexistuje."
-#: include/functions.inc:3613 include/functions.inc:3633
-#: include/functions.inc:3671 include/functions.inc:3683
-#: include/functions.inc:3687 include/functions.inc:3702
-#: include/functions.inc:3711
+#: include/functions.inc:3618 include/functions.inc:3638
+#: include/functions.inc:3676 include/functions.inc:3688
+#: include/functions.inc:3692 include/functions.inc:3707
+#: include/functions.inc:3716
msgid "Cannot allocate a free ID:"
msgstr "Nenà k dispozici volné ID:"
-#: include/functions.inc:3613
+#: include/functions.inc:3618
msgid "unknown idAllocation method!"
msgstr "Neznámá metoda idAllocation (přiřazovánà ID)!"
-#: include/functions.inc:3633
+#: include/functions.inc:3638
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr "%sPoolMin >= %sPoolMax!"
-#: include/functions.inc:3663
+#: include/functions.inc:3668
msgid "Cannot create sambaUnixIdPool entry!"
msgstr "Nelze vytvořit položku sambaUnixIdPool!"
-#: include/functions.inc:3671
+#: include/functions.inc:3676
msgid "sambaUnixIdPool is not unique!"
msgstr "Identifikátor sambaUnixIdPool nenà jedineÄný!"
-#: include/functions.inc:3683 include/functions.inc:3687
+#: include/functions.inc:3688 include/functions.inc:3692
msgid "no ID available!"
msgstr "Nenà k dispozici ID!"
-#: include/functions.inc:3711
+#: include/functions.inc:3716
msgid "maximum tries exceeded!"
msgstr "pÅ™ekroÄen maximálnà poÄet neúspěšných pokusů!"
-#: include/functions.inc:3779
+#: include/functions.inc:3784
msgid "Cannot allocate a free ID!"
msgstr "Nenà k dispozici volné ID – nenà co přidělit!"
-#: include/class_listing.inc:291 include/class_listing.inc:1099
-#: include/class_listing.inc:1101 include/class_sortableListing.inc:343
+#: include/class_listing.inc:290 include/class_listing.inc:1105
+#: include/class_listing.inc:1107 include/class_sortableListing.inc:343
#: include/class_acl.inc:504 plugins/admin/acl/class_aclRole.inc:372
msgid "Up"
msgstr "nahoru"
-#: include/class_listing.inc:291 include/class_sortableListing.inc:343
+#: include/class_listing.inc:290 include/class_sortableListing.inc:343
#: include/class_acl.inc:506 plugins/admin/acl/class_aclRole.inc:374
msgid "Down"
msgstr "dolů"
-#: include/class_listing.inc:564
+#: include/class_listing.inc:563
msgid "created by"
msgstr "vytvořeno (kým)"
-#: include/class_listing.inc:1091
+#: include/class_listing.inc:1097
msgid "Go to root department"
msgstr "pÅ™ejÃt do koÅ™ene vÅ¡ech oddÄ›lenÃ"
-#: include/class_listing.inc:1091 include/class_listing.inc:1093
+#: include/class_listing.inc:1097 include/class_listing.inc:1099
#: include/class_baseSelector.inc:205
msgid "Root"
msgstr "kořen"
-#: include/class_listing.inc:1099
+#: include/class_listing.inc:1105
msgid "Go up one department"
msgstr "pÅ™ejÃt o jedno oddÄ›lenà výše"
-#: include/class_listing.inc:1107
+#: include/class_listing.inc:1113
msgid "Go to users department"
msgstr "pÅ™ejÃt do svého oddÄ›lenÃ"
-#: include/class_listing.inc:1107 include/class_listing.inc:1109
+#: include/class_listing.inc:1113 include/class_listing.inc:1115
msgid "Home"
msgstr "domovské"
-#: include/class_listing.inc:1114
+#: include/class_listing.inc:1120
msgid "Reload list"
msgstr "znovunaÄtenà seznamu"
-#: include/class_listing.inc:1114 include/class_baseSelector.inc:252
+#: include/class_listing.inc:1120 include/class_baseSelector.inc:252
msgid "Submit"
msgstr "potvrdit"
-#: include/class_listing.inc:1211 plugins/admin/acl/acl-list.xml:65
+#: include/class_listing.inc:1217 plugins/admin/acl/acl-list.xml:65
#: plugins/admin/users/user-list.xml:78 plugins/admin/groups/group-list.xml:79
#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:64
#: plugins/admin/departments/dep-list.xml:87
@@ -3086,65 +3083,62 @@ msgstr "potvrdit"
msgid "Actions"
msgstr "akce"
-#: include/class_listing.inc:1495 include/class_listing.inc:1545
-#: include/class_plugin.inc:2228
+#: include/class_listing.inc:1501 include/class_listing.inc:1551
msgid "Copy"
msgstr "zkopÃrovat"
-#: include/class_listing.inc:1501 include/class_listing.inc:1535
-#: include/class_plugin.inc:2232
+#: include/class_listing.inc:1507 include/class_listing.inc:1541
msgid "Cut"
msgstr "vyjmout"
-#: include/class_listing.inc:1509 include/class_listing.inc:1511
-#: include/class_CopyPasteHandler.inc:400 include/class_plugin.inc:2239
-#: include/class_plugin.inc:2242
+#: include/class_listing.inc:1515 include/class_listing.inc:1517
+#: include/class_CopyPasteHandler.inc:400
msgid "Paste"
msgstr "vložit"
-#: include/class_listing.inc:1535 include/class_plugin.inc:2186
+#: include/class_listing.inc:1541
msgid "Cut this entry"
msgstr "vyjmout tuto položku"
-#: include/class_listing.inc:1545 include/class_plugin.inc:2194
+#: include/class_listing.inc:1551
msgid "Copy this entry"
msgstr "kopÃrovat tuto položku"
-#: include/class_listing.inc:1577 include/class_listing.inc:1579
+#: include/class_listing.inc:1583 include/class_listing.inc:1585
msgid "Restore snapshots"
msgstr "obnovit ze snÃmků"
-#: include/class_listing.inc:1593
+#: include/class_listing.inc:1599
msgid "Export list"
msgstr "exportovat seznam"
-#: include/class_listing.inc:1628 include/class_listing.inc:1629
-#: include/class_SnapShotDialog.inc:153 include/class_plugin.inc:2160
+#: include/class_listing.inc:1634 include/class_listing.inc:1635
+#: include/class_SnapShotDialog.inc:298
msgid "Restore snapshot"
msgstr "obnovit ze snÃmku"
-#: include/class_listing.inc:1638 include/class_plugin.inc:2167
+#: include/class_listing.inc:1644
msgid "Create snapshot"
msgstr "vytvoÅ™it snÃmek"
-#: include/class_listing.inc:1639 include/class_plugin.inc:2168
+#: include/class_listing.inc:1645
msgid "Create a new snapshot from this object"
msgstr "vytvoÅ™it nový snÃmek tohoto objektu"
-#: include/class_SnapShotDialog.inc:99
+#: include/class_SnapShotDialog.inc:244
#, php-format
msgid "You're about to delete the snapshot '%s'."
msgstr "Chystáte se smazat snÃmek '%s'."
-#: include/class_SnapShotDialog.inc:155
+#: include/class_SnapShotDialog.inc:300
msgid "Remove snapshot"
msgstr "odebrat snÃmek"
-#: include/class_SnapShotDialog.inc:157 include/class_SnapShotDialog.inc:177
+#: include/class_SnapShotDialog.inc:302 include/class_SnapShotDialog.inc:322
msgid "Y-m-d, H:i:s"
msgstr "r-m-d, h:m:v"
-#: include/class_SnapShotDialog.inc:191 plugins/admin/acl/acl-list.xml:57
+#: include/class_SnapShotDialog.inc:336 plugins/admin/acl/acl-list.xml:57
#: plugins/admin/acl/acl_role.tpl:17 plugins/admin/acl/class_aclRole.inc:704
#: plugins/admin/groups/class_group.inc:1114
#: plugins/admin/groups/group-list.xml:66 plugins/admin/groups/generic.tpl:24
@@ -3220,7 +3214,7 @@ msgid "Cannot find a suitable password method for the current hash!"
msgstr ""
"Pro tento otisk nenà k dispozici odpovÃdajÃcà mechanizmus Å¡ifrovánà hesla!"
-#: include/class_plugin.inc:563
+#: include/class_plugin.inc:562
msgid ""
"The object has changed since opened in FusionDirectory. All changes that may "
"be done by others get lost if you save this entry!"
@@ -3228,26 +3222,14 @@ msgstr ""
"Objekt byl mezitÃm zmÄ›nÄ›n. Jeho uloženÃm zahodÃte vÅ¡echny zmÄ›ny, které "
"ostatnà mezitÃm mohli udÄ›lat."
-#: include/class_plugin.inc:2082
+#: include/class_plugin.inc:1674
msgid "Changing ACL dn"
msgstr "probÃhá zmÄ›na DN ACL"
-#: include/class_plugin.inc:2082
+#: include/class_plugin.inc:1674
msgid "from"
msgstr "z"
-#: include/class_plugin.inc:2136 include/class_plugin.inc:2138
-msgid "Restore"
-msgstr "obnovit"
-
-#: include/class_plugin.inc:2186
-msgid "cut"
-msgstr "vyjmout"
-
-#: include/class_plugin.inc:2194
-msgid "copy"
-msgstr "zkopÃrovat"
-
#: include/class_sortableListing.inc:303
msgid "Sortable list"
msgstr "položky seznamu je možné řadit"
@@ -4137,15 +4119,14 @@ msgstr "Pro zÃskánà dalÅ¡Ãch podrobnostà prosÃm zapnÄ›te režim ladÄ›nÃ!"
msgid "List of acls"
msgstr "seznam ACL"
-#: plugins/admin/acl/acl-list.xml:15
+#: plugins/admin/acl/acl-list.xml:15 plugins/admin/acl/acl-list.xml:82
#: plugins/admin/acl/class_aclManagement.inc:36
msgid "Acl"
msgstr "ACL"
-#: plugins/admin/acl/acl-list.xml:23 plugins/admin/acl/acl-list.xml:82
-#: plugins/admin/acl/class_aclRole.inc:695
+#: plugins/admin/acl/acl-list.xml:23 plugins/admin/acl/class_aclRole.inc:695
#: plugins/personal/generic/class_user.inc:1367
-#: plugins/personal/generic/generic.tpl:515
+#: plugins/personal/generic/generic.tpl:492
msgid "Role"
msgstr "role"
@@ -4189,7 +4170,7 @@ msgstr ""
msgid "Access control list management"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:160
+#: plugins/admin/acl/class_aclManagement.inc:161
msgid "ACL Assignment"
msgstr "přiřazenà ACL"
@@ -4317,7 +4298,7 @@ msgstr ""
"'žádná'."
#: plugins/admin/users/template.tpl:15
-#: plugins/admin/users/class_userManagement.inc:542
+#: plugins/admin/users/class_userManagement.inc:539
#: plugins/admin/users/templatize.tpl:15 plugins/admin/users/user-list.xml:15
#: plugins/admin/users/user-list.xml:102
msgid "Template"
@@ -4352,24 +4333,24 @@ msgstr "uživatelské jméno"
msgid "Manage users"
msgstr "spravovat uživatele"
-#: plugins/admin/users/class_userManagement.inc:344
+#: plugins/admin/users/class_userManagement.inc:341
#: plugins/personal/password/class_password.inc:136
#, php-format
msgid "Check-hook reported a problem: %s. Password change canceled!"
msgstr ""
"Kontrolnà háÄek (Check-hook) ohlásil problém: %s. Heslo nebylo zmÄ›nÄ›no!"
-#: plugins/admin/users/class_userManagement.inc:394
+#: plugins/admin/users/class_userManagement.inc:391
msgid "You have no permission to change this users password!"
msgstr "Nejste oprávněn(a) měnit heslo tohoto uživatele!"
-#: plugins/admin/users/class_userManagement.inc:470
-#: plugins/admin/users/class_userManagement.inc:504
-#: plugins/admin/users/class_userManagement.inc:535
+#: plugins/admin/users/class_userManagement.inc:467
+#: plugins/admin/users/class_userManagement.inc:501
+#: plugins/admin/users/class_userManagement.inc:532
msgid "none"
msgstr "žádná/ý/é"
-#: plugins/admin/users/class_userManagement.inc:548
+#: plugins/admin/users/class_userManagement.inc:545
#: plugins/admin/users/user-list.xml:57
#: plugins/admin/groups/userSelect/user-list.xml:40
#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
@@ -4379,11 +4360,11 @@ msgstr "žádná/ý/é"
msgid "Given name"
msgstr "křestnà jméno"
-#: plugins/admin/users/class_userManagement.inc:799
+#: plugins/admin/users/class_userManagement.inc:796
msgid "Account locking"
msgstr "zamykánà úÄtu"
-#: plugins/admin/users/class_userManagement.inc:800
+#: plugins/admin/users/class_userManagement.inc:797
#, php-format
msgid ""
"Password method '%s' does not support locking. Account (%s) has not been "
@@ -4392,15 +4373,15 @@ msgstr ""
"Způsob ukládánà hesel '%s' nepodporuje uzamykánà úÄtů. ÚÄet (%s) proto "
"nebude uzamÄen!"
-#: plugins/admin/users/class_userManagement.inc:873
+#: plugins/admin/users/class_userManagement.inc:870
msgid "Unlock account"
msgstr "povolit úÄet"
-#: plugins/admin/users/class_userManagement.inc:875
+#: plugins/admin/users/class_userManagement.inc:872
msgid "Lock account"
msgstr "zamknout úÄet"
-#: plugins/admin/users/class_userManagement.inc:903
+#: plugins/admin/users/class_userManagement.inc:900
#, fuzzy
msgid "Generic properties"
msgstr "upravit obecné vlastnosti"
@@ -4492,7 +4473,8 @@ msgid "Remove user"
msgstr "odebrat uživatele"
#: plugins/admin/password/class_recoveryConfig.inc:35
-msgid "Password recovery config"
+#, fuzzy
+msgid "Password recovery"
msgstr "nastavenà obnovovánà ztraceného hesla"
#: plugins/admin/password/class_recoveryConfig.inc:36
@@ -4828,7 +4810,6 @@ msgstr "nastavenà skupiny – obecné"
#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:23
#: plugins/admin/ogroups/class_ogroupManagement.inc:187
#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:79
-#: plugins/admin/ogroups/ogroup-list.xml:79
#: plugins/generic/references/class_reference.inc:55
#: plugins/personal/posix/groupSelect/group-list.xml:15
msgid "Group"
@@ -4920,8 +4901,8 @@ msgstr "upravit vlastnosti pro Sambu"
#: plugins/generic/references/class_reference.inc:59
#: plugins/personal/posix/trustSelect/class_trustSelect.inc:81
#: plugins/personal/generic/class_user.inc:1180
-#: plugins/personal/generic/generic.tpl:399
-#: plugins/personal/generic/generic.tpl:586
+#: plugins/personal/generic/generic.tpl:376
+#: plugins/personal/generic/generic.tpl:563
msgid "Phone"
msgstr "telefon"
@@ -5020,7 +5001,7 @@ msgstr "mÃsto"
#: plugins/admin/departments/generic.tpl:91
#: plugins/admin/departments/class_organizationGeneric.inc:129
#: plugins/personal/generic/class_user.inc:1410
-#: plugins/personal/generic/generic.tpl:448
+#: plugins/personal/generic/generic.tpl:425
msgid "Location"
msgstr "umÃstÄ›nÃ"
@@ -5037,8 +5018,8 @@ msgstr "umÃstÄ›nÃ"
#: plugins/admin/departments/generic.tpl:51
#: plugins/admin/departments/class_organizationGeneric.inc:126
#: plugins/personal/generic/class_user.inc:1399
-#: plugins/personal/generic/generic.tpl:341
-#: plugins/personal/generic/generic.tpl:362
+#: plugins/personal/generic/generic.tpl:318
+#: plugins/personal/generic/generic.tpl:339
msgid "Manager"
msgstr "nadÅ™Ãzený"
@@ -5188,7 +5169,7 @@ msgstr "kategorie pro tento podstrom"
#: plugins/admin/departments/generic.tpl:83
#: plugins/admin/departments/class_organizationGeneric.inc:128
#: plugins/personal/generic/class_user.inc:1409
-#: plugins/personal/generic/generic.tpl:456
+#: plugins/personal/generic/generic.tpl:433
msgid "State"
msgstr "stát"
@@ -5206,7 +5187,7 @@ msgstr "umÃstÄ›nà tohoto podstromu"
#: plugins/admin/departments/class_department.inc:667
#: plugins/admin/departments/generic.tpl:99
#: plugins/personal/generic/generic.tpl:181
-#: plugins/personal/generic/generic.tpl:464
+#: plugins/personal/generic/generic.tpl:441
msgid "Address"
msgstr "adresa"
@@ -5226,8 +5207,8 @@ msgstr "základ telefonnÃho ÄÃsla tohoto podstromu"
#: plugins/admin/departments/generic.tpl:114
#: plugins/admin/departments/class_organizationGeneric.inc:132
#: plugins/personal/generic/class_user.inc:1183
-#: plugins/personal/generic/generic.tpl:430
-#: plugins/personal/generic/generic.tpl:598
+#: plugins/personal/generic/generic.tpl:407
+#: plugins/personal/generic/generic.tpl:575
msgid "Fax"
msgstr "fax"
@@ -5278,7 +5259,7 @@ msgstr "zemÄ›"
#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:15
#: plugins/generic/references/class_reference.inc:57
#: plugins/personal/generic/class_user.inc:1396
-#: plugins/personal/generic/generic.tpl:308
+#: plugins/personal/generic/generic.tpl:285
msgid "Department"
msgstr "oddÄ›lenÃ"
@@ -5587,6 +5568,11 @@ msgstr "Älenské objekty"
msgid "List of object groups"
msgstr "seznam skupin objektu"
+#: plugins/admin/ogroups/ogroup-list.xml:79
+#, fuzzy
+msgid "Objectgroup"
+msgstr "skupina objektu"
+
#: plugins/admin/ogroups/ogroup-list.xml:106
msgid "Send message"
msgstr "poslat zprávu"
@@ -5657,9 +5643,14 @@ msgid "Language"
msgstr "jazyk"
#: plugins/config/class_configInLdap.inc:82
+#, fuzzy
msgid ""
-"Default language to be used if the one asked by the browser is not available"
+"Language of the application. If 'automatic' or not available, the one asked "
+"by the browser will be used. This setting can be overriden per user."
msgstr ""
+"Nynà můžete zvolit výchozà jazyk. Volba 'automaticky' použije jazyk "
+"požadovaný webovým prohlÞeÄem. Jednotlivà uživatelé pak mohou mÃt "
+"individuálně nastaven i jiný jazyk."
#: plugins/config/class_configInLdap.inc:87
msgid "Theme to be used"
@@ -5674,7 +5665,7 @@ msgid "Schema setup"
msgstr ""
#: plugins/config/class_configInLdap.inc:103
-msgid "rfc237bis"
+msgid "rfc2307bis"
msgstr ""
#: plugins/config/class_configInLdap.inc:104
@@ -6383,12 +6374,12 @@ msgid "Homepage"
msgstr "osobnà webové stránky"
#: plugins/personal/generic/class_user.inc:1186
-#: plugins/personal/generic/generic.tpl:411
+#: plugins/personal/generic/generic.tpl:388
msgid "Mobile"
msgstr "mobilnÃ"
#: plugins/personal/generic/class_user.inc:1189
-#: plugins/personal/generic/generic.tpl:422
+#: plugins/personal/generic/generic.tpl:399
msgid "Pager"
msgstr "pager"
@@ -6399,57 +6390,57 @@ msgid "Date of birth"
msgstr "datum narozenÃ"
#: plugins/personal/generic/class_user.inc:1357
-#: plugins/personal/generic/generic.tpl:538
+#: plugins/personal/generic/generic.tpl:515
msgid "Unit"
msgstr "jednotka"
#: plugins/personal/generic/class_user.inc:1358
-#: plugins/personal/generic/generic.tpl:563
+#: plugins/personal/generic/generic.tpl:540
msgid "House identifier"
msgstr "oznaÄenà budovy"
#: plugins/personal/generic/class_user.inc:1359
-#: plugins/personal/generic/generic.tpl:480
+#: plugins/personal/generic/generic.tpl:457
msgid "Vocation"
msgstr "povolánÃ"
#: plugins/personal/generic/class_user.inc:1360
-#: plugins/personal/generic/generic.tpl:607
+#: plugins/personal/generic/generic.tpl:584
msgid "Last delivery"
msgstr ""
#: plugins/personal/generic/class_user.inc:1361
-#: plugins/personal/generic/generic.tpl:529
+#: plugins/personal/generic/generic.tpl:506
msgid "Person locality"
msgstr "kde se osoba nacházÃ"
#: plugins/personal/generic/class_user.inc:1362
-#: plugins/personal/generic/generic.tpl:488
+#: plugins/personal/generic/generic.tpl:465
msgid "Unit description"
msgstr "popis jednotky"
#: plugins/personal/generic/class_user.inc:1363
-#: plugins/personal/generic/generic.tpl:497
+#: plugins/personal/generic/generic.tpl:474
msgid "Subject area"
msgstr ""
#: plugins/personal/generic/class_user.inc:1364
-#: plugins/personal/generic/generic.tpl:506
+#: plugins/personal/generic/generic.tpl:483
msgid "Functional title"
msgstr "funkÄnà zaÅ™azenÃ"
#: plugins/personal/generic/class_user.inc:1365
-#: plugins/personal/generic/generic.tpl:616
+#: plugins/personal/generic/generic.tpl:593
msgid "Public visible"
msgstr "viditelné všem"
#: plugins/personal/generic/class_user.inc:1366
-#: plugins/personal/generic/generic.tpl:547
+#: plugins/personal/generic/generic.tpl:524
msgid "Street"
msgstr "ulice"
#: plugins/personal/generic/class_user.inc:1368
-#: plugins/personal/generic/generic.tpl:555
+#: plugins/personal/generic/generic.tpl:532
msgid "Postal code"
msgstr "poÅ¡tovnà smÄ›rovacà ÄÃslo (PSÄŒ)"
@@ -6498,7 +6489,7 @@ msgid "Employee number"
msgstr "ÄÃslo zamÄ›stnance"
#: plugins/personal/generic/class_user.inc:1401
-#: plugins/personal/generic/generic.tpl:332
+#: plugins/personal/generic/generic.tpl:309
msgid "Employee type"
msgstr "typ zaměstnaneckého poměru"
@@ -6579,29 +6570,28 @@ msgstr "způsob uloženà hesla"
msgid "Restrict login to"
msgstr "Může se přihlásit pouze z:"
-#: plugins/personal/generic/generic.tpl:248
-#: plugins/personal/generic/generic.tpl:267
+#: plugins/personal/generic/generic.tpl:246
msgid "IP or network"
msgstr "IP adresa nebo sÃÅ¥"
-#: plugins/personal/generic/generic.tpl:288
+#: plugins/personal/generic/generic.tpl:265
msgid "Organizational information"
msgstr "organizaÄnà informace"
-#: plugins/personal/generic/generic.tpl:316
+#: plugins/personal/generic/generic.tpl:293
msgid "Department No."
msgstr "ÄÃslo oddÄ›lenÃ"
-#: plugins/personal/generic/generic.tpl:324
+#: plugins/personal/generic/generic.tpl:301
msgid "Employee No."
msgstr "ÄÃslo zamÄ›stnance"
-#: plugins/personal/generic/generic.tpl:390
-#: plugins/personal/generic/generic.tpl:578
+#: plugins/personal/generic/generic.tpl:367
+#: plugins/personal/generic/generic.tpl:555
msgid "Room No."
msgstr "oznaÄenà mÃstnosti"
-#: plugins/personal/generic/generic.tpl:592
+#: plugins/personal/generic/generic.tpl:569
msgid "Please use the phone tab"
msgstr "použijte prosÃm záložku 'telefon'"
@@ -6609,6 +6599,15 @@ msgstr "použijte prosÃm záložku 'telefon'"
msgid "Your password hash method will not be changed!"
msgstr "Způsob uloženà Vašeho hesla nebyl změněn!"
+#~ msgid "Restore"
+#~ msgstr "obnovit"
+
+#~ msgid "cut"
+#~ msgstr "vyjmout"
+
+#~ msgid "copy"
+#~ msgstr "zkopÃrovat"
+
#~ msgid "POSIX"
#~ msgstr "POSIX"
diff --git a/locale/de/messages.po b/locale/de/fusiondirectory.po
similarity index 95%
rename from locale/de/messages.po
rename to locale/de/fusiondirectory.po
index 280bb3ce285322672c6ab7bfb8699b7d2fbdc7f0..5659303e4dadb6b979e5df1ce6c80207eaf5c798 100644
--- a/locale/de/messages.po
+++ b/locale/de/fusiondirectory.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-24 14:48+0100\n"
-"PO-Revision-Date: 2013-03-06 21:40+0000\n"
+"POT-Creation-Date: 2013-04-14 20:13+0200\n"
+"PO-Revision-Date: 2013-03-24 15:00+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory/"
"language/de/)\n"
@@ -23,41 +23,41 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: html/main.php:140 html/class_passwordRecovery.inc:226
+#: html/main.php:135 html/class_passwordRecovery.inc:226
#: include/class_xml.inc:60 include/functions.inc:509
#: plugins/admin/departments/class_department.inc:431
msgid "Fatal error"
msgstr "Schwerer Fehler"
-#: html/main.php:141
+#: html/main.php:136
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr ""
"Konnte Datei '%s' nicht finden - bitte führen Sie '%s' aus um das Problem zu "
"beseitigen"
-#: html/main.php:162
+#: html/main.php:157
msgid "PHP configuration"
msgstr "PHP-Konfiguration"
-#: html/main.php:163
+#: html/main.php:158
msgid ""
"Fatal error: Register globals is on. FusionDirectory will refuse to login "
"unless this is fixed by an administrator."
msgstr ""
-#: html/main.php:192 ihtml/themes/default/password.tpl:40
-#: plugins/admin/users/class_userManagement.inc:393
+#: html/main.php:187 ihtml/themes/default/password.tpl:40
+#: plugins/admin/users/class_userManagement.inc:390
#: plugins/personal/password/class_password.inc:156
#: plugins/personal/password/class_password.inc:162
msgid "Password change"
msgstr "Passwort-Änderung"
-#: html/main.php:192
+#: html/main.php:187
msgid "Your password is about to expire, please change your password!"
msgstr "Ihr Passwort ist fast abgelaufen, bitte setzen Sie ein neues!"
-#: html/main.php:261 html/class_passwordRecovery.inc:301 html/index.php:147
+#: html/main.php:256 html/class_passwordRecovery.inc:296 html/index.php:147
#: html/index.php:208 include/class_SnapshotHandler.inc:57
#: include/class_SnapshotHandler.inc:70 include/class_SnapshotHandler.inc:88
#: include/class_pluglist.inc:272 include/functions.inc:933
@@ -71,30 +71,30 @@ msgstr "Ihr Passwort ist fast abgelaufen, bitte setzen Sie ein neues!"
msgid "Configuration error"
msgstr "Konfigurationsfehler"
-#: html/main.php:261
+#: html/main.php:256
msgid "Running out of memory!"
msgstr "Der verfügbare Arbeitsspeicher wird knapp!"
-#: html/main.php:316
+#: html/main.php:311
msgid "User ACL checks disabled"
msgstr "Prüfung der Benutzer-ACLs deaktiviert"
-#: html/main.php:362
+#: html/main.php:357
msgid "Plugin"
msgstr "Erweiterung"
-#: html/main.php:363
+#: html/main.php:358
#, php-format
msgid ""
"Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not "
"a file)!"
msgstr ""
-#: html/main.php:378
+#: html/main.php:373
msgid "Configuration Error"
msgstr "Konfigurationsfehler"
-#: html/main.php:379
+#: html/main.php:374
#, php-format
msgid ""
"Fatal error: not all POST variables have been transfered by PHP - please "
@@ -112,20 +112,20 @@ msgstr "Passwort-Methode"
msgid "Error: Password method not available!"
msgstr "Fehler: Passwort-Methode ist nicht verfügbar!"
-#: html/class_passwordRecovery.inc:227 html/index.php:147
+#: html/class_passwordRecovery.inc:227
#, php-format
msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
msgstr ""
-#: html/class_passwordRecovery.inc:302 html/setup.php:63 html/index.php:163
+#: html/class_passwordRecovery.inc:297 html/setup.php:63 html/index.php:163
#, php-format
msgid "Directory '%s' specified as compile directory is not accessible!"
msgstr ""
"Auf das als Compile-Verzeichnis angegegebene Verzeichnis '%s' kann nicht "
"zugegriffen werden!"
-#: html/class_passwordRecovery.inc:407
-#: plugins/admin/users/class_userManagement.inc:309
+#: html/class_passwordRecovery.inc:402
+#: plugins/admin/users/class_userManagement.inc:306
#: plugins/personal/password/class_password.inc:113
msgid ""
"The passwords you've entered as 'New password' and 'Repeated new password' "
@@ -134,13 +134,13 @@ msgstr ""
"Die Passwörter, die Sie als 'Neues Passwort' und 'Neues Passwort "
"(Wiederholung)' eingegeben haben sind nicht identisch."
-#: html/class_passwordRecovery.inc:409 ihtml/themes/default/password.tpl:81
+#: html/class_passwordRecovery.inc:404 ihtml/themes/default/password.tpl:81
#: ihtml/themes/default/password.tpl:82
#: ihtml/themes/default/accountexpired.tpl:32
#: ihtml/themes/default/accountexpired.tpl:36
#: ihtml/themes/default/recovery.tpl:93 ihtml/themes/default/recovery.tpl:94
#: plugins/admin/users/password.tpl:17 plugins/admin/users/password.tpl:60
-#: plugins/admin/users/class_userManagement.inc:312
+#: plugins/admin/users/class_userManagement.inc:309
#: plugins/personal/password/password.tpl:27
#: plugins/personal/password/password.tpl:78
#: plugins/personal/generic/password.tpl:22
@@ -148,16 +148,16 @@ msgstr ""
msgid "New password"
msgstr "Neues Passwort"
-#: html/class_passwordRecovery.inc:411
+#: html/class_passwordRecovery.inc:406
msgid "The password used as new is too short."
msgstr ""
-#: html/class_passwordRecovery.inc:413
+#: html/class_passwordRecovery.inc:408
#: plugins/personal/password/class_password.inc:121
msgid "The password contains possibly problematic Unicode characters!"
msgstr ""
-#: html/class_passwordRecovery.inc:437 html/index.php:58 html/index.php:64
+#: html/class_passwordRecovery.inc:432 html/index.php:58 html/index.php:64
#: html/index.php:403 ihtml/themes/default/conflict.tpl:6
#: ihtml/themes/default/islocked.tpl:6 ihtml/themes/default/remove.tpl:2
#: ihtml/themes/default/msg_dialog.tpl:59
@@ -180,39 +180,39 @@ msgstr ""
msgid "Warning"
msgstr "Warnung"
-#: html/class_passwordRecovery.inc:438
+#: html/class_passwordRecovery.inc:433
msgid "Session will not be encrypted."
msgstr "Die Sitzung ist nicht verschlüsselt."
-#: html/class_passwordRecovery.inc:440
+#: html/class_passwordRecovery.inc:435
msgid "Enter SSL session"
msgstr "SSL Sitzung"
-#: html/class_passwordRecovery.inc:481
+#: html/class_passwordRecovery.inc:476
#, php-format
msgid "Did not found account %s"
msgstr ""
-#: html/class_passwordRecovery.inc:484
+#: html/class_passwordRecovery.inc:479
#, php-format
msgid "Found multiple accounts %s"
msgstr ""
-#: html/class_passwordRecovery.inc:498 ihtml/themes/default/recovery.tpl:142
+#: html/class_passwordRecovery.inc:493 ihtml/themes/default/recovery.tpl:142
msgid "Adresse mail"
msgstr ""
-#: html/class_passwordRecovery.inc:515
+#: html/class_passwordRecovery.inc:510
#, php-format
msgid "There is no account using email %s"
msgstr ""
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:513
#, php-format
msgid "There are several accounts using email %s"
msgstr ""
-#: html/class_passwordRecovery.inc:543 html/index.php:257 html/index.php:269
+#: html/class_passwordRecovery.inc:538 html/index.php:257 html/index.php:269
#: html/index.php:282 setup/class_setupStep_Migrate.inc:1138
#: setup/class_setupStep_Migrate.inc:1164
#: setup/class_setupStep_Migrate.inc:1213
@@ -224,20 +224,17 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:2549
#: setup/class_setupStep_Migrate.inc:2896
#: setup/class_setupStep_Migrate.inc:2910
-#: include/class_SnapshotHandler.inc:150 include/class_SnapshotHandler.inc:329
-#: include/class_SnapshotHandler.inc:378 include/class_SnapshotHandler.inc:382
-#: include/class_SnapshotHandler.inc:402 include/class_SnapshotHandler.inc:445
-#: include/class_SnapshotHandler.inc:508 include/class_SnapshotHandler.inc:577
-#: include/class_SnapshotHandler.inc:592 include/functions.inc:547
+#: include/class_SnapshotHandler.inc:150 include/class_SnapshotHandler.inc:335
+#: include/class_SnapshotHandler.inc:388 include/class_SnapshotHandler.inc:392
+#: include/class_SnapshotHandler.inc:412 include/class_SnapshotHandler.inc:455
+#: include/class_SnapshotHandler.inc:518 include/class_SnapshotHandler.inc:587
+#: include/class_SnapshotHandler.inc:602 include/functions.inc:547
#: include/functions.inc:583 include/functions.inc:591
#: include/functions.inc:639 include/functions.inc:948
#: include/functions.inc:998 include/functions.inc:1058
#: include/functions.inc:1113 include/functions.inc:3244
-#: include/functions.inc:3509 include/class_config.inc:330
-#: include/class_plugin.inc:1500 include/class_plugin.inc:1550
-#: include/class_plugin.inc:1554 include/class_plugin.inc:1574
-#: include/class_plugin.inc:1621 include/class_plugin.inc:1681
-#: include/class_plugin.inc:1751 include/class_plugin.inc:1766
+#: include/functions.inc:3514 include/class_SnapShotDialog.inc:104
+#: include/class_SnapShotDialog.inc:177 include/class_config.inc:330
#: include/class_acl.inc:1308 include/class_acl.inc:1413
#: include/class_ldap.inc:934 include/class_ldap.inc:1421
#: plugins/admin/acl/class_aclRole.inc:613
@@ -256,19 +253,19 @@ msgstr ""
msgid "LDAP error"
msgstr "LDAP-Fehler"
-#: html/class_passwordRecovery.inc:566
+#: html/class_passwordRecovery.inc:561
msgid "Contact your administrator, there was a problem with mail server"
msgstr ""
-#: html/class_passwordRecovery.inc:577
+#: html/class_passwordRecovery.inc:572
msgid "This token is invalid"
msgstr ""
-#: html/class_passwordRecovery.inc:615
+#: html/class_passwordRecovery.inc:610
msgid "External password changer reported a problem: "
msgstr "Das externe Passwort-Änderungsprogramm hat einen Fehler gemeldet:"
-#: html/class_passwordRecovery.inc:640
+#: html/class_passwordRecovery.inc:635
msgid "There was a problem with mail server, confirmation email not sent"
msgstr ""
@@ -288,6 +285,13 @@ msgstr ""
"Die Konfiguration der Gültigkeitsdauer einer Sitzung in Ihrer "
"fusiondirectory.conf wird von der Einstellung in der php.ini überschrieben."
+#: html/index.php:147
+#, php-format
+msgid ""
+"FusionDirectory configuration %s/%s is not readable. Please run "
+"fusiondirectory-setup --check-config to fix this."
+msgstr ""
+
#: html/index.php:163
msgid "Smarty error"
msgstr "Smarty-Fehler"
@@ -302,22 +306,22 @@ msgstr "Es gab ein Problem mit der Authentisierungseinrichtung!"
#: setup/setup_checks.tpl:91 setup/class_setupStep_Migrate.inc:1127
#: include/class_xml.inc:57 include/class_tabs.inc:74
#: include/class_management.inc:507 include/class_management.inc:657
-#: include/functions.inc:3613 include/functions.inc:3633
-#: include/functions.inc:3663 include/functions.inc:3671
-#: include/functions.inc:3683 include/functions.inc:3687
-#: include/functions.inc:3702 include/functions.inc:3711
-#: include/functions.inc:3779 include/class_listing.inc:522
+#: include/functions.inc:3618 include/functions.inc:3638
+#: include/functions.inc:3668 include/functions.inc:3676
+#: include/functions.inc:3688 include/functions.inc:3692
+#: include/functions.inc:3707 include/functions.inc:3716
+#: include/functions.inc:3784 include/class_listing.inc:521
#: include/class_config.inc:483 include/class_CopyPasteHandler.inc:264
#: include/password-methods/class_password-methods-sasl.inc:51
#: include/password-methods/class_password-methods-sasl.inc:63
#: include/password-methods/class_password-methods.inc:342
#: include/password-methods/class_password-methods.inc:447
#: include/password-methods/class_password-methods.inc:458
-#: include/class_plugin.inc:1368 include/class_plugin.inc:1843
-#: include/class_msg_dialog.inc:128 include/class_msgPool.inc:215
-#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:680 include/class_msgPool.inc:711
-#: include/class_msgPool.inc:738 include/class_databaseManagement.inc:78
+#: include/class_plugin.inc:1367 include/class_msg_dialog.inc:128
+#: include/class_msgPool.inc:215 include/class_msgPool.inc:235
+#: include/class_msgPool.inc:265 include/class_msgPool.inc:680
+#: include/class_msgPool.inc:711 include/class_msgPool.inc:738
+#: include/class_databaseManagement.inc:78
#: plugins/admin/acl/class_aclRole.inc:681
#: plugins/admin/groups/class_group.inc:521
#: plugins/admin/groups/class_group.inc:527
@@ -1032,32 +1036,29 @@ msgid ""
"databases."
msgstr ""
-#: setup/class_setupStep_Checks.inc:136
-msgid "MDB2 mysql"
-msgstr ""
-
-#: setup/class_setupStep_Checks.inc:137
+#: setup/class_setupStep_Checks.inc:134
msgid ""
-"FusionDirectory requires this module to communicate with mysql databases."
+"If you do not want to install MDB2 and won't use databases, remove the "
+"class_databaseManagement.inc file."
msgstr ""
-#: setup/class_setupStep_Checks.inc:143
+#: setup/class_setupStep_Checks.inc:138
msgid "imagick"
msgstr "Imagick"
-#: setup/class_setupStep_Checks.inc:144
+#: setup/class_setupStep_Checks.inc:139
msgid "FusionDirectory requires this extension to handle images."
msgstr ""
-#: setup/class_setupStep_Checks.inc:159
+#: setup/class_setupStep_Checks.inc:154
msgid "compression module"
msgstr "Komprimierungs-Modul"
-#: setup/class_setupStep_Checks.inc:160
+#: setup/class_setupStep_Checks.inc:155
msgid "FusionDirectory requires this extension to handle snapshots."
msgstr ""
-#: setup/class_setupStep_Checks.inc:171
+#: setup/class_setupStep_Checks.inc:166
msgid ""
"register_globals is a PHP mechanism to register all global variables to be "
"accessible from scripts without changing the scope. This may be a security "
@@ -1066,19 +1067,19 @@ msgstr ""
"register_globals ist ein PHP-Mechanismus, welcher alle globalen Variablen "
"für Skripte direkt zugänglich macht. Dies kann ein Sicherheitsrisiko sein."
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStep_Checks.inc:167
msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
msgstr ""
"Suchen Sie nach 'register_globals' in Ihrer php.ini und setzen Sie es auf "
"'Off'."
-#: setup/class_setupStep_Checks.inc:180
+#: setup/class_setupStep_Checks.inc:175
msgid "PHP uses this value for the garbage collector to delete old sessions."
msgstr ""
"PHP verwendet diese Einstellungen für den Garbage Collector, um alte "
"Sessions zu entfernen."
-#: setup/class_setupStep_Checks.inc:181
+#: setup/class_setupStep_Checks.inc:176
msgid ""
"Setting this value to one day will prevent loosing session and cookies "
"before they really timeout."
@@ -1087,7 +1088,7 @@ msgstr ""
"Sitzung und den zugehörigen Cookie verlieren, bevor diese tatsächlich ihre "
"Gültigkeit verlieren."
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStep_Checks.inc:177
msgid ""
"Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
"higher."
@@ -1095,35 +1096,35 @@ msgstr ""
"Suchen Sie in Ihrer php.ini nach 'session.gc_maxlifetime' und setzen Sie es "
"auf 84600 oder höher."
-#: setup/class_setupStep_Checks.inc:189 setup/class_setupStep_Checks.inc:205
-#: setup/class_setupStep_Checks.inc:221 setup/class_setupStep_Checks.inc:229
+#: setup/class_setupStep_Checks.inc:184 setup/class_setupStep_Checks.inc:200
+#: setup/class_setupStep_Checks.inc:216 setup/class_setupStep_Checks.inc:224
msgid "Off"
msgstr "Aus"
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStep_Checks.inc:185
msgid ""
"In Order to use FusionDirectory without any trouble, the session.auto_start "
"option in your php.ini should be set to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStep_Checks.inc:186
msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
msgstr ""
"Suchen Sie in Ihrer php.ini nach 'session.auto_start' und setzen Sie es auf "
"'Off'."
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStep_Checks.inc:193
msgid ""
"FusionDirectory needs at least 128MB of memory. Setting it below this limit "
"may cause errors that are not reproducable! Increase it for larger setups."
msgstr ""
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStep_Checks.inc:194
msgid ""
"Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
msgstr ""
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStep_Checks.inc:201
msgid ""
"This option influences the PHP output handling. Turn this Option off, to "
"increase performance."
@@ -1131,24 +1132,24 @@ msgstr ""
"Diese Einstellung beeinflusst die Verarbeitung der Ausgabe. Stellen Sie "
"diese auf 'off', um die Leistung zu erhöhen."
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStep_Checks.inc:202
msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
msgstr ""
"Suchen Sie in Ihrer php.ini nach 'implicit_flush' und setzen Sie es auf "
"'Off'."
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStep_Checks.inc:209
msgid "The Execution time should be at least 30 seconds."
msgstr "Die Ausführungszeit sollte mindestens 30 Sekunden betragen."
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStep_Checks.inc:210
msgid ""
"Search for 'max_execution_time' in your php.ini and set it to '30' or higher."
msgstr ""
"Suchen Sie in Ihrer php.ini nach 'max_execution_time' und setzen Sie es auf "
"'30' oder höher."
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStep_Checks.inc:217
msgid ""
"Increase the server security by setting expose_php to 'off'. PHP won't send "
"any information about the server you are running in this case."
@@ -1157,33 +1158,33 @@ msgstr ""
"setzen. PHP wird in dieser Einstellung keine Informationen über Ihren "
"laufenden Server senden."
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStep_Checks.inc:218
msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
msgstr ""
"Suchen Sie in Ihrer php.ini nach 'expose_php' und setzen Sie es auf 'Off'."
-#: setup/class_setupStep_Checks.inc:230
+#: setup/class_setupStep_Checks.inc:225
msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
msgstr ""
"Erhöhen Sie die Leistung des Servers, indem sie magic_quotes_gpc auf 'off' "
"stellen."
-#: setup/class_setupStep_Checks.inc:231
+#: setup/class_setupStep_Checks.inc:226
msgid ""
"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to 'Off'."
msgstr ""
"Suchen Sie in Ihrer php.ini nach 'zend.ze1_compatibility_mode' und setzen "
"Sie es auf 'Off'."
-#: setup/class_setupStep_Checks.inc:241
+#: setup/class_setupStep_Checks.inc:236
msgid "Configuration writeable"
msgstr "Konfigurationsdatei schreibbar"
-#: setup/class_setupStep_Checks.inc:242
+#: setup/class_setupStep_Checks.inc:237
msgid "The configuration file can't be written"
msgstr "Die Konfigurationsdatei kann nicht geschrieben werden"
-#: setup/class_setupStep_Checks.inc:243
+#: setup/class_setupStep_Checks.inc:238
#, php-format
msgid ""
"FusionDirectory reads its configuration from a file located in (%s/%s). The "
@@ -1737,7 +1738,7 @@ msgstr ""
#: plugins/admin/departments/class_organizationGeneric.inc:115
#: plugins/admin/departments/class_organizationGeneric.inc:118
#: plugins/personal/generic/class_user.inc:1395
-#: plugins/personal/generic/generic.tpl:300
+#: plugins/personal/generic/generic.tpl:277
msgid "Organization"
msgstr "Organisation"
@@ -1747,8 +1748,8 @@ msgstr "Organisation"
#: plugins/admin/acl/class_aclRole.inc:702
#: plugins/admin/acl/class_aclRole.inc:715
#: plugins/admin/acl/class_aclRole.inc:725
-#: plugins/admin/users/class_userManagement.inc:545
-#: plugins/admin/users/class_userManagement.inc:592
+#: plugins/admin/users/class_userManagement.inc:542
+#: plugins/admin/users/class_userManagement.inc:589
#: plugins/admin/users/user-filter.tpl:26
#: plugins/admin/groups/group-filter.tpl:21
#: plugins/admin/groups/userSelect/user-filter.tpl:17
@@ -1829,7 +1830,7 @@ msgid ""
msgstr ""
#: setup/setup_feedback.tpl:52
-#: plugins/admin/users/class_userManagement.inc:903
+#: plugins/admin/users/class_userManagement.inc:900
#: plugins/admin/groups/class_group.inc:1106
#: plugins/admin/departments/class_department.inc:653
#: plugins/admin/ogroups/class_ogroup.inc:895
@@ -1971,7 +1972,7 @@ msgstr "Verschiebe die ausgewählten Gruppen in diesen Gruppenbaum"
#: setup/setup_migrate.tpl:101 setup/setup_migrate.tpl:153
#: setup/setup_migrate.tpl:320 setup/setup_migrate.tpl:373
#: setup/setup_migrate.tpl:416 setup/setup_migrate.tpl:459
-#: setup/setup_migrate.tpl:503 include/class_listing.inc:352
+#: setup/setup_migrate.tpl:503 include/class_listing.inc:351
msgid "Select all"
msgstr "Alle auswählen"
@@ -2451,7 +2452,7 @@ msgid "Group will be moved from"
msgstr "Die Gruppe wird verschoben von"
#: setup/class_setupStep_Migrate.inc:1175
-#: setup/class_setupStep_Migrate.inc:1223 include/class_plugin.inc:2083
+#: setup/class_setupStep_Migrate.inc:1223 include/class_plugin.inc:1675
msgid "to"
msgstr "an"
@@ -2532,8 +2533,7 @@ msgstr "Es müssen %s Dienste migriert werden."
#: setup/class_setupStep_Migrate.inc:2647 include/class_msgPool.inc:495
#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:83
#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:138
-#: plugins/personal/generic/generic.tpl:251
-#: plugins/personal/generic/generic.tpl:270
+#: plugins/personal/generic/generic.tpl:249
#, php-format
msgid "Add"
msgstr "Hinzufügen"
@@ -2662,28 +2662,25 @@ msgstr "Der Filter ist unvollständig!"
#: include/class_management.inc:333 include/class_management.inc:483
#: include/class_management.inc:536 include/class_management.inc:576
#: include/class_management.inc:590 include/class_CopyPasteHandler.inc:223
-#: include/class_plugin.inc:1791 include/class_plugin.inc:1803
-#: include/class_plugin.inc:1818 include/class_plugin.inc:1831
-#: plugins/admin/users/class_userManagement.inc:205
-#: plugins/admin/users/class_userManagement.inc:761
+#: plugins/admin/users/class_userManagement.inc:202
+#: plugins/admin/users/class_userManagement.inc:758
msgid "Permission"
msgstr "Berechtigung"
#: include/class_management.inc:403
-#: plugins/admin/acl/class_aclManagement.inc:100
-#: plugins/admin/users/class_userManagement.inc:719
-#: plugins/admin/users/class_userManagement.inc:723
+#: plugins/admin/acl/class_aclManagement.inc:101
+#: plugins/admin/users/class_userManagement.inc:716
+#: plugins/admin/users/class_userManagement.inc:720
msgid "Permission error"
msgstr "Berechtigungsfehler"
-#: include/class_management.inc:483 include/class_plugin.inc:1791
+#: include/class_management.inc:483
#, php-format
msgid "You are not allowed to create a snapshot for %s."
msgstr "Ihnen ist es nicht erlaubt, einen Snapshot für %s zu erstellen."
#: include/class_management.inc:536 include/class_management.inc:576
-#: include/class_management.inc:590 include/class_plugin.inc:1803
-#: include/class_plugin.inc:1818 include/class_plugin.inc:1831
+#: include/class_management.inc:590
#, php-format
msgid "You are not allowed to restore a snapshot for %s."
msgstr "Ihnen ist es nicht erlaubt, einen Snapshot für %s wiederherzustellen."
@@ -2912,87 +2909,87 @@ msgstr ""
"Das in POSTMODIFY angegebene Kommando '%s' (Modul '%s') scheint nicht zu "
"existieren."
-#: include/functions.inc:3613 include/functions.inc:3633
-#: include/functions.inc:3671 include/functions.inc:3683
-#: include/functions.inc:3687 include/functions.inc:3702
-#: include/functions.inc:3711
+#: include/functions.inc:3618 include/functions.inc:3638
+#: include/functions.inc:3676 include/functions.inc:3688
+#: include/functions.inc:3692 include/functions.inc:3707
+#: include/functions.inc:3716
msgid "Cannot allocate a free ID:"
msgstr "Konnte keine freie ID allozieren:"
-#: include/functions.inc:3613
+#: include/functions.inc:3618
msgid "unknown idAllocation method!"
msgstr "unbekannte idAllocation-Methode!"
-#: include/functions.inc:3633
+#: include/functions.inc:3638
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr "%sPoolMin >= %sPoolMax!"
-#: include/functions.inc:3663
+#: include/functions.inc:3668
msgid "Cannot create sambaUnixIdPool entry!"
msgstr "kann sambaUnixIdPool-Eintrag nicht anlegen!"
-#: include/functions.inc:3671
+#: include/functions.inc:3676
msgid "sambaUnixIdPool is not unique!"
msgstr "sambaUnixIdPool ist nicht eindeutig!"
-#: include/functions.inc:3683 include/functions.inc:3687
+#: include/functions.inc:3688 include/functions.inc:3692
msgid "no ID available!"
msgstr "keine ID verfügbar!"
-#: include/functions.inc:3711
+#: include/functions.inc:3716
msgid "maximum tries exceeded!"
msgstr "maximale Anzahl von Versuchen abgelaufen!"
-#: include/functions.inc:3779
+#: include/functions.inc:3784
msgid "Cannot allocate a free ID!"
msgstr "Konnte keine freie ID allozieren!"
-#: include/class_listing.inc:291 include/class_listing.inc:1099
-#: include/class_listing.inc:1101 include/class_sortableListing.inc:343
+#: include/class_listing.inc:290 include/class_listing.inc:1105
+#: include/class_listing.inc:1107 include/class_sortableListing.inc:343
#: include/class_acl.inc:504 plugins/admin/acl/class_aclRole.inc:372
msgid "Up"
msgstr "Auf"
-#: include/class_listing.inc:291 include/class_sortableListing.inc:343
+#: include/class_listing.inc:290 include/class_sortableListing.inc:343
#: include/class_acl.inc:506 plugins/admin/acl/class_aclRole.inc:374
msgid "Down"
msgstr "Ab"
-#: include/class_listing.inc:564
+#: include/class_listing.inc:563
msgid "created by"
msgstr "Angelegt von"
-#: include/class_listing.inc:1091
+#: include/class_listing.inc:1097
msgid "Go to root department"
msgstr "Gehe zur Wurzel-Abteilung"
-#: include/class_listing.inc:1091 include/class_listing.inc:1093
+#: include/class_listing.inc:1097 include/class_listing.inc:1099
#: include/class_baseSelector.inc:205
msgid "Root"
msgstr "Wurzel"
-#: include/class_listing.inc:1099
+#: include/class_listing.inc:1105
msgid "Go up one department"
msgstr "Eine Abteilung nach oben"
-#: include/class_listing.inc:1107
+#: include/class_listing.inc:1113
msgid "Go to users department"
msgstr "Gehe zur Abteilung des Benutzers"
-#: include/class_listing.inc:1107 include/class_listing.inc:1109
+#: include/class_listing.inc:1113 include/class_listing.inc:1115
msgid "Home"
msgstr "Heimat"
-#: include/class_listing.inc:1114
+#: include/class_listing.inc:1120
msgid "Reload list"
msgstr "Liste neu laden"
-#: include/class_listing.inc:1114 include/class_baseSelector.inc:252
+#: include/class_listing.inc:1120 include/class_baseSelector.inc:252
msgid "Submit"
msgstr "Ãœbertragen"
-#: include/class_listing.inc:1211 plugins/admin/acl/acl-list.xml:65
+#: include/class_listing.inc:1217 plugins/admin/acl/acl-list.xml:65
#: plugins/admin/users/user-list.xml:78 plugins/admin/groups/group-list.xml:79
#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:64
#: plugins/admin/departments/dep-list.xml:87
@@ -3000,65 +2997,62 @@ msgstr "Ãœbertragen"
msgid "Actions"
msgstr "Aktionen"
-#: include/class_listing.inc:1495 include/class_listing.inc:1545
-#: include/class_plugin.inc:2228
+#: include/class_listing.inc:1501 include/class_listing.inc:1551
msgid "Copy"
msgstr "Kopieren"
-#: include/class_listing.inc:1501 include/class_listing.inc:1535
-#: include/class_plugin.inc:2232
+#: include/class_listing.inc:1507 include/class_listing.inc:1541
msgid "Cut"
msgstr "Ausschneiden"
-#: include/class_listing.inc:1509 include/class_listing.inc:1511
-#: include/class_CopyPasteHandler.inc:400 include/class_plugin.inc:2239
-#: include/class_plugin.inc:2242
+#: include/class_listing.inc:1515 include/class_listing.inc:1517
+#: include/class_CopyPasteHandler.inc:400
msgid "Paste"
msgstr "Einfügen"
-#: include/class_listing.inc:1535 include/class_plugin.inc:2186
+#: include/class_listing.inc:1541
msgid "Cut this entry"
msgstr "Diesen Eintrag ausschneiden"
-#: include/class_listing.inc:1545 include/class_plugin.inc:2194
+#: include/class_listing.inc:1551
msgid "Copy this entry"
msgstr "Diesen Eintrag kopieren"
-#: include/class_listing.inc:1577 include/class_listing.inc:1579
+#: include/class_listing.inc:1583 include/class_listing.inc:1585
msgid "Restore snapshots"
msgstr "Abzug wiederherstellen"
-#: include/class_listing.inc:1593
+#: include/class_listing.inc:1599
msgid "Export list"
msgstr "Liste exportieren"
-#: include/class_listing.inc:1628 include/class_listing.inc:1629
-#: include/class_SnapShotDialog.inc:153 include/class_plugin.inc:2160
+#: include/class_listing.inc:1634 include/class_listing.inc:1635
+#: include/class_SnapShotDialog.inc:298
msgid "Restore snapshot"
msgstr "Abzug wiederherstellen"
-#: include/class_listing.inc:1638 include/class_plugin.inc:2167
+#: include/class_listing.inc:1644
msgid "Create snapshot"
msgstr "Snapshot erstellen"
-#: include/class_listing.inc:1639 include/class_plugin.inc:2168
+#: include/class_listing.inc:1645
msgid "Create a new snapshot from this object"
msgstr "Erstelle einen neuen Snapshot dieses Objekts"
-#: include/class_SnapShotDialog.inc:99
+#: include/class_SnapShotDialog.inc:244
#, php-format
msgid "You're about to delete the snapshot '%s'."
msgstr "Sie sind dabei den Snapshot '%s' zu entfernen."
-#: include/class_SnapShotDialog.inc:155
+#: include/class_SnapShotDialog.inc:300
msgid "Remove snapshot"
msgstr "Snapshot entfernen."
-#: include/class_SnapShotDialog.inc:157 include/class_SnapShotDialog.inc:177
+#: include/class_SnapShotDialog.inc:302 include/class_SnapShotDialog.inc:322
msgid "Y-m-d, H:i:s"
msgstr "Y-m-d, H:i:s"
-#: include/class_SnapShotDialog.inc:191 plugins/admin/acl/acl-list.xml:57
+#: include/class_SnapShotDialog.inc:336 plugins/admin/acl/acl-list.xml:57
#: plugins/admin/acl/acl_role.tpl:17 plugins/admin/acl/class_aclRole.inc:704
#: plugins/admin/groups/class_group.inc:1114
#: plugins/admin/groups/group-list.xml:66 plugins/admin/groups/generic.tpl:24
@@ -3137,32 +3131,20 @@ msgstr ""
"Es konnte keine passende Passwort-Methode für den aktuellen Hash gefunden "
"werden!"
-#: include/class_plugin.inc:563
+#: include/class_plugin.inc:562
msgid ""
"The object has changed since opened in FusionDirectory. All changes that may "
"be done by others get lost if you save this entry!"
msgstr ""
-#: include/class_plugin.inc:2082
+#: include/class_plugin.inc:1674
msgid "Changing ACL dn"
msgstr "Ändere ACL dn"
-#: include/class_plugin.inc:2082
+#: include/class_plugin.inc:1674
msgid "from"
msgstr "von"
-#: include/class_plugin.inc:2136 include/class_plugin.inc:2138
-msgid "Restore"
-msgstr "Wiederherstellen"
-
-#: include/class_plugin.inc:2186
-msgid "cut"
-msgstr "Ausschneiden"
-
-#: include/class_plugin.inc:2194
-msgid "copy"
-msgstr "Kopieren"
-
#: include/class_sortableListing.inc:303
msgid "Sortable list"
msgstr "Sortierbare Liste"
@@ -4061,15 +4043,14 @@ msgstr "Bitte Aktivieren Sie das Debuggung für mehr Informationen!"
msgid "List of acls"
msgstr "Liste der ACLs"
-#: plugins/admin/acl/acl-list.xml:15
+#: plugins/admin/acl/acl-list.xml:15 plugins/admin/acl/acl-list.xml:82
#: plugins/admin/acl/class_aclManagement.inc:36
msgid "Acl"
msgstr "ACL"
-#: plugins/admin/acl/acl-list.xml:23 plugins/admin/acl/acl-list.xml:82
-#: plugins/admin/acl/class_aclRole.inc:695
+#: plugins/admin/acl/acl-list.xml:23 plugins/admin/acl/class_aclRole.inc:695
#: plugins/personal/generic/class_user.inc:1367
-#: plugins/personal/generic/generic.tpl:515
+#: plugins/personal/generic/generic.tpl:492
msgid "Role"
msgstr "Rolle"
@@ -4109,7 +4090,7 @@ msgstr ""
msgid "Access control list management"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:160
+#: plugins/admin/acl/class_aclManagement.inc:161
msgid "ACL Assignment"
msgstr "ACL-Zuordnung"
@@ -4239,7 +4220,7 @@ msgstr ""
"ausfüllen. Wählen sie 'keine' um den Vorlagen-Dialog zu überspringen."
#: plugins/admin/users/template.tpl:15
-#: plugins/admin/users/class_userManagement.inc:542
+#: plugins/admin/users/class_userManagement.inc:539
#: plugins/admin/users/templatize.tpl:15 plugins/admin/users/user-list.xml:15
#: plugins/admin/users/user-list.xml:102
msgid "Template"
@@ -4274,23 +4255,23 @@ msgstr "Kennung"
msgid "Manage users"
msgstr "Benutzer verwalten"
-#: plugins/admin/users/class_userManagement.inc:344
+#: plugins/admin/users/class_userManagement.inc:341
#: plugins/personal/password/class_password.inc:136
#, php-format
msgid "Check-hook reported a problem: %s. Password change canceled!"
msgstr "Check-Hook meldet ein Problem: %s. Passwortänderung wurde abgebrochen!"
-#: plugins/admin/users/class_userManagement.inc:394
+#: plugins/admin/users/class_userManagement.inc:391
msgid "You have no permission to change this users password!"
msgstr "Sie haben keine Berechtigung dieses Passwort zu ändern!"
-#: plugins/admin/users/class_userManagement.inc:470
-#: plugins/admin/users/class_userManagement.inc:504
-#: plugins/admin/users/class_userManagement.inc:535
+#: plugins/admin/users/class_userManagement.inc:467
+#: plugins/admin/users/class_userManagement.inc:501
+#: plugins/admin/users/class_userManagement.inc:532
msgid "none"
msgstr "keine"
-#: plugins/admin/users/class_userManagement.inc:548
+#: plugins/admin/users/class_userManagement.inc:545
#: plugins/admin/users/user-list.xml:57
#: plugins/admin/groups/userSelect/user-list.xml:40
#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
@@ -4300,11 +4281,11 @@ msgstr "keine"
msgid "Given name"
msgstr "Vorname"
-#: plugins/admin/users/class_userManagement.inc:799
+#: plugins/admin/users/class_userManagement.inc:796
msgid "Account locking"
msgstr "Konto-Sperrung"
-#: plugins/admin/users/class_userManagement.inc:800
+#: plugins/admin/users/class_userManagement.inc:797
#, php-format
msgid ""
"Password method '%s' does not support locking. Account (%s) has not been "
@@ -4313,15 +4294,15 @@ msgstr ""
"Die Passwort-Methode '%s' unterstützt keine Sperrungen. Das Konto %s wurde "
"nicht gesperrt!"
-#: plugins/admin/users/class_userManagement.inc:873
+#: plugins/admin/users/class_userManagement.inc:870
msgid "Unlock account"
msgstr "Konto aktivieren"
-#: plugins/admin/users/class_userManagement.inc:875
+#: plugins/admin/users/class_userManagement.inc:872
msgid "Lock account"
msgstr "Konto deaktivieren"
-#: plugins/admin/users/class_userManagement.inc:903
+#: plugins/admin/users/class_userManagement.inc:900
#, fuzzy
msgid "Generic properties"
msgstr "Allgemeine Einstellungen bearbeiten"
@@ -4413,8 +4394,9 @@ msgid "Remove user"
msgstr "Benutzer entfernen"
#: plugins/admin/password/class_recoveryConfig.inc:35
-msgid "Password recovery config"
-msgstr ""
+#, fuzzy
+msgid "Password recovery"
+msgstr "Passwortfehler"
#: plugins/admin/password/class_recoveryConfig.inc:36
msgid "Settings for the password recovery feature"
@@ -4736,7 +4718,6 @@ msgstr "Allgemeine Gruppeneinstellungen"
#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:23
#: plugins/admin/ogroups/class_ogroupManagement.inc:187
#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:79
-#: plugins/admin/ogroups/ogroup-list.xml:79
#: plugins/generic/references/class_reference.inc:55
#: plugins/personal/posix/groupSelect/group-list.xml:15
msgid "Group"
@@ -4828,8 +4809,8 @@ msgstr "Samba-Einstellungen bearbeiten"
#: plugins/generic/references/class_reference.inc:59
#: plugins/personal/posix/trustSelect/class_trustSelect.inc:81
#: plugins/personal/generic/class_user.inc:1180
-#: plugins/personal/generic/generic.tpl:399
-#: plugins/personal/generic/generic.tpl:586
+#: plugins/personal/generic/generic.tpl:376
+#: plugins/personal/generic/generic.tpl:563
msgid "Phone"
msgstr "Telefon"
@@ -4928,7 +4909,7 @@ msgstr "Standort"
#: plugins/admin/departments/generic.tpl:91
#: plugins/admin/departments/class_organizationGeneric.inc:129
#: plugins/personal/generic/class_user.inc:1410
-#: plugins/personal/generic/generic.tpl:448
+#: plugins/personal/generic/generic.tpl:425
msgid "Location"
msgstr "Ort"
@@ -4945,8 +4926,8 @@ msgstr "Ort"
#: plugins/admin/departments/generic.tpl:51
#: plugins/admin/departments/class_organizationGeneric.inc:126
#: plugins/personal/generic/class_user.inc:1399
-#: plugins/personal/generic/generic.tpl:341
-#: plugins/personal/generic/generic.tpl:362
+#: plugins/personal/generic/generic.tpl:318
+#: plugins/personal/generic/generic.tpl:339
msgid "Manager"
msgstr "Verwalter"
@@ -5096,7 +5077,7 @@ msgstr "Kategorie dieses Teilbaums"
#: plugins/admin/departments/generic.tpl:83
#: plugins/admin/departments/class_organizationGeneric.inc:128
#: plugins/personal/generic/class_user.inc:1409
-#: plugins/personal/generic/generic.tpl:456
+#: plugins/personal/generic/generic.tpl:433
msgid "State"
msgstr "Land"
@@ -5114,7 +5095,7 @@ msgstr "Ort dieses Teilbaums"
#: plugins/admin/departments/class_department.inc:667
#: plugins/admin/departments/generic.tpl:99
#: plugins/personal/generic/generic.tpl:181
-#: plugins/personal/generic/generic.tpl:464
+#: plugins/personal/generic/generic.tpl:441
msgid "Address"
msgstr "Adresse"
@@ -5134,8 +5115,8 @@ msgstr "Einleitende Telefonnummer dieses Teilbaums"
#: plugins/admin/departments/generic.tpl:114
#: plugins/admin/departments/class_organizationGeneric.inc:132
#: plugins/personal/generic/class_user.inc:1183
-#: plugins/personal/generic/generic.tpl:430
-#: plugins/personal/generic/generic.tpl:598
+#: plugins/personal/generic/generic.tpl:407
+#: plugins/personal/generic/generic.tpl:575
msgid "Fax"
msgstr "Fax"
@@ -5186,7 +5167,7 @@ msgstr "Land"
#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:15
#: plugins/generic/references/class_reference.inc:57
#: plugins/personal/generic/class_user.inc:1396
-#: plugins/personal/generic/generic.tpl:308
+#: plugins/personal/generic/generic.tpl:285
msgid "Department"
msgstr "Abteilung"
@@ -5495,6 +5476,11 @@ msgstr "Zusammengefasste Objekte"
msgid "List of object groups"
msgstr "Liste von Objektgruppen"
+#: plugins/admin/ogroups/ogroup-list.xml:79
+#, fuzzy
+msgid "Objectgroup"
+msgstr "Objektgruppe"
+
#: plugins/admin/ogroups/ogroup-list.xml:106
msgid "Send message"
msgstr "Nachricht senden"
@@ -5565,9 +5551,15 @@ msgid "Language"
msgstr "Sprache"
#: plugins/config/class_configInLdap.inc:82
+#, fuzzy
msgid ""
-"Default language to be used if the one asked by the browser is not available"
+"Language of the application. If 'automatic' or not available, the one asked "
+"by the browser will be used. This setting can be overriden per user."
msgstr ""
+"An dieser Stelle können Sie die standortweite Standardsprache auswählen. Bei "
+"Auswahl von 'automatisch' wird automatisch die vom Browser angeforderte "
+"Sprache verwendet. Diese Einstellung kann von der Einstellung des Benutzers "
+"überschrieben werden."
#: plugins/config/class_configInLdap.inc:87
msgid "Theme to be used"
@@ -5582,7 +5574,7 @@ msgid "Schema setup"
msgstr ""
#: plugins/config/class_configInLdap.inc:103
-msgid "rfc237bis"
+msgid "rfc2307bis"
msgstr ""
#: plugins/config/class_configInLdap.inc:104
@@ -6295,12 +6287,12 @@ msgid "Homepage"
msgstr "Homepage"
#: plugins/personal/generic/class_user.inc:1186
-#: plugins/personal/generic/generic.tpl:411
+#: plugins/personal/generic/generic.tpl:388
msgid "Mobile"
msgstr "Mobiltelefon"
#: plugins/personal/generic/class_user.inc:1189
-#: plugins/personal/generic/generic.tpl:422
+#: plugins/personal/generic/generic.tpl:399
msgid "Pager"
msgstr "Pager"
@@ -6311,57 +6303,57 @@ msgid "Date of birth"
msgstr "Geburtsdatum"
#: plugins/personal/generic/class_user.inc:1357
-#: plugins/personal/generic/generic.tpl:538
+#: plugins/personal/generic/generic.tpl:515
msgid "Unit"
msgstr "Referat"
#: plugins/personal/generic/class_user.inc:1358
-#: plugins/personal/generic/generic.tpl:563
+#: plugins/personal/generic/generic.tpl:540
msgid "House identifier"
msgstr "Hausbezeichnung"
#: plugins/personal/generic/class_user.inc:1359
-#: plugins/personal/generic/generic.tpl:480
+#: plugins/personal/generic/generic.tpl:457
msgid "Vocation"
msgstr "Anrede"
#: plugins/personal/generic/class_user.inc:1360
-#: plugins/personal/generic/generic.tpl:607
+#: plugins/personal/generic/generic.tpl:584
msgid "Last delivery"
msgstr "letzte Ãœbermittlung"
#: plugins/personal/generic/class_user.inc:1361
-#: plugins/personal/generic/generic.tpl:529
+#: plugins/personal/generic/generic.tpl:506
msgid "Person locality"
msgstr "Dienstort"
#: plugins/personal/generic/class_user.inc:1362
-#: plugins/personal/generic/generic.tpl:488
+#: plugins/personal/generic/generic.tpl:465
msgid "Unit description"
msgstr "Aufgabengebiet"
#: plugins/personal/generic/class_user.inc:1363
-#: plugins/personal/generic/generic.tpl:497
+#: plugins/personal/generic/generic.tpl:474
msgid "Subject area"
msgstr "Sachgebiet"
#: plugins/personal/generic/class_user.inc:1364
-#: plugins/personal/generic/generic.tpl:506
+#: plugins/personal/generic/generic.tpl:483
msgid "Functional title"
msgstr "Amts-/Dienstbezeichnung"
#: plugins/personal/generic/class_user.inc:1365
-#: plugins/personal/generic/generic.tpl:616
+#: plugins/personal/generic/generic.tpl:593
msgid "Public visible"
msgstr "Öffentlich sichtbar"
#: plugins/personal/generic/class_user.inc:1366
-#: plugins/personal/generic/generic.tpl:547
+#: plugins/personal/generic/generic.tpl:524
msgid "Street"
msgstr "Straße"
#: plugins/personal/generic/class_user.inc:1368
-#: plugins/personal/generic/generic.tpl:555
+#: plugins/personal/generic/generic.tpl:532
msgid "Postal code"
msgstr "Postleitzahl"
@@ -6410,7 +6402,7 @@ msgid "Employee number"
msgstr "Personalnummer"
#: plugins/personal/generic/class_user.inc:1401
-#: plugins/personal/generic/generic.tpl:332
+#: plugins/personal/generic/generic.tpl:309
msgid "Employee type"
msgstr "Anstellungsart"
@@ -6491,29 +6483,28 @@ msgstr "Passwort-Speicherung"
msgid "Restrict login to"
msgstr "Anmeldung beschränken"
-#: plugins/personal/generic/generic.tpl:248
-#: plugins/personal/generic/generic.tpl:267
+#: plugins/personal/generic/generic.tpl:246
msgid "IP or network"
msgstr "IP oder Netzwerk"
-#: plugins/personal/generic/generic.tpl:288
+#: plugins/personal/generic/generic.tpl:265
msgid "Organizational information"
msgstr "Angabe zur Organisationseinheit"
-#: plugins/personal/generic/generic.tpl:316
+#: plugins/personal/generic/generic.tpl:293
msgid "Department No."
msgstr "Abteilungs-Nr."
-#: plugins/personal/generic/generic.tpl:324
+#: plugins/personal/generic/generic.tpl:301
msgid "Employee No."
msgstr "Angestellten-Nr."
-#: plugins/personal/generic/generic.tpl:390
-#: plugins/personal/generic/generic.tpl:578
+#: plugins/personal/generic/generic.tpl:367
+#: plugins/personal/generic/generic.tpl:555
msgid "Room No."
msgstr "Zimmer-Nr."
-#: plugins/personal/generic/generic.tpl:592
+#: plugins/personal/generic/generic.tpl:569
msgid "Please use the phone tab"
msgstr "Verwenden sie den Telefon-Reiter"
@@ -6521,6 +6512,15 @@ msgstr "Verwenden sie den Telefon-Reiter"
msgid "Your password hash method will not be changed!"
msgstr "Ihr Passwort-Hash wird nicht geändert!"
+#~ msgid "Restore"
+#~ msgstr "Wiederherstellen"
+
+#~ msgid "cut"
+#~ msgstr "Ausschneiden"
+
+#~ msgid "copy"
+#~ msgstr "Kopieren"
+
#~ msgid "POSIX"
#~ msgstr "POSIX"
diff --git a/locale/es/messages.po b/locale/es/fusiondirectory.po
similarity index 95%
rename from locale/es/messages.po
rename to locale/es/fusiondirectory.po
index 6fb7d4303d896fa7c1063f22b27b7d981bceed09..9b9c15d668b81e87a927ad7443a1fd8204aeeeca 100644
--- a/locale/es/messages.po
+++ b/locale/es/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-24 14:48+0100\n"
-"PO-Revision-Date: 2013-03-06 21:40+0000\n"
+"POT-Creation-Date: 2013-04-14 20:13+0200\n"
+"PO-Revision-Date: 2013-03-24 15:00+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory/"
"language/es/)\n"
@@ -19,24 +19,24 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: html/main.php:140 html/class_passwordRecovery.inc:226
+#: html/main.php:135 html/class_passwordRecovery.inc:226
#: include/class_xml.inc:60 include/functions.inc:509
#: plugins/admin/departments/class_department.inc:431
msgid "Fatal error"
msgstr "Error fatal"
-#: html/main.php:141
+#: html/main.php:136
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr ""
"No se puede encontrar el archivo '%s' - por favor ejecute '%s' para "
"solucionarlo"
-#: html/main.php:162
+#: html/main.php:157
msgid "PHP configuration"
msgstr "Configuración PHP"
-#: html/main.php:163
+#: html/main.php:158
msgid ""
"Fatal error: Register globals is on. FusionDirectory will refuse to login "
"unless this is fixed by an administrator."
@@ -44,19 +44,19 @@ msgstr ""
"Error Fatal: 'Register globals' está activado. No se permitirá ningun acceso "
"hasta que esto sea solucionado por un administrador."
-#: html/main.php:192 ihtml/themes/default/password.tpl:40
-#: plugins/admin/users/class_userManagement.inc:393
+#: html/main.php:187 ihtml/themes/default/password.tpl:40
+#: plugins/admin/users/class_userManagement.inc:390
#: plugins/personal/password/class_password.inc:156
#: plugins/personal/password/class_password.inc:162
msgid "Password change"
msgstr "Cambio de contraseña"
-#: html/main.php:192
+#: html/main.php:187
msgid "Your password is about to expire, please change your password!"
msgstr ""
"Su contraseña va a caducar próximamente, ¡Por favor cambie su contraseña!"
-#: html/main.php:261 html/class_passwordRecovery.inc:301 html/index.php:147
+#: html/main.php:256 html/class_passwordRecovery.inc:296 html/index.php:147
#: html/index.php:208 include/class_SnapshotHandler.inc:57
#: include/class_SnapshotHandler.inc:70 include/class_SnapshotHandler.inc:88
#: include/class_pluglist.inc:272 include/functions.inc:933
@@ -70,30 +70,30 @@ msgstr ""
msgid "Configuration error"
msgstr "Error de configuración"
-#: html/main.php:261
+#: html/main.php:256
msgid "Running out of memory!"
msgstr "¡Funcionando sin memoria!"
-#: html/main.php:316
+#: html/main.php:311
msgid "User ACL checks disabled"
msgstr "Desactivados chequeos de ACL de usuario"
-#: html/main.php:362
+#: html/main.php:357
msgid "Plugin"
msgstr "Extensión"
-#: html/main.php:363
+#: html/main.php:358
#, php-format
msgid ""
"Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not "
"a file)!"
msgstr ""
-#: html/main.php:378
+#: html/main.php:373
msgid "Configuration Error"
msgstr "Error de configuración"
-#: html/main.php:379
+#: html/main.php:374
#, php-format
msgid ""
"Fatal error: not all POST variables have been transfered by PHP - please "
@@ -111,18 +111,18 @@ msgstr "Metodo de contraseña"
msgid "Error: Password method not available!"
msgstr "Error: ¡El método de contraseñas no esta disponible!"
-#: html/class_passwordRecovery.inc:227 html/index.php:147
+#: html/class_passwordRecovery.inc:227
#, php-format
msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
msgstr "La configuración de FusionDirectory %s/%s no se puede leer. Cancelado."
-#: html/class_passwordRecovery.inc:302 html/setup.php:63 html/index.php:163
+#: html/class_passwordRecovery.inc:297 html/setup.php:63 html/index.php:163
#, php-format
msgid "Directory '%s' specified as compile directory is not accessible!"
msgstr "¡No se puede acceder a el directorio de compilación '%s'!"
-#: html/class_passwordRecovery.inc:407
-#: plugins/admin/users/class_userManagement.inc:309
+#: html/class_passwordRecovery.inc:402
+#: plugins/admin/users/class_userManagement.inc:306
#: plugins/personal/password/class_password.inc:113
msgid ""
"The passwords you've entered as 'New password' and 'Repeated new password' "
@@ -131,13 +131,13 @@ msgstr ""
"No coinciden las contraseñas introducidas como 'Nueva contraseña' y 'Repetir "
"nueva contraseña'."
-#: html/class_passwordRecovery.inc:409 ihtml/themes/default/password.tpl:81
+#: html/class_passwordRecovery.inc:404 ihtml/themes/default/password.tpl:81
#: ihtml/themes/default/password.tpl:82
#: ihtml/themes/default/accountexpired.tpl:32
#: ihtml/themes/default/accountexpired.tpl:36
#: ihtml/themes/default/recovery.tpl:93 ihtml/themes/default/recovery.tpl:94
#: plugins/admin/users/password.tpl:17 plugins/admin/users/password.tpl:60
-#: plugins/admin/users/class_userManagement.inc:312
+#: plugins/admin/users/class_userManagement.inc:309
#: plugins/personal/password/password.tpl:27
#: plugins/personal/password/password.tpl:78
#: plugins/personal/generic/password.tpl:22
@@ -145,16 +145,16 @@ msgstr ""
msgid "New password"
msgstr "Nueva contraseña"
-#: html/class_passwordRecovery.inc:411
+#: html/class_passwordRecovery.inc:406
msgid "The password used as new is too short."
msgstr ""
-#: html/class_passwordRecovery.inc:413
+#: html/class_passwordRecovery.inc:408
#: plugins/personal/password/class_password.inc:121
msgid "The password contains possibly problematic Unicode characters!"
msgstr "La clave contiene caracteres unicode posiblemente problemáticos!"
-#: html/class_passwordRecovery.inc:437 html/index.php:58 html/index.php:64
+#: html/class_passwordRecovery.inc:432 html/index.php:58 html/index.php:64
#: html/index.php:403 ihtml/themes/default/conflict.tpl:6
#: ihtml/themes/default/islocked.tpl:6 ihtml/themes/default/remove.tpl:2
#: ihtml/themes/default/msg_dialog.tpl:59
@@ -177,39 +177,39 @@ msgstr "La clave contiene caracteres unicode posiblemente problemáticos!"
msgid "Warning"
msgstr "Aviso"
-#: html/class_passwordRecovery.inc:438
+#: html/class_passwordRecovery.inc:433
msgid "Session will not be encrypted."
msgstr "La sesión no será codificada."
-#: html/class_passwordRecovery.inc:440
+#: html/class_passwordRecovery.inc:435
msgid "Enter SSL session"
msgstr "Entrar en sesión SSL"
-#: html/class_passwordRecovery.inc:481
+#: html/class_passwordRecovery.inc:476
#, php-format
msgid "Did not found account %s"
msgstr "No se encontró la cuenta %s"
-#: html/class_passwordRecovery.inc:484
+#: html/class_passwordRecovery.inc:479
#, php-format
msgid "Found multiple accounts %s"
msgstr "Se encontraron varias cuentas %s"
-#: html/class_passwordRecovery.inc:498 ihtml/themes/default/recovery.tpl:142
+#: html/class_passwordRecovery.inc:493 ihtml/themes/default/recovery.tpl:142
msgid "Adresse mail"
msgstr "Dirección de correo"
-#: html/class_passwordRecovery.inc:515
+#: html/class_passwordRecovery.inc:510
#, php-format
msgid "There is no account using email %s"
msgstr "No existe una cuenta con el correo %s"
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:513
#, php-format
msgid "There are several accounts using email %s"
msgstr "Existen varias cuentas con el correo %s"
-#: html/class_passwordRecovery.inc:543 html/index.php:257 html/index.php:269
+#: html/class_passwordRecovery.inc:538 html/index.php:257 html/index.php:269
#: html/index.php:282 setup/class_setupStep_Migrate.inc:1138
#: setup/class_setupStep_Migrate.inc:1164
#: setup/class_setupStep_Migrate.inc:1213
@@ -221,20 +221,17 @@ msgstr "Existen varias cuentas con el correo %s"
#: setup/class_setupStep_Migrate.inc:2549
#: setup/class_setupStep_Migrate.inc:2896
#: setup/class_setupStep_Migrate.inc:2910
-#: include/class_SnapshotHandler.inc:150 include/class_SnapshotHandler.inc:329
-#: include/class_SnapshotHandler.inc:378 include/class_SnapshotHandler.inc:382
-#: include/class_SnapshotHandler.inc:402 include/class_SnapshotHandler.inc:445
-#: include/class_SnapshotHandler.inc:508 include/class_SnapshotHandler.inc:577
-#: include/class_SnapshotHandler.inc:592 include/functions.inc:547
+#: include/class_SnapshotHandler.inc:150 include/class_SnapshotHandler.inc:335
+#: include/class_SnapshotHandler.inc:388 include/class_SnapshotHandler.inc:392
+#: include/class_SnapshotHandler.inc:412 include/class_SnapshotHandler.inc:455
+#: include/class_SnapshotHandler.inc:518 include/class_SnapshotHandler.inc:587
+#: include/class_SnapshotHandler.inc:602 include/functions.inc:547
#: include/functions.inc:583 include/functions.inc:591
#: include/functions.inc:639 include/functions.inc:948
#: include/functions.inc:998 include/functions.inc:1058
#: include/functions.inc:1113 include/functions.inc:3244
-#: include/functions.inc:3509 include/class_config.inc:330
-#: include/class_plugin.inc:1500 include/class_plugin.inc:1550
-#: include/class_plugin.inc:1554 include/class_plugin.inc:1574
-#: include/class_plugin.inc:1621 include/class_plugin.inc:1681
-#: include/class_plugin.inc:1751 include/class_plugin.inc:1766
+#: include/functions.inc:3514 include/class_SnapShotDialog.inc:104
+#: include/class_SnapShotDialog.inc:177 include/class_config.inc:330
#: include/class_acl.inc:1308 include/class_acl.inc:1413
#: include/class_ldap.inc:934 include/class_ldap.inc:1421
#: plugins/admin/acl/class_aclRole.inc:613
@@ -253,20 +250,20 @@ msgstr "Existen varias cuentas con el correo %s"
msgid "LDAP error"
msgstr "Error LDAP"
-#: html/class_passwordRecovery.inc:566
+#: html/class_passwordRecovery.inc:561
msgid "Contact your administrator, there was a problem with mail server"
msgstr ""
"Contacte a su administrador, hubo un problema con el servidor de correo"
-#: html/class_passwordRecovery.inc:577
+#: html/class_passwordRecovery.inc:572
msgid "This token is invalid"
msgstr "Esta prenda es invalida"
-#: html/class_passwordRecovery.inc:615
+#: html/class_passwordRecovery.inc:610
msgid "External password changer reported a problem: "
msgstr "El programa externo de cambio de contraseña informo de un problema: "
-#: html/class_passwordRecovery.inc:640
+#: html/class_passwordRecovery.inc:635
msgid "There was a problem with mail server, confirmation email not sent"
msgstr ""
@@ -286,6 +283,13 @@ msgstr ""
"El tiempo de vida de sesión es su fusiondirectory.conf sera sustituido por "
"el valor de ini de php."
+#: html/index.php:147
+#, fuzzy, php-format
+msgid ""
+"FusionDirectory configuration %s/%s is not readable. Please run "
+"fusiondirectory-setup --check-config to fix this."
+msgstr "La configuración de FusionDirectory %s/%s no se puede leer. Cancelado."
+
#: html/index.php:163
msgid "Smarty error"
msgstr "Error Smarty"
@@ -300,22 +304,22 @@ msgstr "¡Hay un problema con la configuración de autenticación!"
#: setup/setup_checks.tpl:91 setup/class_setupStep_Migrate.inc:1127
#: include/class_xml.inc:57 include/class_tabs.inc:74
#: include/class_management.inc:507 include/class_management.inc:657
-#: include/functions.inc:3613 include/functions.inc:3633
-#: include/functions.inc:3663 include/functions.inc:3671
-#: include/functions.inc:3683 include/functions.inc:3687
-#: include/functions.inc:3702 include/functions.inc:3711
-#: include/functions.inc:3779 include/class_listing.inc:522
+#: include/functions.inc:3618 include/functions.inc:3638
+#: include/functions.inc:3668 include/functions.inc:3676
+#: include/functions.inc:3688 include/functions.inc:3692
+#: include/functions.inc:3707 include/functions.inc:3716
+#: include/functions.inc:3784 include/class_listing.inc:521
#: include/class_config.inc:483 include/class_CopyPasteHandler.inc:264
#: include/password-methods/class_password-methods-sasl.inc:51
#: include/password-methods/class_password-methods-sasl.inc:63
#: include/password-methods/class_password-methods.inc:342
#: include/password-methods/class_password-methods.inc:447
#: include/password-methods/class_password-methods.inc:458
-#: include/class_plugin.inc:1368 include/class_plugin.inc:1843
-#: include/class_msg_dialog.inc:128 include/class_msgPool.inc:215
-#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:680 include/class_msgPool.inc:711
-#: include/class_msgPool.inc:738 include/class_databaseManagement.inc:78
+#: include/class_plugin.inc:1367 include/class_msg_dialog.inc:128
+#: include/class_msgPool.inc:215 include/class_msgPool.inc:235
+#: include/class_msgPool.inc:265 include/class_msgPool.inc:680
+#: include/class_msgPool.inc:711 include/class_msgPool.inc:738
+#: include/class_databaseManagement.inc:78
#: plugins/admin/acl/class_aclRole.inc:681
#: plugins/admin/groups/class_group.inc:521
#: plugins/admin/groups/class_group.inc:527
@@ -1056,32 +1060,29 @@ msgstr ""
"FusionDirectory requiere este modulo para comunicarse con varias bases de "
"datos soportadas."
-#: setup/class_setupStep_Checks.inc:136
-msgid "MDB2 mysql"
-msgstr ""
-
-#: setup/class_setupStep_Checks.inc:137
+#: setup/class_setupStep_Checks.inc:134
msgid ""
-"FusionDirectory requires this module to communicate with mysql databases."
+"If you do not want to install MDB2 and won't use databases, remove the "
+"class_databaseManagement.inc file."
msgstr ""
-#: setup/class_setupStep_Checks.inc:143
+#: setup/class_setupStep_Checks.inc:138
msgid "imagick"
msgstr "imagick"
-#: setup/class_setupStep_Checks.inc:144
+#: setup/class_setupStep_Checks.inc:139
msgid "FusionDirectory requires this extension to handle images."
msgstr "FusionDirectory requiere esta extensión para manejar imágenes."
-#: setup/class_setupStep_Checks.inc:159
+#: setup/class_setupStep_Checks.inc:154
msgid "compression module"
msgstr "modulo de compresión"
-#: setup/class_setupStep_Checks.inc:160
+#: setup/class_setupStep_Checks.inc:155
msgid "FusionDirectory requires this extension to handle snapshots."
msgstr "FusionDirectory requiere esta extensión para manejar capturas."
-#: setup/class_setupStep_Checks.inc:171
+#: setup/class_setupStep_Checks.inc:166
msgid ""
"register_globals is a PHP mechanism to register all global variables to be "
"accessible from scripts without changing the scope. This may be a security "
@@ -1091,17 +1092,17 @@ msgstr ""
"globales de tal manera que sean accesible desde scripts sin que cambien su "
"ámbito. Esto puede ser un problema de seguridad."
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStep_Checks.inc:167
msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
msgstr "Busque 'register_globals' en su php.ini y modifÃquelo por 'Off'."
-#: setup/class_setupStep_Checks.inc:180
+#: setup/class_setupStep_Checks.inc:175
msgid "PHP uses this value for the garbage collector to delete old sessions."
msgstr ""
"PHP usa este valor en el recolector de basura para eliminar las sesiones "
"antiguas."
-#: setup/class_setupStep_Checks.inc:181
+#: setup/class_setupStep_Checks.inc:176
msgid ""
"Setting this value to one day will prevent loosing session and cookies "
"before they really timeout."
@@ -1109,40 +1110,40 @@ msgstr ""
"Ajustando este valor a un dÃa impedirá la perdida de sesiones y cookies "
"antes de que realmente se desconecte por tiempo."
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStep_Checks.inc:177
msgid ""
"Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
"higher."
msgstr ""
"Busque 'sessio.gc_maxlifetime' en su php.ini y modifÃquelo a 86400 o mayor."
-#: setup/class_setupStep_Checks.inc:189 setup/class_setupStep_Checks.inc:205
-#: setup/class_setupStep_Checks.inc:221 setup/class_setupStep_Checks.inc:229
+#: setup/class_setupStep_Checks.inc:184 setup/class_setupStep_Checks.inc:200
+#: setup/class_setupStep_Checks.inc:216 setup/class_setupStep_Checks.inc:224
msgid "Off"
msgstr "Off"
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStep_Checks.inc:185
msgid ""
"In Order to use FusionDirectory without any trouble, the session.auto_start "
"option in your php.ini should be set to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStep_Checks.inc:186
msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
msgstr "Busque 'session.auto_start' en su php.ini y modifÃquelo a 'Off'."
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStep_Checks.inc:193
msgid ""
"FusionDirectory needs at least 128MB of memory. Setting it below this limit "
"may cause errors that are not reproducable! Increase it for larger setups."
msgstr ""
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStep_Checks.inc:194
msgid ""
"Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
msgstr ""
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStep_Checks.inc:201
msgid ""
"This option influences the PHP output handling. Turn this Option off, to "
"increase performance."
@@ -1150,21 +1151,21 @@ msgstr ""
"Esta opción está relacionada con el manejo de salida de PHP. Desactive esta "
"opción poniéndola en off para mejorar el rendimiento."
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStep_Checks.inc:202
msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
msgstr "Busque 'implicit_flush' en su php.ini y modifÃquelo a 'Off'."
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStep_Checks.inc:209
msgid "The Execution time should be at least 30 seconds."
msgstr "El tiempo de ejecución debe ser de al menos 30 segundos."
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStep_Checks.inc:210
msgid ""
"Search for 'max_execution_time' in your php.ini and set it to '30' or higher."
msgstr ""
"Busque 'max_execution_time' en su php.ini y modifÃquelo a '30' o mayor."
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStep_Checks.inc:217
msgid ""
"Increase the server security by setting expose_php to 'off'. PHP won't send "
"any information about the server you are running in this case."
@@ -1173,30 +1174,30 @@ msgstr ""
"'off'. PHP no deberÃa enviar ningún tipo de información sobre el servidor "
"que esta ejecutando la aplicación."
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStep_Checks.inc:218
msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
msgstr "Busque 'expose_php' en su php.ini y modifÃquelo a 'Off'."
-#: setup/class_setupStep_Checks.inc:230
+#: setup/class_setupStep_Checks.inc:225
msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
msgstr ""
"Aumente el rendimiento de su servidor modificando 'magic_quotes_gpc' a 'off'"
-#: setup/class_setupStep_Checks.inc:231
+#: setup/class_setupStep_Checks.inc:226
msgid ""
"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to 'Off'."
msgstr ""
"Busque 'zend.ze1_compatibility_mode' en su php.ini y modifÃquelo a 'Off'."
-#: setup/class_setupStep_Checks.inc:241
+#: setup/class_setupStep_Checks.inc:236
msgid "Configuration writeable"
msgstr "Se puede escribir en la configuración"
-#: setup/class_setupStep_Checks.inc:242
+#: setup/class_setupStep_Checks.inc:237
msgid "The configuration file can't be written"
msgstr "No se puede escribir en la configuración"
-#: setup/class_setupStep_Checks.inc:243
+#: setup/class_setupStep_Checks.inc:238
#, php-format
msgid ""
"FusionDirectory reads its configuration from a file located in (%s/%s). The "
@@ -1784,7 +1785,7 @@ msgstr "Subscribirse a la lista de correo fusiondirectory-users"
#: plugins/admin/departments/class_organizationGeneric.inc:115
#: plugins/admin/departments/class_organizationGeneric.inc:118
#: plugins/personal/generic/class_user.inc:1395
-#: plugins/personal/generic/generic.tpl:300
+#: plugins/personal/generic/generic.tpl:277
msgid "Organization"
msgstr "Organización"
@@ -1794,8 +1795,8 @@ msgstr "Organización"
#: plugins/admin/acl/class_aclRole.inc:702
#: plugins/admin/acl/class_aclRole.inc:715
#: plugins/admin/acl/class_aclRole.inc:725
-#: plugins/admin/users/class_userManagement.inc:545
-#: plugins/admin/users/class_userManagement.inc:592
+#: plugins/admin/users/class_userManagement.inc:542
+#: plugins/admin/users/class_userManagement.inc:589
#: plugins/admin/users/user-filter.tpl:26
#: plugins/admin/groups/group-filter.tpl:21
#: plugins/admin/groups/userSelect/user-filter.tpl:17
@@ -1878,7 +1879,7 @@ msgstr ""
"http://www.fusiondirectory.org para enviar su formulario de manera anónima."
#: setup/setup_feedback.tpl:52
-#: plugins/admin/users/class_userManagement.inc:903
+#: plugins/admin/users/class_userManagement.inc:900
#: plugins/admin/groups/class_group.inc:1106
#: plugins/admin/departments/class_department.inc:653
#: plugins/admin/ogroups/class_ogroup.inc:895
@@ -2027,7 +2028,7 @@ msgstr "Mover grupos seleccionados en este árbol de grupos"
#: setup/setup_migrate.tpl:101 setup/setup_migrate.tpl:153
#: setup/setup_migrate.tpl:320 setup/setup_migrate.tpl:373
#: setup/setup_migrate.tpl:416 setup/setup_migrate.tpl:459
-#: setup/setup_migrate.tpl:503 include/class_listing.inc:352
+#: setup/setup_migrate.tpl:503 include/class_listing.inc:351
msgid "Select all"
msgstr "Seleccione todos"
@@ -2529,7 +2530,7 @@ msgid "Group will be moved from"
msgstr "El grupo serán trasladado desde"
#: setup/class_setupStep_Migrate.inc:1175
-#: setup/class_setupStep_Migrate.inc:1223 include/class_plugin.inc:2083
+#: setup/class_setupStep_Migrate.inc:1223 include/class_plugin.inc:1675
msgid "to"
msgstr "a"
@@ -2609,8 +2610,7 @@ msgstr "Hay %s serviccios que necesitan ser migrados."
#: setup/class_setupStep_Migrate.inc:2647 include/class_msgPool.inc:495
#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:83
#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:138
-#: plugins/personal/generic/generic.tpl:251
-#: plugins/personal/generic/generic.tpl:270
+#: plugins/personal/generic/generic.tpl:249
#, php-format
msgid "Add"
msgstr "Añadir"
@@ -2739,28 +2739,25 @@ msgstr "¡El filtro está incompleto!"
#: include/class_management.inc:333 include/class_management.inc:483
#: include/class_management.inc:536 include/class_management.inc:576
#: include/class_management.inc:590 include/class_CopyPasteHandler.inc:223
-#: include/class_plugin.inc:1791 include/class_plugin.inc:1803
-#: include/class_plugin.inc:1818 include/class_plugin.inc:1831
-#: plugins/admin/users/class_userManagement.inc:205
-#: plugins/admin/users/class_userManagement.inc:761
+#: plugins/admin/users/class_userManagement.inc:202
+#: plugins/admin/users/class_userManagement.inc:758
msgid "Permission"
msgstr "Permiso"
#: include/class_management.inc:403
-#: plugins/admin/acl/class_aclManagement.inc:100
-#: plugins/admin/users/class_userManagement.inc:719
-#: plugins/admin/users/class_userManagement.inc:723
+#: plugins/admin/acl/class_aclManagement.inc:101
+#: plugins/admin/users/class_userManagement.inc:716
+#: plugins/admin/users/class_userManagement.inc:720
msgid "Permission error"
msgstr "Error de Permisos"
-#: include/class_management.inc:483 include/class_plugin.inc:1791
+#: include/class_management.inc:483
#, php-format
msgid "You are not allowed to create a snapshot for %s."
msgstr "No tiene permisos para crear una instantanea para %s."
#: include/class_management.inc:536 include/class_management.inc:576
-#: include/class_management.inc:590 include/class_plugin.inc:1803
-#: include/class_plugin.inc:1818 include/class_plugin.inc:1831
+#: include/class_management.inc:590
#, php-format
msgid "You are not allowed to restore a snapshot for %s."
msgstr "No tiene permisos para recuperar una instantanea para %s."
@@ -2991,87 +2988,87 @@ msgstr ""
"El comando '%s', utilizado como POSTMODIFY para la extensión '%s', no parece "
"existir."
-#: include/functions.inc:3613 include/functions.inc:3633
-#: include/functions.inc:3671 include/functions.inc:3683
-#: include/functions.inc:3687 include/functions.inc:3702
-#: include/functions.inc:3711
+#: include/functions.inc:3618 include/functions.inc:3638
+#: include/functions.inc:3676 include/functions.inc:3688
+#: include/functions.inc:3692 include/functions.inc:3707
+#: include/functions.inc:3716
msgid "Cannot allocate a free ID:"
msgstr "No se puede asignar un identificador (ID) libre:"
-#: include/functions.inc:3613
+#: include/functions.inc:3618
msgid "unknown idAllocation method!"
msgstr "¡método de asignación de id desconocido!"
-#: include/functions.inc:3633
+#: include/functions.inc:3638
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr "¡%sPoolMin >= %sPoolMax!"
-#: include/functions.inc:3663
+#: include/functions.inc:3668
msgid "Cannot create sambaUnixIdPool entry!"
msgstr "¡No se puede crear la entrada sambaUnixIdPool!"
-#: include/functions.inc:3671
+#: include/functions.inc:3676
msgid "sambaUnixIdPool is not unique!"
msgstr "¡sambaUnixIdPool no es único!"
-#: include/functions.inc:3683 include/functions.inc:3687
+#: include/functions.inc:3688 include/functions.inc:3692
msgid "no ID available!"
msgstr "¡No hay ID disponibles!"
-#: include/functions.inc:3711
+#: include/functions.inc:3716
msgid "maximum tries exceeded!"
msgstr "¡Excedido el número de intentos máximo!"
-#: include/functions.inc:3779
+#: include/functions.inc:3784
msgid "Cannot allocate a free ID!"
msgstr "¡No se puede asignar un identificador (ID) libre!"
-#: include/class_listing.inc:291 include/class_listing.inc:1099
-#: include/class_listing.inc:1101 include/class_sortableListing.inc:343
+#: include/class_listing.inc:290 include/class_listing.inc:1105
+#: include/class_listing.inc:1107 include/class_sortableListing.inc:343
#: include/class_acl.inc:504 plugins/admin/acl/class_aclRole.inc:372
msgid "Up"
msgstr "Arriba"
-#: include/class_listing.inc:291 include/class_sortableListing.inc:343
+#: include/class_listing.inc:290 include/class_sortableListing.inc:343
#: include/class_acl.inc:506 plugins/admin/acl/class_aclRole.inc:374
msgid "Down"
msgstr "Abajo"
-#: include/class_listing.inc:564
+#: include/class_listing.inc:563
msgid "created by"
msgstr "Creado por"
-#: include/class_listing.inc:1091
+#: include/class_listing.inc:1097
msgid "Go to root department"
msgstr "Ir al departamento raÃz"
-#: include/class_listing.inc:1091 include/class_listing.inc:1093
+#: include/class_listing.inc:1097 include/class_listing.inc:1099
#: include/class_baseSelector.inc:205
msgid "Root"
msgstr "RaÃz"
-#: include/class_listing.inc:1099
+#: include/class_listing.inc:1105
msgid "Go up one department"
msgstr "Subir un departamento"
-#: include/class_listing.inc:1107
+#: include/class_listing.inc:1113
msgid "Go to users department"
msgstr "Ir al departamento de usuarios"
-#: include/class_listing.inc:1107 include/class_listing.inc:1109
+#: include/class_listing.inc:1113 include/class_listing.inc:1115
msgid "Home"
msgstr "Inicio"
-#: include/class_listing.inc:1114
+#: include/class_listing.inc:1120
msgid "Reload list"
msgstr "Recargar lista"
-#: include/class_listing.inc:1114 include/class_baseSelector.inc:252
+#: include/class_listing.inc:1120 include/class_baseSelector.inc:252
msgid "Submit"
msgstr "Enviar"
-#: include/class_listing.inc:1211 plugins/admin/acl/acl-list.xml:65
+#: include/class_listing.inc:1217 plugins/admin/acl/acl-list.xml:65
#: plugins/admin/users/user-list.xml:78 plugins/admin/groups/group-list.xml:79
#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:64
#: plugins/admin/departments/dep-list.xml:87
@@ -3079,65 +3076,62 @@ msgstr "Enviar"
msgid "Actions"
msgstr "Acciones"
-#: include/class_listing.inc:1495 include/class_listing.inc:1545
-#: include/class_plugin.inc:2228
+#: include/class_listing.inc:1501 include/class_listing.inc:1551
msgid "Copy"
msgstr "Copiar"
-#: include/class_listing.inc:1501 include/class_listing.inc:1535
-#: include/class_plugin.inc:2232
+#: include/class_listing.inc:1507 include/class_listing.inc:1541
msgid "Cut"
msgstr "Mover"
-#: include/class_listing.inc:1509 include/class_listing.inc:1511
-#: include/class_CopyPasteHandler.inc:400 include/class_plugin.inc:2239
-#: include/class_plugin.inc:2242
+#: include/class_listing.inc:1515 include/class_listing.inc:1517
+#: include/class_CopyPasteHandler.inc:400
msgid "Paste"
msgstr "Pegar"
-#: include/class_listing.inc:1535 include/class_plugin.inc:2186
+#: include/class_listing.inc:1541
msgid "Cut this entry"
msgstr "Mover esta entrada"
-#: include/class_listing.inc:1545 include/class_plugin.inc:2194
+#: include/class_listing.inc:1551
msgid "Copy this entry"
msgstr "Copiar esta entrada"
-#: include/class_listing.inc:1577 include/class_listing.inc:1579
+#: include/class_listing.inc:1583 include/class_listing.inc:1585
msgid "Restore snapshots"
msgstr "Recuperar instantánea"
-#: include/class_listing.inc:1593
+#: include/class_listing.inc:1599
msgid "Export list"
msgstr "Exportar lista"
-#: include/class_listing.inc:1628 include/class_listing.inc:1629
-#: include/class_SnapShotDialog.inc:153 include/class_plugin.inc:2160
+#: include/class_listing.inc:1634 include/class_listing.inc:1635
+#: include/class_SnapShotDialog.inc:298
msgid "Restore snapshot"
msgstr "Recuperar instantanea"
-#: include/class_listing.inc:1638 include/class_plugin.inc:2167
+#: include/class_listing.inc:1644
msgid "Create snapshot"
msgstr "Crear instantánea"
-#: include/class_listing.inc:1639 include/class_plugin.inc:2168
+#: include/class_listing.inc:1645
msgid "Create a new snapshot from this object"
msgstr "¡Crear una nueva instantánea de este objeto!"
-#: include/class_SnapShotDialog.inc:99
+#: include/class_SnapShotDialog.inc:244
#, php-format
msgid "You're about to delete the snapshot '%s'."
msgstr "Va a eliminar la instantanea '%s'."
-#: include/class_SnapShotDialog.inc:155
+#: include/class_SnapShotDialog.inc:300
msgid "Remove snapshot"
msgstr "Eliminar instantanea"
-#: include/class_SnapShotDialog.inc:157 include/class_SnapShotDialog.inc:177
+#: include/class_SnapShotDialog.inc:302 include/class_SnapShotDialog.inc:322
msgid "Y-m-d, H:i:s"
msgstr "Y-m-d, H:i:s"
-#: include/class_SnapShotDialog.inc:191 plugins/admin/acl/acl-list.xml:57
+#: include/class_SnapShotDialog.inc:336 plugins/admin/acl/acl-list.xml:57
#: plugins/admin/acl/acl_role.tpl:17 plugins/admin/acl/class_aclRole.inc:704
#: plugins/admin/groups/class_group.inc:1114
#: plugins/admin/groups/group-list.xml:66 plugins/admin/groups/generic.tpl:24
@@ -3216,7 +3210,7 @@ msgstr ""
"¡No se puede encontrar un método de codificación válido para la clave "
"introducida!"
-#: include/class_plugin.inc:563
+#: include/class_plugin.inc:562
msgid ""
"The object has changed since opened in FusionDirectory. All changes that may "
"be done by others get lost if you save this entry!"
@@ -3225,26 +3219,14 @@ msgstr ""
"cambios que pudiera haber sido hechos por otros se perderán si guarda esta "
"entrada!"
-#: include/class_plugin.inc:2082
+#: include/class_plugin.inc:1674
msgid "Changing ACL dn"
msgstr "Modificando ACL dn"
-#: include/class_plugin.inc:2082
+#: include/class_plugin.inc:1674
msgid "from"
msgstr "desde"
-#: include/class_plugin.inc:2136 include/class_plugin.inc:2138
-msgid "Restore"
-msgstr "Recuperar"
-
-#: include/class_plugin.inc:2186
-msgid "cut"
-msgstr "mover"
-
-#: include/class_plugin.inc:2194
-msgid "copy"
-msgstr "copiar"
-
#: include/class_sortableListing.inc:303
msgid "Sortable list"
msgstr "Lista ordenada"
@@ -4139,15 +4121,14 @@ msgstr "¡Por favor active depuración para mas información!"
msgid "List of acls"
msgstr "Lista de acls"
-#: plugins/admin/acl/acl-list.xml:15
+#: plugins/admin/acl/acl-list.xml:15 plugins/admin/acl/acl-list.xml:82
#: plugins/admin/acl/class_aclManagement.inc:36
msgid "Acl"
msgstr "ACL"
-#: plugins/admin/acl/acl-list.xml:23 plugins/admin/acl/acl-list.xml:82
-#: plugins/admin/acl/class_aclRole.inc:695
+#: plugins/admin/acl/acl-list.xml:23 plugins/admin/acl/class_aclRole.inc:695
#: plugins/personal/generic/class_user.inc:1367
-#: plugins/personal/generic/generic.tpl:515
+#: plugins/personal/generic/generic.tpl:492
msgid "Role"
msgstr "Rol"
@@ -4190,7 +4171,7 @@ msgstr ""
msgid "Access control list management"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:160
+#: plugins/admin/acl/class_aclManagement.inc:161
msgid "ACL Assignment"
msgstr "Asignación de ACL"
@@ -4320,7 +4301,7 @@ msgstr ""
"anular el uso de plantillas."
#: plugins/admin/users/template.tpl:15
-#: plugins/admin/users/class_userManagement.inc:542
+#: plugins/admin/users/class_userManagement.inc:539
#: plugins/admin/users/templatize.tpl:15 plugins/admin/users/user-list.xml:15
#: plugins/admin/users/user-list.xml:102
msgid "Template"
@@ -4355,24 +4336,24 @@ msgstr "Inicio"
msgid "Manage users"
msgstr "Gestión de usuarios"
-#: plugins/admin/users/class_userManagement.inc:344
+#: plugins/admin/users/class_userManagement.inc:341
#: plugins/personal/password/class_password.inc:136
#, php-format
msgid "Check-hook reported a problem: %s. Password change canceled!"
msgstr ""
"Check-hook ha reportado un problema: %s. Cambio de contraseña cancelado!"
-#: plugins/admin/users/class_userManagement.inc:394
+#: plugins/admin/users/class_userManagement.inc:391
msgid "You have no permission to change this users password!"
msgstr "¡No tiene permisos para cambiar la contraseña de este usuario!"
-#: plugins/admin/users/class_userManagement.inc:470
-#: plugins/admin/users/class_userManagement.inc:504
-#: plugins/admin/users/class_userManagement.inc:535
+#: plugins/admin/users/class_userManagement.inc:467
+#: plugins/admin/users/class_userManagement.inc:501
+#: plugins/admin/users/class_userManagement.inc:532
msgid "none"
msgstr "ninguno"
-#: plugins/admin/users/class_userManagement.inc:548
+#: plugins/admin/users/class_userManagement.inc:545
#: plugins/admin/users/user-list.xml:57
#: plugins/admin/groups/userSelect/user-list.xml:40
#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
@@ -4382,11 +4363,11 @@ msgstr "ninguno"
msgid "Given name"
msgstr "Nombre de pila"
-#: plugins/admin/users/class_userManagement.inc:799
+#: plugins/admin/users/class_userManagement.inc:796
msgid "Account locking"
msgstr "Bloqueo de cuenta"
-#: plugins/admin/users/class_userManagement.inc:800
+#: plugins/admin/users/class_userManagement.inc:797
#, php-format
msgid ""
"Password method '%s' does not support locking. Account (%s) has not been "
@@ -4395,15 +4376,15 @@ msgstr ""
"El método de contraseña '%s' no soporta bloqueo. ¡La cuenta (%s) no ha sido "
"bloqueada!"
-#: plugins/admin/users/class_userManagement.inc:873
+#: plugins/admin/users/class_userManagement.inc:870
msgid "Unlock account"
msgstr "Desbloquear cuenta"
-#: plugins/admin/users/class_userManagement.inc:875
+#: plugins/admin/users/class_userManagement.inc:872
msgid "Lock account"
msgstr "Bloquear cuenta"
-#: plugins/admin/users/class_userManagement.inc:903
+#: plugins/admin/users/class_userManagement.inc:900
#, fuzzy
msgid "Generic properties"
msgstr "Editar caracterÃsticas generales"
@@ -4495,7 +4476,8 @@ msgid "Remove user"
msgstr "Eliminar usuario"
#: plugins/admin/password/class_recoveryConfig.inc:35
-msgid "Password recovery config"
+#, fuzzy
+msgid "Password recovery"
msgstr "Configuración de recuperación de clave"
#: plugins/admin/password/class_recoveryConfig.inc:36
@@ -4831,7 +4813,6 @@ msgstr "Parámetros genéricos del grupo"
#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:23
#: plugins/admin/ogroups/class_ogroupManagement.inc:187
#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:79
-#: plugins/admin/ogroups/ogroup-list.xml:79
#: plugins/generic/references/class_reference.inc:55
#: plugins/personal/posix/groupSelect/group-list.xml:15
msgid "Group"
@@ -4923,8 +4904,8 @@ msgstr "Editar caracterÃsticas samba"
#: plugins/generic/references/class_reference.inc:59
#: plugins/personal/posix/trustSelect/class_trustSelect.inc:81
#: plugins/personal/generic/class_user.inc:1180
-#: plugins/personal/generic/generic.tpl:399
-#: plugins/personal/generic/generic.tpl:586
+#: plugins/personal/generic/generic.tpl:376
+#: plugins/personal/generic/generic.tpl:563
msgid "Phone"
msgstr "Teléfono"
@@ -5023,7 +5004,7 @@ msgstr "Localidad"
#: plugins/admin/departments/generic.tpl:91
#: plugins/admin/departments/class_organizationGeneric.inc:129
#: plugins/personal/generic/class_user.inc:1410
-#: plugins/personal/generic/generic.tpl:448
+#: plugins/personal/generic/generic.tpl:425
msgid "Location"
msgstr "Localización"
@@ -5040,8 +5021,8 @@ msgstr "Localización"
#: plugins/admin/departments/generic.tpl:51
#: plugins/admin/departments/class_organizationGeneric.inc:126
#: plugins/personal/generic/class_user.inc:1399
-#: plugins/personal/generic/generic.tpl:341
-#: plugins/personal/generic/generic.tpl:362
+#: plugins/personal/generic/generic.tpl:318
+#: plugins/personal/generic/generic.tpl:339
msgid "Manager"
msgstr "Gestor"
@@ -5191,7 +5172,7 @@ msgstr "CategorÃa para este subárbol"
#: plugins/admin/departments/generic.tpl:83
#: plugins/admin/departments/class_organizationGeneric.inc:128
#: plugins/personal/generic/class_user.inc:1409
-#: plugins/personal/generic/generic.tpl:456
+#: plugins/personal/generic/generic.tpl:433
msgid "State"
msgstr "Provincia"
@@ -5209,7 +5190,7 @@ msgstr "Localización de este subárbol"
#: plugins/admin/departments/class_department.inc:667
#: plugins/admin/departments/generic.tpl:99
#: plugins/personal/generic/generic.tpl:181
-#: plugins/personal/generic/generic.tpl:464
+#: plugins/personal/generic/generic.tpl:441
msgid "Address"
msgstr "Dirección"
@@ -5229,8 +5210,8 @@ msgstr "Número base de teléfono de este subárbol"
#: plugins/admin/departments/generic.tpl:114
#: plugins/admin/departments/class_organizationGeneric.inc:132
#: plugins/personal/generic/class_user.inc:1183
-#: plugins/personal/generic/generic.tpl:430
-#: plugins/personal/generic/generic.tpl:598
+#: plugins/personal/generic/generic.tpl:407
+#: plugins/personal/generic/generic.tpl:575
msgid "Fax"
msgstr "Fax"
@@ -5281,7 +5262,7 @@ msgstr "PaÃs"
#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:15
#: plugins/generic/references/class_reference.inc:57
#: plugins/personal/generic/class_user.inc:1396
-#: plugins/personal/generic/generic.tpl:308
+#: plugins/personal/generic/generic.tpl:285
msgid "Department"
msgstr "Departamento"
@@ -5593,6 +5574,11 @@ msgstr "Objetos miembros"
msgid "List of object groups"
msgstr "Lista del grupo de objetos"
+#: plugins/admin/ogroups/ogroup-list.xml:79
+#, fuzzy
+msgid "Objectgroup"
+msgstr "Grupo de objetos"
+
#: plugins/admin/ogroups/ogroup-list.xml:106
msgid "Send message"
msgstr "Enviar mensaje"
@@ -5663,9 +5649,14 @@ msgid "Language"
msgstr "Idioma"
#: plugins/config/class_configInLdap.inc:82
+#, fuzzy
msgid ""
-"Default language to be used if the one asked by the browser is not available"
+"Language of the application. If 'automatic' or not available, the one asked "
+"by the browser will be used. This setting can be overriden per user."
msgstr ""
+"En este punto, puede seleccionar el idioma usado por defecto. Seleccionando "
+"'automático' obtendrá el lenguaje usado por el navedador. Esta configuración "
+"puede ser modificada por cada usuario."
#: plugins/config/class_configInLdap.inc:87
msgid "Theme to be used"
@@ -5680,7 +5671,7 @@ msgid "Schema setup"
msgstr ""
#: plugins/config/class_configInLdap.inc:103
-msgid "rfc237bis"
+msgid "rfc2307bis"
msgstr ""
#: plugins/config/class_configInLdap.inc:104
@@ -6391,12 +6382,12 @@ msgid "Homepage"
msgstr "Página Web"
#: plugins/personal/generic/class_user.inc:1186
-#: plugins/personal/generic/generic.tpl:411
+#: plugins/personal/generic/generic.tpl:388
msgid "Mobile"
msgstr "Móvil"
#: plugins/personal/generic/class_user.inc:1189
-#: plugins/personal/generic/generic.tpl:422
+#: plugins/personal/generic/generic.tpl:399
msgid "Pager"
msgstr "Buscapersonas"
@@ -6407,57 +6398,57 @@ msgid "Date of birth"
msgstr "Fecha de nacimiento"
#: plugins/personal/generic/class_user.inc:1357
-#: plugins/personal/generic/generic.tpl:538
+#: plugins/personal/generic/generic.tpl:515
msgid "Unit"
msgstr "Unidad"
#: plugins/personal/generic/class_user.inc:1358
-#: plugins/personal/generic/generic.tpl:563
+#: plugins/personal/generic/generic.tpl:540
msgid "House identifier"
msgstr "Tipo de VÃa"
#: plugins/personal/generic/class_user.inc:1359
-#: plugins/personal/generic/generic.tpl:480
+#: plugins/personal/generic/generic.tpl:457
msgid "Vocation"
msgstr "Profesión"
#: plugins/personal/generic/class_user.inc:1360
-#: plugins/personal/generic/generic.tpl:607
+#: plugins/personal/generic/generic.tpl:584
msgid "Last delivery"
msgstr "Última dirección conocida"
#: plugins/personal/generic/class_user.inc:1361
-#: plugins/personal/generic/generic.tpl:529
+#: plugins/personal/generic/generic.tpl:506
msgid "Person locality"
msgstr "Lugar de residencia"
#: plugins/personal/generic/class_user.inc:1362
-#: plugins/personal/generic/generic.tpl:488
+#: plugins/personal/generic/generic.tpl:465
msgid "Unit description"
msgstr "Descripción de la unidad"
#: plugins/personal/generic/class_user.inc:1363
-#: plugins/personal/generic/generic.tpl:497
+#: plugins/personal/generic/generic.tpl:474
msgid "Subject area"
msgstr "Ãrea de desarrollo"
#: plugins/personal/generic/class_user.inc:1364
-#: plugins/personal/generic/generic.tpl:506
+#: plugins/personal/generic/generic.tpl:483
msgid "Functional title"
msgstr "Función"
#: plugins/personal/generic/class_user.inc:1365
-#: plugins/personal/generic/generic.tpl:616
+#: plugins/personal/generic/generic.tpl:593
msgid "Public visible"
msgstr "Visible por todos"
#: plugins/personal/generic/class_user.inc:1366
-#: plugins/personal/generic/generic.tpl:547
+#: plugins/personal/generic/generic.tpl:524
msgid "Street"
msgstr "Calle"
#: plugins/personal/generic/class_user.inc:1368
-#: plugins/personal/generic/generic.tpl:555
+#: plugins/personal/generic/generic.tpl:532
msgid "Postal code"
msgstr "Código Postal"
@@ -6506,7 +6497,7 @@ msgid "Employee number"
msgstr "Número de empleado"
#: plugins/personal/generic/class_user.inc:1401
-#: plugins/personal/generic/generic.tpl:332
+#: plugins/personal/generic/generic.tpl:309
msgid "Employee type"
msgstr "CategorÃa profesional"
@@ -6587,29 +6578,28 @@ msgstr "Almacén de claves"
msgid "Restrict login to"
msgstr "Restringir inicio de sesión a"
-#: plugins/personal/generic/generic.tpl:248
-#: plugins/personal/generic/generic.tpl:267
+#: plugins/personal/generic/generic.tpl:246
msgid "IP or network"
msgstr "IP o Red"
-#: plugins/personal/generic/generic.tpl:288
+#: plugins/personal/generic/generic.tpl:265
msgid "Organizational information"
msgstr "Información corporativa"
-#: plugins/personal/generic/generic.tpl:316
+#: plugins/personal/generic/generic.tpl:293
msgid "Department No."
msgstr "Número departamento"
-#: plugins/personal/generic/generic.tpl:324
+#: plugins/personal/generic/generic.tpl:301
msgid "Employee No."
msgstr "Número empleado"
-#: plugins/personal/generic/generic.tpl:390
-#: plugins/personal/generic/generic.tpl:578
+#: plugins/personal/generic/generic.tpl:367
+#: plugins/personal/generic/generic.tpl:555
msgid "Room No."
msgstr "Número sala"
-#: plugins/personal/generic/generic.tpl:592
+#: plugins/personal/generic/generic.tpl:569
msgid "Please use the phone tab"
msgstr "Por favor use la sección telefóno"
@@ -6617,6 +6607,15 @@ msgstr "Por favor use la sección telefóno"
msgid "Your password hash method will not be changed!"
msgstr "No se cambiará su método de hash de la contraseña!"
+#~ msgid "Restore"
+#~ msgstr "Recuperar"
+
+#~ msgid "cut"
+#~ msgstr "mover"
+
+#~ msgid "copy"
+#~ msgstr "copiar"
+
#~ msgid "POSIX"
#~ msgstr "POSIX"
diff --git a/locale/es_VE/messages.po b/locale/es_VE/fusiondirectory.po
similarity index 95%
rename from locale/es_VE/messages.po
rename to locale/es_VE/fusiondirectory.po
index b535c251e3de2518fa305a0c5889bd0b067ad882..5568c4c3231e5c1f9d0bc8e1726edd645a98bf83 100644
--- a/locale/es_VE/messages.po
+++ b/locale/es_VE/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-24 14:48+0100\n"
-"PO-Revision-Date: 2013-03-06 21:40+0000\n"
+"POT-Creation-Date: 2013-04-14 20:13+0200\n"
+"PO-Revision-Date: 2013-03-24 15:00+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/"
"FusionDirectory/language/es_VE/)\n"
@@ -19,24 +19,24 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: html/main.php:140 html/class_passwordRecovery.inc:226
+#: html/main.php:135 html/class_passwordRecovery.inc:226
#: include/class_xml.inc:60 include/functions.inc:509
#: plugins/admin/departments/class_department.inc:431
msgid "Fatal error"
msgstr "Error fatal"
-#: html/main.php:141
+#: html/main.php:136
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr ""
"No se puede encontrar el archivo '%s' - por favor ejecute '%s' para "
"solucionarlo"
-#: html/main.php:162
+#: html/main.php:157
msgid "PHP configuration"
msgstr "Configuración PHP"
-#: html/main.php:163
+#: html/main.php:158
msgid ""
"Fatal error: Register globals is on. FusionDirectory will refuse to login "
"unless this is fixed by an administrator."
@@ -44,19 +44,19 @@ msgstr ""
"Error Fatal: 'Register globals' está activado. No se permitirá ningun acceso "
"hasta que esto sea solucionado por un administrador."
-#: html/main.php:192 ihtml/themes/default/password.tpl:40
-#: plugins/admin/users/class_userManagement.inc:393
+#: html/main.php:187 ihtml/themes/default/password.tpl:40
+#: plugins/admin/users/class_userManagement.inc:390
#: plugins/personal/password/class_password.inc:156
#: plugins/personal/password/class_password.inc:162
msgid "Password change"
msgstr "Cambio de contraseña"
-#: html/main.php:192
+#: html/main.php:187
msgid "Your password is about to expire, please change your password!"
msgstr ""
"Su contraseña va a caducar próximamente, ¡Por favor cambie su contraseña!"
-#: html/main.php:261 html/class_passwordRecovery.inc:301 html/index.php:147
+#: html/main.php:256 html/class_passwordRecovery.inc:296 html/index.php:147
#: html/index.php:208 include/class_SnapshotHandler.inc:57
#: include/class_SnapshotHandler.inc:70 include/class_SnapshotHandler.inc:88
#: include/class_pluglist.inc:272 include/functions.inc:933
@@ -70,30 +70,30 @@ msgstr ""
msgid "Configuration error"
msgstr "Error de configuración"
-#: html/main.php:261
+#: html/main.php:256
msgid "Running out of memory!"
msgstr "¡Funcionando sin memoria!"
-#: html/main.php:316
+#: html/main.php:311
msgid "User ACL checks disabled"
msgstr "Desactivados chequeos de ACL de usuario"
-#: html/main.php:362
+#: html/main.php:357
msgid "Plugin"
msgstr "Extensión"
-#: html/main.php:363
+#: html/main.php:358
#, php-format
msgid ""
"Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not "
"a file)!"
msgstr ""
-#: html/main.php:378
+#: html/main.php:373
msgid "Configuration Error"
msgstr "Error de configuración"
-#: html/main.php:379
+#: html/main.php:374
#, php-format
msgid ""
"Fatal error: not all POST variables have been transfered by PHP - please "
@@ -111,18 +111,18 @@ msgstr "Metodo de contraseña"
msgid "Error: Password method not available!"
msgstr "Error: ¡El método de contraseñas no esta disponible!"
-#: html/class_passwordRecovery.inc:227 html/index.php:147
+#: html/class_passwordRecovery.inc:227
#, php-format
msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
msgstr "La configuración de FusionDirectory %s/%s no se puede leer. Cancelado."
-#: html/class_passwordRecovery.inc:302 html/setup.php:63 html/index.php:163
+#: html/class_passwordRecovery.inc:297 html/setup.php:63 html/index.php:163
#, php-format
msgid "Directory '%s' specified as compile directory is not accessible!"
msgstr "¡No se puede acceder a el directorio de compilación '%s'!"
-#: html/class_passwordRecovery.inc:407
-#: plugins/admin/users/class_userManagement.inc:309
+#: html/class_passwordRecovery.inc:402
+#: plugins/admin/users/class_userManagement.inc:306
#: plugins/personal/password/class_password.inc:113
msgid ""
"The passwords you've entered as 'New password' and 'Repeated new password' "
@@ -131,13 +131,13 @@ msgstr ""
"No coinciden las contraseñas introducidas como 'Nueva contraseña' y 'Repetir "
"nueva contraseña'."
-#: html/class_passwordRecovery.inc:409 ihtml/themes/default/password.tpl:81
+#: html/class_passwordRecovery.inc:404 ihtml/themes/default/password.tpl:81
#: ihtml/themes/default/password.tpl:82
#: ihtml/themes/default/accountexpired.tpl:32
#: ihtml/themes/default/accountexpired.tpl:36
#: ihtml/themes/default/recovery.tpl:93 ihtml/themes/default/recovery.tpl:94
#: plugins/admin/users/password.tpl:17 plugins/admin/users/password.tpl:60
-#: plugins/admin/users/class_userManagement.inc:312
+#: plugins/admin/users/class_userManagement.inc:309
#: plugins/personal/password/password.tpl:27
#: plugins/personal/password/password.tpl:78
#: plugins/personal/generic/password.tpl:22
@@ -145,16 +145,16 @@ msgstr ""
msgid "New password"
msgstr "Nueva contraseña"
-#: html/class_passwordRecovery.inc:411
+#: html/class_passwordRecovery.inc:406
msgid "The password used as new is too short."
msgstr ""
-#: html/class_passwordRecovery.inc:413
+#: html/class_passwordRecovery.inc:408
#: plugins/personal/password/class_password.inc:121
msgid "The password contains possibly problematic Unicode characters!"
msgstr "La clave contiene caracteres unicode posiblemente problemáticos!"
-#: html/class_passwordRecovery.inc:437 html/index.php:58 html/index.php:64
+#: html/class_passwordRecovery.inc:432 html/index.php:58 html/index.php:64
#: html/index.php:403 ihtml/themes/default/conflict.tpl:6
#: ihtml/themes/default/islocked.tpl:6 ihtml/themes/default/remove.tpl:2
#: ihtml/themes/default/msg_dialog.tpl:59
@@ -177,39 +177,39 @@ msgstr "La clave contiene caracteres unicode posiblemente problemáticos!"
msgid "Warning"
msgstr "Aviso"
-#: html/class_passwordRecovery.inc:438
+#: html/class_passwordRecovery.inc:433
msgid "Session will not be encrypted."
msgstr "La sesión no será codificada."
-#: html/class_passwordRecovery.inc:440
+#: html/class_passwordRecovery.inc:435
msgid "Enter SSL session"
msgstr "Entrar en sesión SSL"
-#: html/class_passwordRecovery.inc:481
+#: html/class_passwordRecovery.inc:476
#, php-format
msgid "Did not found account %s"
msgstr "No se encontró la cuenta %s"
-#: html/class_passwordRecovery.inc:484
+#: html/class_passwordRecovery.inc:479
#, php-format
msgid "Found multiple accounts %s"
msgstr "Se encontraron varias cuentas %s"
-#: html/class_passwordRecovery.inc:498 ihtml/themes/default/recovery.tpl:142
+#: html/class_passwordRecovery.inc:493 ihtml/themes/default/recovery.tpl:142
msgid "Adresse mail"
msgstr "Dirección de correo"
-#: html/class_passwordRecovery.inc:515
+#: html/class_passwordRecovery.inc:510
#, php-format
msgid "There is no account using email %s"
msgstr "No existe una cuenta con el correo %s"
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:513
#, php-format
msgid "There are several accounts using email %s"
msgstr "Existen varias cuentas con el correo %s"
-#: html/class_passwordRecovery.inc:543 html/index.php:257 html/index.php:269
+#: html/class_passwordRecovery.inc:538 html/index.php:257 html/index.php:269
#: html/index.php:282 setup/class_setupStep_Migrate.inc:1138
#: setup/class_setupStep_Migrate.inc:1164
#: setup/class_setupStep_Migrate.inc:1213
@@ -221,20 +221,17 @@ msgstr "Existen varias cuentas con el correo %s"
#: setup/class_setupStep_Migrate.inc:2549
#: setup/class_setupStep_Migrate.inc:2896
#: setup/class_setupStep_Migrate.inc:2910
-#: include/class_SnapshotHandler.inc:150 include/class_SnapshotHandler.inc:329
-#: include/class_SnapshotHandler.inc:378 include/class_SnapshotHandler.inc:382
-#: include/class_SnapshotHandler.inc:402 include/class_SnapshotHandler.inc:445
-#: include/class_SnapshotHandler.inc:508 include/class_SnapshotHandler.inc:577
-#: include/class_SnapshotHandler.inc:592 include/functions.inc:547
+#: include/class_SnapshotHandler.inc:150 include/class_SnapshotHandler.inc:335
+#: include/class_SnapshotHandler.inc:388 include/class_SnapshotHandler.inc:392
+#: include/class_SnapshotHandler.inc:412 include/class_SnapshotHandler.inc:455
+#: include/class_SnapshotHandler.inc:518 include/class_SnapshotHandler.inc:587
+#: include/class_SnapshotHandler.inc:602 include/functions.inc:547
#: include/functions.inc:583 include/functions.inc:591
#: include/functions.inc:639 include/functions.inc:948
#: include/functions.inc:998 include/functions.inc:1058
#: include/functions.inc:1113 include/functions.inc:3244
-#: include/functions.inc:3509 include/class_config.inc:330
-#: include/class_plugin.inc:1500 include/class_plugin.inc:1550
-#: include/class_plugin.inc:1554 include/class_plugin.inc:1574
-#: include/class_plugin.inc:1621 include/class_plugin.inc:1681
-#: include/class_plugin.inc:1751 include/class_plugin.inc:1766
+#: include/functions.inc:3514 include/class_SnapShotDialog.inc:104
+#: include/class_SnapShotDialog.inc:177 include/class_config.inc:330
#: include/class_acl.inc:1308 include/class_acl.inc:1413
#: include/class_ldap.inc:934 include/class_ldap.inc:1421
#: plugins/admin/acl/class_aclRole.inc:613
@@ -253,20 +250,20 @@ msgstr "Existen varias cuentas con el correo %s"
msgid "LDAP error"
msgstr "Error LDAP"
-#: html/class_passwordRecovery.inc:566
+#: html/class_passwordRecovery.inc:561
msgid "Contact your administrator, there was a problem with mail server"
msgstr ""
"Contacte a su administrador, hubo un problema con el servidor de correo"
-#: html/class_passwordRecovery.inc:577
+#: html/class_passwordRecovery.inc:572
msgid "This token is invalid"
msgstr "Esta prenda es invalida"
-#: html/class_passwordRecovery.inc:615
+#: html/class_passwordRecovery.inc:610
msgid "External password changer reported a problem: "
msgstr "El programa externo de cambio de contraseña informo de un problema: "
-#: html/class_passwordRecovery.inc:640
+#: html/class_passwordRecovery.inc:635
msgid "There was a problem with mail server, confirmation email not sent"
msgstr ""
@@ -286,6 +283,13 @@ msgstr ""
"El tiempo de vida de sesión es su fusiondirectory.conf sera sustituido por "
"el valor de ini de php."
+#: html/index.php:147
+#, fuzzy, php-format
+msgid ""
+"FusionDirectory configuration %s/%s is not readable. Please run "
+"fusiondirectory-setup --check-config to fix this."
+msgstr "La configuración de FusionDirectory %s/%s no se puede leer. Cancelado."
+
#: html/index.php:163
msgid "Smarty error"
msgstr "Error Smarty"
@@ -300,22 +304,22 @@ msgstr "¡Hay un problema con la configuración de autenticación!"
#: setup/setup_checks.tpl:91 setup/class_setupStep_Migrate.inc:1127
#: include/class_xml.inc:57 include/class_tabs.inc:74
#: include/class_management.inc:507 include/class_management.inc:657
-#: include/functions.inc:3613 include/functions.inc:3633
-#: include/functions.inc:3663 include/functions.inc:3671
-#: include/functions.inc:3683 include/functions.inc:3687
-#: include/functions.inc:3702 include/functions.inc:3711
-#: include/functions.inc:3779 include/class_listing.inc:522
+#: include/functions.inc:3618 include/functions.inc:3638
+#: include/functions.inc:3668 include/functions.inc:3676
+#: include/functions.inc:3688 include/functions.inc:3692
+#: include/functions.inc:3707 include/functions.inc:3716
+#: include/functions.inc:3784 include/class_listing.inc:521
#: include/class_config.inc:483 include/class_CopyPasteHandler.inc:264
#: include/password-methods/class_password-methods-sasl.inc:51
#: include/password-methods/class_password-methods-sasl.inc:63
#: include/password-methods/class_password-methods.inc:342
#: include/password-methods/class_password-methods.inc:447
#: include/password-methods/class_password-methods.inc:458
-#: include/class_plugin.inc:1368 include/class_plugin.inc:1843
-#: include/class_msg_dialog.inc:128 include/class_msgPool.inc:215
-#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:680 include/class_msgPool.inc:711
-#: include/class_msgPool.inc:738 include/class_databaseManagement.inc:78
+#: include/class_plugin.inc:1367 include/class_msg_dialog.inc:128
+#: include/class_msgPool.inc:215 include/class_msgPool.inc:235
+#: include/class_msgPool.inc:265 include/class_msgPool.inc:680
+#: include/class_msgPool.inc:711 include/class_msgPool.inc:738
+#: include/class_databaseManagement.inc:78
#: plugins/admin/acl/class_aclRole.inc:681
#: plugins/admin/groups/class_group.inc:521
#: plugins/admin/groups/class_group.inc:527
@@ -1056,32 +1060,29 @@ msgstr ""
"FusionDirectory requiere este modulo para comunicarse con varias bases de "
"datos soportadas."
-#: setup/class_setupStep_Checks.inc:136
-msgid "MDB2 mysql"
-msgstr ""
-
-#: setup/class_setupStep_Checks.inc:137
+#: setup/class_setupStep_Checks.inc:134
msgid ""
-"FusionDirectory requires this module to communicate with mysql databases."
+"If you do not want to install MDB2 and won't use databases, remove the "
+"class_databaseManagement.inc file."
msgstr ""
-#: setup/class_setupStep_Checks.inc:143
+#: setup/class_setupStep_Checks.inc:138
msgid "imagick"
msgstr "imagick"
-#: setup/class_setupStep_Checks.inc:144
+#: setup/class_setupStep_Checks.inc:139
msgid "FusionDirectory requires this extension to handle images."
msgstr "FusionDirectory requiere esta extensión para manejar imágenes."
-#: setup/class_setupStep_Checks.inc:159
+#: setup/class_setupStep_Checks.inc:154
msgid "compression module"
msgstr "modulo de compresión"
-#: setup/class_setupStep_Checks.inc:160
+#: setup/class_setupStep_Checks.inc:155
msgid "FusionDirectory requires this extension to handle snapshots."
msgstr "FusionDirectory requiere esta extensión para manejar capturas."
-#: setup/class_setupStep_Checks.inc:171
+#: setup/class_setupStep_Checks.inc:166
msgid ""
"register_globals is a PHP mechanism to register all global variables to be "
"accessible from scripts without changing the scope. This may be a security "
@@ -1091,17 +1092,17 @@ msgstr ""
"globales de tal manera que sean accesible desde scripts sin que cambien su "
"ámbito. Esto puede ser un problema de seguridad."
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStep_Checks.inc:167
msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
msgstr "Busque 'register_globals' en su php.ini y modifÃquelo por 'Off'."
-#: setup/class_setupStep_Checks.inc:180
+#: setup/class_setupStep_Checks.inc:175
msgid "PHP uses this value for the garbage collector to delete old sessions."
msgstr ""
"PHP usa este valor en el recolector de basura para eliminar las sesiones "
"antiguas."
-#: setup/class_setupStep_Checks.inc:181
+#: setup/class_setupStep_Checks.inc:176
msgid ""
"Setting this value to one day will prevent loosing session and cookies "
"before they really timeout."
@@ -1109,40 +1110,40 @@ msgstr ""
"Ajustando este valor a un dÃa impedirá la perdida de sesiones y cookies "
"antes de que realmente se desconecte por tiempo."
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStep_Checks.inc:177
msgid ""
"Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
"higher."
msgstr ""
"Busque 'sessio.gc_maxlifetime' en su php.ini y modifÃquelo a 86400 o mayor."
-#: setup/class_setupStep_Checks.inc:189 setup/class_setupStep_Checks.inc:205
-#: setup/class_setupStep_Checks.inc:221 setup/class_setupStep_Checks.inc:229
+#: setup/class_setupStep_Checks.inc:184 setup/class_setupStep_Checks.inc:200
+#: setup/class_setupStep_Checks.inc:216 setup/class_setupStep_Checks.inc:224
msgid "Off"
msgstr "Off"
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStep_Checks.inc:185
msgid ""
"In Order to use FusionDirectory without any trouble, the session.auto_start "
"option in your php.ini should be set to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStep_Checks.inc:186
msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
msgstr "Busque 'session.auto_start' en su php.ini y modifÃquelo a 'Off'."
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStep_Checks.inc:193
msgid ""
"FusionDirectory needs at least 128MB of memory. Setting it below this limit "
"may cause errors that are not reproducable! Increase it for larger setups."
msgstr ""
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStep_Checks.inc:194
msgid ""
"Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
msgstr ""
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStep_Checks.inc:201
msgid ""
"This option influences the PHP output handling. Turn this Option off, to "
"increase performance."
@@ -1150,21 +1151,21 @@ msgstr ""
"Esta opción está relacionada con el manejo de salida de PHP. Desactive esta "
"opción poniéndola en off para mejorar el rendimiento."
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStep_Checks.inc:202
msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
msgstr "Busque 'implicit_flush' en su php.ini y modifÃquelo a 'Off'."
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStep_Checks.inc:209
msgid "The Execution time should be at least 30 seconds."
msgstr "El tiempo de ejecución debe ser de al menos 30 segundos."
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStep_Checks.inc:210
msgid ""
"Search for 'max_execution_time' in your php.ini and set it to '30' or higher."
msgstr ""
"Busque 'max_execution_time' en su php.ini y modifÃquelo a '30' o mayor."
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStep_Checks.inc:217
msgid ""
"Increase the server security by setting expose_php to 'off'. PHP won't send "
"any information about the server you are running in this case."
@@ -1173,30 +1174,30 @@ msgstr ""
"'off'. PHP no deberÃa enviar ningún tipo de información sobre el servidor "
"que esta ejecutando la aplicación."
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStep_Checks.inc:218
msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
msgstr "Busque 'expose_php' en su php.ini y modifÃquelo a 'Off'."
-#: setup/class_setupStep_Checks.inc:230
+#: setup/class_setupStep_Checks.inc:225
msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
msgstr ""
"Aumente el rendimiento de su servidor modificando 'magic_quotes_gpc' a 'off'"
-#: setup/class_setupStep_Checks.inc:231
+#: setup/class_setupStep_Checks.inc:226
msgid ""
"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to 'Off'."
msgstr ""
"Busque 'zend.ze1_compatibility_mode' en su php.ini y modifÃquelo a 'Off'."
-#: setup/class_setupStep_Checks.inc:241
+#: setup/class_setupStep_Checks.inc:236
msgid "Configuration writeable"
msgstr "Se puede escribir en la configuración"
-#: setup/class_setupStep_Checks.inc:242
+#: setup/class_setupStep_Checks.inc:237
msgid "The configuration file can't be written"
msgstr "No se puede escribir en la configuración"
-#: setup/class_setupStep_Checks.inc:243
+#: setup/class_setupStep_Checks.inc:238
#, php-format
msgid ""
"FusionDirectory reads its configuration from a file located in (%s/%s). The "
@@ -1784,7 +1785,7 @@ msgstr "Subscribirse a la lista de correo fusiondirectory-users"
#: plugins/admin/departments/class_organizationGeneric.inc:115
#: plugins/admin/departments/class_organizationGeneric.inc:118
#: plugins/personal/generic/class_user.inc:1395
-#: plugins/personal/generic/generic.tpl:300
+#: plugins/personal/generic/generic.tpl:277
msgid "Organization"
msgstr "Organización"
@@ -1794,8 +1795,8 @@ msgstr "Organización"
#: plugins/admin/acl/class_aclRole.inc:702
#: plugins/admin/acl/class_aclRole.inc:715
#: plugins/admin/acl/class_aclRole.inc:725
-#: plugins/admin/users/class_userManagement.inc:545
-#: plugins/admin/users/class_userManagement.inc:592
+#: plugins/admin/users/class_userManagement.inc:542
+#: plugins/admin/users/class_userManagement.inc:589
#: plugins/admin/users/user-filter.tpl:26
#: plugins/admin/groups/group-filter.tpl:21
#: plugins/admin/groups/userSelect/user-filter.tpl:17
@@ -1878,7 +1879,7 @@ msgstr ""
"http://www.fusiondirectory.org para enviar su formulario de manera anónima."
#: setup/setup_feedback.tpl:52
-#: plugins/admin/users/class_userManagement.inc:903
+#: plugins/admin/users/class_userManagement.inc:900
#: plugins/admin/groups/class_group.inc:1106
#: plugins/admin/departments/class_department.inc:653
#: plugins/admin/ogroups/class_ogroup.inc:895
@@ -2027,7 +2028,7 @@ msgstr "Mover grupos seleccionados en este árbol de grupos"
#: setup/setup_migrate.tpl:101 setup/setup_migrate.tpl:153
#: setup/setup_migrate.tpl:320 setup/setup_migrate.tpl:373
#: setup/setup_migrate.tpl:416 setup/setup_migrate.tpl:459
-#: setup/setup_migrate.tpl:503 include/class_listing.inc:352
+#: setup/setup_migrate.tpl:503 include/class_listing.inc:351
msgid "Select all"
msgstr "Seleccione todos"
@@ -2529,7 +2530,7 @@ msgid "Group will be moved from"
msgstr "El grupo serán trasladado desde"
#: setup/class_setupStep_Migrate.inc:1175
-#: setup/class_setupStep_Migrate.inc:1223 include/class_plugin.inc:2083
+#: setup/class_setupStep_Migrate.inc:1223 include/class_plugin.inc:1675
msgid "to"
msgstr "a"
@@ -2609,8 +2610,7 @@ msgstr "Hay %s serviccios que necesitan ser migrados."
#: setup/class_setupStep_Migrate.inc:2647 include/class_msgPool.inc:495
#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:83
#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:138
-#: plugins/personal/generic/generic.tpl:251
-#: plugins/personal/generic/generic.tpl:270
+#: plugins/personal/generic/generic.tpl:249
#, php-format
msgid "Add"
msgstr "Añadir"
@@ -2739,28 +2739,25 @@ msgstr "¡El filtro está incompleto!"
#: include/class_management.inc:333 include/class_management.inc:483
#: include/class_management.inc:536 include/class_management.inc:576
#: include/class_management.inc:590 include/class_CopyPasteHandler.inc:223
-#: include/class_plugin.inc:1791 include/class_plugin.inc:1803
-#: include/class_plugin.inc:1818 include/class_plugin.inc:1831
-#: plugins/admin/users/class_userManagement.inc:205
-#: plugins/admin/users/class_userManagement.inc:761
+#: plugins/admin/users/class_userManagement.inc:202
+#: plugins/admin/users/class_userManagement.inc:758
msgid "Permission"
msgstr "Permiso"
#: include/class_management.inc:403
-#: plugins/admin/acl/class_aclManagement.inc:100
-#: plugins/admin/users/class_userManagement.inc:719
-#: plugins/admin/users/class_userManagement.inc:723
+#: plugins/admin/acl/class_aclManagement.inc:101
+#: plugins/admin/users/class_userManagement.inc:716
+#: plugins/admin/users/class_userManagement.inc:720
msgid "Permission error"
msgstr "Error de Permisos"
-#: include/class_management.inc:483 include/class_plugin.inc:1791
+#: include/class_management.inc:483
#, php-format
msgid "You are not allowed to create a snapshot for %s."
msgstr "No tiene permisos para crear una instantanea para %s."
#: include/class_management.inc:536 include/class_management.inc:576
-#: include/class_management.inc:590 include/class_plugin.inc:1803
-#: include/class_plugin.inc:1818 include/class_plugin.inc:1831
+#: include/class_management.inc:590
#, php-format
msgid "You are not allowed to restore a snapshot for %s."
msgstr "No tiene permisos para recuperar una instantanea para %s."
@@ -2991,87 +2988,87 @@ msgstr ""
"El comando '%s', utilizado como POSTMODIFY para la extensión '%s', no parece "
"existir."
-#: include/functions.inc:3613 include/functions.inc:3633
-#: include/functions.inc:3671 include/functions.inc:3683
-#: include/functions.inc:3687 include/functions.inc:3702
-#: include/functions.inc:3711
+#: include/functions.inc:3618 include/functions.inc:3638
+#: include/functions.inc:3676 include/functions.inc:3688
+#: include/functions.inc:3692 include/functions.inc:3707
+#: include/functions.inc:3716
msgid "Cannot allocate a free ID:"
msgstr "No se puede asignar un identificador (ID) libre:"
-#: include/functions.inc:3613
+#: include/functions.inc:3618
msgid "unknown idAllocation method!"
msgstr "¡método de asignación de id desconocido!"
-#: include/functions.inc:3633
+#: include/functions.inc:3638
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr "¡%sPoolMin >= %sPoolMax!"
-#: include/functions.inc:3663
+#: include/functions.inc:3668
msgid "Cannot create sambaUnixIdPool entry!"
msgstr "¡No se puede crear la entrada sambaUnixIdPool!"
-#: include/functions.inc:3671
+#: include/functions.inc:3676
msgid "sambaUnixIdPool is not unique!"
msgstr "¡sambaUnixIdPool no es único!"
-#: include/functions.inc:3683 include/functions.inc:3687
+#: include/functions.inc:3688 include/functions.inc:3692
msgid "no ID available!"
msgstr "¡No hay ID disponibles!"
-#: include/functions.inc:3711
+#: include/functions.inc:3716
msgid "maximum tries exceeded!"
msgstr "¡Excedido el número de intentos máximo!"
-#: include/functions.inc:3779
+#: include/functions.inc:3784
msgid "Cannot allocate a free ID!"
msgstr "¡No se puede asignar un identificador (ID) libre!"
-#: include/class_listing.inc:291 include/class_listing.inc:1099
-#: include/class_listing.inc:1101 include/class_sortableListing.inc:343
+#: include/class_listing.inc:290 include/class_listing.inc:1105
+#: include/class_listing.inc:1107 include/class_sortableListing.inc:343
#: include/class_acl.inc:504 plugins/admin/acl/class_aclRole.inc:372
msgid "Up"
msgstr "Arriba"
-#: include/class_listing.inc:291 include/class_sortableListing.inc:343
+#: include/class_listing.inc:290 include/class_sortableListing.inc:343
#: include/class_acl.inc:506 plugins/admin/acl/class_aclRole.inc:374
msgid "Down"
msgstr "Abajo"
-#: include/class_listing.inc:564
+#: include/class_listing.inc:563
msgid "created by"
msgstr "Creado por"
-#: include/class_listing.inc:1091
+#: include/class_listing.inc:1097
msgid "Go to root department"
msgstr "Ir al departamento raÃz"
-#: include/class_listing.inc:1091 include/class_listing.inc:1093
+#: include/class_listing.inc:1097 include/class_listing.inc:1099
#: include/class_baseSelector.inc:205
msgid "Root"
msgstr "RaÃz"
-#: include/class_listing.inc:1099
+#: include/class_listing.inc:1105
msgid "Go up one department"
msgstr "Subir un departamento"
-#: include/class_listing.inc:1107
+#: include/class_listing.inc:1113
msgid "Go to users department"
msgstr "Ir al departamento de usuarios"
-#: include/class_listing.inc:1107 include/class_listing.inc:1109
+#: include/class_listing.inc:1113 include/class_listing.inc:1115
msgid "Home"
msgstr "Inicio"
-#: include/class_listing.inc:1114
+#: include/class_listing.inc:1120
msgid "Reload list"
msgstr "Recargar lista"
-#: include/class_listing.inc:1114 include/class_baseSelector.inc:252
+#: include/class_listing.inc:1120 include/class_baseSelector.inc:252
msgid "Submit"
msgstr "Enviar"
-#: include/class_listing.inc:1211 plugins/admin/acl/acl-list.xml:65
+#: include/class_listing.inc:1217 plugins/admin/acl/acl-list.xml:65
#: plugins/admin/users/user-list.xml:78 plugins/admin/groups/group-list.xml:79
#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:64
#: plugins/admin/departments/dep-list.xml:87
@@ -3079,65 +3076,62 @@ msgstr "Enviar"
msgid "Actions"
msgstr "Acciones"
-#: include/class_listing.inc:1495 include/class_listing.inc:1545
-#: include/class_plugin.inc:2228
+#: include/class_listing.inc:1501 include/class_listing.inc:1551
msgid "Copy"
msgstr "Copiar"
-#: include/class_listing.inc:1501 include/class_listing.inc:1535
-#: include/class_plugin.inc:2232
+#: include/class_listing.inc:1507 include/class_listing.inc:1541
msgid "Cut"
msgstr "Mover"
-#: include/class_listing.inc:1509 include/class_listing.inc:1511
-#: include/class_CopyPasteHandler.inc:400 include/class_plugin.inc:2239
-#: include/class_plugin.inc:2242
+#: include/class_listing.inc:1515 include/class_listing.inc:1517
+#: include/class_CopyPasteHandler.inc:400
msgid "Paste"
msgstr "Pegar"
-#: include/class_listing.inc:1535 include/class_plugin.inc:2186
+#: include/class_listing.inc:1541
msgid "Cut this entry"
msgstr "Mover esta entrada"
-#: include/class_listing.inc:1545 include/class_plugin.inc:2194
+#: include/class_listing.inc:1551
msgid "Copy this entry"
msgstr "Copiar esta entrada"
-#: include/class_listing.inc:1577 include/class_listing.inc:1579
+#: include/class_listing.inc:1583 include/class_listing.inc:1585
msgid "Restore snapshots"
msgstr "Recuperar instantánea"
-#: include/class_listing.inc:1593
+#: include/class_listing.inc:1599
msgid "Export list"
msgstr "Exportar lista"
-#: include/class_listing.inc:1628 include/class_listing.inc:1629
-#: include/class_SnapShotDialog.inc:153 include/class_plugin.inc:2160
+#: include/class_listing.inc:1634 include/class_listing.inc:1635
+#: include/class_SnapShotDialog.inc:298
msgid "Restore snapshot"
msgstr "Recuperar instantanea"
-#: include/class_listing.inc:1638 include/class_plugin.inc:2167
+#: include/class_listing.inc:1644
msgid "Create snapshot"
msgstr "Crear instantánea"
-#: include/class_listing.inc:1639 include/class_plugin.inc:2168
+#: include/class_listing.inc:1645
msgid "Create a new snapshot from this object"
msgstr "¡Crear una nueva instantánea de este objeto!"
-#: include/class_SnapShotDialog.inc:99
+#: include/class_SnapShotDialog.inc:244
#, php-format
msgid "You're about to delete the snapshot '%s'."
msgstr "Va a eliminar la instantanea '%s'."
-#: include/class_SnapShotDialog.inc:155
+#: include/class_SnapShotDialog.inc:300
msgid "Remove snapshot"
msgstr "Eliminar instantanea"
-#: include/class_SnapShotDialog.inc:157 include/class_SnapShotDialog.inc:177
+#: include/class_SnapShotDialog.inc:302 include/class_SnapShotDialog.inc:322
msgid "Y-m-d, H:i:s"
msgstr "Y-m-d, H:i:s"
-#: include/class_SnapShotDialog.inc:191 plugins/admin/acl/acl-list.xml:57
+#: include/class_SnapShotDialog.inc:336 plugins/admin/acl/acl-list.xml:57
#: plugins/admin/acl/acl_role.tpl:17 plugins/admin/acl/class_aclRole.inc:704
#: plugins/admin/groups/class_group.inc:1114
#: plugins/admin/groups/group-list.xml:66 plugins/admin/groups/generic.tpl:24
@@ -3216,7 +3210,7 @@ msgstr ""
"¡No se puede encontrar un método de codificación válido para la clave "
"introducida!"
-#: include/class_plugin.inc:563
+#: include/class_plugin.inc:562
msgid ""
"The object has changed since opened in FusionDirectory. All changes that may "
"be done by others get lost if you save this entry!"
@@ -3225,26 +3219,14 @@ msgstr ""
"cambios que pudiera haber sido hechos por otros se perderán si guarda esta "
"entrada!"
-#: include/class_plugin.inc:2082
+#: include/class_plugin.inc:1674
msgid "Changing ACL dn"
msgstr "Modificando ACL dn"
-#: include/class_plugin.inc:2082
+#: include/class_plugin.inc:1674
msgid "from"
msgstr "desde"
-#: include/class_plugin.inc:2136 include/class_plugin.inc:2138
-msgid "Restore"
-msgstr "Recuperar"
-
-#: include/class_plugin.inc:2186
-msgid "cut"
-msgstr "mover"
-
-#: include/class_plugin.inc:2194
-msgid "copy"
-msgstr "copiar"
-
#: include/class_sortableListing.inc:303
msgid "Sortable list"
msgstr "Lista ordenada"
@@ -4139,15 +4121,14 @@ msgstr "¡Por favor active depuración para mas información!"
msgid "List of acls"
msgstr "Lista de acls"
-#: plugins/admin/acl/acl-list.xml:15
+#: plugins/admin/acl/acl-list.xml:15 plugins/admin/acl/acl-list.xml:82
#: plugins/admin/acl/class_aclManagement.inc:36
msgid "Acl"
msgstr "ACL"
-#: plugins/admin/acl/acl-list.xml:23 plugins/admin/acl/acl-list.xml:82
-#: plugins/admin/acl/class_aclRole.inc:695
+#: plugins/admin/acl/acl-list.xml:23 plugins/admin/acl/class_aclRole.inc:695
#: plugins/personal/generic/class_user.inc:1367
-#: plugins/personal/generic/generic.tpl:515
+#: plugins/personal/generic/generic.tpl:492
msgid "Role"
msgstr "Rol"
@@ -4190,7 +4171,7 @@ msgstr ""
msgid "Access control list management"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:160
+#: plugins/admin/acl/class_aclManagement.inc:161
msgid "ACL Assignment"
msgstr "Asignación de ACL"
@@ -4320,7 +4301,7 @@ msgstr ""
"anular el uso de plantillas."
#: plugins/admin/users/template.tpl:15
-#: plugins/admin/users/class_userManagement.inc:542
+#: plugins/admin/users/class_userManagement.inc:539
#: plugins/admin/users/templatize.tpl:15 plugins/admin/users/user-list.xml:15
#: plugins/admin/users/user-list.xml:102
msgid "Template"
@@ -4355,24 +4336,24 @@ msgstr "Inicio"
msgid "Manage users"
msgstr "Gestión de usuarios"
-#: plugins/admin/users/class_userManagement.inc:344
+#: plugins/admin/users/class_userManagement.inc:341
#: plugins/personal/password/class_password.inc:136
#, php-format
msgid "Check-hook reported a problem: %s. Password change canceled!"
msgstr ""
"Check-hook ha reportado un problema: %s. Cambio de contraseña cancelado!"
-#: plugins/admin/users/class_userManagement.inc:394
+#: plugins/admin/users/class_userManagement.inc:391
msgid "You have no permission to change this users password!"
msgstr "¡No tiene permisos para cambiar la contraseña de este usuario!"
-#: plugins/admin/users/class_userManagement.inc:470
-#: plugins/admin/users/class_userManagement.inc:504
-#: plugins/admin/users/class_userManagement.inc:535
+#: plugins/admin/users/class_userManagement.inc:467
+#: plugins/admin/users/class_userManagement.inc:501
+#: plugins/admin/users/class_userManagement.inc:532
msgid "none"
msgstr "ninguno"
-#: plugins/admin/users/class_userManagement.inc:548
+#: plugins/admin/users/class_userManagement.inc:545
#: plugins/admin/users/user-list.xml:57
#: plugins/admin/groups/userSelect/user-list.xml:40
#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
@@ -4382,11 +4363,11 @@ msgstr "ninguno"
msgid "Given name"
msgstr "Nombre de pila"
-#: plugins/admin/users/class_userManagement.inc:799
+#: plugins/admin/users/class_userManagement.inc:796
msgid "Account locking"
msgstr "Bloqueo de cuenta"
-#: plugins/admin/users/class_userManagement.inc:800
+#: plugins/admin/users/class_userManagement.inc:797
#, php-format
msgid ""
"Password method '%s' does not support locking. Account (%s) has not been "
@@ -4395,15 +4376,15 @@ msgstr ""
"El método de contraseña '%s' no soporta bloqueo. ¡La cuenta (%s) no ha sido "
"bloqueada!"
-#: plugins/admin/users/class_userManagement.inc:873
+#: plugins/admin/users/class_userManagement.inc:870
msgid "Unlock account"
msgstr "Desbloquear cuenta"
-#: plugins/admin/users/class_userManagement.inc:875
+#: plugins/admin/users/class_userManagement.inc:872
msgid "Lock account"
msgstr "Bloquear cuenta"
-#: plugins/admin/users/class_userManagement.inc:903
+#: plugins/admin/users/class_userManagement.inc:900
#, fuzzy
msgid "Generic properties"
msgstr "Editar caracterÃsticas generales"
@@ -4495,7 +4476,8 @@ msgid "Remove user"
msgstr "Eliminar usuario"
#: plugins/admin/password/class_recoveryConfig.inc:35
-msgid "Password recovery config"
+#, fuzzy
+msgid "Password recovery"
msgstr "Configuración de recuperación de clave"
#: plugins/admin/password/class_recoveryConfig.inc:36
@@ -4831,7 +4813,6 @@ msgstr "Parámetros genéricos del grupo"
#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:23
#: plugins/admin/ogroups/class_ogroupManagement.inc:187
#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:79
-#: plugins/admin/ogroups/ogroup-list.xml:79
#: plugins/generic/references/class_reference.inc:55
#: plugins/personal/posix/groupSelect/group-list.xml:15
msgid "Group"
@@ -4923,8 +4904,8 @@ msgstr "Editar caracterÃsticas samba"
#: plugins/generic/references/class_reference.inc:59
#: plugins/personal/posix/trustSelect/class_trustSelect.inc:81
#: plugins/personal/generic/class_user.inc:1180
-#: plugins/personal/generic/generic.tpl:399
-#: plugins/personal/generic/generic.tpl:586
+#: plugins/personal/generic/generic.tpl:376
+#: plugins/personal/generic/generic.tpl:563
msgid "Phone"
msgstr "Teléfono"
@@ -5023,7 +5004,7 @@ msgstr "Localidad"
#: plugins/admin/departments/generic.tpl:91
#: plugins/admin/departments/class_organizationGeneric.inc:129
#: plugins/personal/generic/class_user.inc:1410
-#: plugins/personal/generic/generic.tpl:448
+#: plugins/personal/generic/generic.tpl:425
msgid "Location"
msgstr "Localización"
@@ -5040,8 +5021,8 @@ msgstr "Localización"
#: plugins/admin/departments/generic.tpl:51
#: plugins/admin/departments/class_organizationGeneric.inc:126
#: plugins/personal/generic/class_user.inc:1399
-#: plugins/personal/generic/generic.tpl:341
-#: plugins/personal/generic/generic.tpl:362
+#: plugins/personal/generic/generic.tpl:318
+#: plugins/personal/generic/generic.tpl:339
msgid "Manager"
msgstr "Gestor"
@@ -5191,7 +5172,7 @@ msgstr "CategorÃa para este subárbol"
#: plugins/admin/departments/generic.tpl:83
#: plugins/admin/departments/class_organizationGeneric.inc:128
#: plugins/personal/generic/class_user.inc:1409
-#: plugins/personal/generic/generic.tpl:456
+#: plugins/personal/generic/generic.tpl:433
msgid "State"
msgstr "Provincia"
@@ -5209,7 +5190,7 @@ msgstr "Localización de este subárbol"
#: plugins/admin/departments/class_department.inc:667
#: plugins/admin/departments/generic.tpl:99
#: plugins/personal/generic/generic.tpl:181
-#: plugins/personal/generic/generic.tpl:464
+#: plugins/personal/generic/generic.tpl:441
msgid "Address"
msgstr "Dirección"
@@ -5229,8 +5210,8 @@ msgstr "Número base de teléfono de este subárbol"
#: plugins/admin/departments/generic.tpl:114
#: plugins/admin/departments/class_organizationGeneric.inc:132
#: plugins/personal/generic/class_user.inc:1183
-#: plugins/personal/generic/generic.tpl:430
-#: plugins/personal/generic/generic.tpl:598
+#: plugins/personal/generic/generic.tpl:407
+#: plugins/personal/generic/generic.tpl:575
msgid "Fax"
msgstr "Fax"
@@ -5281,7 +5262,7 @@ msgstr "PaÃs"
#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:15
#: plugins/generic/references/class_reference.inc:57
#: plugins/personal/generic/class_user.inc:1396
-#: plugins/personal/generic/generic.tpl:308
+#: plugins/personal/generic/generic.tpl:285
msgid "Department"
msgstr "Departamento"
@@ -5593,6 +5574,11 @@ msgstr "Objetos miembros"
msgid "List of object groups"
msgstr "Lista del grupo de objetos"
+#: plugins/admin/ogroups/ogroup-list.xml:79
+#, fuzzy
+msgid "Objectgroup"
+msgstr "Grupo de objetos"
+
#: plugins/admin/ogroups/ogroup-list.xml:106
msgid "Send message"
msgstr "Enviar mensaje"
@@ -5663,9 +5649,14 @@ msgid "Language"
msgstr "Idioma"
#: plugins/config/class_configInLdap.inc:82
+#, fuzzy
msgid ""
-"Default language to be used if the one asked by the browser is not available"
+"Language of the application. If 'automatic' or not available, the one asked "
+"by the browser will be used. This setting can be overriden per user."
msgstr ""
+"En este punto, puede seleccionar el idioma usado por defecto. Seleccionando "
+"'automático' obtendrá el lenguaje usado por el navedador. Esta configuración "
+"puede ser modificada por cada usuario."
#: plugins/config/class_configInLdap.inc:87
msgid "Theme to be used"
@@ -5680,7 +5671,7 @@ msgid "Schema setup"
msgstr ""
#: plugins/config/class_configInLdap.inc:103
-msgid "rfc237bis"
+msgid "rfc2307bis"
msgstr ""
#: plugins/config/class_configInLdap.inc:104
@@ -6391,12 +6382,12 @@ msgid "Homepage"
msgstr "Página Web"
#: plugins/personal/generic/class_user.inc:1186
-#: plugins/personal/generic/generic.tpl:411
+#: plugins/personal/generic/generic.tpl:388
msgid "Mobile"
msgstr "Móvil"
#: plugins/personal/generic/class_user.inc:1189
-#: plugins/personal/generic/generic.tpl:422
+#: plugins/personal/generic/generic.tpl:399
msgid "Pager"
msgstr "Buscapersonas"
@@ -6407,57 +6398,57 @@ msgid "Date of birth"
msgstr "Fecha de nacimiento"
#: plugins/personal/generic/class_user.inc:1357
-#: plugins/personal/generic/generic.tpl:538
+#: plugins/personal/generic/generic.tpl:515
msgid "Unit"
msgstr "Unidad"
#: plugins/personal/generic/class_user.inc:1358
-#: plugins/personal/generic/generic.tpl:563
+#: plugins/personal/generic/generic.tpl:540
msgid "House identifier"
msgstr "Tipo de VÃa"
#: plugins/personal/generic/class_user.inc:1359
-#: plugins/personal/generic/generic.tpl:480
+#: plugins/personal/generic/generic.tpl:457
msgid "Vocation"
msgstr "Profesión"
#: plugins/personal/generic/class_user.inc:1360
-#: plugins/personal/generic/generic.tpl:607
+#: plugins/personal/generic/generic.tpl:584
msgid "Last delivery"
msgstr "Última dirección conocida"
#: plugins/personal/generic/class_user.inc:1361
-#: plugins/personal/generic/generic.tpl:529
+#: plugins/personal/generic/generic.tpl:506
msgid "Person locality"
msgstr "Lugar de residencia"
#: plugins/personal/generic/class_user.inc:1362
-#: plugins/personal/generic/generic.tpl:488
+#: plugins/personal/generic/generic.tpl:465
msgid "Unit description"
msgstr "Descripción de la unidad"
#: plugins/personal/generic/class_user.inc:1363
-#: plugins/personal/generic/generic.tpl:497
+#: plugins/personal/generic/generic.tpl:474
msgid "Subject area"
msgstr "Ãrea de desarrollo"
#: plugins/personal/generic/class_user.inc:1364
-#: plugins/personal/generic/generic.tpl:506
+#: plugins/personal/generic/generic.tpl:483
msgid "Functional title"
msgstr "Función"
#: plugins/personal/generic/class_user.inc:1365
-#: plugins/personal/generic/generic.tpl:616
+#: plugins/personal/generic/generic.tpl:593
msgid "Public visible"
msgstr "Visible por todos"
#: plugins/personal/generic/class_user.inc:1366
-#: plugins/personal/generic/generic.tpl:547
+#: plugins/personal/generic/generic.tpl:524
msgid "Street"
msgstr "Calle"
#: plugins/personal/generic/class_user.inc:1368
-#: plugins/personal/generic/generic.tpl:555
+#: plugins/personal/generic/generic.tpl:532
msgid "Postal code"
msgstr "Código Postal"
@@ -6506,7 +6497,7 @@ msgid "Employee number"
msgstr "Número de empleado"
#: plugins/personal/generic/class_user.inc:1401
-#: plugins/personal/generic/generic.tpl:332
+#: plugins/personal/generic/generic.tpl:309
msgid "Employee type"
msgstr "CategorÃa profesional"
@@ -6587,29 +6578,28 @@ msgstr "Almacén de claves"
msgid "Restrict login to"
msgstr "Restringir inicio de sesión a"
-#: plugins/personal/generic/generic.tpl:248
-#: plugins/personal/generic/generic.tpl:267
+#: plugins/personal/generic/generic.tpl:246
msgid "IP or network"
msgstr "IP o Red"
-#: plugins/personal/generic/generic.tpl:288
+#: plugins/personal/generic/generic.tpl:265
msgid "Organizational information"
msgstr "Información corporativa"
-#: plugins/personal/generic/generic.tpl:316
+#: plugins/personal/generic/generic.tpl:293
msgid "Department No."
msgstr "Número departamento"
-#: plugins/personal/generic/generic.tpl:324
+#: plugins/personal/generic/generic.tpl:301
msgid "Employee No."
msgstr "Número empleado"
-#: plugins/personal/generic/generic.tpl:390
-#: plugins/personal/generic/generic.tpl:578
+#: plugins/personal/generic/generic.tpl:367
+#: plugins/personal/generic/generic.tpl:555
msgid "Room No."
msgstr "Número sala"
-#: plugins/personal/generic/generic.tpl:592
+#: plugins/personal/generic/generic.tpl:569
msgid "Please use the phone tab"
msgstr "Por favor use la sección telefóno"
@@ -6617,6 +6607,15 @@ msgstr "Por favor use la sección telefóno"
msgid "Your password hash method will not be changed!"
msgstr "No se cambiará su método de hash de la contraseña!"
+#~ msgid "Restore"
+#~ msgstr "Recuperar"
+
+#~ msgid "cut"
+#~ msgstr "mover"
+
+#~ msgid "copy"
+#~ msgstr "copiar"
+
#~ msgid "POSIX"
#~ msgstr "POSIX"
diff --git a/locale/fa_IR/messages.po b/locale/fa_IR/fusiondirectory.po
similarity index 94%
rename from locale/fa_IR/messages.po
rename to locale/fa_IR/fusiondirectory.po
index 39e735d66df3a5def2bd600d0a1b2d484988f631..211ba6df203ec3f1348a2f8a0bed16f1dc906f3d 100644
--- a/locale/fa_IR/messages.po
+++ b/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-24 14:48+0100\n"
+"POT-Creation-Date: 2013-04-14 20:13+0200\n"
"PO-Revision-Date: 2013-03-06 21:40+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/"
@@ -19,39 +19,39 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: html/main.php:140 html/class_passwordRecovery.inc:226
+#: html/main.php:135 html/class_passwordRecovery.inc:226
#: include/class_xml.inc:60 include/functions.inc:509
#: plugins/admin/departments/class_department.inc:431
msgid "Fatal error"
msgstr "خطا"
-#: html/main.php:141
+#: html/main.php:136
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr "Ùایل '%s' موجود نیست - لطÙا '%s' را اجرا کنید تا مشکل را رÙع نمایید."
-#: html/main.php:162
+#: html/main.php:157
msgid "PHP configuration"
msgstr "پیکربندی PHP"
-#: html/main.php:163
+#: html/main.php:158
msgid ""
"Fatal error: Register globals is on. FusionDirectory will refuse to login "
"unless this is fixed by an administrator."
msgstr ""
-#: html/main.php:192 ihtml/themes/default/password.tpl:40
-#: plugins/admin/users/class_userManagement.inc:393
+#: html/main.php:187 ihtml/themes/default/password.tpl:40
+#: plugins/admin/users/class_userManagement.inc:390
#: plugins/personal/password/class_password.inc:156
#: plugins/personal/password/class_password.inc:162
msgid "Password change"
msgstr "تغییر کلمه عبور"
-#: html/main.php:192
+#: html/main.php:187
msgid "Your password is about to expire, please change your password!"
msgstr "اعتبار کلمه عبور شما پایان یاÙته، لطÙا کلمه عبور خود را تغییر دهید!"
-#: html/main.php:261 html/class_passwordRecovery.inc:301 html/index.php:147
+#: html/main.php:256 html/class_passwordRecovery.inc:296 html/index.php:147
#: html/index.php:208 include/class_SnapshotHandler.inc:57
#: include/class_SnapshotHandler.inc:70 include/class_SnapshotHandler.inc:88
#: include/class_pluglist.inc:272 include/functions.inc:933
@@ -65,30 +65,30 @@ msgstr "اعتبار کلمه عبور شما پایان یاÙته، لطÙا
msgid "Configuration error"
msgstr ""
-#: html/main.php:261
+#: html/main.php:256
msgid "Running out of memory!"
msgstr ""
-#: html/main.php:316
+#: html/main.php:311
msgid "User ACL checks disabled"
msgstr ""
-#: html/main.php:362
+#: html/main.php:357
msgid "Plugin"
msgstr ""
-#: html/main.php:363
+#: html/main.php:358
#, php-format
msgid ""
"Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not "
"a file)!"
msgstr ""
-#: html/main.php:378
+#: html/main.php:373
msgid "Configuration Error"
msgstr ""
-#: html/main.php:379
+#: html/main.php:374
#, php-format
msgid ""
"Fatal error: not all POST variables have been transfered by PHP - please "
@@ -104,31 +104,31 @@ msgstr ""
msgid "Error: Password method not available!"
msgstr ""
-#: html/class_passwordRecovery.inc:227 html/index.php:147
+#: html/class_passwordRecovery.inc:227
#, php-format
msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
msgstr ""
-#: html/class_passwordRecovery.inc:302 html/setup.php:63 html/index.php:163
+#: html/class_passwordRecovery.inc:297 html/setup.php:63 html/index.php:163
#, php-format
msgid "Directory '%s' specified as compile directory is not accessible!"
msgstr ""
-#: html/class_passwordRecovery.inc:407
-#: plugins/admin/users/class_userManagement.inc:309
+#: html/class_passwordRecovery.inc:402
+#: plugins/admin/users/class_userManagement.inc:306
#: plugins/personal/password/class_password.inc:113
msgid ""
"The passwords you've entered as 'New password' and 'Repeated new password' "
"do not match."
msgstr ""
-#: html/class_passwordRecovery.inc:409 ihtml/themes/default/password.tpl:81
+#: html/class_passwordRecovery.inc:404 ihtml/themes/default/password.tpl:81
#: ihtml/themes/default/password.tpl:82
#: ihtml/themes/default/accountexpired.tpl:32
#: ihtml/themes/default/accountexpired.tpl:36
#: ihtml/themes/default/recovery.tpl:93 ihtml/themes/default/recovery.tpl:94
#: plugins/admin/users/password.tpl:17 plugins/admin/users/password.tpl:60
-#: plugins/admin/users/class_userManagement.inc:312
+#: plugins/admin/users/class_userManagement.inc:309
#: plugins/personal/password/password.tpl:27
#: plugins/personal/password/password.tpl:78
#: plugins/personal/generic/password.tpl:22
@@ -136,16 +136,16 @@ msgstr ""
msgid "New password"
msgstr ""
-#: html/class_passwordRecovery.inc:411
+#: html/class_passwordRecovery.inc:406
msgid "The password used as new is too short."
msgstr ""
-#: html/class_passwordRecovery.inc:413
+#: html/class_passwordRecovery.inc:408
#: plugins/personal/password/class_password.inc:121
msgid "The password contains possibly problematic Unicode characters!"
msgstr ""
-#: html/class_passwordRecovery.inc:437 html/index.php:58 html/index.php:64
+#: html/class_passwordRecovery.inc:432 html/index.php:58 html/index.php:64
#: html/index.php:403 ihtml/themes/default/conflict.tpl:6
#: ihtml/themes/default/islocked.tpl:6 ihtml/themes/default/remove.tpl:2
#: ihtml/themes/default/msg_dialog.tpl:59
@@ -168,39 +168,39 @@ msgstr ""
msgid "Warning"
msgstr ""
-#: html/class_passwordRecovery.inc:438
+#: html/class_passwordRecovery.inc:433
msgid "Session will not be encrypted."
msgstr ""
-#: html/class_passwordRecovery.inc:440
+#: html/class_passwordRecovery.inc:435
msgid "Enter SSL session"
msgstr ""
-#: html/class_passwordRecovery.inc:481
+#: html/class_passwordRecovery.inc:476
#, php-format
msgid "Did not found account %s"
msgstr ""
-#: html/class_passwordRecovery.inc:484
+#: html/class_passwordRecovery.inc:479
#, php-format
msgid "Found multiple accounts %s"
msgstr ""
-#: html/class_passwordRecovery.inc:498 ihtml/themes/default/recovery.tpl:142
+#: html/class_passwordRecovery.inc:493 ihtml/themes/default/recovery.tpl:142
msgid "Adresse mail"
msgstr ""
-#: html/class_passwordRecovery.inc:515
+#: html/class_passwordRecovery.inc:510
#, php-format
msgid "There is no account using email %s"
msgstr ""
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:513
#, php-format
msgid "There are several accounts using email %s"
msgstr ""
-#: html/class_passwordRecovery.inc:543 html/index.php:257 html/index.php:269
+#: html/class_passwordRecovery.inc:538 html/index.php:257 html/index.php:269
#: html/index.php:282 setup/class_setupStep_Migrate.inc:1138
#: setup/class_setupStep_Migrate.inc:1164
#: setup/class_setupStep_Migrate.inc:1213
@@ -212,20 +212,17 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:2549
#: setup/class_setupStep_Migrate.inc:2896
#: setup/class_setupStep_Migrate.inc:2910
-#: include/class_SnapshotHandler.inc:150 include/class_SnapshotHandler.inc:329
-#: include/class_SnapshotHandler.inc:378 include/class_SnapshotHandler.inc:382
-#: include/class_SnapshotHandler.inc:402 include/class_SnapshotHandler.inc:445
-#: include/class_SnapshotHandler.inc:508 include/class_SnapshotHandler.inc:577
-#: include/class_SnapshotHandler.inc:592 include/functions.inc:547
+#: include/class_SnapshotHandler.inc:150 include/class_SnapshotHandler.inc:335
+#: include/class_SnapshotHandler.inc:388 include/class_SnapshotHandler.inc:392
+#: include/class_SnapshotHandler.inc:412 include/class_SnapshotHandler.inc:455
+#: include/class_SnapshotHandler.inc:518 include/class_SnapshotHandler.inc:587
+#: include/class_SnapshotHandler.inc:602 include/functions.inc:547
#: include/functions.inc:583 include/functions.inc:591
#: include/functions.inc:639 include/functions.inc:948
#: include/functions.inc:998 include/functions.inc:1058
#: include/functions.inc:1113 include/functions.inc:3244
-#: include/functions.inc:3509 include/class_config.inc:330
-#: include/class_plugin.inc:1500 include/class_plugin.inc:1550
-#: include/class_plugin.inc:1554 include/class_plugin.inc:1574
-#: include/class_plugin.inc:1621 include/class_plugin.inc:1681
-#: include/class_plugin.inc:1751 include/class_plugin.inc:1766
+#: include/functions.inc:3514 include/class_SnapShotDialog.inc:104
+#: include/class_SnapShotDialog.inc:177 include/class_config.inc:330
#: include/class_acl.inc:1308 include/class_acl.inc:1413
#: include/class_ldap.inc:934 include/class_ldap.inc:1421
#: plugins/admin/acl/class_aclRole.inc:613
@@ -244,19 +241,19 @@ msgstr ""
msgid "LDAP error"
msgstr "خطای LDAP"
-#: html/class_passwordRecovery.inc:566
+#: html/class_passwordRecovery.inc:561
msgid "Contact your administrator, there was a problem with mail server"
msgstr ""
-#: html/class_passwordRecovery.inc:577
+#: html/class_passwordRecovery.inc:572
msgid "This token is invalid"
msgstr ""
-#: html/class_passwordRecovery.inc:615
+#: html/class_passwordRecovery.inc:610
msgid "External password changer reported a problem: "
msgstr ""
-#: html/class_passwordRecovery.inc:640
+#: html/class_passwordRecovery.inc:635
msgid "There was a problem with mail server, confirmation email not sent"
msgstr ""
@@ -274,6 +271,13 @@ msgid ""
"overridden by php.ini settings."
msgstr ""
+#: html/index.php:147
+#, php-format
+msgid ""
+"FusionDirectory configuration %s/%s is not readable. Please run "
+"fusiondirectory-setup --check-config to fix this."
+msgstr ""
+
#: html/index.php:163
msgid "Smarty error"
msgstr ""
@@ -288,22 +292,22 @@ msgstr ""
#: setup/setup_checks.tpl:91 setup/class_setupStep_Migrate.inc:1127
#: include/class_xml.inc:57 include/class_tabs.inc:74
#: include/class_management.inc:507 include/class_management.inc:657
-#: include/functions.inc:3613 include/functions.inc:3633
-#: include/functions.inc:3663 include/functions.inc:3671
-#: include/functions.inc:3683 include/functions.inc:3687
-#: include/functions.inc:3702 include/functions.inc:3711
-#: include/functions.inc:3779 include/class_listing.inc:522
+#: include/functions.inc:3618 include/functions.inc:3638
+#: include/functions.inc:3668 include/functions.inc:3676
+#: include/functions.inc:3688 include/functions.inc:3692
+#: include/functions.inc:3707 include/functions.inc:3716
+#: include/functions.inc:3784 include/class_listing.inc:521
#: include/class_config.inc:483 include/class_CopyPasteHandler.inc:264
#: include/password-methods/class_password-methods-sasl.inc:51
#: include/password-methods/class_password-methods-sasl.inc:63
#: include/password-methods/class_password-methods.inc:342
#: include/password-methods/class_password-methods.inc:447
#: include/password-methods/class_password-methods.inc:458
-#: include/class_plugin.inc:1368 include/class_plugin.inc:1843
-#: include/class_msg_dialog.inc:128 include/class_msgPool.inc:215
-#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:680 include/class_msgPool.inc:711
-#: include/class_msgPool.inc:738 include/class_databaseManagement.inc:78
+#: include/class_plugin.inc:1367 include/class_msg_dialog.inc:128
+#: include/class_msgPool.inc:215 include/class_msgPool.inc:235
+#: include/class_msgPool.inc:265 include/class_msgPool.inc:680
+#: include/class_msgPool.inc:711 include/class_msgPool.inc:738
+#: include/class_databaseManagement.inc:78
#: plugins/admin/acl/class_aclRole.inc:681
#: plugins/admin/groups/class_group.inc:521
#: plugins/admin/groups/class_group.inc:527
@@ -967,131 +971,128 @@ msgid ""
"databases."
msgstr ""
-#: setup/class_setupStep_Checks.inc:136
-msgid "MDB2 mysql"
-msgstr ""
-
-#: setup/class_setupStep_Checks.inc:137
+#: setup/class_setupStep_Checks.inc:134
msgid ""
-"FusionDirectory requires this module to communicate with mysql databases."
+"If you do not want to install MDB2 and won't use databases, remove the "
+"class_databaseManagement.inc file."
msgstr ""
-#: setup/class_setupStep_Checks.inc:143
+#: setup/class_setupStep_Checks.inc:138
msgid "imagick"
msgstr ""
-#: setup/class_setupStep_Checks.inc:144
+#: setup/class_setupStep_Checks.inc:139
msgid "FusionDirectory requires this extension to handle images."
msgstr ""
-#: setup/class_setupStep_Checks.inc:159
+#: setup/class_setupStep_Checks.inc:154
msgid "compression module"
msgstr ""
-#: setup/class_setupStep_Checks.inc:160
+#: setup/class_setupStep_Checks.inc:155
msgid "FusionDirectory requires this extension to handle snapshots."
msgstr ""
-#: setup/class_setupStep_Checks.inc:171
+#: setup/class_setupStep_Checks.inc:166
msgid ""
"register_globals is a PHP mechanism to register all global variables to be "
"accessible from scripts without changing the scope. This may be a security "
"risk."
msgstr ""
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStep_Checks.inc:167
msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:180
+#: setup/class_setupStep_Checks.inc:175
msgid "PHP uses this value for the garbage collector to delete old sessions."
msgstr ""
-#: setup/class_setupStep_Checks.inc:181
+#: setup/class_setupStep_Checks.inc:176
msgid ""
"Setting this value to one day will prevent loosing session and cookies "
"before they really timeout."
msgstr ""
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStep_Checks.inc:177
msgid ""
"Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
"higher."
msgstr ""
-#: setup/class_setupStep_Checks.inc:189 setup/class_setupStep_Checks.inc:205
-#: setup/class_setupStep_Checks.inc:221 setup/class_setupStep_Checks.inc:229
+#: setup/class_setupStep_Checks.inc:184 setup/class_setupStep_Checks.inc:200
+#: setup/class_setupStep_Checks.inc:216 setup/class_setupStep_Checks.inc:224
msgid "Off"
msgstr ""
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStep_Checks.inc:185
msgid ""
"In Order to use FusionDirectory without any trouble, the session.auto_start "
"option in your php.ini should be set to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStep_Checks.inc:186
msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStep_Checks.inc:193
msgid ""
"FusionDirectory needs at least 128MB of memory. Setting it below this limit "
"may cause errors that are not reproducable! Increase it for larger setups."
msgstr ""
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStep_Checks.inc:194
msgid ""
"Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
msgstr ""
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStep_Checks.inc:201
msgid ""
"This option influences the PHP output handling. Turn this Option off, to "
"increase performance."
msgstr ""
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStep_Checks.inc:202
msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStep_Checks.inc:209
msgid "The Execution time should be at least 30 seconds."
msgstr ""
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStep_Checks.inc:210
msgid ""
"Search for 'max_execution_time' in your php.ini and set it to '30' or higher."
msgstr ""
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStep_Checks.inc:217
msgid ""
"Increase the server security by setting expose_php to 'off'. PHP won't send "
"any information about the server you are running in this case."
msgstr ""
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStep_Checks.inc:218
msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:230
+#: setup/class_setupStep_Checks.inc:225
msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:231
+#: setup/class_setupStep_Checks.inc:226
msgid ""
"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:241
+#: setup/class_setupStep_Checks.inc:236
msgid "Configuration writeable"
msgstr ""
-#: setup/class_setupStep_Checks.inc:242
+#: setup/class_setupStep_Checks.inc:237
msgid "The configuration file can't be written"
msgstr ""
-#: setup/class_setupStep_Checks.inc:243
+#: setup/class_setupStep_Checks.inc:238
#, php-format
msgid ""
"FusionDirectory reads its configuration from a file located in (%s/%s). The "
@@ -1639,7 +1640,7 @@ msgstr ""
#: plugins/admin/departments/class_organizationGeneric.inc:115
#: plugins/admin/departments/class_organizationGeneric.inc:118
#: plugins/personal/generic/class_user.inc:1395
-#: plugins/personal/generic/generic.tpl:300
+#: plugins/personal/generic/generic.tpl:277
msgid "Organization"
msgstr ""
@@ -1649,8 +1650,8 @@ msgstr ""
#: plugins/admin/acl/class_aclRole.inc:702
#: plugins/admin/acl/class_aclRole.inc:715
#: plugins/admin/acl/class_aclRole.inc:725
-#: plugins/admin/users/class_userManagement.inc:545
-#: plugins/admin/users/class_userManagement.inc:592
+#: plugins/admin/users/class_userManagement.inc:542
+#: plugins/admin/users/class_userManagement.inc:589
#: plugins/admin/users/user-filter.tpl:26
#: plugins/admin/groups/group-filter.tpl:21
#: plugins/admin/groups/userSelect/user-filter.tpl:17
@@ -1731,7 +1732,7 @@ msgid ""
msgstr ""
#: setup/setup_feedback.tpl:52
-#: plugins/admin/users/class_userManagement.inc:903
+#: plugins/admin/users/class_userManagement.inc:900
#: plugins/admin/groups/class_group.inc:1106
#: plugins/admin/departments/class_department.inc:653
#: plugins/admin/ogroups/class_ogroup.inc:895
@@ -1871,7 +1872,7 @@ msgstr ""
#: setup/setup_migrate.tpl:101 setup/setup_migrate.tpl:153
#: setup/setup_migrate.tpl:320 setup/setup_migrate.tpl:373
#: setup/setup_migrate.tpl:416 setup/setup_migrate.tpl:459
-#: setup/setup_migrate.tpl:503 include/class_listing.inc:352
+#: setup/setup_migrate.tpl:503 include/class_listing.inc:351
msgid "Select all"
msgstr ""
@@ -2339,7 +2340,7 @@ msgid "Group will be moved from"
msgstr ""
#: setup/class_setupStep_Migrate.inc:1175
-#: setup/class_setupStep_Migrate.inc:1223 include/class_plugin.inc:2083
+#: setup/class_setupStep_Migrate.inc:1223 include/class_plugin.inc:1675
msgid "to"
msgstr ""
@@ -2414,8 +2415,7 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:2647 include/class_msgPool.inc:495
#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:83
#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:138
-#: plugins/personal/generic/generic.tpl:251
-#: plugins/personal/generic/generic.tpl:270
+#: plugins/personal/generic/generic.tpl:249
#, php-format
msgid "Add"
msgstr ""
@@ -2536,28 +2536,25 @@ msgstr ""
#: include/class_management.inc:333 include/class_management.inc:483
#: include/class_management.inc:536 include/class_management.inc:576
#: include/class_management.inc:590 include/class_CopyPasteHandler.inc:223
-#: include/class_plugin.inc:1791 include/class_plugin.inc:1803
-#: include/class_plugin.inc:1818 include/class_plugin.inc:1831
-#: plugins/admin/users/class_userManagement.inc:205
-#: plugins/admin/users/class_userManagement.inc:761
+#: plugins/admin/users/class_userManagement.inc:202
+#: plugins/admin/users/class_userManagement.inc:758
msgid "Permission"
msgstr "جواز"
#: include/class_management.inc:403
-#: plugins/admin/acl/class_aclManagement.inc:100
-#: plugins/admin/users/class_userManagement.inc:719
-#: plugins/admin/users/class_userManagement.inc:723
+#: plugins/admin/acl/class_aclManagement.inc:101
+#: plugins/admin/users/class_userManagement.inc:716
+#: plugins/admin/users/class_userManagement.inc:720
msgid "Permission error"
msgstr ""
-#: include/class_management.inc:483 include/class_plugin.inc:1791
+#: include/class_management.inc:483
#, php-format
msgid "You are not allowed to create a snapshot for %s."
msgstr ""
#: include/class_management.inc:536 include/class_management.inc:576
-#: include/class_management.inc:590 include/class_plugin.inc:1803
-#: include/class_plugin.inc:1818 include/class_plugin.inc:1831
+#: include/class_management.inc:590
#, php-format
msgid "You are not allowed to restore a snapshot for %s."
msgstr ""
@@ -2758,87 +2755,87 @@ msgid ""
"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
msgstr ""
-#: include/functions.inc:3613 include/functions.inc:3633
-#: include/functions.inc:3671 include/functions.inc:3683
-#: include/functions.inc:3687 include/functions.inc:3702
-#: include/functions.inc:3711
+#: include/functions.inc:3618 include/functions.inc:3638
+#: include/functions.inc:3676 include/functions.inc:3688
+#: include/functions.inc:3692 include/functions.inc:3707
+#: include/functions.inc:3716
msgid "Cannot allocate a free ID:"
msgstr ""
-#: include/functions.inc:3613
+#: include/functions.inc:3618
msgid "unknown idAllocation method!"
msgstr ""
-#: include/functions.inc:3633
+#: include/functions.inc:3638
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3663
+#: include/functions.inc:3668
msgid "Cannot create sambaUnixIdPool entry!"
msgstr ""
-#: include/functions.inc:3671
+#: include/functions.inc:3676
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3683 include/functions.inc:3687
+#: include/functions.inc:3688 include/functions.inc:3692
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3711
+#: include/functions.inc:3716
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3779
+#: include/functions.inc:3784
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/class_listing.inc:291 include/class_listing.inc:1099
-#: include/class_listing.inc:1101 include/class_sortableListing.inc:343
+#: include/class_listing.inc:290 include/class_listing.inc:1105
+#: include/class_listing.inc:1107 include/class_sortableListing.inc:343
#: include/class_acl.inc:504 plugins/admin/acl/class_aclRole.inc:372
msgid "Up"
msgstr ""
-#: include/class_listing.inc:291 include/class_sortableListing.inc:343
+#: include/class_listing.inc:290 include/class_sortableListing.inc:343
#: include/class_acl.inc:506 plugins/admin/acl/class_aclRole.inc:374
msgid "Down"
msgstr ""
-#: include/class_listing.inc:564
+#: include/class_listing.inc:563
msgid "created by"
msgstr ""
-#: include/class_listing.inc:1091
+#: include/class_listing.inc:1097
msgid "Go to root department"
msgstr ""
-#: include/class_listing.inc:1091 include/class_listing.inc:1093
+#: include/class_listing.inc:1097 include/class_listing.inc:1099
#: include/class_baseSelector.inc:205
msgid "Root"
msgstr ""
-#: include/class_listing.inc:1099
+#: include/class_listing.inc:1105
msgid "Go up one department"
msgstr ""
-#: include/class_listing.inc:1107
+#: include/class_listing.inc:1113
msgid "Go to users department"
msgstr ""
-#: include/class_listing.inc:1107 include/class_listing.inc:1109
+#: include/class_listing.inc:1113 include/class_listing.inc:1115
msgid "Home"
msgstr ""
-#: include/class_listing.inc:1114
+#: include/class_listing.inc:1120
msgid "Reload list"
msgstr ""
-#: include/class_listing.inc:1114 include/class_baseSelector.inc:252
+#: include/class_listing.inc:1120 include/class_baseSelector.inc:252
msgid "Submit"
msgstr ""
-#: include/class_listing.inc:1211 plugins/admin/acl/acl-list.xml:65
+#: include/class_listing.inc:1217 plugins/admin/acl/acl-list.xml:65
#: plugins/admin/users/user-list.xml:78 plugins/admin/groups/group-list.xml:79
#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:64
#: plugins/admin/departments/dep-list.xml:87
@@ -2846,65 +2843,62 @@ msgstr ""
msgid "Actions"
msgstr ""
-#: include/class_listing.inc:1495 include/class_listing.inc:1545
-#: include/class_plugin.inc:2228
+#: include/class_listing.inc:1501 include/class_listing.inc:1551
msgid "Copy"
msgstr ""
-#: include/class_listing.inc:1501 include/class_listing.inc:1535
-#: include/class_plugin.inc:2232
+#: include/class_listing.inc:1507 include/class_listing.inc:1541
msgid "Cut"
msgstr ""
-#: include/class_listing.inc:1509 include/class_listing.inc:1511
-#: include/class_CopyPasteHandler.inc:400 include/class_plugin.inc:2239
-#: include/class_plugin.inc:2242
+#: include/class_listing.inc:1515 include/class_listing.inc:1517
+#: include/class_CopyPasteHandler.inc:400
msgid "Paste"
msgstr ""
-#: include/class_listing.inc:1535 include/class_plugin.inc:2186
+#: include/class_listing.inc:1541
msgid "Cut this entry"
msgstr ""
-#: include/class_listing.inc:1545 include/class_plugin.inc:2194
+#: include/class_listing.inc:1551
msgid "Copy this entry"
msgstr ""
-#: include/class_listing.inc:1577 include/class_listing.inc:1579
+#: include/class_listing.inc:1583 include/class_listing.inc:1585
msgid "Restore snapshots"
msgstr ""
-#: include/class_listing.inc:1593
+#: include/class_listing.inc:1599
msgid "Export list"
msgstr ""
-#: include/class_listing.inc:1628 include/class_listing.inc:1629
-#: include/class_SnapShotDialog.inc:153 include/class_plugin.inc:2160
+#: include/class_listing.inc:1634 include/class_listing.inc:1635
+#: include/class_SnapShotDialog.inc:298
msgid "Restore snapshot"
msgstr ""
-#: include/class_listing.inc:1638 include/class_plugin.inc:2167
+#: include/class_listing.inc:1644
msgid "Create snapshot"
msgstr ""
-#: include/class_listing.inc:1639 include/class_plugin.inc:2168
+#: include/class_listing.inc:1645
msgid "Create a new snapshot from this object"
msgstr ""
-#: include/class_SnapShotDialog.inc:99
+#: include/class_SnapShotDialog.inc:244
#, php-format
msgid "You're about to delete the snapshot '%s'."
msgstr ""
-#: include/class_SnapShotDialog.inc:155
+#: include/class_SnapShotDialog.inc:300
msgid "Remove snapshot"
msgstr ""
-#: include/class_SnapShotDialog.inc:157 include/class_SnapShotDialog.inc:177
+#: include/class_SnapShotDialog.inc:302 include/class_SnapShotDialog.inc:322
msgid "Y-m-d, H:i:s"
msgstr ""
-#: include/class_SnapShotDialog.inc:191 plugins/admin/acl/acl-list.xml:57
+#: include/class_SnapShotDialog.inc:336 plugins/admin/acl/acl-list.xml:57
#: plugins/admin/acl/acl_role.tpl:17 plugins/admin/acl/class_aclRole.inc:704
#: plugins/admin/groups/class_group.inc:1114
#: plugins/admin/groups/group-list.xml:66 plugins/admin/groups/generic.tpl:24
@@ -2979,32 +2973,20 @@ msgstr ""
msgid "Cannot find a suitable password method for the current hash!"
msgstr ""
-#: include/class_plugin.inc:563
+#: include/class_plugin.inc:562
msgid ""
"The object has changed since opened in FusionDirectory. All changes that may "
"be done by others get lost if you save this entry!"
msgstr ""
-#: include/class_plugin.inc:2082
+#: include/class_plugin.inc:1674
msgid "Changing ACL dn"
msgstr ""
-#: include/class_plugin.inc:2082
+#: include/class_plugin.inc:1674
msgid "from"
msgstr ""
-#: include/class_plugin.inc:2136 include/class_plugin.inc:2138
-msgid "Restore"
-msgstr ""
-
-#: include/class_plugin.inc:2186
-msgid "cut"
-msgstr ""
-
-#: include/class_plugin.inc:2194
-msgid "copy"
-msgstr ""
-
#: include/class_sortableListing.inc:303
msgid "Sortable list"
msgstr ""
@@ -3873,15 +3855,14 @@ msgstr ""
msgid "List of acls"
msgstr ""
-#: plugins/admin/acl/acl-list.xml:15
+#: plugins/admin/acl/acl-list.xml:15 plugins/admin/acl/acl-list.xml:82
#: plugins/admin/acl/class_aclManagement.inc:36
msgid "Acl"
msgstr ""
-#: plugins/admin/acl/acl-list.xml:23 plugins/admin/acl/acl-list.xml:82
-#: plugins/admin/acl/class_aclRole.inc:695
+#: plugins/admin/acl/acl-list.xml:23 plugins/admin/acl/class_aclRole.inc:695
#: plugins/personal/generic/class_user.inc:1367
-#: plugins/personal/generic/generic.tpl:515
+#: plugins/personal/generic/generic.tpl:492
msgid "Role"
msgstr ""
@@ -3921,7 +3902,7 @@ msgstr ""
msgid "Access control list management"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:160
+#: plugins/admin/acl/class_aclManagement.inc:161
msgid "ACL Assignment"
msgstr ""
@@ -4041,7 +4022,7 @@ msgid ""
msgstr ""
#: plugins/admin/users/template.tpl:15
-#: plugins/admin/users/class_userManagement.inc:542
+#: plugins/admin/users/class_userManagement.inc:539
#: plugins/admin/users/templatize.tpl:15 plugins/admin/users/user-list.xml:15
#: plugins/admin/users/user-list.xml:102
msgid "Template"
@@ -4076,23 +4057,23 @@ msgstr ""
msgid "Manage users"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:344
+#: plugins/admin/users/class_userManagement.inc:341
#: plugins/personal/password/class_password.inc:136
#, php-format
msgid "Check-hook reported a problem: %s. Password change canceled!"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:394
+#: plugins/admin/users/class_userManagement.inc:391
msgid "You have no permission to change this users password!"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:470
-#: plugins/admin/users/class_userManagement.inc:504
-#: plugins/admin/users/class_userManagement.inc:535
+#: plugins/admin/users/class_userManagement.inc:467
+#: plugins/admin/users/class_userManagement.inc:501
+#: plugins/admin/users/class_userManagement.inc:532
msgid "none"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:548
+#: plugins/admin/users/class_userManagement.inc:545
#: plugins/admin/users/user-list.xml:57
#: plugins/admin/groups/userSelect/user-list.xml:40
#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
@@ -4102,26 +4083,26 @@ msgstr ""
msgid "Given name"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:799
+#: plugins/admin/users/class_userManagement.inc:796
msgid "Account locking"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:800
+#: plugins/admin/users/class_userManagement.inc:797
#, php-format
msgid ""
"Password method '%s' does not support locking. Account (%s) has not been "
"locked!"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:873
+#: plugins/admin/users/class_userManagement.inc:870
msgid "Unlock account"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:875
+#: plugins/admin/users/class_userManagement.inc:872
msgid "Lock account"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:903
+#: plugins/admin/users/class_userManagement.inc:900
msgid "Generic properties"
msgstr ""
@@ -4210,8 +4191,9 @@ msgid "Remove user"
msgstr ""
#: plugins/admin/password/class_recoveryConfig.inc:35
-msgid "Password recovery config"
-msgstr ""
+#, fuzzy
+msgid "Password recovery"
+msgstr "تغییر کلمه عبور"
#: plugins/admin/password/class_recoveryConfig.inc:36
msgid "Settings for the password recovery feature"
@@ -4526,7 +4508,6 @@ msgstr ""
#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:23
#: plugins/admin/ogroups/class_ogroupManagement.inc:187
#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:79
-#: plugins/admin/ogroups/ogroup-list.xml:79
#: plugins/generic/references/class_reference.inc:55
#: plugins/personal/posix/groupSelect/group-list.xml:15
msgid "Group"
@@ -4618,8 +4599,8 @@ msgstr ""
#: plugins/generic/references/class_reference.inc:59
#: plugins/personal/posix/trustSelect/class_trustSelect.inc:81
#: plugins/personal/generic/class_user.inc:1180
-#: plugins/personal/generic/generic.tpl:399
-#: plugins/personal/generic/generic.tpl:586
+#: plugins/personal/generic/generic.tpl:376
+#: plugins/personal/generic/generic.tpl:563
msgid "Phone"
msgstr "تلÙÙ†"
@@ -4718,7 +4699,7 @@ msgstr ""
#: plugins/admin/departments/generic.tpl:91
#: plugins/admin/departments/class_organizationGeneric.inc:129
#: plugins/personal/generic/class_user.inc:1410
-#: plugins/personal/generic/generic.tpl:448
+#: plugins/personal/generic/generic.tpl:425
msgid "Location"
msgstr ""
@@ -4735,8 +4716,8 @@ msgstr ""
#: plugins/admin/departments/generic.tpl:51
#: plugins/admin/departments/class_organizationGeneric.inc:126
#: plugins/personal/generic/class_user.inc:1399
-#: plugins/personal/generic/generic.tpl:341
-#: plugins/personal/generic/generic.tpl:362
+#: plugins/personal/generic/generic.tpl:318
+#: plugins/personal/generic/generic.tpl:339
msgid "Manager"
msgstr ""
@@ -4874,7 +4855,7 @@ msgstr ""
#: plugins/admin/departments/generic.tpl:83
#: plugins/admin/departments/class_organizationGeneric.inc:128
#: plugins/personal/generic/class_user.inc:1409
-#: plugins/personal/generic/generic.tpl:456
+#: plugins/personal/generic/generic.tpl:433
msgid "State"
msgstr ""
@@ -4892,7 +4873,7 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:667
#: plugins/admin/departments/generic.tpl:99
#: plugins/personal/generic/generic.tpl:181
-#: plugins/personal/generic/generic.tpl:464
+#: plugins/personal/generic/generic.tpl:441
msgid "Address"
msgstr "آدرس"
@@ -4912,8 +4893,8 @@ msgstr ""
#: plugins/admin/departments/generic.tpl:114
#: plugins/admin/departments/class_organizationGeneric.inc:132
#: plugins/personal/generic/class_user.inc:1183
-#: plugins/personal/generic/generic.tpl:430
-#: plugins/personal/generic/generic.tpl:598
+#: plugins/personal/generic/generic.tpl:407
+#: plugins/personal/generic/generic.tpl:575
msgid "Fax"
msgstr ""
@@ -4964,7 +4945,7 @@ msgstr "کشور"
#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:15
#: plugins/generic/references/class_reference.inc:57
#: plugins/personal/generic/class_user.inc:1396
-#: plugins/personal/generic/generic.tpl:308
+#: plugins/personal/generic/generic.tpl:285
msgid "Department"
msgstr "دپارتمان"
@@ -5268,6 +5249,10 @@ msgstr ""
msgid "List of object groups"
msgstr ""
+#: plugins/admin/ogroups/ogroup-list.xml:79
+msgid "Objectgroup"
+msgstr ""
+
#: plugins/admin/ogroups/ogroup-list.xml:106
msgid "Send message"
msgstr ""
@@ -5339,7 +5324,8 @@ msgstr ""
#: plugins/config/class_configInLdap.inc:82
msgid ""
-"Default language to be used if the one asked by the browser is not available"
+"Language of the application. If 'automatic' or not available, the one asked "
+"by the browser will be used. This setting can be overriden per user."
msgstr ""
#: plugins/config/class_configInLdap.inc:87
@@ -5355,7 +5341,7 @@ msgid "Schema setup"
msgstr ""
#: plugins/config/class_configInLdap.inc:103
-msgid "rfc237bis"
+msgid "rfc2307bis"
msgstr ""
#: plugins/config/class_configInLdap.inc:104
@@ -6057,12 +6043,12 @@ msgid "Homepage"
msgstr ""
#: plugins/personal/generic/class_user.inc:1186
-#: plugins/personal/generic/generic.tpl:411
+#: plugins/personal/generic/generic.tpl:388
msgid "Mobile"
msgstr "تلÙÙ† همراه"
#: plugins/personal/generic/class_user.inc:1189
-#: plugins/personal/generic/generic.tpl:422
+#: plugins/personal/generic/generic.tpl:399
msgid "Pager"
msgstr "پیجر"
@@ -6073,57 +6059,57 @@ msgid "Date of birth"
msgstr ""
#: plugins/personal/generic/class_user.inc:1357
-#: plugins/personal/generic/generic.tpl:538
+#: plugins/personal/generic/generic.tpl:515
msgid "Unit"
msgstr ""
#: plugins/personal/generic/class_user.inc:1358
-#: plugins/personal/generic/generic.tpl:563
+#: plugins/personal/generic/generic.tpl:540
msgid "House identifier"
msgstr ""
#: plugins/personal/generic/class_user.inc:1359
-#: plugins/personal/generic/generic.tpl:480
+#: plugins/personal/generic/generic.tpl:457
msgid "Vocation"
msgstr ""
#: plugins/personal/generic/class_user.inc:1360
-#: plugins/personal/generic/generic.tpl:607
+#: plugins/personal/generic/generic.tpl:584
msgid "Last delivery"
msgstr ""
#: plugins/personal/generic/class_user.inc:1361
-#: plugins/personal/generic/generic.tpl:529
+#: plugins/personal/generic/generic.tpl:506
msgid "Person locality"
msgstr ""
#: plugins/personal/generic/class_user.inc:1362
-#: plugins/personal/generic/generic.tpl:488
+#: plugins/personal/generic/generic.tpl:465
msgid "Unit description"
msgstr ""
#: plugins/personal/generic/class_user.inc:1363
-#: plugins/personal/generic/generic.tpl:497
+#: plugins/personal/generic/generic.tpl:474
msgid "Subject area"
msgstr ""
#: plugins/personal/generic/class_user.inc:1364
-#: plugins/personal/generic/generic.tpl:506
+#: plugins/personal/generic/generic.tpl:483
msgid "Functional title"
msgstr ""
#: plugins/personal/generic/class_user.inc:1365
-#: plugins/personal/generic/generic.tpl:616
+#: plugins/personal/generic/generic.tpl:593
msgid "Public visible"
msgstr ""
#: plugins/personal/generic/class_user.inc:1366
-#: plugins/personal/generic/generic.tpl:547
+#: plugins/personal/generic/generic.tpl:524
msgid "Street"
msgstr ""
#: plugins/personal/generic/class_user.inc:1368
-#: plugins/personal/generic/generic.tpl:555
+#: plugins/personal/generic/generic.tpl:532
msgid "Postal code"
msgstr "کد پستی"
@@ -6172,7 +6158,7 @@ msgid "Employee number"
msgstr ""
#: plugins/personal/generic/class_user.inc:1401
-#: plugins/personal/generic/generic.tpl:332
+#: plugins/personal/generic/generic.tpl:309
msgid "Employee type"
msgstr ""
@@ -6253,29 +6239,28 @@ msgstr ""
msgid "Restrict login to"
msgstr ""
-#: plugins/personal/generic/generic.tpl:248
-#: plugins/personal/generic/generic.tpl:267
+#: plugins/personal/generic/generic.tpl:246
msgid "IP or network"
msgstr ""
-#: plugins/personal/generic/generic.tpl:288
+#: plugins/personal/generic/generic.tpl:265
msgid "Organizational information"
msgstr ""
-#: plugins/personal/generic/generic.tpl:316
+#: plugins/personal/generic/generic.tpl:293
msgid "Department No."
msgstr ""
-#: plugins/personal/generic/generic.tpl:324
+#: plugins/personal/generic/generic.tpl:301
msgid "Employee No."
msgstr ""
-#: plugins/personal/generic/generic.tpl:390
-#: plugins/personal/generic/generic.tpl:578
+#: plugins/personal/generic/generic.tpl:367
+#: plugins/personal/generic/generic.tpl:555
msgid "Room No."
msgstr ""
-#: plugins/personal/generic/generic.tpl:592
+#: plugins/personal/generic/generic.tpl:569
msgid "Please use the phone tab"
msgstr ""
diff --git a/locale/fr/messages.po b/locale/fr/fusiondirectory.po
similarity index 95%
rename from locale/fr/messages.po
rename to locale/fr/fusiondirectory.po
index abef540a857bf35efda56c75f84c65b90644e279..27b68e7774d20b9f0be0e11cf20c51726ba59a98 100644
--- a/locale/fr/messages.po
+++ b/locale/fr/fusiondirectory.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-24 14:48+0100\n"
-"PO-Revision-Date: 2013-03-06 21:40+0000\n"
+"POT-Creation-Date: 2013-04-14 20:13+0200\n"
+"PO-Revision-Date: 2013-04-07 21:20+0000\n"
"Last-Translator: gallak <antoine.gallavardin@free.fr>\n"
"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory/"
"language/fr/)\n"
@@ -24,23 +24,23 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: html/main.php:140 html/class_passwordRecovery.inc:226
+#: html/main.php:135 html/class_passwordRecovery.inc:226
#: include/class_xml.inc:60 include/functions.inc:509
#: plugins/admin/departments/class_department.inc:431
msgid "Fatal error"
msgstr "Erreur Fatale"
-#: html/main.php:141
+#: html/main.php:136
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr ""
"Je n'ai pas trouvé '%s' - veuillez exécuter '%s' pour régler ce problème"
-#: html/main.php:162
+#: html/main.php:157
msgid "PHP configuration"
msgstr "Configuration de PHP"
-#: html/main.php:163
+#: html/main.php:158
msgid ""
"Fatal error: Register globals is on. FusionDirectory will refuse to login "
"unless this is fixed by an administrator."
@@ -49,19 +49,19 @@ msgstr ""
"utilisateurs de se connecter tant que ceci n'est pas corrigé par un "
"administrateur."
-#: html/main.php:192 ihtml/themes/default/password.tpl:40
-#: plugins/admin/users/class_userManagement.inc:393
+#: html/main.php:187 ihtml/themes/default/password.tpl:40
+#: plugins/admin/users/class_userManagement.inc:390
#: plugins/personal/password/class_password.inc:156
#: plugins/personal/password/class_password.inc:162
msgid "Password change"
msgstr "Changement de mot de passe"
-#: html/main.php:192
+#: html/main.php:187
msgid "Your password is about to expire, please change your password!"
msgstr ""
"Votre mot de passe va bientôt expirer, veuillez changer votre mot de passe !"
-#: html/main.php:261 html/class_passwordRecovery.inc:301 html/index.php:147
+#: html/main.php:256 html/class_passwordRecovery.inc:296 html/index.php:147
#: html/index.php:208 include/class_SnapshotHandler.inc:57
#: include/class_SnapshotHandler.inc:70 include/class_SnapshotHandler.inc:88
#: include/class_pluglist.inc:272 include/functions.inc:933
@@ -75,19 +75,19 @@ msgstr ""
msgid "Configuration error"
msgstr "Erreur de configuration"
-#: html/main.php:261
+#: html/main.php:256
msgid "Running out of memory!"
msgstr "Plus de mémoire disponible !"
-#: html/main.php:316
+#: html/main.php:311
msgid "User ACL checks disabled"
msgstr "Les vérifications des ACL de l'utilisateur ont été désactivés"
-#: html/main.php:362
+#: html/main.php:357
msgid "Plugin"
msgstr "Extension"
-#: html/main.php:363
+#: html/main.php:358
#, php-format
msgid ""
"Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not "
@@ -96,11 +96,11 @@ msgstr ""
"Erreur Fatale : Impossible de trouver une définition pour le plugin '%s' ! "
"('%s' n'est pas un fichier)!"
-#: html/main.php:378
+#: html/main.php:373
msgid "Configuration Error"
msgstr "Erreur de configuration"
-#: html/main.php:379
+#: html/main.php:374
#, php-format
msgid ""
"Fatal error: not all POST variables have been transfered by PHP - please "
@@ -118,22 +118,22 @@ msgstr "Format de stockage des mots de passe"
msgid "Error: Password method not available!"
msgstr "Erreur: Méthode de changement de mot de passe non disponible!"
-#: html/class_passwordRecovery.inc:227 html/index.php:147
+#: html/class_passwordRecovery.inc:227
#, php-format
msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
msgstr ""
"Le fichier de configuration de FusionDirectory %s/%s ne peut être lu. "
"Abandon."
-#: html/class_passwordRecovery.inc:302 html/setup.php:63 html/index.php:163
+#: html/class_passwordRecovery.inc:297 html/setup.php:63 html/index.php:163
#, php-format
msgid "Directory '%s' specified as compile directory is not accessible!"
msgstr ""
"Le répertoire '%s' spécifié comme répertoire de compilation est "
"inaccessible !"
-#: html/class_passwordRecovery.inc:407
-#: plugins/admin/users/class_userManagement.inc:309
+#: html/class_passwordRecovery.inc:402
+#: plugins/admin/users/class_userManagement.inc:306
#: plugins/personal/password/class_password.inc:113
msgid ""
"The passwords you've entered as 'New password' and 'Repeated new password' "
@@ -142,13 +142,13 @@ msgstr ""
"Le mot de passe entrée dans le champ 'Nouveau mot de passe' et celui dans le "
"champ 'Répéter le nouveau mot de passe' ne concordent pas."
-#: html/class_passwordRecovery.inc:409 ihtml/themes/default/password.tpl:81
+#: html/class_passwordRecovery.inc:404 ihtml/themes/default/password.tpl:81
#: ihtml/themes/default/password.tpl:82
#: ihtml/themes/default/accountexpired.tpl:32
#: ihtml/themes/default/accountexpired.tpl:36
#: ihtml/themes/default/recovery.tpl:93 ihtml/themes/default/recovery.tpl:94
#: plugins/admin/users/password.tpl:17 plugins/admin/users/password.tpl:60
-#: plugins/admin/users/class_userManagement.inc:312
+#: plugins/admin/users/class_userManagement.inc:309
#: plugins/personal/password/password.tpl:27
#: plugins/personal/password/password.tpl:78
#: plugins/personal/generic/password.tpl:22
@@ -156,18 +156,18 @@ msgstr ""
msgid "New password"
msgstr "Nouveau mot de passe"
-#: html/class_passwordRecovery.inc:411
+#: html/class_passwordRecovery.inc:406
msgid "The password used as new is too short."
msgstr "Le nouveau mot de passe ne comporte pas suffisamment de caractères."
-#: html/class_passwordRecovery.inc:413
+#: html/class_passwordRecovery.inc:408
#: plugins/personal/password/class_password.inc:121
msgid "The password contains possibly problematic Unicode characters!"
msgstr ""
"Le mot de passe contient probablement des caractères Unicode qui sont "
"problématique"
-#: html/class_passwordRecovery.inc:437 html/index.php:58 html/index.php:64
+#: html/class_passwordRecovery.inc:432 html/index.php:58 html/index.php:64
#: html/index.php:403 ihtml/themes/default/conflict.tpl:6
#: ihtml/themes/default/islocked.tpl:6 ihtml/themes/default/remove.tpl:2
#: ihtml/themes/default/msg_dialog.tpl:59
@@ -190,39 +190,39 @@ msgstr ""
msgid "Warning"
msgstr "Avertissement"
-#: html/class_passwordRecovery.inc:438
+#: html/class_passwordRecovery.inc:433
msgid "Session will not be encrypted."
msgstr "La session ne sera pas cryptée."
-#: html/class_passwordRecovery.inc:440
+#: html/class_passwordRecovery.inc:435
msgid "Enter SSL session"
msgstr "Démarrer une session SSL"
-#: html/class_passwordRecovery.inc:481
+#: html/class_passwordRecovery.inc:476
#, php-format
msgid "Did not found account %s"
msgstr "Je n'ai pas trouve le compte %s"
-#: html/class_passwordRecovery.inc:484
+#: html/class_passwordRecovery.inc:479
#, php-format
msgid "Found multiple accounts %s"
msgstr "J'ai trouvé plusieurs comptes %s"
-#: html/class_passwordRecovery.inc:498 ihtml/themes/default/recovery.tpl:142
+#: html/class_passwordRecovery.inc:493 ihtml/themes/default/recovery.tpl:142
msgid "Adresse mail"
msgstr "Adresse de messagerie"
-#: html/class_passwordRecovery.inc:515
+#: html/class_passwordRecovery.inc:510
#, php-format
msgid "There is no account using email %s"
msgstr "Il n'y a pas de compte qui utilise l'adresse de messagerie %s"
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:513
#, php-format
msgid "There are several accounts using email %s"
msgstr "Il n'y a plusieurs comptes qui utilise l'adresse de messagerie %s"
-#: html/class_passwordRecovery.inc:543 html/index.php:257 html/index.php:269
+#: html/class_passwordRecovery.inc:538 html/index.php:257 html/index.php:269
#: html/index.php:282 setup/class_setupStep_Migrate.inc:1138
#: setup/class_setupStep_Migrate.inc:1164
#: setup/class_setupStep_Migrate.inc:1213
@@ -234,20 +234,17 @@ msgstr "Il n'y a plusieurs comptes qui utilise l'adresse de messagerie %s"
#: setup/class_setupStep_Migrate.inc:2549
#: setup/class_setupStep_Migrate.inc:2896
#: setup/class_setupStep_Migrate.inc:2910
-#: include/class_SnapshotHandler.inc:150 include/class_SnapshotHandler.inc:329
-#: include/class_SnapshotHandler.inc:378 include/class_SnapshotHandler.inc:382
-#: include/class_SnapshotHandler.inc:402 include/class_SnapshotHandler.inc:445
-#: include/class_SnapshotHandler.inc:508 include/class_SnapshotHandler.inc:577
-#: include/class_SnapshotHandler.inc:592 include/functions.inc:547
+#: include/class_SnapshotHandler.inc:150 include/class_SnapshotHandler.inc:335
+#: include/class_SnapshotHandler.inc:388 include/class_SnapshotHandler.inc:392
+#: include/class_SnapshotHandler.inc:412 include/class_SnapshotHandler.inc:455
+#: include/class_SnapshotHandler.inc:518 include/class_SnapshotHandler.inc:587
+#: include/class_SnapshotHandler.inc:602 include/functions.inc:547
#: include/functions.inc:583 include/functions.inc:591
#: include/functions.inc:639 include/functions.inc:948
#: include/functions.inc:998 include/functions.inc:1058
#: include/functions.inc:1113 include/functions.inc:3244
-#: include/functions.inc:3509 include/class_config.inc:330
-#: include/class_plugin.inc:1500 include/class_plugin.inc:1550
-#: include/class_plugin.inc:1554 include/class_plugin.inc:1574
-#: include/class_plugin.inc:1621 include/class_plugin.inc:1681
-#: include/class_plugin.inc:1751 include/class_plugin.inc:1766
+#: include/functions.inc:3514 include/class_SnapShotDialog.inc:104
+#: include/class_SnapShotDialog.inc:177 include/class_config.inc:330
#: include/class_acl.inc:1308 include/class_acl.inc:1413
#: include/class_ldap.inc:934 include/class_ldap.inc:1421
#: plugins/admin/acl/class_aclRole.inc:613
@@ -266,22 +263,22 @@ msgstr "Il n'y a plusieurs comptes qui utilise l'adresse de messagerie %s"
msgid "LDAP error"
msgstr "Erreur LDAP"
-#: html/class_passwordRecovery.inc:566
+#: html/class_passwordRecovery.inc:561
msgid "Contact your administrator, there was a problem with mail server"
msgstr ""
"Contactez votre administrateur système, il y a eu un problème avec l'envoi "
"du message"
-#: html/class_passwordRecovery.inc:577
+#: html/class_passwordRecovery.inc:572
msgid "This token is invalid"
msgstr "Le token n'est pas valable"
-#: html/class_passwordRecovery.inc:615
+#: html/class_passwordRecovery.inc:610
msgid "External password changer reported a problem: "
msgstr ""
"Le programme externe pour changer votre mot de passe à renvoyé une erreur: "
-#: html/class_passwordRecovery.inc:640
+#: html/class_passwordRecovery.inc:635
msgid "There was a problem with mail server, confirmation email not sent"
msgstr ""
"Un problème est survenu avec le serveur de messagerie, le mail de "
@@ -303,6 +300,15 @@ msgstr ""
"La durée de validité des sessions configurée dans votre fusiondirectory.conf "
"sera remplacée par celle définie dans votre php.ini."
+#: html/index.php:147
+#, fuzzy, php-format
+msgid ""
+"FusionDirectory configuration %s/%s is not readable. Please run "
+"fusiondirectory-setup --check-config to fix this."
+msgstr ""
+"Le fichier de configuration de FusionDirectory %s/%s ne peut être lu. "
+"Abandon."
+
#: html/index.php:163
msgid "Smarty error"
msgstr "Erreur Smarty"
@@ -317,22 +323,22 @@ msgstr "Il y a une problèmes avec la configuration de l'authentification !"
#: setup/setup_checks.tpl:91 setup/class_setupStep_Migrate.inc:1127
#: include/class_xml.inc:57 include/class_tabs.inc:74
#: include/class_management.inc:507 include/class_management.inc:657
-#: include/functions.inc:3613 include/functions.inc:3633
-#: include/functions.inc:3663 include/functions.inc:3671
-#: include/functions.inc:3683 include/functions.inc:3687
-#: include/functions.inc:3702 include/functions.inc:3711
-#: include/functions.inc:3779 include/class_listing.inc:522
+#: include/functions.inc:3618 include/functions.inc:3638
+#: include/functions.inc:3668 include/functions.inc:3676
+#: include/functions.inc:3688 include/functions.inc:3692
+#: include/functions.inc:3707 include/functions.inc:3716
+#: include/functions.inc:3784 include/class_listing.inc:521
#: include/class_config.inc:483 include/class_CopyPasteHandler.inc:264
#: include/password-methods/class_password-methods-sasl.inc:51
#: include/password-methods/class_password-methods-sasl.inc:63
#: include/password-methods/class_password-methods.inc:342
#: include/password-methods/class_password-methods.inc:447
#: include/password-methods/class_password-methods.inc:458
-#: include/class_plugin.inc:1368 include/class_plugin.inc:1843
-#: include/class_msg_dialog.inc:128 include/class_msgPool.inc:215
-#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:680 include/class_msgPool.inc:711
-#: include/class_msgPool.inc:738 include/class_databaseManagement.inc:78
+#: include/class_plugin.inc:1367 include/class_msg_dialog.inc:128
+#: include/class_msgPool.inc:215 include/class_msgPool.inc:235
+#: include/class_msgPool.inc:265 include/class_msgPool.inc:680
+#: include/class_msgPool.inc:711 include/class_msgPool.inc:738
+#: include/class_databaseManagement.inc:78
#: plugins/admin/acl/class_aclRole.inc:681
#: plugins/admin/groups/class_group.inc:521
#: plugins/admin/groups/class_group.inc:527
@@ -1097,35 +1103,30 @@ msgstr ""
"FusionDirectory à besoin de ce module pour dialoguer avec les bases de "
"données supportées."
-#: setup/class_setupStep_Checks.inc:136
-msgid "MDB2 mysql"
-msgstr "backend mysql pour MDB2"
-
-#: setup/class_setupStep_Checks.inc:137
+#: setup/class_setupStep_Checks.inc:134
msgid ""
-"FusionDirectory requires this module to communicate with mysql databases."
+"If you do not want to install MDB2 and won't use databases, remove the "
+"class_databaseManagement.inc file."
msgstr ""
-"FusionDirectory a besoin de ce module pour dialoguer avec les base de "
-"données MYSQL"
-#: setup/class_setupStep_Checks.inc:143
+#: setup/class_setupStep_Checks.inc:138
msgid "imagick"
msgstr "imagick"
-#: setup/class_setupStep_Checks.inc:144
+#: setup/class_setupStep_Checks.inc:139
msgid "FusionDirectory requires this extension to handle images."
msgstr "FusionDirectory a besoin de ce module pour gérer les images."
-#: setup/class_setupStep_Checks.inc:159
+#: setup/class_setupStep_Checks.inc:154
msgid "compression module"
msgstr "Module de compression"
-#: setup/class_setupStep_Checks.inc:160
+#: setup/class_setupStep_Checks.inc:155
msgid "FusionDirectory requires this extension to handle snapshots."
msgstr ""
"FusionDirectory a besoin de ce module pour gérer les copie instantanées."
-#: setup/class_setupStep_Checks.inc:171
+#: setup/class_setupStep_Checks.inc:166
msgid ""
"register_globals is a PHP mechanism to register all global variables to be "
"accessible from scripts without changing the scope. This may be a security "
@@ -1135,17 +1136,17 @@ msgstr ""
"globales afin que les scripts puissent y accéder sans changer la porté des "
"variables. Cela peut constituer un risque de sécurité."
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStep_Checks.inc:167
msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
msgstr ""
"Recherchez l'option 'register_globals' dans votre php.ini et mettez la à "
"'Off'."
-#: setup/class_setupStep_Checks.inc:180
+#: setup/class_setupStep_Checks.inc:175
msgid "PHP uses this value for the garbage collector to delete old sessions."
msgstr "PHP utilise cette variable pour effacer des anciennes sessions."
-#: setup/class_setupStep_Checks.inc:181
+#: setup/class_setupStep_Checks.inc:176
msgid ""
"Setting this value to one day will prevent loosing session and cookies "
"before they really timeout."
@@ -1153,7 +1154,7 @@ msgstr ""
"Mettre cette valeur à 1 jour permet d'éviter de perde les cookies et les "
"sessions avant qu'elles soient réellement expirées."
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStep_Checks.inc:177
msgid ""
"Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
"higher."
@@ -1161,12 +1162,12 @@ msgstr ""
"Cherchez pour 'session.gc_maxlifetime' dans votre php.ini et mettez le à "
"86400 ou plus haut."
-#: setup/class_setupStep_Checks.inc:189 setup/class_setupStep_Checks.inc:205
-#: setup/class_setupStep_Checks.inc:221 setup/class_setupStep_Checks.inc:229
+#: setup/class_setupStep_Checks.inc:184 setup/class_setupStep_Checks.inc:200
+#: setup/class_setupStep_Checks.inc:216 setup/class_setupStep_Checks.inc:224
msgid "Off"
msgstr "Eteint"
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStep_Checks.inc:185
msgid ""
"In Order to use FusionDirectory without any trouble, the session.auto_start "
"option in your php.ini should be set to 'Off'."
@@ -1174,13 +1175,13 @@ msgstr ""
"Pour pouvoir utiliser FusionDirectory sans problèmes, la variable session."
"auto_register doit être à 'Off' dans votre php.ini."
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStep_Checks.inc:186
msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
msgstr ""
"Recherchez la variable session.auto_register et mettez la à 'Off' dans "
"votre php.ini."
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStep_Checks.inc:193
msgid ""
"FusionDirectory needs at least 128MB of memory. Setting it below this limit "
"may cause errors that are not reproducable! Increase it for larger setups."
@@ -1189,14 +1190,14 @@ msgstr ""
"128MB causera des erreurs imprévisibles, qui ne seront pas reproductibles ! "
"Augmentez la mémoire pour les installations plus complexes."
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStep_Checks.inc:194
msgid ""
"Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
msgstr ""
"Recherchez 'memory_limit' dans votre fichier php.ini votre et mettez le à "
"'128M' ou plus haut."
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStep_Checks.inc:201
msgid ""
"This option influences the PHP output handling. Turn this Option off, to "
"increase performance."
@@ -1204,22 +1205,22 @@ msgstr ""
"Cette option défini la gestion des sorties, mettez cette option à 'Off', "
"pour améliorer la performance."
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStep_Checks.inc:202
msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
msgstr "Recherchez 'implicit_flush' dans votre php.ini et mettez le à 'Off'."
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStep_Checks.inc:209
msgid "The Execution time should be at least 30 seconds."
msgstr "Le temps d'exécution doit être au moins de 30 secondes."
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStep_Checks.inc:210
msgid ""
"Search for 'max_execution_time' in your php.ini and set it to '30' or higher."
msgstr ""
"Rechercher l'option 'max_execution_time' dans votre php.ini et mettez le à "
"'30' ou plus."
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStep_Checks.inc:217
msgid ""
"Increase the server security by setting expose_php to 'off'. PHP won't send "
"any information about the server you are running in this case."
@@ -1227,32 +1228,32 @@ msgstr ""
"Augmentez la sécurité de votre serveur en mettant l'option expose_php à "
"'Off'. PHP n'enverra pas d'information a propos du serveur."
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStep_Checks.inc:218
msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
msgstr "Recherchez 'expose_php' dans votre php.ini et mettez le à 'Off'."
-#: setup/class_setupStep_Checks.inc:230
+#: setup/class_setupStep_Checks.inc:225
msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
msgstr ""
"Améliorez la performance de votre serveur en mettant magic_quotes_gpc à "
"'off'."
-#: setup/class_setupStep_Checks.inc:231
+#: setup/class_setupStep_Checks.inc:226
msgid ""
"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to 'Off'."
msgstr ""
"Recherchez l'option 'zend.ze1_compatibility_mode' dans votre hp.ini et "
"mettez la à 'Off'."
-#: setup/class_setupStep_Checks.inc:241
+#: setup/class_setupStep_Checks.inc:236
msgid "Configuration writeable"
msgstr "Le fichier de configuration peut être écrit"
-#: setup/class_setupStep_Checks.inc:242
+#: setup/class_setupStep_Checks.inc:237
msgid "The configuration file can't be written"
msgstr "Le fichier de configuration ne peut pas être écrit"
-#: setup/class_setupStep_Checks.inc:243
+#: setup/class_setupStep_Checks.inc:238
#, php-format
msgid ""
"FusionDirectory reads its configuration from a file located in (%s/%s). The "
@@ -1840,7 +1841,7 @@ msgstr "Souscrire à la liste de discutions fusiondirectory-users"
#: plugins/admin/departments/class_organizationGeneric.inc:115
#: plugins/admin/departments/class_organizationGeneric.inc:118
#: plugins/personal/generic/class_user.inc:1395
-#: plugins/personal/generic/generic.tpl:300
+#: plugins/personal/generic/generic.tpl:277
msgid "Organization"
msgstr "Entreprise"
@@ -1850,8 +1851,8 @@ msgstr "Entreprise"
#: plugins/admin/acl/class_aclRole.inc:702
#: plugins/admin/acl/class_aclRole.inc:715
#: plugins/admin/acl/class_aclRole.inc:725
-#: plugins/admin/users/class_userManagement.inc:545
-#: plugins/admin/users/class_userManagement.inc:592
+#: plugins/admin/users/class_userManagement.inc:542
+#: plugins/admin/users/class_userManagement.inc:589
#: plugins/admin/users/user-filter.tpl:26
#: plugins/admin/groups/group-filter.tpl:21
#: plugins/admin/groups/userSelect/user-filter.tpl:17
@@ -1935,7 +1936,7 @@ msgstr ""
"manière anonyme."
#: setup/setup_feedback.tpl:52
-#: plugins/admin/users/class_userManagement.inc:903
+#: plugins/admin/users/class_userManagement.inc:900
#: plugins/admin/groups/class_group.inc:1106
#: plugins/admin/departments/class_department.inc:653
#: plugins/admin/ogroups/class_ogroup.inc:895
@@ -2088,7 +2089,7 @@ msgstr "Bouger les groupes sélectionnés dans le groupe de base cet annuaire"
#: setup/setup_migrate.tpl:101 setup/setup_migrate.tpl:153
#: setup/setup_migrate.tpl:320 setup/setup_migrate.tpl:373
#: setup/setup_migrate.tpl:416 setup/setup_migrate.tpl:459
-#: setup/setup_migrate.tpl:503 include/class_listing.inc:352
+#: setup/setup_migrate.tpl:503 include/class_listing.inc:351
msgid "Select all"
msgstr "Sélectionner tout"
@@ -2599,7 +2600,7 @@ msgid "Group will be moved from"
msgstr "Les groupes seront bougés depuis"
#: setup/class_setupStep_Migrate.inc:1175
-#: setup/class_setupStep_Migrate.inc:1223 include/class_plugin.inc:2083
+#: setup/class_setupStep_Migrate.inc:1223 include/class_plugin.inc:1675
msgid "to"
msgstr "vers"
@@ -2678,8 +2679,7 @@ msgstr "Il y a %s services qui doivent être migrés."
#: setup/class_setupStep_Migrate.inc:2647 include/class_msgPool.inc:495
#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:83
#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:138
-#: plugins/personal/generic/generic.tpl:251
-#: plugins/personal/generic/generic.tpl:270
+#: plugins/personal/generic/generic.tpl:249
#, php-format
msgid "Add"
msgstr "Ajouter"
@@ -2808,29 +2808,26 @@ msgstr "Le filtre est incomplet !"
#: include/class_management.inc:333 include/class_management.inc:483
#: include/class_management.inc:536 include/class_management.inc:576
#: include/class_management.inc:590 include/class_CopyPasteHandler.inc:223
-#: include/class_plugin.inc:1791 include/class_plugin.inc:1803
-#: include/class_plugin.inc:1818 include/class_plugin.inc:1831
-#: plugins/admin/users/class_userManagement.inc:205
-#: plugins/admin/users/class_userManagement.inc:761
+#: plugins/admin/users/class_userManagement.inc:202
+#: plugins/admin/users/class_userManagement.inc:758
msgid "Permission"
msgstr "Permissions"
#: include/class_management.inc:403
-#: plugins/admin/acl/class_aclManagement.inc:100
-#: plugins/admin/users/class_userManagement.inc:719
-#: plugins/admin/users/class_userManagement.inc:723
+#: plugins/admin/acl/class_aclManagement.inc:101
+#: plugins/admin/users/class_userManagement.inc:716
+#: plugins/admin/users/class_userManagement.inc:720
msgid "Permission error"
msgstr "Erreur de permissions"
-#: include/class_management.inc:483 include/class_plugin.inc:1791
+#: include/class_management.inc:483
#, php-format
msgid "You are not allowed to create a snapshot for %s."
msgstr ""
"Vous n'êtes pas autorisé à créer une nouvelle copie instantanée pour %s."
#: include/class_management.inc:536 include/class_management.inc:576
-#: include/class_management.inc:590 include/class_plugin.inc:1803
-#: include/class_plugin.inc:1818 include/class_plugin.inc:1831
+#: include/class_management.inc:590
#, php-format
msgid "You are not allowed to restore a snapshot for %s."
msgstr "Vous n'êtes pas autorisé à restaurer un copie instantanée de %s."
@@ -3065,87 +3062,87 @@ msgstr ""
"La commande '%s', utilisée dans le POSTMODIFY de l'extension '%s' n'existe "
"pas."
-#: include/functions.inc:3613 include/functions.inc:3633
-#: include/functions.inc:3671 include/functions.inc:3683
-#: include/functions.inc:3687 include/functions.inc:3702
-#: include/functions.inc:3711
+#: include/functions.inc:3618 include/functions.inc:3638
+#: include/functions.inc:3676 include/functions.inc:3688
+#: include/functions.inc:3692 include/functions.inc:3707
+#: include/functions.inc:3716
msgid "Cannot allocate a free ID:"
msgstr "Impossible d'assigner un ID libre :"
-#: include/functions.inc:3613
+#: include/functions.inc:3618
msgid "unknown idAllocation method!"
msgstr "Méthode d'allocation des id inconnue !"
-#: include/functions.inc:3633
+#: include/functions.inc:3638
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr "%sPoolMin >= %sPoolMax!"
-#: include/functions.inc:3663
+#: include/functions.inc:3668
msgid "Cannot create sambaUnixIdPool entry!"
msgstr "Impossible de créer l'entrée sambaUnixIdPool !"
-#: include/functions.inc:3671
+#: include/functions.inc:3676
msgid "sambaUnixIdPool is not unique!"
msgstr "sambaUnixIdPool n'est pas unique !"
-#: include/functions.inc:3683 include/functions.inc:3687
+#: include/functions.inc:3688 include/functions.inc:3692
msgid "no ID available!"
msgstr "Pas d' ID disponibles !"
-#: include/functions.inc:3711
+#: include/functions.inc:3716
msgid "maximum tries exceeded!"
msgstr "Nombre maximum d'essais dépassés !"
-#: include/functions.inc:3779
+#: include/functions.inc:3784
msgid "Cannot allocate a free ID!"
msgstr "Impossible d'assigner un ID libre !"
-#: include/class_listing.inc:291 include/class_listing.inc:1099
-#: include/class_listing.inc:1101 include/class_sortableListing.inc:343
+#: include/class_listing.inc:290 include/class_listing.inc:1105
+#: include/class_listing.inc:1107 include/class_sortableListing.inc:343
#: include/class_acl.inc:504 plugins/admin/acl/class_aclRole.inc:372
msgid "Up"
msgstr "Au dessus"
-#: include/class_listing.inc:291 include/class_sortableListing.inc:343
+#: include/class_listing.inc:290 include/class_sortableListing.inc:343
#: include/class_acl.inc:506 plugins/admin/acl/class_aclRole.inc:374
msgid "Down"
msgstr "En bas"
-#: include/class_listing.inc:564
+#: include/class_listing.inc:563
msgid "created by"
msgstr "Crée par"
-#: include/class_listing.inc:1091
+#: include/class_listing.inc:1097
msgid "Go to root department"
msgstr "Aller au département de base"
-#: include/class_listing.inc:1091 include/class_listing.inc:1093
+#: include/class_listing.inc:1097 include/class_listing.inc:1099
#: include/class_baseSelector.inc:205
msgid "Root"
msgstr "Racine"
-#: include/class_listing.inc:1099
+#: include/class_listing.inc:1105
msgid "Go up one department"
msgstr "Monter d'un département"
-#: include/class_listing.inc:1107
+#: include/class_listing.inc:1113
msgid "Go to users department"
msgstr "Aller au département des utilisateurs"
-#: include/class_listing.inc:1107 include/class_listing.inc:1109
+#: include/class_listing.inc:1113 include/class_listing.inc:1115
msgid "Home"
msgstr "Accueil"
-#: include/class_listing.inc:1114
+#: include/class_listing.inc:1120
msgid "Reload list"
msgstr "Recharger la liste"
-#: include/class_listing.inc:1114 include/class_baseSelector.inc:252
+#: include/class_listing.inc:1120 include/class_baseSelector.inc:252
msgid "Submit"
msgstr "Soumettre"
-#: include/class_listing.inc:1211 plugins/admin/acl/acl-list.xml:65
+#: include/class_listing.inc:1217 plugins/admin/acl/acl-list.xml:65
#: plugins/admin/users/user-list.xml:78 plugins/admin/groups/group-list.xml:79
#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:64
#: plugins/admin/departments/dep-list.xml:87
@@ -3153,65 +3150,62 @@ msgstr "Soumettre"
msgid "Actions"
msgstr "Actions"
-#: include/class_listing.inc:1495 include/class_listing.inc:1545
-#: include/class_plugin.inc:2228
+#: include/class_listing.inc:1501 include/class_listing.inc:1551
msgid "Copy"
msgstr "Copier"
-#: include/class_listing.inc:1501 include/class_listing.inc:1535
-#: include/class_plugin.inc:2232
+#: include/class_listing.inc:1507 include/class_listing.inc:1541
msgid "Cut"
msgstr "Couper"
-#: include/class_listing.inc:1509 include/class_listing.inc:1511
-#: include/class_CopyPasteHandler.inc:400 include/class_plugin.inc:2239
-#: include/class_plugin.inc:2242
+#: include/class_listing.inc:1515 include/class_listing.inc:1517
+#: include/class_CopyPasteHandler.inc:400
msgid "Paste"
msgstr "Coller"
-#: include/class_listing.inc:1535 include/class_plugin.inc:2186
+#: include/class_listing.inc:1541
msgid "Cut this entry"
msgstr "Couper cette entrée"
-#: include/class_listing.inc:1545 include/class_plugin.inc:2194
+#: include/class_listing.inc:1551
msgid "Copy this entry"
msgstr "Copier cette entrée"
-#: include/class_listing.inc:1577 include/class_listing.inc:1579
+#: include/class_listing.inc:1583 include/class_listing.inc:1585
msgid "Restore snapshots"
msgstr "Restaurer la copie instantanée"
-#: include/class_listing.inc:1593
+#: include/class_listing.inc:1599
msgid "Export list"
msgstr "Exporter la liste"
-#: include/class_listing.inc:1628 include/class_listing.inc:1629
-#: include/class_SnapShotDialog.inc:153 include/class_plugin.inc:2160
+#: include/class_listing.inc:1634 include/class_listing.inc:1635
+#: include/class_SnapShotDialog.inc:298
msgid "Restore snapshot"
msgstr "Restaurer la copie instantanée"
-#: include/class_listing.inc:1638 include/class_plugin.inc:2167
+#: include/class_listing.inc:1644
msgid "Create snapshot"
msgstr "Créer un snapshot"
-#: include/class_listing.inc:1639 include/class_plugin.inc:2168
+#: include/class_listing.inc:1645
msgid "Create a new snapshot from this object"
msgstr "Créer un nouveau snapshot depuis cet objet"
-#: include/class_SnapShotDialog.inc:99
+#: include/class_SnapShotDialog.inc:244
#, php-format
msgid "You're about to delete the snapshot '%s'."
msgstr "Vous êtes sur le point de supprimer le snapshot '%s'."
-#: include/class_SnapShotDialog.inc:155
+#: include/class_SnapShotDialog.inc:300
msgid "Remove snapshot"
msgstr "Supprimer le snapshot"
-#: include/class_SnapShotDialog.inc:157 include/class_SnapShotDialog.inc:177
+#: include/class_SnapShotDialog.inc:302 include/class_SnapShotDialog.inc:322
msgid "Y-m-d, H:i:s"
msgstr "Y-m-d, H:i:s"
-#: include/class_SnapShotDialog.inc:191 plugins/admin/acl/acl-list.xml:57
+#: include/class_SnapShotDialog.inc:336 plugins/admin/acl/acl-list.xml:57
#: plugins/admin/acl/acl_role.tpl:17 plugins/admin/acl/class_aclRole.inc:704
#: plugins/admin/groups/class_group.inc:1114
#: plugins/admin/groups/group-list.xml:66 plugins/admin/groups/generic.tpl:24
@@ -3290,7 +3284,7 @@ msgstr ""
"Impossible de trouver une méthode de cryptage correspondante pour le mot de "
"passe !"
-#: include/class_plugin.inc:563
+#: include/class_plugin.inc:562
msgid ""
"The object has changed since opened in FusionDirectory. All changes that may "
"be done by others get lost if you save this entry!"
@@ -3299,26 +3293,14 @@ msgstr ""
"changement effectués par les autres seront perdus si vous sauvez cette "
"entrée !"
-#: include/class_plugin.inc:2082
+#: include/class_plugin.inc:1674
msgid "Changing ACL dn"
msgstr "Changement du dn de l'acl"
-#: include/class_plugin.inc:2082
+#: include/class_plugin.inc:1674
msgid "from"
msgstr "de"
-#: include/class_plugin.inc:2136 include/class_plugin.inc:2138
-msgid "Restore"
-msgstr "Restaurer"
-
-#: include/class_plugin.inc:2186
-msgid "cut"
-msgstr "couper"
-
-#: include/class_plugin.inc:2194
-msgid "copy"
-msgstr "copier"
-
#: include/class_sortableListing.inc:303
msgid "Sortable list"
msgstr "Liste triable"
@@ -4226,15 +4208,14 @@ msgstr "Veuillez activer le mode debug pour plus de détail !"
msgid "List of acls"
msgstr "Liste des acls"
-#: plugins/admin/acl/acl-list.xml:15
+#: plugins/admin/acl/acl-list.xml:15 plugins/admin/acl/acl-list.xml:82
#: plugins/admin/acl/class_aclManagement.inc:36
msgid "Acl"
msgstr "Acl"
-#: plugins/admin/acl/acl-list.xml:23 plugins/admin/acl/acl-list.xml:82
-#: plugins/admin/acl/class_aclRole.inc:695
+#: plugins/admin/acl/acl-list.xml:23 plugins/admin/acl/class_aclRole.inc:695
#: plugins/personal/generic/class_user.inc:1367
-#: plugins/personal/generic/generic.tpl:515
+#: plugins/personal/generic/generic.tpl:492
msgid "Role"
msgstr "Rôle"
@@ -4278,7 +4259,7 @@ msgstr ""
msgid "Access control list management"
msgstr "Gestion des listes de contrôle d’accès (ACL)"
-#: plugins/admin/acl/class_aclManagement.inc:160
+#: plugins/admin/acl/class_aclManagement.inc:161
msgid "ACL Assignment"
msgstr "Gestion des ACL"
@@ -4407,7 +4388,7 @@ msgstr ""
"Sélectionnez 'aucun' afin de ne pas utiliser les modèles."
#: plugins/admin/users/template.tpl:15
-#: plugins/admin/users/class_userManagement.inc:542
+#: plugins/admin/users/class_userManagement.inc:539
#: plugins/admin/users/templatize.tpl:15 plugins/admin/users/user-list.xml:15
#: plugins/admin/users/user-list.xml:102
msgid "Template"
@@ -4442,25 +4423,25 @@ msgstr "Identifiant"
msgid "Manage users"
msgstr "Gérer les utilisateurs"
-#: plugins/admin/users/class_userManagement.inc:344
+#: plugins/admin/users/class_userManagement.inc:341
#: plugins/personal/password/class_password.inc:136
#, php-format
msgid "Check-hook reported a problem: %s. Password change canceled!"
msgstr "il y à eu un problème: %s. Changement du mot de passe annulé !"
-#: plugins/admin/users/class_userManagement.inc:394
+#: plugins/admin/users/class_userManagement.inc:391
msgid "You have no permission to change this users password!"
msgstr ""
"Vous n'avez pas l'autorisation pour changer le mot de passe de ce(s) "
"utilisateurs !"
-#: plugins/admin/users/class_userManagement.inc:470
-#: plugins/admin/users/class_userManagement.inc:504
-#: plugins/admin/users/class_userManagement.inc:535
+#: plugins/admin/users/class_userManagement.inc:467
+#: plugins/admin/users/class_userManagement.inc:501
+#: plugins/admin/users/class_userManagement.inc:532
msgid "none"
msgstr "aucun"
-#: plugins/admin/users/class_userManagement.inc:548
+#: plugins/admin/users/class_userManagement.inc:545
#: plugins/admin/users/user-list.xml:57
#: plugins/admin/groups/userSelect/user-list.xml:40
#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
@@ -4470,11 +4451,11 @@ msgstr "aucun"
msgid "Given name"
msgstr "Prénom"
-#: plugins/admin/users/class_userManagement.inc:799
+#: plugins/admin/users/class_userManagement.inc:796
msgid "Account locking"
msgstr "Verrouillage du compte"
-#: plugins/admin/users/class_userManagement.inc:800
+#: plugins/admin/users/class_userManagement.inc:797
#, php-format
msgid ""
"Password method '%s' does not support locking. Account (%s) has not been "
@@ -4483,15 +4464,15 @@ msgstr ""
"La méthode '%s' ne permet pas le verrouillage du mot de passe. Le compte "
"(%s) n'a pas été verrouillé !"
-#: plugins/admin/users/class_userManagement.inc:873
+#: plugins/admin/users/class_userManagement.inc:870
msgid "Unlock account"
msgstr "Déverrouiller le compte"
-#: plugins/admin/users/class_userManagement.inc:875
+#: plugins/admin/users/class_userManagement.inc:872
msgid "Lock account"
msgstr "Verrouiller Compte"
-#: plugins/admin/users/class_userManagement.inc:903
+#: plugins/admin/users/class_userManagement.inc:900
#, fuzzy
msgid "Generic properties"
msgstr "Modifier les propriétés de base"
@@ -4583,7 +4564,8 @@ msgid "Remove user"
msgstr "Suppression de l'utilisateur"
#: plugins/admin/password/class_recoveryConfig.inc:35
-msgid "Password recovery config"
+#, fuzzy
+msgid "Password recovery"
msgstr "Configurer la récupération du mot de passe"
#: plugins/admin/password/class_recoveryConfig.inc:36
@@ -4930,7 +4912,6 @@ msgstr "Préférences des groupes génériques"
#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:23
#: plugins/admin/ogroups/class_ogroupManagement.inc:187
#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:79
-#: plugins/admin/ogroups/ogroup-list.xml:79
#: plugins/generic/references/class_reference.inc:55
#: plugins/personal/posix/groupSelect/group-list.xml:15
msgid "Group"
@@ -5022,8 +5003,8 @@ msgstr "Modifier les propriétés samba"
#: plugins/generic/references/class_reference.inc:59
#: plugins/personal/posix/trustSelect/class_trustSelect.inc:81
#: plugins/personal/generic/class_user.inc:1180
-#: plugins/personal/generic/generic.tpl:399
-#: plugins/personal/generic/generic.tpl:586
+#: plugins/personal/generic/generic.tpl:376
+#: plugins/personal/generic/generic.tpl:563
msgid "Phone"
msgstr "Téléphone"
@@ -5122,7 +5103,7 @@ msgstr "Lieu"
#: plugins/admin/departments/generic.tpl:91
#: plugins/admin/departments/class_organizationGeneric.inc:129
#: plugins/personal/generic/class_user.inc:1410
-#: plugins/personal/generic/generic.tpl:448
+#: plugins/personal/generic/generic.tpl:425
msgid "Location"
msgstr "Lieu"
@@ -5139,8 +5120,8 @@ msgstr "Lieu"
#: plugins/admin/departments/generic.tpl:51
#: plugins/admin/departments/class_organizationGeneric.inc:126
#: plugins/personal/generic/class_user.inc:1399
-#: plugins/personal/generic/generic.tpl:341
-#: plugins/personal/generic/generic.tpl:362
+#: plugins/personal/generic/generic.tpl:318
+#: plugins/personal/generic/generic.tpl:339
msgid "Manager"
msgstr "Responsable"
@@ -5290,7 +5271,7 @@ msgstr "Catégorie pour cette branche de l'annuaire"
#: plugins/admin/departments/generic.tpl:83
#: plugins/admin/departments/class_organizationGeneric.inc:128
#: plugins/personal/generic/class_user.inc:1409
-#: plugins/personal/generic/generic.tpl:456
+#: plugins/personal/generic/generic.tpl:433
msgid "State"
msgstr "Département"
@@ -5308,7 +5289,7 @@ msgstr "Lieu de cette branche"
#: plugins/admin/departments/class_department.inc:667
#: plugins/admin/departments/generic.tpl:99
#: plugins/personal/generic/generic.tpl:181
-#: plugins/personal/generic/generic.tpl:464
+#: plugins/personal/generic/generic.tpl:441
msgid "Address"
msgstr "Adresse"
@@ -5328,8 +5309,8 @@ msgstr "Numéro de téléphone de base pour cette sous-branche"
#: plugins/admin/departments/generic.tpl:114
#: plugins/admin/departments/class_organizationGeneric.inc:132
#: plugins/personal/generic/class_user.inc:1183
-#: plugins/personal/generic/generic.tpl:430
-#: plugins/personal/generic/generic.tpl:598
+#: plugins/personal/generic/generic.tpl:407
+#: plugins/personal/generic/generic.tpl:575
msgid "Fax"
msgstr "Fax"
@@ -5380,7 +5361,7 @@ msgstr "Pays"
#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:15
#: plugins/generic/references/class_reference.inc:57
#: plugins/personal/generic/class_user.inc:1396
-#: plugins/personal/generic/generic.tpl:308
+#: plugins/personal/generic/generic.tpl:285
msgid "Department"
msgstr "Département"
@@ -5622,7 +5603,7 @@ msgstr "Systèmes"
#: plugins/admin/ogroups/tabs_ogroups.inc:236
msgid "Workstartup"
-msgstr ""
+msgstr "Stations de travail"
#: plugins/admin/ogroups/tabs_ogroups.inc:237
msgid "Debconf"
@@ -5693,6 +5674,11 @@ msgstr "Objets membres"
msgid "List of object groups"
msgstr "Liste des groupes d'objets"
+#: plugins/admin/ogroups/ogroup-list.xml:79
+#, fuzzy
+msgid "Objectgroup"
+msgstr "Groupes d'objets"
+
#: plugins/admin/ogroups/ogroup-list.xml:106
msgid "Send message"
msgstr "Envoyer un message"
@@ -5763,11 +5749,14 @@ msgid "Language"
msgstr "Langue"
#: plugins/config/class_configInLdap.inc:82
+#, fuzzy
msgid ""
-"Default language to be used if the one asked by the browser is not available"
+"Language of the application. If 'automatic' or not available, the one asked "
+"by the browser will be used. This setting can be overriden per user."
msgstr ""
-"Langue par défaut utilisée si celle fournit par le navigateur n'est pas "
-"disponible"
+"Maintenant vous pouvez choisir la langue par défaut. Automatique utilisera "
+"la langue demandée par le navigateur. Ce paramètre peut être configuré par "
+"utilisateur."
#: plugins/config/class_configInLdap.inc:87
msgid "Theme to be used"
@@ -5782,7 +5771,8 @@ msgid "Schema setup"
msgstr "Installation des schémas"
#: plugins/config/class_configInLdap.inc:103
-msgid "rfc237bis"
+#, fuzzy
+msgid "rfc2307bis"
msgstr "rfc237bis"
#: plugins/config/class_configInLdap.inc:104
@@ -6561,12 +6551,12 @@ msgid "Homepage"
msgstr "Page d'accueil"
#: plugins/personal/generic/class_user.inc:1186
-#: plugins/personal/generic/generic.tpl:411
+#: plugins/personal/generic/generic.tpl:388
msgid "Mobile"
msgstr "GSM"
#: plugins/personal/generic/class_user.inc:1189
-#: plugins/personal/generic/generic.tpl:422
+#: plugins/personal/generic/generic.tpl:399
msgid "Pager"
msgstr "Bip"
@@ -6577,57 +6567,57 @@ msgid "Date of birth"
msgstr "Date de naissance"
#: plugins/personal/generic/class_user.inc:1357
-#: plugins/personal/generic/generic.tpl:538
+#: plugins/personal/generic/generic.tpl:515
msgid "Unit"
msgstr "Unité"
#: plugins/personal/generic/class_user.inc:1358
-#: plugins/personal/generic/generic.tpl:563
+#: plugins/personal/generic/generic.tpl:540
msgid "House identifier"
msgstr "Identifiant du bâtiment"
#: plugins/personal/generic/class_user.inc:1359
-#: plugins/personal/generic/generic.tpl:480
+#: plugins/personal/generic/generic.tpl:457
msgid "Vocation"
msgstr "Travail"
#: plugins/personal/generic/class_user.inc:1360
-#: plugins/personal/generic/generic.tpl:607
+#: plugins/personal/generic/generic.tpl:584
msgid "Last delivery"
msgstr "Dernière distribution"
#: plugins/personal/generic/class_user.inc:1361
-#: plugins/personal/generic/generic.tpl:529
+#: plugins/personal/generic/generic.tpl:506
msgid "Person locality"
msgstr "Lieu de résidence"
#: plugins/personal/generic/class_user.inc:1362
-#: plugins/personal/generic/generic.tpl:488
+#: plugins/personal/generic/generic.tpl:465
msgid "Unit description"
msgstr "Description de l'unité"
#: plugins/personal/generic/class_user.inc:1363
-#: plugins/personal/generic/generic.tpl:497
+#: plugins/personal/generic/generic.tpl:474
msgid "Subject area"
msgstr "Zone de sujet"
#: plugins/personal/generic/class_user.inc:1364
-#: plugins/personal/generic/generic.tpl:506
+#: plugins/personal/generic/generic.tpl:483
msgid "Functional title"
msgstr "Fonction"
#: plugins/personal/generic/class_user.inc:1365
-#: plugins/personal/generic/generic.tpl:616
+#: plugins/personal/generic/generic.tpl:593
msgid "Public visible"
msgstr "Visible par tous"
#: plugins/personal/generic/class_user.inc:1366
-#: plugins/personal/generic/generic.tpl:547
+#: plugins/personal/generic/generic.tpl:524
msgid "Street"
msgstr "Rue"
#: plugins/personal/generic/class_user.inc:1368
-#: plugins/personal/generic/generic.tpl:555
+#: plugins/personal/generic/generic.tpl:532
msgid "Postal code"
msgstr "Code postal"
@@ -6676,7 +6666,7 @@ msgid "Employee number"
msgstr "Numéro de l'employé"
#: plugins/personal/generic/class_user.inc:1401
-#: plugins/personal/generic/generic.tpl:332
+#: plugins/personal/generic/generic.tpl:309
msgid "Employee type"
msgstr "Type de l'employé"
@@ -6757,29 +6747,28 @@ msgstr "Format de stockage des mots de passe"
msgid "Restrict login to"
msgstr "Restreindre le login à "
-#: plugins/personal/generic/generic.tpl:248
-#: plugins/personal/generic/generic.tpl:267
+#: plugins/personal/generic/generic.tpl:246
msgid "IP or network"
msgstr "IP ou réseau"
-#: plugins/personal/generic/generic.tpl:288
+#: plugins/personal/generic/generic.tpl:265
msgid "Organizational information"
msgstr "Informations sur l'entreprise"
-#: plugins/personal/generic/generic.tpl:316
+#: plugins/personal/generic/generic.tpl:293
msgid "Department No."
msgstr "No. du département."
-#: plugins/personal/generic/generic.tpl:324
+#: plugins/personal/generic/generic.tpl:301
msgid "Employee No."
msgstr "No. de l'employé."
-#: plugins/personal/generic/generic.tpl:390
-#: plugins/personal/generic/generic.tpl:578
+#: plugins/personal/generic/generic.tpl:367
+#: plugins/personal/generic/generic.tpl:555
msgid "Room No."
msgstr "No. de bureau."
-#: plugins/personal/generic/generic.tpl:592
+#: plugins/personal/generic/generic.tpl:569
msgid "Please use the phone tab"
msgstr "Veuillez utiliser l'onglet téléphone"
@@ -6787,6 +6776,24 @@ msgstr "Veuillez utiliser l'onglet téléphone"
msgid "Your password hash method will not be changed!"
msgstr "Votre méthode de cryptage des mots de passe ne sera pas changé !"
+#~ msgid "MDB2 mysql"
+#~ msgstr "backend mysql pour MDB2"
+
+#~ msgid ""
+#~ "FusionDirectory requires this module to communicate with mysql databases."
+#~ msgstr ""
+#~ "FusionDirectory a besoin de ce module pour dialoguer avec les base de "
+#~ "données MYSQL"
+
+#~ msgid "Restore"
+#~ msgstr "Restaurer"
+
+#~ msgid "cut"
+#~ msgstr "couper"
+
+#~ msgid "copy"
+#~ msgstr "copier"
+
#~ msgid "POSIX"
#~ msgstr "UNIX"
@@ -6801,3 +6808,10 @@ msgstr "Votre méthode de cryptage des mots de passe ne sera pas changé !"
#~ msgid "Edit FAX properties"
#~ msgstr "Modifier les propriétés FAX"
+
+#~ msgid ""
+#~ "Default language to be used if the one asked by the browser is not "
+#~ "available"
+#~ msgstr ""
+#~ "Langue par défaut utilisée si celle fournit par le navigateur n'est pas "
+#~ "disponible"
diff --git a/locale/id_ID/messages.po b/locale/id_ID/fusiondirectory.po
similarity index 94%
rename from locale/id_ID/messages.po
rename to locale/id_ID/fusiondirectory.po
index 7446a822db69b896f25cee73d64a4e4dfadf9ecf..909f2f129d63c081a54e51e71f81fa4532225dcd 100644
--- a/locale/id_ID/messages.po
+++ b/locale/id_ID/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-24 14:48+0100\n"
+"POT-Creation-Date: 2013-04-14 20:13+0200\n"
"PO-Revision-Date: 2013-02-12 10:26+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,39 +17,39 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: html/main.php:140 html/class_passwordRecovery.inc:226
+#: html/main.php:135 html/class_passwordRecovery.inc:226
#: include/class_xml.inc:60 include/functions.inc:509
#: plugins/admin/departments/class_department.inc:431
msgid "Fatal error"
msgstr ""
-#: html/main.php:141
+#: html/main.php:136
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr ""
-#: html/main.php:162
+#: html/main.php:157
msgid "PHP configuration"
msgstr ""
-#: html/main.php:163
+#: html/main.php:158
msgid ""
"Fatal error: Register globals is on. FusionDirectory will refuse to login "
"unless this is fixed by an administrator."
msgstr ""
-#: html/main.php:192 ihtml/themes/default/password.tpl:40
-#: plugins/admin/users/class_userManagement.inc:393
+#: html/main.php:187 ihtml/themes/default/password.tpl:40
+#: plugins/admin/users/class_userManagement.inc:390
#: plugins/personal/password/class_password.inc:156
#: plugins/personal/password/class_password.inc:162
msgid "Password change"
msgstr ""
-#: html/main.php:192
+#: html/main.php:187
msgid "Your password is about to expire, please change your password!"
msgstr ""
-#: html/main.php:261 html/class_passwordRecovery.inc:301 html/index.php:147
+#: html/main.php:256 html/class_passwordRecovery.inc:296 html/index.php:147
#: html/index.php:208 include/class_SnapshotHandler.inc:57
#: include/class_SnapshotHandler.inc:70 include/class_SnapshotHandler.inc:88
#: include/class_pluglist.inc:272 include/functions.inc:933
@@ -63,30 +63,30 @@ msgstr ""
msgid "Configuration error"
msgstr ""
-#: html/main.php:261
+#: html/main.php:256
msgid "Running out of memory!"
msgstr ""
-#: html/main.php:316
+#: html/main.php:311
msgid "User ACL checks disabled"
msgstr ""
-#: html/main.php:362
+#: html/main.php:357
msgid "Plugin"
msgstr ""
-#: html/main.php:363
+#: html/main.php:358
#, php-format
msgid ""
"Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not "
"a file)!"
msgstr ""
-#: html/main.php:378
+#: html/main.php:373
msgid "Configuration Error"
msgstr ""
-#: html/main.php:379
+#: html/main.php:374
#, php-format
msgid ""
"Fatal error: not all POST variables have been transfered by PHP - please "
@@ -102,31 +102,31 @@ msgstr ""
msgid "Error: Password method not available!"
msgstr ""
-#: html/class_passwordRecovery.inc:227 html/index.php:147
+#: html/class_passwordRecovery.inc:227
#, php-format
msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
msgstr ""
-#: html/class_passwordRecovery.inc:302 html/setup.php:63 html/index.php:163
+#: html/class_passwordRecovery.inc:297 html/setup.php:63 html/index.php:163
#, php-format
msgid "Directory '%s' specified as compile directory is not accessible!"
msgstr ""
-#: html/class_passwordRecovery.inc:407
-#: plugins/admin/users/class_userManagement.inc:309
+#: html/class_passwordRecovery.inc:402
+#: plugins/admin/users/class_userManagement.inc:306
#: plugins/personal/password/class_password.inc:113
msgid ""
"The passwords you've entered as 'New password' and 'Repeated new password' "
"do not match."
msgstr ""
-#: html/class_passwordRecovery.inc:409 ihtml/themes/default/password.tpl:81
+#: html/class_passwordRecovery.inc:404 ihtml/themes/default/password.tpl:81
#: ihtml/themes/default/password.tpl:82
#: ihtml/themes/default/accountexpired.tpl:32
#: ihtml/themes/default/accountexpired.tpl:36
#: ihtml/themes/default/recovery.tpl:93 ihtml/themes/default/recovery.tpl:94
#: plugins/admin/users/password.tpl:17 plugins/admin/users/password.tpl:60
-#: plugins/admin/users/class_userManagement.inc:312
+#: plugins/admin/users/class_userManagement.inc:309
#: plugins/personal/password/password.tpl:27
#: plugins/personal/password/password.tpl:78
#: plugins/personal/generic/password.tpl:22
@@ -134,16 +134,16 @@ msgstr ""
msgid "New password"
msgstr ""
-#: html/class_passwordRecovery.inc:411
+#: html/class_passwordRecovery.inc:406
msgid "The password used as new is too short."
msgstr ""
-#: html/class_passwordRecovery.inc:413
+#: html/class_passwordRecovery.inc:408
#: plugins/personal/password/class_password.inc:121
msgid "The password contains possibly problematic Unicode characters!"
msgstr ""
-#: html/class_passwordRecovery.inc:437 html/index.php:58 html/index.php:64
+#: html/class_passwordRecovery.inc:432 html/index.php:58 html/index.php:64
#: html/index.php:403 ihtml/themes/default/conflict.tpl:6
#: ihtml/themes/default/islocked.tpl:6 ihtml/themes/default/remove.tpl:2
#: ihtml/themes/default/msg_dialog.tpl:59
@@ -166,39 +166,39 @@ msgstr ""
msgid "Warning"
msgstr ""
-#: html/class_passwordRecovery.inc:438
+#: html/class_passwordRecovery.inc:433
msgid "Session will not be encrypted."
msgstr ""
-#: html/class_passwordRecovery.inc:440
+#: html/class_passwordRecovery.inc:435
msgid "Enter SSL session"
msgstr ""
-#: html/class_passwordRecovery.inc:481
+#: html/class_passwordRecovery.inc:476
#, php-format
msgid "Did not found account %s"
msgstr ""
-#: html/class_passwordRecovery.inc:484
+#: html/class_passwordRecovery.inc:479
#, php-format
msgid "Found multiple accounts %s"
msgstr ""
-#: html/class_passwordRecovery.inc:498 ihtml/themes/default/recovery.tpl:142
+#: html/class_passwordRecovery.inc:493 ihtml/themes/default/recovery.tpl:142
msgid "Adresse mail"
msgstr ""
-#: html/class_passwordRecovery.inc:515
+#: html/class_passwordRecovery.inc:510
#, php-format
msgid "There is no account using email %s"
msgstr ""
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:513
#, php-format
msgid "There are several accounts using email %s"
msgstr ""
-#: html/class_passwordRecovery.inc:543 html/index.php:257 html/index.php:269
+#: html/class_passwordRecovery.inc:538 html/index.php:257 html/index.php:269
#: html/index.php:282 setup/class_setupStep_Migrate.inc:1138
#: setup/class_setupStep_Migrate.inc:1164
#: setup/class_setupStep_Migrate.inc:1213
@@ -210,20 +210,17 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:2549
#: setup/class_setupStep_Migrate.inc:2896
#: setup/class_setupStep_Migrate.inc:2910
-#: include/class_SnapshotHandler.inc:150 include/class_SnapshotHandler.inc:329
-#: include/class_SnapshotHandler.inc:378 include/class_SnapshotHandler.inc:382
-#: include/class_SnapshotHandler.inc:402 include/class_SnapshotHandler.inc:445
-#: include/class_SnapshotHandler.inc:508 include/class_SnapshotHandler.inc:577
-#: include/class_SnapshotHandler.inc:592 include/functions.inc:547
+#: include/class_SnapshotHandler.inc:150 include/class_SnapshotHandler.inc:335
+#: include/class_SnapshotHandler.inc:388 include/class_SnapshotHandler.inc:392
+#: include/class_SnapshotHandler.inc:412 include/class_SnapshotHandler.inc:455
+#: include/class_SnapshotHandler.inc:518 include/class_SnapshotHandler.inc:587
+#: include/class_SnapshotHandler.inc:602 include/functions.inc:547
#: include/functions.inc:583 include/functions.inc:591
#: include/functions.inc:639 include/functions.inc:948
#: include/functions.inc:998 include/functions.inc:1058
#: include/functions.inc:1113 include/functions.inc:3244
-#: include/functions.inc:3509 include/class_config.inc:330
-#: include/class_plugin.inc:1500 include/class_plugin.inc:1550
-#: include/class_plugin.inc:1554 include/class_plugin.inc:1574
-#: include/class_plugin.inc:1621 include/class_plugin.inc:1681
-#: include/class_plugin.inc:1751 include/class_plugin.inc:1766
+#: include/functions.inc:3514 include/class_SnapShotDialog.inc:104
+#: include/class_SnapShotDialog.inc:177 include/class_config.inc:330
#: include/class_acl.inc:1308 include/class_acl.inc:1413
#: include/class_ldap.inc:934 include/class_ldap.inc:1421
#: plugins/admin/acl/class_aclRole.inc:613
@@ -242,19 +239,19 @@ msgstr ""
msgid "LDAP error"
msgstr ""
-#: html/class_passwordRecovery.inc:566
+#: html/class_passwordRecovery.inc:561
msgid "Contact your administrator, there was a problem with mail server"
msgstr ""
-#: html/class_passwordRecovery.inc:577
+#: html/class_passwordRecovery.inc:572
msgid "This token is invalid"
msgstr ""
-#: html/class_passwordRecovery.inc:615
+#: html/class_passwordRecovery.inc:610
msgid "External password changer reported a problem: "
msgstr ""
-#: html/class_passwordRecovery.inc:640
+#: html/class_passwordRecovery.inc:635
msgid "There was a problem with mail server, confirmation email not sent"
msgstr ""
@@ -272,6 +269,13 @@ msgid ""
"overridden by php.ini settings."
msgstr ""
+#: html/index.php:147
+#, php-format
+msgid ""
+"FusionDirectory configuration %s/%s is not readable. Please run "
+"fusiondirectory-setup --check-config to fix this."
+msgstr ""
+
#: html/index.php:163
msgid "Smarty error"
msgstr ""
@@ -286,22 +290,22 @@ msgstr ""
#: setup/setup_checks.tpl:91 setup/class_setupStep_Migrate.inc:1127
#: include/class_xml.inc:57 include/class_tabs.inc:74
#: include/class_management.inc:507 include/class_management.inc:657
-#: include/functions.inc:3613 include/functions.inc:3633
-#: include/functions.inc:3663 include/functions.inc:3671
-#: include/functions.inc:3683 include/functions.inc:3687
-#: include/functions.inc:3702 include/functions.inc:3711
-#: include/functions.inc:3779 include/class_listing.inc:522
+#: include/functions.inc:3618 include/functions.inc:3638
+#: include/functions.inc:3668 include/functions.inc:3676
+#: include/functions.inc:3688 include/functions.inc:3692
+#: include/functions.inc:3707 include/functions.inc:3716
+#: include/functions.inc:3784 include/class_listing.inc:521
#: include/class_config.inc:483 include/class_CopyPasteHandler.inc:264
#: include/password-methods/class_password-methods-sasl.inc:51
#: include/password-methods/class_password-methods-sasl.inc:63
#: include/password-methods/class_password-methods.inc:342
#: include/password-methods/class_password-methods.inc:447
#: include/password-methods/class_password-methods.inc:458
-#: include/class_plugin.inc:1368 include/class_plugin.inc:1843
-#: include/class_msg_dialog.inc:128 include/class_msgPool.inc:215
-#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:680 include/class_msgPool.inc:711
-#: include/class_msgPool.inc:738 include/class_databaseManagement.inc:78
+#: include/class_plugin.inc:1367 include/class_msg_dialog.inc:128
+#: include/class_msgPool.inc:215 include/class_msgPool.inc:235
+#: include/class_msgPool.inc:265 include/class_msgPool.inc:680
+#: include/class_msgPool.inc:711 include/class_msgPool.inc:738
+#: include/class_databaseManagement.inc:78
#: plugins/admin/acl/class_aclRole.inc:681
#: plugins/admin/groups/class_group.inc:521
#: plugins/admin/groups/class_group.inc:527
@@ -965,131 +969,128 @@ msgid ""
"databases."
msgstr ""
-#: setup/class_setupStep_Checks.inc:136
-msgid "MDB2 mysql"
-msgstr ""
-
-#: setup/class_setupStep_Checks.inc:137
+#: setup/class_setupStep_Checks.inc:134
msgid ""
-"FusionDirectory requires this module to communicate with mysql databases."
+"If you do not want to install MDB2 and won't use databases, remove the "
+"class_databaseManagement.inc file."
msgstr ""
-#: setup/class_setupStep_Checks.inc:143
+#: setup/class_setupStep_Checks.inc:138
msgid "imagick"
msgstr ""
-#: setup/class_setupStep_Checks.inc:144
+#: setup/class_setupStep_Checks.inc:139
msgid "FusionDirectory requires this extension to handle images."
msgstr ""
-#: setup/class_setupStep_Checks.inc:159
+#: setup/class_setupStep_Checks.inc:154
msgid "compression module"
msgstr ""
-#: setup/class_setupStep_Checks.inc:160
+#: setup/class_setupStep_Checks.inc:155
msgid "FusionDirectory requires this extension to handle snapshots."
msgstr ""
-#: setup/class_setupStep_Checks.inc:171
+#: setup/class_setupStep_Checks.inc:166
msgid ""
"register_globals is a PHP mechanism to register all global variables to be "
"accessible from scripts without changing the scope. This may be a security "
"risk."
msgstr ""
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStep_Checks.inc:167
msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:180
+#: setup/class_setupStep_Checks.inc:175
msgid "PHP uses this value for the garbage collector to delete old sessions."
msgstr ""
-#: setup/class_setupStep_Checks.inc:181
+#: setup/class_setupStep_Checks.inc:176
msgid ""
"Setting this value to one day will prevent loosing session and cookies "
"before they really timeout."
msgstr ""
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStep_Checks.inc:177
msgid ""
"Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
"higher."
msgstr ""
-#: setup/class_setupStep_Checks.inc:189 setup/class_setupStep_Checks.inc:205
-#: setup/class_setupStep_Checks.inc:221 setup/class_setupStep_Checks.inc:229
+#: setup/class_setupStep_Checks.inc:184 setup/class_setupStep_Checks.inc:200
+#: setup/class_setupStep_Checks.inc:216 setup/class_setupStep_Checks.inc:224
msgid "Off"
msgstr ""
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStep_Checks.inc:185
msgid ""
"In Order to use FusionDirectory without any trouble, the session.auto_start "
"option in your php.ini should be set to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStep_Checks.inc:186
msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStep_Checks.inc:193
msgid ""
"FusionDirectory needs at least 128MB of memory. Setting it below this limit "
"may cause errors that are not reproducable! Increase it for larger setups."
msgstr ""
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStep_Checks.inc:194
msgid ""
"Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
msgstr ""
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStep_Checks.inc:201
msgid ""
"This option influences the PHP output handling. Turn this Option off, to "
"increase performance."
msgstr ""
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStep_Checks.inc:202
msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStep_Checks.inc:209
msgid "The Execution time should be at least 30 seconds."
msgstr ""
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStep_Checks.inc:210
msgid ""
"Search for 'max_execution_time' in your php.ini and set it to '30' or higher."
msgstr ""
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStep_Checks.inc:217
msgid ""
"Increase the server security by setting expose_php to 'off'. PHP won't send "
"any information about the server you are running in this case."
msgstr ""
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStep_Checks.inc:218
msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:230
+#: setup/class_setupStep_Checks.inc:225
msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:231
+#: setup/class_setupStep_Checks.inc:226
msgid ""
"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:241
+#: setup/class_setupStep_Checks.inc:236
msgid "Configuration writeable"
msgstr ""
-#: setup/class_setupStep_Checks.inc:242
+#: setup/class_setupStep_Checks.inc:237
msgid "The configuration file can't be written"
msgstr ""
-#: setup/class_setupStep_Checks.inc:243
+#: setup/class_setupStep_Checks.inc:238
#, php-format
msgid ""
"FusionDirectory reads its configuration from a file located in (%s/%s). The "
@@ -1637,7 +1638,7 @@ msgstr ""
#: plugins/admin/departments/class_organizationGeneric.inc:115
#: plugins/admin/departments/class_organizationGeneric.inc:118
#: plugins/personal/generic/class_user.inc:1395
-#: plugins/personal/generic/generic.tpl:300
+#: plugins/personal/generic/generic.tpl:277
msgid "Organization"
msgstr ""
@@ -1647,8 +1648,8 @@ msgstr ""
#: plugins/admin/acl/class_aclRole.inc:702
#: plugins/admin/acl/class_aclRole.inc:715
#: plugins/admin/acl/class_aclRole.inc:725
-#: plugins/admin/users/class_userManagement.inc:545
-#: plugins/admin/users/class_userManagement.inc:592
+#: plugins/admin/users/class_userManagement.inc:542
+#: plugins/admin/users/class_userManagement.inc:589
#: plugins/admin/users/user-filter.tpl:26
#: plugins/admin/groups/group-filter.tpl:21
#: plugins/admin/groups/userSelect/user-filter.tpl:17
@@ -1729,7 +1730,7 @@ msgid ""
msgstr ""
#: setup/setup_feedback.tpl:52
-#: plugins/admin/users/class_userManagement.inc:903
+#: plugins/admin/users/class_userManagement.inc:900
#: plugins/admin/groups/class_group.inc:1106
#: plugins/admin/departments/class_department.inc:653
#: plugins/admin/ogroups/class_ogroup.inc:895
@@ -1869,7 +1870,7 @@ msgstr ""
#: setup/setup_migrate.tpl:101 setup/setup_migrate.tpl:153
#: setup/setup_migrate.tpl:320 setup/setup_migrate.tpl:373
#: setup/setup_migrate.tpl:416 setup/setup_migrate.tpl:459
-#: setup/setup_migrate.tpl:503 include/class_listing.inc:352
+#: setup/setup_migrate.tpl:503 include/class_listing.inc:351
msgid "Select all"
msgstr ""
@@ -2337,7 +2338,7 @@ msgid "Group will be moved from"
msgstr ""
#: setup/class_setupStep_Migrate.inc:1175
-#: setup/class_setupStep_Migrate.inc:1223 include/class_plugin.inc:2083
+#: setup/class_setupStep_Migrate.inc:1223 include/class_plugin.inc:1675
msgid "to"
msgstr ""
@@ -2412,8 +2413,7 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:2647 include/class_msgPool.inc:495
#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:83
#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:138
-#: plugins/personal/generic/generic.tpl:251
-#: plugins/personal/generic/generic.tpl:270
+#: plugins/personal/generic/generic.tpl:249
#, php-format
msgid "Add"
msgstr ""
@@ -2534,28 +2534,25 @@ msgstr ""
#: include/class_management.inc:333 include/class_management.inc:483
#: include/class_management.inc:536 include/class_management.inc:576
#: include/class_management.inc:590 include/class_CopyPasteHandler.inc:223
-#: include/class_plugin.inc:1791 include/class_plugin.inc:1803
-#: include/class_plugin.inc:1818 include/class_plugin.inc:1831
-#: plugins/admin/users/class_userManagement.inc:205
-#: plugins/admin/users/class_userManagement.inc:761
+#: plugins/admin/users/class_userManagement.inc:202
+#: plugins/admin/users/class_userManagement.inc:758
msgid "Permission"
msgstr ""
#: include/class_management.inc:403
-#: plugins/admin/acl/class_aclManagement.inc:100
-#: plugins/admin/users/class_userManagement.inc:719
-#: plugins/admin/users/class_userManagement.inc:723
+#: plugins/admin/acl/class_aclManagement.inc:101
+#: plugins/admin/users/class_userManagement.inc:716
+#: plugins/admin/users/class_userManagement.inc:720
msgid "Permission error"
msgstr ""
-#: include/class_management.inc:483 include/class_plugin.inc:1791
+#: include/class_management.inc:483
#, php-format
msgid "You are not allowed to create a snapshot for %s."
msgstr ""
#: include/class_management.inc:536 include/class_management.inc:576
-#: include/class_management.inc:590 include/class_plugin.inc:1803
-#: include/class_plugin.inc:1818 include/class_plugin.inc:1831
+#: include/class_management.inc:590
#, php-format
msgid "You are not allowed to restore a snapshot for %s."
msgstr ""
@@ -2756,87 +2753,87 @@ msgid ""
"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
msgstr ""
-#: include/functions.inc:3613 include/functions.inc:3633
-#: include/functions.inc:3671 include/functions.inc:3683
-#: include/functions.inc:3687 include/functions.inc:3702
-#: include/functions.inc:3711
+#: include/functions.inc:3618 include/functions.inc:3638
+#: include/functions.inc:3676 include/functions.inc:3688
+#: include/functions.inc:3692 include/functions.inc:3707
+#: include/functions.inc:3716
msgid "Cannot allocate a free ID:"
msgstr ""
-#: include/functions.inc:3613
+#: include/functions.inc:3618
msgid "unknown idAllocation method!"
msgstr ""
-#: include/functions.inc:3633
+#: include/functions.inc:3638
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3663
+#: include/functions.inc:3668
msgid "Cannot create sambaUnixIdPool entry!"
msgstr ""
-#: include/functions.inc:3671
+#: include/functions.inc:3676
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3683 include/functions.inc:3687
+#: include/functions.inc:3688 include/functions.inc:3692
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3711
+#: include/functions.inc:3716
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3779
+#: include/functions.inc:3784
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/class_listing.inc:291 include/class_listing.inc:1099
-#: include/class_listing.inc:1101 include/class_sortableListing.inc:343
+#: include/class_listing.inc:290 include/class_listing.inc:1105
+#: include/class_listing.inc:1107 include/class_sortableListing.inc:343
#: include/class_acl.inc:504 plugins/admin/acl/class_aclRole.inc:372
msgid "Up"
msgstr ""
-#: include/class_listing.inc:291 include/class_sortableListing.inc:343
+#: include/class_listing.inc:290 include/class_sortableListing.inc:343
#: include/class_acl.inc:506 plugins/admin/acl/class_aclRole.inc:374
msgid "Down"
msgstr ""
-#: include/class_listing.inc:564
+#: include/class_listing.inc:563
msgid "created by"
msgstr ""
-#: include/class_listing.inc:1091
+#: include/class_listing.inc:1097
msgid "Go to root department"
msgstr ""
-#: include/class_listing.inc:1091 include/class_listing.inc:1093
+#: include/class_listing.inc:1097 include/class_listing.inc:1099
#: include/class_baseSelector.inc:205
msgid "Root"
msgstr ""
-#: include/class_listing.inc:1099
+#: include/class_listing.inc:1105
msgid "Go up one department"
msgstr ""
-#: include/class_listing.inc:1107
+#: include/class_listing.inc:1113
msgid "Go to users department"
msgstr ""
-#: include/class_listing.inc:1107 include/class_listing.inc:1109
+#: include/class_listing.inc:1113 include/class_listing.inc:1115
msgid "Home"
msgstr ""
-#: include/class_listing.inc:1114
+#: include/class_listing.inc:1120
msgid "Reload list"
msgstr ""
-#: include/class_listing.inc:1114 include/class_baseSelector.inc:252
+#: include/class_listing.inc:1120 include/class_baseSelector.inc:252
msgid "Submit"
msgstr ""
-#: include/class_listing.inc:1211 plugins/admin/acl/acl-list.xml:65
+#: include/class_listing.inc:1217 plugins/admin/acl/acl-list.xml:65
#: plugins/admin/users/user-list.xml:78 plugins/admin/groups/group-list.xml:79
#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:64
#: plugins/admin/departments/dep-list.xml:87
@@ -2844,65 +2841,62 @@ msgstr ""
msgid "Actions"
msgstr ""
-#: include/class_listing.inc:1495 include/class_listing.inc:1545
-#: include/class_plugin.inc:2228
+#: include/class_listing.inc:1501 include/class_listing.inc:1551
msgid "Copy"
msgstr ""
-#: include/class_listing.inc:1501 include/class_listing.inc:1535
-#: include/class_plugin.inc:2232
+#: include/class_listing.inc:1507 include/class_listing.inc:1541
msgid "Cut"
msgstr ""
-#: include/class_listing.inc:1509 include/class_listing.inc:1511
-#: include/class_CopyPasteHandler.inc:400 include/class_plugin.inc:2239
-#: include/class_plugin.inc:2242
+#: include/class_listing.inc:1515 include/class_listing.inc:1517
+#: include/class_CopyPasteHandler.inc:400
msgid "Paste"
msgstr ""
-#: include/class_listing.inc:1535 include/class_plugin.inc:2186
+#: include/class_listing.inc:1541
msgid "Cut this entry"
msgstr ""
-#: include/class_listing.inc:1545 include/class_plugin.inc:2194
+#: include/class_listing.inc:1551
msgid "Copy this entry"
msgstr ""
-#: include/class_listing.inc:1577 include/class_listing.inc:1579
+#: include/class_listing.inc:1583 include/class_listing.inc:1585
msgid "Restore snapshots"
msgstr ""
-#: include/class_listing.inc:1593
+#: include/class_listing.inc:1599
msgid "Export list"
msgstr ""
-#: include/class_listing.inc:1628 include/class_listing.inc:1629
-#: include/class_SnapShotDialog.inc:153 include/class_plugin.inc:2160
+#: include/class_listing.inc:1634 include/class_listing.inc:1635
+#: include/class_SnapShotDialog.inc:298
msgid "Restore snapshot"
msgstr ""
-#: include/class_listing.inc:1638 include/class_plugin.inc:2167
+#: include/class_listing.inc:1644
msgid "Create snapshot"
msgstr ""
-#: include/class_listing.inc:1639 include/class_plugin.inc:2168
+#: include/class_listing.inc:1645
msgid "Create a new snapshot from this object"
msgstr ""
-#: include/class_SnapShotDialog.inc:99
+#: include/class_SnapShotDialog.inc:244
#, php-format
msgid "You're about to delete the snapshot '%s'."
msgstr ""
-#: include/class_SnapShotDialog.inc:155
+#: include/class_SnapShotDialog.inc:300
msgid "Remove snapshot"
msgstr ""
-#: include/class_SnapShotDialog.inc:157 include/class_SnapShotDialog.inc:177
+#: include/class_SnapShotDialog.inc:302 include/class_SnapShotDialog.inc:322
msgid "Y-m-d, H:i:s"
msgstr ""
-#: include/class_SnapShotDialog.inc:191 plugins/admin/acl/acl-list.xml:57
+#: include/class_SnapShotDialog.inc:336 plugins/admin/acl/acl-list.xml:57
#: plugins/admin/acl/acl_role.tpl:17 plugins/admin/acl/class_aclRole.inc:704
#: plugins/admin/groups/class_group.inc:1114
#: plugins/admin/groups/group-list.xml:66 plugins/admin/groups/generic.tpl:24
@@ -2977,32 +2971,20 @@ msgstr ""
msgid "Cannot find a suitable password method for the current hash!"
msgstr ""
-#: include/class_plugin.inc:563
+#: include/class_plugin.inc:562
msgid ""
"The object has changed since opened in FusionDirectory. All changes that may "
"be done by others get lost if you save this entry!"
msgstr ""
-#: include/class_plugin.inc:2082
+#: include/class_plugin.inc:1674
msgid "Changing ACL dn"
msgstr ""
-#: include/class_plugin.inc:2082
+#: include/class_plugin.inc:1674
msgid "from"
msgstr ""
-#: include/class_plugin.inc:2136 include/class_plugin.inc:2138
-msgid "Restore"
-msgstr ""
-
-#: include/class_plugin.inc:2186
-msgid "cut"
-msgstr ""
-
-#: include/class_plugin.inc:2194
-msgid "copy"
-msgstr ""
-
#: include/class_sortableListing.inc:303
msgid "Sortable list"
msgstr ""
@@ -3871,15 +3853,14 @@ msgstr ""
msgid "List of acls"
msgstr ""
-#: plugins/admin/acl/acl-list.xml:15
+#: plugins/admin/acl/acl-list.xml:15 plugins/admin/acl/acl-list.xml:82
#: plugins/admin/acl/class_aclManagement.inc:36
msgid "Acl"
msgstr ""
-#: plugins/admin/acl/acl-list.xml:23 plugins/admin/acl/acl-list.xml:82
-#: plugins/admin/acl/class_aclRole.inc:695
+#: plugins/admin/acl/acl-list.xml:23 plugins/admin/acl/class_aclRole.inc:695
#: plugins/personal/generic/class_user.inc:1367
-#: plugins/personal/generic/generic.tpl:515
+#: plugins/personal/generic/generic.tpl:492
msgid "Role"
msgstr ""
@@ -3919,7 +3900,7 @@ msgstr ""
msgid "Access control list management"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:160
+#: plugins/admin/acl/class_aclManagement.inc:161
msgid "ACL Assignment"
msgstr ""
@@ -4039,7 +4020,7 @@ msgid ""
msgstr ""
#: plugins/admin/users/template.tpl:15
-#: plugins/admin/users/class_userManagement.inc:542
+#: plugins/admin/users/class_userManagement.inc:539
#: plugins/admin/users/templatize.tpl:15 plugins/admin/users/user-list.xml:15
#: plugins/admin/users/user-list.xml:102
msgid "Template"
@@ -4074,23 +4055,23 @@ msgstr ""
msgid "Manage users"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:344
+#: plugins/admin/users/class_userManagement.inc:341
#: plugins/personal/password/class_password.inc:136
#, php-format
msgid "Check-hook reported a problem: %s. Password change canceled!"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:394
+#: plugins/admin/users/class_userManagement.inc:391
msgid "You have no permission to change this users password!"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:470
-#: plugins/admin/users/class_userManagement.inc:504
-#: plugins/admin/users/class_userManagement.inc:535
+#: plugins/admin/users/class_userManagement.inc:467
+#: plugins/admin/users/class_userManagement.inc:501
+#: plugins/admin/users/class_userManagement.inc:532
msgid "none"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:548
+#: plugins/admin/users/class_userManagement.inc:545
#: plugins/admin/users/user-list.xml:57
#: plugins/admin/groups/userSelect/user-list.xml:40
#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
@@ -4100,26 +4081,26 @@ msgstr ""
msgid "Given name"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:799
+#: plugins/admin/users/class_userManagement.inc:796
msgid "Account locking"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:800
+#: plugins/admin/users/class_userManagement.inc:797
#, php-format
msgid ""
"Password method '%s' does not support locking. Account (%s) has not been "
"locked!"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:873
+#: plugins/admin/users/class_userManagement.inc:870
msgid "Unlock account"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:875
+#: plugins/admin/users/class_userManagement.inc:872
msgid "Lock account"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:903
+#: plugins/admin/users/class_userManagement.inc:900
msgid "Generic properties"
msgstr ""
@@ -4208,7 +4189,7 @@ msgid "Remove user"
msgstr ""
#: plugins/admin/password/class_recoveryConfig.inc:35
-msgid "Password recovery config"
+msgid "Password recovery"
msgstr ""
#: plugins/admin/password/class_recoveryConfig.inc:36
@@ -4524,7 +4505,6 @@ msgstr ""
#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:23
#: plugins/admin/ogroups/class_ogroupManagement.inc:187
#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:79
-#: plugins/admin/ogroups/ogroup-list.xml:79
#: plugins/generic/references/class_reference.inc:55
#: plugins/personal/posix/groupSelect/group-list.xml:15
msgid "Group"
@@ -4616,8 +4596,8 @@ msgstr ""
#: plugins/generic/references/class_reference.inc:59
#: plugins/personal/posix/trustSelect/class_trustSelect.inc:81
#: plugins/personal/generic/class_user.inc:1180
-#: plugins/personal/generic/generic.tpl:399
-#: plugins/personal/generic/generic.tpl:586
+#: plugins/personal/generic/generic.tpl:376
+#: plugins/personal/generic/generic.tpl:563
msgid "Phone"
msgstr ""
@@ -4716,7 +4696,7 @@ msgstr ""
#: plugins/admin/departments/generic.tpl:91
#: plugins/admin/departments/class_organizationGeneric.inc:129
#: plugins/personal/generic/class_user.inc:1410
-#: plugins/personal/generic/generic.tpl:448
+#: plugins/personal/generic/generic.tpl:425
msgid "Location"
msgstr ""
@@ -4733,8 +4713,8 @@ msgstr ""
#: plugins/admin/departments/generic.tpl:51
#: plugins/admin/departments/class_organizationGeneric.inc:126
#: plugins/personal/generic/class_user.inc:1399
-#: plugins/personal/generic/generic.tpl:341
-#: plugins/personal/generic/generic.tpl:362
+#: plugins/personal/generic/generic.tpl:318
+#: plugins/personal/generic/generic.tpl:339
msgid "Manager"
msgstr ""
@@ -4872,7 +4852,7 @@ msgstr ""
#: plugins/admin/departments/generic.tpl:83
#: plugins/admin/departments/class_organizationGeneric.inc:128
#: plugins/personal/generic/class_user.inc:1409
-#: plugins/personal/generic/generic.tpl:456
+#: plugins/personal/generic/generic.tpl:433
msgid "State"
msgstr ""
@@ -4890,7 +4870,7 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:667
#: plugins/admin/departments/generic.tpl:99
#: plugins/personal/generic/generic.tpl:181
-#: plugins/personal/generic/generic.tpl:464
+#: plugins/personal/generic/generic.tpl:441
msgid "Address"
msgstr ""
@@ -4910,8 +4890,8 @@ msgstr ""
#: plugins/admin/departments/generic.tpl:114
#: plugins/admin/departments/class_organizationGeneric.inc:132
#: plugins/personal/generic/class_user.inc:1183
-#: plugins/personal/generic/generic.tpl:430
-#: plugins/personal/generic/generic.tpl:598
+#: plugins/personal/generic/generic.tpl:407
+#: plugins/personal/generic/generic.tpl:575
msgid "Fax"
msgstr ""
@@ -4962,7 +4942,7 @@ msgstr ""
#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:15
#: plugins/generic/references/class_reference.inc:57
#: plugins/personal/generic/class_user.inc:1396
-#: plugins/personal/generic/generic.tpl:308
+#: plugins/personal/generic/generic.tpl:285
msgid "Department"
msgstr ""
@@ -5266,6 +5246,10 @@ msgstr ""
msgid "List of object groups"
msgstr ""
+#: plugins/admin/ogroups/ogroup-list.xml:79
+msgid "Objectgroup"
+msgstr ""
+
#: plugins/admin/ogroups/ogroup-list.xml:106
msgid "Send message"
msgstr ""
@@ -5337,7 +5321,8 @@ msgstr ""
#: plugins/config/class_configInLdap.inc:82
msgid ""
-"Default language to be used if the one asked by the browser is not available"
+"Language of the application. If 'automatic' or not available, the one asked "
+"by the browser will be used. This setting can be overriden per user."
msgstr ""
#: plugins/config/class_configInLdap.inc:87
@@ -5353,7 +5338,7 @@ msgid "Schema setup"
msgstr ""
#: plugins/config/class_configInLdap.inc:103
-msgid "rfc237bis"
+msgid "rfc2307bis"
msgstr ""
#: plugins/config/class_configInLdap.inc:104
@@ -6055,12 +6040,12 @@ msgid "Homepage"
msgstr ""
#: plugins/personal/generic/class_user.inc:1186
-#: plugins/personal/generic/generic.tpl:411
+#: plugins/personal/generic/generic.tpl:388
msgid "Mobile"
msgstr ""
#: plugins/personal/generic/class_user.inc:1189
-#: plugins/personal/generic/generic.tpl:422
+#: plugins/personal/generic/generic.tpl:399
msgid "Pager"
msgstr ""
@@ -6071,57 +6056,57 @@ msgid "Date of birth"
msgstr ""
#: plugins/personal/generic/class_user.inc:1357
-#: plugins/personal/generic/generic.tpl:538
+#: plugins/personal/generic/generic.tpl:515
msgid "Unit"
msgstr ""
#: plugins/personal/generic/class_user.inc:1358
-#: plugins/personal/generic/generic.tpl:563
+#: plugins/personal/generic/generic.tpl:540
msgid "House identifier"
msgstr ""
#: plugins/personal/generic/class_user.inc:1359
-#: plugins/personal/generic/generic.tpl:480
+#: plugins/personal/generic/generic.tpl:457
msgid "Vocation"
msgstr ""
#: plugins/personal/generic/class_user.inc:1360
-#: plugins/personal/generic/generic.tpl:607
+#: plugins/personal/generic/generic.tpl:584
msgid "Last delivery"
msgstr ""
#: plugins/personal/generic/class_user.inc:1361
-#: plugins/personal/generic/generic.tpl:529
+#: plugins/personal/generic/generic.tpl:506
msgid "Person locality"
msgstr ""
#: plugins/personal/generic/class_user.inc:1362
-#: plugins/personal/generic/generic.tpl:488
+#: plugins/personal/generic/generic.tpl:465
msgid "Unit description"
msgstr ""
#: plugins/personal/generic/class_user.inc:1363
-#: plugins/personal/generic/generic.tpl:497
+#: plugins/personal/generic/generic.tpl:474
msgid "Subject area"
msgstr ""
#: plugins/personal/generic/class_user.inc:1364
-#: plugins/personal/generic/generic.tpl:506
+#: plugins/personal/generic/generic.tpl:483
msgid "Functional title"
msgstr ""
#: plugins/personal/generic/class_user.inc:1365
-#: plugins/personal/generic/generic.tpl:616
+#: plugins/personal/generic/generic.tpl:593
msgid "Public visible"
msgstr ""
#: plugins/personal/generic/class_user.inc:1366
-#: plugins/personal/generic/generic.tpl:547
+#: plugins/personal/generic/generic.tpl:524
msgid "Street"
msgstr ""
#: plugins/personal/generic/class_user.inc:1368
-#: plugins/personal/generic/generic.tpl:555
+#: plugins/personal/generic/generic.tpl:532
msgid "Postal code"
msgstr ""
@@ -6170,7 +6155,7 @@ msgid "Employee number"
msgstr ""
#: plugins/personal/generic/class_user.inc:1401
-#: plugins/personal/generic/generic.tpl:332
+#: plugins/personal/generic/generic.tpl:309
msgid "Employee type"
msgstr ""
@@ -6251,29 +6236,28 @@ msgstr ""
msgid "Restrict login to"
msgstr ""
-#: plugins/personal/generic/generic.tpl:248
-#: plugins/personal/generic/generic.tpl:267
+#: plugins/personal/generic/generic.tpl:246
msgid "IP or network"
msgstr ""
-#: plugins/personal/generic/generic.tpl:288
+#: plugins/personal/generic/generic.tpl:265
msgid "Organizational information"
msgstr ""
-#: plugins/personal/generic/generic.tpl:316
+#: plugins/personal/generic/generic.tpl:293
msgid "Department No."
msgstr ""
-#: plugins/personal/generic/generic.tpl:324
+#: plugins/personal/generic/generic.tpl:301
msgid "Employee No."
msgstr ""
-#: plugins/personal/generic/generic.tpl:390
-#: plugins/personal/generic/generic.tpl:578
+#: plugins/personal/generic/generic.tpl:367
+#: plugins/personal/generic/generic.tpl:555
msgid "Room No."
msgstr ""
-#: plugins/personal/generic/generic.tpl:592
+#: plugins/personal/generic/generic.tpl:569
msgid "Please use the phone tab"
msgstr ""
diff --git a/locale/it/messages.po b/locale/it/fusiondirectory.po
similarity index 95%
rename from locale/it/messages.po
rename to locale/it/fusiondirectory.po
index 95573edaa6865a8129cf178a56ba6339ef775223..e55d04c17e78151f8b17ab3854f55242893b5ce1 100644
--- a/locale/it/messages.po
+++ b/locale/it/fusiondirectory.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-24 14:48+0100\n"
-"PO-Revision-Date: 2013-03-07 23:20+0000\n"
+"POT-Creation-Date: 2013-04-14 20:13+0200\n"
+"PO-Revision-Date: 2013-03-26 15:10+0000\n"
"Last-Translator: poterealpopolo <giuliano@opensides.be>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory/"
"language/it/)\n"
@@ -23,23 +23,23 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: html/main.php:140 html/class_passwordRecovery.inc:226
+#: html/main.php:135 html/class_passwordRecovery.inc:226
#: include/class_xml.inc:60 include/functions.inc:509
#: plugins/admin/departments/class_department.inc:431
msgid "Fatal error"
msgstr "Errore fatale"
-#: html/main.php:141
+#: html/main.php:136
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr ""
"Impossibile trovare il file '%s' - esegui '%s' per porre rimedio al problema"
-#: html/main.php:162
+#: html/main.php:157
msgid "PHP configuration"
msgstr "Configurazione PHP"
-#: html/main.php:163
+#: html/main.php:158
msgid ""
"Fatal error: Register globals is on. FusionDirectory will refuse to login "
"unless this is fixed by an administrator."
@@ -47,18 +47,18 @@ msgstr ""
"Errore fatale: Register globals è attivato. FusionDirectory rifiuterà ogni "
"accesso utente finchè questo errore non sarà corretto da un amministratore."
-#: html/main.php:192 ihtml/themes/default/password.tpl:40
-#: plugins/admin/users/class_userManagement.inc:393
+#: html/main.php:187 ihtml/themes/default/password.tpl:40
+#: plugins/admin/users/class_userManagement.inc:390
#: plugins/personal/password/class_password.inc:156
#: plugins/personal/password/class_password.inc:162
msgid "Password change"
msgstr "Modifica della password"
-#: html/main.php:192
+#: html/main.php:187
msgid "Your password is about to expire, please change your password!"
msgstr "La tua password sta per scadere, per favore cambiala !"
-#: html/main.php:261 html/class_passwordRecovery.inc:301 html/index.php:147
+#: html/main.php:256 html/class_passwordRecovery.inc:296 html/index.php:147
#: html/index.php:208 include/class_SnapshotHandler.inc:57
#: include/class_SnapshotHandler.inc:70 include/class_SnapshotHandler.inc:88
#: include/class_pluglist.inc:272 include/functions.inc:933
@@ -72,19 +72,19 @@ msgstr "La tua password sta per scadere, per favore cambiala !"
msgid "Configuration error"
msgstr "Errore di configurazione"
-#: html/main.php:261
+#: html/main.php:256
msgid "Running out of memory!"
msgstr "Fine della memoria disponibile !"
-#: html/main.php:316
+#: html/main.php:311
msgid "User ACL checks disabled"
msgstr "Le verifiche ACL dell'utente sono state disattivate"
-#: html/main.php:362
+#: html/main.php:357
msgid "Plugin"
msgstr "Estensione"
-#: html/main.php:363
+#: html/main.php:358
#, php-format
msgid ""
"Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not "
@@ -93,11 +93,11 @@ msgstr ""
"Errore fatale: Impossibile trovare alcuna definizione per il plugin "
"'%s' ('%s' non è un file)!"
-#: html/main.php:378
+#: html/main.php:373
msgid "Configuration Error"
msgstr "Errore di configurazione"
-#: html/main.php:379
+#: html/main.php:374
#, php-format
msgid ""
"Fatal error: not all POST variables have been transfered by PHP - please "
@@ -115,19 +115,19 @@ msgstr "Algoritmo di memorizzazione delle password"
msgid "Error: Password method not available!"
msgstr "Errore: Algoritmo di memorizzazione delle password non disponibile !"
-#: html/class_passwordRecovery.inc:227 html/index.php:147
+#: html/class_passwordRecovery.inc:227
#, php-format
msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
msgstr "Il file di configurazione %s/%s non è leggibile. Operazione Annullata."
-#: html/class_passwordRecovery.inc:302 html/setup.php:63 html/index.php:163
+#: html/class_passwordRecovery.inc:297 html/setup.php:63 html/index.php:163
#, php-format
msgid "Directory '%s' specified as compile directory is not accessible!"
msgstr ""
"La cartella '%s' dichiarata come cartella di compilazione è inaccessibile !"
-#: html/class_passwordRecovery.inc:407
-#: plugins/admin/users/class_userManagement.inc:309
+#: html/class_passwordRecovery.inc:402
+#: plugins/admin/users/class_userManagement.inc:306
#: plugins/personal/password/class_password.inc:113
msgid ""
"The passwords you've entered as 'New password' and 'Repeated new password' "
@@ -136,13 +136,13 @@ msgstr ""
"Le password che hai definito come 'Nuova password' e 'Ripeti nuova password' "
"non corrispondono."
-#: html/class_passwordRecovery.inc:409 ihtml/themes/default/password.tpl:81
+#: html/class_passwordRecovery.inc:404 ihtml/themes/default/password.tpl:81
#: ihtml/themes/default/password.tpl:82
#: ihtml/themes/default/accountexpired.tpl:32
#: ihtml/themes/default/accountexpired.tpl:36
#: ihtml/themes/default/recovery.tpl:93 ihtml/themes/default/recovery.tpl:94
#: plugins/admin/users/password.tpl:17 plugins/admin/users/password.tpl:60
-#: plugins/admin/users/class_userManagement.inc:312
+#: plugins/admin/users/class_userManagement.inc:309
#: plugins/personal/password/password.tpl:27
#: plugins/personal/password/password.tpl:78
#: plugins/personal/generic/password.tpl:22
@@ -150,16 +150,16 @@ msgstr ""
msgid "New password"
msgstr "Nuova password"
-#: html/class_passwordRecovery.inc:411
+#: html/class_passwordRecovery.inc:406
msgid "The password used as new is too short."
msgstr "La password che hai definito come 'Nuova password' è troppo corta."
-#: html/class_passwordRecovery.inc:413
+#: html/class_passwordRecovery.inc:408
#: plugins/personal/password/class_password.inc:121
msgid "The password contains possibly problematic Unicode characters!"
msgstr "La password contiene caratteri Unicode eventualmente problematici!"
-#: html/class_passwordRecovery.inc:437 html/index.php:58 html/index.php:64
+#: html/class_passwordRecovery.inc:432 html/index.php:58 html/index.php:64
#: html/index.php:403 ihtml/themes/default/conflict.tpl:6
#: ihtml/themes/default/islocked.tpl:6 ihtml/themes/default/remove.tpl:2
#: ihtml/themes/default/msg_dialog.tpl:59
@@ -182,39 +182,39 @@ msgstr "La password contiene caratteri Unicode eventualmente problematici!"
msgid "Warning"
msgstr "Attenzione"
-#: html/class_passwordRecovery.inc:438
+#: html/class_passwordRecovery.inc:433
msgid "Session will not be encrypted."
msgstr "La sessione non sarà criptata."
-#: html/class_passwordRecovery.inc:440
+#: html/class_passwordRecovery.inc:435
msgid "Enter SSL session"
msgstr "Inizia una sessione SSL"
-#: html/class_passwordRecovery.inc:481
+#: html/class_passwordRecovery.inc:476
#, php-format
msgid "Did not found account %s"
msgstr "Non ha trovato l'account %s"
-#: html/class_passwordRecovery.inc:484
+#: html/class_passwordRecovery.inc:479
#, php-format
msgid "Found multiple accounts %s"
msgstr "Trovati più account %s"
-#: html/class_passwordRecovery.inc:498 ihtml/themes/default/recovery.tpl:142
+#: html/class_passwordRecovery.inc:493 ihtml/themes/default/recovery.tpl:142
msgid "Adresse mail"
msgstr "Indirizzo mail"
-#: html/class_passwordRecovery.inc:515
+#: html/class_passwordRecovery.inc:510
#, php-format
msgid "There is no account using email %s"
msgstr "Non c'è nessun account che usa l'indirizzo mail %s"
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:513
#, php-format
msgid "There are several accounts using email %s"
msgstr "Ci sono più account che usano l'indirizzo mail %s"
-#: html/class_passwordRecovery.inc:543 html/index.php:257 html/index.php:269
+#: html/class_passwordRecovery.inc:538 html/index.php:257 html/index.php:269
#: html/index.php:282 setup/class_setupStep_Migrate.inc:1138
#: setup/class_setupStep_Migrate.inc:1164
#: setup/class_setupStep_Migrate.inc:1213
@@ -226,20 +226,17 @@ msgstr "Ci sono più account che usano l'indirizzo mail %s"
#: setup/class_setupStep_Migrate.inc:2549
#: setup/class_setupStep_Migrate.inc:2896
#: setup/class_setupStep_Migrate.inc:2910
-#: include/class_SnapshotHandler.inc:150 include/class_SnapshotHandler.inc:329
-#: include/class_SnapshotHandler.inc:378 include/class_SnapshotHandler.inc:382
-#: include/class_SnapshotHandler.inc:402 include/class_SnapshotHandler.inc:445
-#: include/class_SnapshotHandler.inc:508 include/class_SnapshotHandler.inc:577
-#: include/class_SnapshotHandler.inc:592 include/functions.inc:547
+#: include/class_SnapshotHandler.inc:150 include/class_SnapshotHandler.inc:335
+#: include/class_SnapshotHandler.inc:388 include/class_SnapshotHandler.inc:392
+#: include/class_SnapshotHandler.inc:412 include/class_SnapshotHandler.inc:455
+#: include/class_SnapshotHandler.inc:518 include/class_SnapshotHandler.inc:587
+#: include/class_SnapshotHandler.inc:602 include/functions.inc:547
#: include/functions.inc:583 include/functions.inc:591
#: include/functions.inc:639 include/functions.inc:948
#: include/functions.inc:998 include/functions.inc:1058
#: include/functions.inc:1113 include/functions.inc:3244
-#: include/functions.inc:3509 include/class_config.inc:330
-#: include/class_plugin.inc:1500 include/class_plugin.inc:1550
-#: include/class_plugin.inc:1554 include/class_plugin.inc:1574
-#: include/class_plugin.inc:1621 include/class_plugin.inc:1681
-#: include/class_plugin.inc:1751 include/class_plugin.inc:1766
+#: include/functions.inc:3514 include/class_SnapShotDialog.inc:104
+#: include/class_SnapShotDialog.inc:177 include/class_config.inc:330
#: include/class_acl.inc:1308 include/class_acl.inc:1413
#: include/class_ldap.inc:934 include/class_ldap.inc:1421
#: plugins/admin/acl/class_aclRole.inc:613
@@ -258,21 +255,21 @@ msgstr "Ci sono più account che usano l'indirizzo mail %s"
msgid "LDAP error"
msgstr "Errore LDAP"
-#: html/class_passwordRecovery.inc:566
+#: html/class_passwordRecovery.inc:561
msgid "Contact your administrator, there was a problem with mail server"
msgstr ""
"Contattare l'amministratore, c'è stato un problema con il server di posta "
"elettronica"
-#: html/class_passwordRecovery.inc:577
+#: html/class_passwordRecovery.inc:572
msgid "This token is invalid"
msgstr "Questo token non è valido"
-#: html/class_passwordRecovery.inc:615
+#: html/class_passwordRecovery.inc:610
msgid "External password changer reported a problem: "
msgstr "Il programma esterno per cambiare la password ha rilevato un problema:"
-#: html/class_passwordRecovery.inc:640
+#: html/class_passwordRecovery.inc:635
msgid "There was a problem with mail server, confirmation email not sent"
msgstr ""
"Si è verificato un problema con il server mail, la email di conferma non è "
@@ -294,6 +291,13 @@ msgstr ""
"La durata di vita delle sessioni configurata nel tuo file fusiondirectory."
"conf sarà rimpiazzata da quella definita nel tuo php.ini."
+#: html/index.php:147
+#, fuzzy, php-format
+msgid ""
+"FusionDirectory configuration %s/%s is not readable. Please run "
+"fusiondirectory-setup --check-config to fix this."
+msgstr "Il file di configurazione %s/%s non è leggibile. Operazione Annullata."
+
#: html/index.php:163
msgid "Smarty error"
msgstr "Errore Smarty"
@@ -308,22 +312,22 @@ msgstr "C'è un problema con la configurazione dell'autentificazione !"
#: setup/setup_checks.tpl:91 setup/class_setupStep_Migrate.inc:1127
#: include/class_xml.inc:57 include/class_tabs.inc:74
#: include/class_management.inc:507 include/class_management.inc:657
-#: include/functions.inc:3613 include/functions.inc:3633
-#: include/functions.inc:3663 include/functions.inc:3671
-#: include/functions.inc:3683 include/functions.inc:3687
-#: include/functions.inc:3702 include/functions.inc:3711
-#: include/functions.inc:3779 include/class_listing.inc:522
+#: include/functions.inc:3618 include/functions.inc:3638
+#: include/functions.inc:3668 include/functions.inc:3676
+#: include/functions.inc:3688 include/functions.inc:3692
+#: include/functions.inc:3707 include/functions.inc:3716
+#: include/functions.inc:3784 include/class_listing.inc:521
#: include/class_config.inc:483 include/class_CopyPasteHandler.inc:264
#: include/password-methods/class_password-methods-sasl.inc:51
#: include/password-methods/class_password-methods-sasl.inc:63
#: include/password-methods/class_password-methods.inc:342
#: include/password-methods/class_password-methods.inc:447
#: include/password-methods/class_password-methods.inc:458
-#: include/class_plugin.inc:1368 include/class_plugin.inc:1843
-#: include/class_msg_dialog.inc:128 include/class_msgPool.inc:215
-#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:680 include/class_msgPool.inc:711
-#: include/class_msgPool.inc:738 include/class_databaseManagement.inc:78
+#: include/class_plugin.inc:1367 include/class_msg_dialog.inc:128
+#: include/class_msgPool.inc:215 include/class_msgPool.inc:235
+#: include/class_msgPool.inc:265 include/class_msgPool.inc:680
+#: include/class_msgPool.inc:711 include/class_msgPool.inc:738
+#: include/class_databaseManagement.inc:78
#: plugins/admin/acl/class_aclRole.inc:681
#: plugins/admin/groups/class_group.inc:521
#: plugins/admin/groups/class_group.inc:527
@@ -1080,37 +1084,32 @@ msgstr ""
"FusionDirectory ha bisogno di questo modulo per comunicare con i database "
"supportati."
-#: setup/class_setupStep_Checks.inc:136
-msgid "MDB2 mysql"
-msgstr "MDB2 mysql"
-
-#: setup/class_setupStep_Checks.inc:137
+#: setup/class_setupStep_Checks.inc:134
msgid ""
-"FusionDirectory requires this module to communicate with mysql databases."
+"If you do not want to install MDB2 and won't use databases, remove the "
+"class_databaseManagement.inc file."
msgstr ""
-"FusionDirectory ha bisogno di questo modulo per comunicare con i database "
-"mysql."
-#: setup/class_setupStep_Checks.inc:143
+#: setup/class_setupStep_Checks.inc:138
msgid "imagick"
msgstr "imagick"
-#: setup/class_setupStep_Checks.inc:144
+#: setup/class_setupStep_Checks.inc:139
msgid "FusionDirectory requires this extension to handle images."
msgstr ""
"FusionDirectory ha bisogno di questa estensione per gestire le immagini."
-#: setup/class_setupStep_Checks.inc:159
+#: setup/class_setupStep_Checks.inc:154
msgid "compression module"
msgstr "modulo di compressione"
-#: setup/class_setupStep_Checks.inc:160
+#: setup/class_setupStep_Checks.inc:155
msgid "FusionDirectory requires this extension to handle snapshots."
msgstr ""
"FusionDirectory ha bisogno di questa estensione per gestire gli snapshot (le "
"copie istantanee)."
-#: setup/class_setupStep_Checks.inc:171
+#: setup/class_setupStep_Checks.inc:166
msgid ""
"register_globals is a PHP mechanism to register all global variables to be "
"accessible from scripts without changing the scope. This may be a security "
@@ -1120,16 +1119,16 @@ msgstr ""
"variabili globali affinchè gli scripts possano accedervi senza cambiare la "
"portata delle variabili. Questo puó generare un rischio per la sicurezza."
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStep_Checks.inc:167
msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
msgstr ""
"Cerca l'opzione register_globals nel tuo file php.ini e impostalo su 'Off'."
-#: setup/class_setupStep_Checks.inc:180
+#: setup/class_setupStep_Checks.inc:175
msgid "PHP uses this value for the garbage collector to delete old sessions."
msgstr "PHP utilizza questa variabile per cancellare delle vecchie sessioni."
-#: setup/class_setupStep_Checks.inc:181
+#: setup/class_setupStep_Checks.inc:176
msgid ""
"Setting this value to one day will prevent loosing session and cookies "
"before they really timeout."
@@ -1137,7 +1136,7 @@ msgstr ""
"Impostare questa variabile a \"1 giorno\" eviterà di perdere i coockies e le "
"sessioni prima che siano realmente scadute."
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStep_Checks.inc:177
msgid ""
"Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
"higher."
@@ -1145,12 +1144,12 @@ msgstr ""
"Cerca la variabile 'session.gc_maxlifetime' nel tuo file php.ini e impostala "
"a 86400 o un valore più grande."
-#: setup/class_setupStep_Checks.inc:189 setup/class_setupStep_Checks.inc:205
-#: setup/class_setupStep_Checks.inc:221 setup/class_setupStep_Checks.inc:229
+#: setup/class_setupStep_Checks.inc:184 setup/class_setupStep_Checks.inc:200
+#: setup/class_setupStep_Checks.inc:216 setup/class_setupStep_Checks.inc:224
msgid "Off"
msgstr "Off"
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStep_Checks.inc:185
msgid ""
"In Order to use FusionDirectory without any trouble, the session.auto_start "
"option in your php.ini should be set to 'Off'."
@@ -1158,13 +1157,13 @@ msgstr ""
"Per non avere problemi nell'uso di FusionDirectory, è necessario impostare "
"l'opzione 'session.auto_start' su 'Off' nel file php.ini."
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStep_Checks.inc:186
msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
msgstr ""
"Cerca la variabile 'session.auto_start' nel file php.ini e impostala su "
"'Off'."
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStep_Checks.inc:193
msgid ""
"FusionDirectory needs at least 128MB of memory. Setting it below this limit "
"may cause errors that are not reproducable! Increase it for larger setups."
@@ -1173,14 +1172,14 @@ msgstr ""
"memoria causeranno degli errori imprevisti che non saranno riproducibili ! "
"Aumenta la memoria per delle installazioni più complesse."
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStep_Checks.inc:194
msgid ""
"Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
msgstr ""
"Cerca la variabile 'memory_limit' nel file php.ini e impostala su '128MB' o "
"un valore più grande."
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStep_Checks.inc:201
msgid ""
"This option influences the PHP output handling. Turn this Option off, to "
"increase performance."
@@ -1188,23 +1187,23 @@ msgstr ""
"Questa opzione influenza la gestione delle uscite. Per aumentare le "
"prestazioni, impostala su 'Off'."
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStep_Checks.inc:202
msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
msgstr ""
"Cerca la variabile 'implicit_flush' nel file php.ini e impostala su 'Off'."
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStep_Checks.inc:209
msgid "The Execution time should be at least 30 seconds."
msgstr "Il tempo di esecuzione deve essere di almeno 30 secondi."
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStep_Checks.inc:210
msgid ""
"Search for 'max_execution_time' in your php.ini and set it to '30' or higher."
msgstr ""
"Cerca la variabile 'max_execution_time' nel file php.ini e impostala su '30' "
"o un valore più grande."
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStep_Checks.inc:217
msgid ""
"Increase the server security by setting expose_php to 'off'. PHP won't send "
"any information about the server you are running in this case."
@@ -1213,32 +1212,32 @@ msgstr ""
"'Off'. PHP non trasmetterà alcuna informazione a proposito del server che "
"stai configurando."
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStep_Checks.inc:218
msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
msgstr "Cerca la variabile 'expose_php' nel file php.ini e impostala su 'Off'."
-#: setup/class_setupStep_Checks.inc:230
+#: setup/class_setupStep_Checks.inc:225
msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
msgstr ""
"Aumenta le prestazioni del tuo server impostando la variabile "
"'magic_quotes_gpc' su 'Off'."
-#: setup/class_setupStep_Checks.inc:231
+#: setup/class_setupStep_Checks.inc:226
msgid ""
"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to 'Off'."
msgstr ""
"Cerca la variabile 'zend.ze1_compatibility_mode' nel file php.ini e "
"impostala su 'Off'."
-#: setup/class_setupStep_Checks.inc:241
+#: setup/class_setupStep_Checks.inc:236
msgid "Configuration writeable"
msgstr "Il file di configurazione puó essere scritto"
-#: setup/class_setupStep_Checks.inc:242
+#: setup/class_setupStep_Checks.inc:237
msgid "The configuration file can't be written"
msgstr "Il file di configurazione non puó essere scritto"
-#: setup/class_setupStep_Checks.inc:243
+#: setup/class_setupStep_Checks.inc:238
#, php-format
msgid ""
"FusionDirectory reads its configuration from a file located in (%s/%s). The "
@@ -1833,7 +1832,7 @@ msgstr "Inscriviti alla mailing list di FusionDirectory-users"
#: plugins/admin/departments/class_organizationGeneric.inc:115
#: plugins/admin/departments/class_organizationGeneric.inc:118
#: plugins/personal/generic/class_user.inc:1395
-#: plugins/personal/generic/generic.tpl:300
+#: plugins/personal/generic/generic.tpl:277
msgid "Organization"
msgstr "Organizzazione"
@@ -1843,8 +1842,8 @@ msgstr "Organizzazione"
#: plugins/admin/acl/class_aclRole.inc:702
#: plugins/admin/acl/class_aclRole.inc:715
#: plugins/admin/acl/class_aclRole.inc:725
-#: plugins/admin/users/class_userManagement.inc:545
-#: plugins/admin/users/class_userManagement.inc:592
+#: plugins/admin/users/class_userManagement.inc:542
+#: plugins/admin/users/class_userManagement.inc:589
#: plugins/admin/users/user-filter.tpl:26
#: plugins/admin/groups/group-filter.tpl:21
#: plugins/admin/groups/userSelect/user-filter.tpl:17
@@ -1928,7 +1927,7 @@ msgstr ""
"d'iscrizione anonimamente."
#: setup/setup_feedback.tpl:52
-#: plugins/admin/users/class_userManagement.inc:903
+#: plugins/admin/users/class_userManagement.inc:900
#: plugins/admin/groups/class_group.inc:1106
#: plugins/admin/departments/class_department.inc:653
#: plugins/admin/ogroups/class_ogroup.inc:895
@@ -2079,7 +2078,7 @@ msgstr "Sposta i gruppi selezionati nel gruppo di base dell'annuario"
#: setup/setup_migrate.tpl:101 setup/setup_migrate.tpl:153
#: setup/setup_migrate.tpl:320 setup/setup_migrate.tpl:373
#: setup/setup_migrate.tpl:416 setup/setup_migrate.tpl:459
-#: setup/setup_migrate.tpl:503 include/class_listing.inc:352
+#: setup/setup_migrate.tpl:503 include/class_listing.inc:351
msgid "Select all"
msgstr "Seleziona tutto"
@@ -2583,7 +2582,7 @@ msgid "Group will be moved from"
msgstr "Il gruppo sarà spostato da"
#: setup/class_setupStep_Migrate.inc:1175
-#: setup/class_setupStep_Migrate.inc:1223 include/class_plugin.inc:2083
+#: setup/class_setupStep_Migrate.inc:1223 include/class_plugin.inc:1675
msgid "to"
msgstr "verso"
@@ -2662,8 +2661,7 @@ msgstr "Ci sono %s servizi che hanno bisogno di essere migrati."
#: setup/class_setupStep_Migrate.inc:2647 include/class_msgPool.inc:495
#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:83
#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:138
-#: plugins/personal/generic/generic.tpl:251
-#: plugins/personal/generic/generic.tpl:270
+#: plugins/personal/generic/generic.tpl:249
#, php-format
msgid "Add"
msgstr "Aggiungi"
@@ -2791,28 +2789,25 @@ msgstr "Il filtro non è completo!"
#: include/class_management.inc:333 include/class_management.inc:483
#: include/class_management.inc:536 include/class_management.inc:576
#: include/class_management.inc:590 include/class_CopyPasteHandler.inc:223
-#: include/class_plugin.inc:1791 include/class_plugin.inc:1803
-#: include/class_plugin.inc:1818 include/class_plugin.inc:1831
-#: plugins/admin/users/class_userManagement.inc:205
-#: plugins/admin/users/class_userManagement.inc:761
+#: plugins/admin/users/class_userManagement.inc:202
+#: plugins/admin/users/class_userManagement.inc:758
msgid "Permission"
msgstr "Permesso"
#: include/class_management.inc:403
-#: plugins/admin/acl/class_aclManagement.inc:100
-#: plugins/admin/users/class_userManagement.inc:719
-#: plugins/admin/users/class_userManagement.inc:723
+#: plugins/admin/acl/class_aclManagement.inc:101
+#: plugins/admin/users/class_userManagement.inc:716
+#: plugins/admin/users/class_userManagement.inc:720
msgid "Permission error"
msgstr "Errore di permesso"
-#: include/class_management.inc:483 include/class_plugin.inc:1791
+#: include/class_management.inc:483
#, php-format
msgid "You are not allowed to create a snapshot for %s."
msgstr "Non sei autorizzato a creare una 'copia instantanea' di %s."
#: include/class_management.inc:536 include/class_management.inc:576
-#: include/class_management.inc:590 include/class_plugin.inc:1803
-#: include/class_plugin.inc:1818 include/class_plugin.inc:1831
+#: include/class_management.inc:590
#, php-format
msgid "You are not allowed to restore a snapshot for %s."
msgstr "Non sei autorizzato a restaurare una 'copia instantanea' di %s."
@@ -3043,87 +3038,87 @@ msgid ""
msgstr ""
"Il comando '%s', usato nel POSTMODIFY dell'estensione '%s', non esiste !"
-#: include/functions.inc:3613 include/functions.inc:3633
-#: include/functions.inc:3671 include/functions.inc:3683
-#: include/functions.inc:3687 include/functions.inc:3702
-#: include/functions.inc:3711
+#: include/functions.inc:3618 include/functions.inc:3638
+#: include/functions.inc:3676 include/functions.inc:3688
+#: include/functions.inc:3692 include/functions.inc:3707
+#: include/functions.inc:3716
msgid "Cannot allocate a free ID:"
msgstr "Impossibile assegnare un ID libero:"
-#: include/functions.inc:3613
+#: include/functions.inc:3618
msgid "unknown idAllocation method!"
msgstr "Metodo idAllocation sconosciuto !"
-#: include/functions.inc:3633
+#: include/functions.inc:3638
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr "%sPoolMin >= %sPoolMax!"
-#: include/functions.inc:3663
+#: include/functions.inc:3668
msgid "Cannot create sambaUnixIdPool entry!"
msgstr "Impossibile creare la voce sambaUnixIdPool !"
-#: include/functions.inc:3671
+#: include/functions.inc:3676
msgid "sambaUnixIdPool is not unique!"
msgstr "sambaUnixIdPool non è univoco !"
-#: include/functions.inc:3683 include/functions.inc:3687
+#: include/functions.inc:3688 include/functions.inc:3692
msgid "no ID available!"
msgstr "nessun ID disponibile !"
-#: include/functions.inc:3711
+#: include/functions.inc:3716
msgid "maximum tries exceeded!"
msgstr "Il numero massimo di tentativi è stato superato"
-#: include/functions.inc:3779
+#: include/functions.inc:3784
msgid "Cannot allocate a free ID!"
msgstr "Impossibile assegnare un ID libero!"
-#: include/class_listing.inc:291 include/class_listing.inc:1099
-#: include/class_listing.inc:1101 include/class_sortableListing.inc:343
+#: include/class_listing.inc:290 include/class_listing.inc:1105
+#: include/class_listing.inc:1107 include/class_sortableListing.inc:343
#: include/class_acl.inc:504 plugins/admin/acl/class_aclRole.inc:372
msgid "Up"
msgstr "Sopra"
-#: include/class_listing.inc:291 include/class_sortableListing.inc:343
+#: include/class_listing.inc:290 include/class_sortableListing.inc:343
#: include/class_acl.inc:506 plugins/admin/acl/class_aclRole.inc:374
msgid "Down"
msgstr "Sotto"
-#: include/class_listing.inc:564
+#: include/class_listing.inc:563
msgid "created by"
msgstr "Creato da"
-#: include/class_listing.inc:1091
+#: include/class_listing.inc:1097
msgid "Go to root department"
msgstr "Vai al dipartimento base"
-#: include/class_listing.inc:1091 include/class_listing.inc:1093
+#: include/class_listing.inc:1097 include/class_listing.inc:1099
#: include/class_baseSelector.inc:205
msgid "Root"
msgstr "Root"
-#: include/class_listing.inc:1099
+#: include/class_listing.inc:1105
msgid "Go up one department"
msgstr "Sali di un dipartimento"
-#: include/class_listing.inc:1107
+#: include/class_listing.inc:1113
msgid "Go to users department"
msgstr "Vai agli utenti del dipartimento"
-#: include/class_listing.inc:1107 include/class_listing.inc:1109
+#: include/class_listing.inc:1113 include/class_listing.inc:1115
msgid "Home"
msgstr "Home"
-#: include/class_listing.inc:1114
+#: include/class_listing.inc:1120
msgid "Reload list"
msgstr "Ricarica la lista"
-#: include/class_listing.inc:1114 include/class_baseSelector.inc:252
+#: include/class_listing.inc:1120 include/class_baseSelector.inc:252
msgid "Submit"
msgstr "Invia"
-#: include/class_listing.inc:1211 plugins/admin/acl/acl-list.xml:65
+#: include/class_listing.inc:1217 plugins/admin/acl/acl-list.xml:65
#: plugins/admin/users/user-list.xml:78 plugins/admin/groups/group-list.xml:79
#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:64
#: plugins/admin/departments/dep-list.xml:87
@@ -3131,65 +3126,62 @@ msgstr "Invia"
msgid "Actions"
msgstr "Azioni"
-#: include/class_listing.inc:1495 include/class_listing.inc:1545
-#: include/class_plugin.inc:2228
+#: include/class_listing.inc:1501 include/class_listing.inc:1551
msgid "Copy"
msgstr "Copia"
-#: include/class_listing.inc:1501 include/class_listing.inc:1535
-#: include/class_plugin.inc:2232
+#: include/class_listing.inc:1507 include/class_listing.inc:1541
msgid "Cut"
msgstr "Taglia"
-#: include/class_listing.inc:1509 include/class_listing.inc:1511
-#: include/class_CopyPasteHandler.inc:400 include/class_plugin.inc:2239
-#: include/class_plugin.inc:2242
+#: include/class_listing.inc:1515 include/class_listing.inc:1517
+#: include/class_CopyPasteHandler.inc:400
msgid "Paste"
msgstr "Incolla"
-#: include/class_listing.inc:1535 include/class_plugin.inc:2186
+#: include/class_listing.inc:1541
msgid "Cut this entry"
msgstr "Taglia questa voce"
-#: include/class_listing.inc:1545 include/class_plugin.inc:2194
+#: include/class_listing.inc:1551
msgid "Copy this entry"
msgstr "Copia questa voce"
-#: include/class_listing.inc:1577 include/class_listing.inc:1579
+#: include/class_listing.inc:1583 include/class_listing.inc:1585
msgid "Restore snapshots"
msgstr "Restaura le 'copie istantanee'"
-#: include/class_listing.inc:1593
+#: include/class_listing.inc:1599
msgid "Export list"
msgstr "Lista d'esportazione"
-#: include/class_listing.inc:1628 include/class_listing.inc:1629
-#: include/class_SnapShotDialog.inc:153 include/class_plugin.inc:2160
+#: include/class_listing.inc:1634 include/class_listing.inc:1635
+#: include/class_SnapShotDialog.inc:298
msgid "Restore snapshot"
msgstr "Restaura la 'copia istantanea'"
-#: include/class_listing.inc:1638 include/class_plugin.inc:2167
+#: include/class_listing.inc:1644
msgid "Create snapshot"
msgstr "Crea una 'copia istantanea'"
-#: include/class_listing.inc:1639 include/class_plugin.inc:2168
+#: include/class_listing.inc:1645
msgid "Create a new snapshot from this object"
msgstr "Crea una nuova 'copia istantanea a partire da questi oggetti"
-#: include/class_SnapShotDialog.inc:99
+#: include/class_SnapShotDialog.inc:244
#, php-format
msgid "You're about to delete the snapshot '%s'."
msgstr "Sei sul punto di cancellare la 'copia istantanea' '%s'."
-#: include/class_SnapShotDialog.inc:155
+#: include/class_SnapShotDialog.inc:300
msgid "Remove snapshot"
msgstr "Cancella la 'copia istantanea'"
-#: include/class_SnapShotDialog.inc:157 include/class_SnapShotDialog.inc:177
+#: include/class_SnapShotDialog.inc:302 include/class_SnapShotDialog.inc:322
msgid "Y-m-d, H:i:s"
msgstr "Anno-mese-giorno, Ore:minuti:secondi"
-#: include/class_SnapShotDialog.inc:191 plugins/admin/acl/acl-list.xml:57
+#: include/class_SnapShotDialog.inc:336 plugins/admin/acl/acl-list.xml:57
#: plugins/admin/acl/acl_role.tpl:17 plugins/admin/acl/class_aclRole.inc:704
#: plugins/admin/groups/class_group.inc:1114
#: plugins/admin/groups/group-list.xml:66 plugins/admin/groups/generic.tpl:24
@@ -3266,7 +3258,7 @@ msgid "Cannot find a suitable password method for the current hash!"
msgstr ""
"Impossibile trovare un algoritmo di criptaggio che corrisponda alla password!"
-#: include/class_plugin.inc:563
+#: include/class_plugin.inc:562
msgid ""
"The object has changed since opened in FusionDirectory. All changes that may "
"be done by others get lost if you save this entry!"
@@ -3275,26 +3267,14 @@ msgstr ""
"FusionDirectory. Tutte le modifiche effettuate da altri andranno perse se tu "
"registrerai adesso!"
-#: include/class_plugin.inc:2082
+#: include/class_plugin.inc:1674
msgid "Changing ACL dn"
msgstr "Modifica del dn dell'ACL"
-#: include/class_plugin.inc:2082
+#: include/class_plugin.inc:1674
msgid "from"
msgstr "da"
-#: include/class_plugin.inc:2136 include/class_plugin.inc:2138
-msgid "Restore"
-msgstr "Restaura"
-
-#: include/class_plugin.inc:2186
-msgid "cut"
-msgstr "Taglia"
-
-#: include/class_plugin.inc:2194
-msgid "copy"
-msgstr "Copia"
-
#: include/class_sortableListing.inc:303
msgid "Sortable list"
msgstr "Elenco ordinabile"
@@ -4199,15 +4179,14 @@ msgstr "Si prega di attivare il debug per i dettagli!"
msgid "List of acls"
msgstr "Elenco delle ACL"
-#: plugins/admin/acl/acl-list.xml:15
+#: plugins/admin/acl/acl-list.xml:15 plugins/admin/acl/acl-list.xml:82
#: plugins/admin/acl/class_aclManagement.inc:36
msgid "Acl"
msgstr "Acl"
-#: plugins/admin/acl/acl-list.xml:23 plugins/admin/acl/acl-list.xml:82
-#: plugins/admin/acl/class_aclRole.inc:695
+#: plugins/admin/acl/acl-list.xml:23 plugins/admin/acl/class_aclRole.inc:695
#: plugins/personal/generic/class_user.inc:1367
-#: plugins/personal/generic/generic.tpl:515
+#: plugins/personal/generic/generic.tpl:492
msgid "Role"
msgstr "Ruolo"
@@ -4251,7 +4230,7 @@ msgstr ""
msgid "Access control list management"
msgstr "Gestione della lista di controllo degli accessi"
-#: plugins/admin/acl/class_aclManagement.inc:160
+#: plugins/admin/acl/class_aclManagement.inc:161
msgid "ACL Assignment"
msgstr "Gestione delle ACL"
@@ -4380,7 +4359,7 @@ msgstr ""
"Seleziona 'alcuno' se non vuoi utilizzare i modelli."
#: plugins/admin/users/template.tpl:15
-#: plugins/admin/users/class_userManagement.inc:542
+#: plugins/admin/users/class_userManagement.inc:539
#: plugins/admin/users/templatize.tpl:15 plugins/admin/users/user-list.xml:15
#: plugins/admin/users/user-list.xml:102
msgid "Template"
@@ -4415,7 +4394,7 @@ msgstr "Nome utente"
msgid "Manage users"
msgstr "Gestisci gli utenti"
-#: plugins/admin/users/class_userManagement.inc:344
+#: plugins/admin/users/class_userManagement.inc:341
#: plugins/personal/password/class_password.inc:136
#, php-format
msgid "Check-hook reported a problem: %s. Password change canceled!"
@@ -4423,17 +4402,17 @@ msgstr ""
"La verifica del blocco ha segnalato un problema: %s. La modifica della "
"password è stata annulata !"
-#: plugins/admin/users/class_userManagement.inc:394
+#: plugins/admin/users/class_userManagement.inc:391
msgid "You have no permission to change this users password!"
msgstr "Non hai il permesso di cambiare la password di questo/i utente/i !"
-#: plugins/admin/users/class_userManagement.inc:470
-#: plugins/admin/users/class_userManagement.inc:504
-#: plugins/admin/users/class_userManagement.inc:535
+#: plugins/admin/users/class_userManagement.inc:467
+#: plugins/admin/users/class_userManagement.inc:501
+#: plugins/admin/users/class_userManagement.inc:532
msgid "none"
msgstr "nessuno"
-#: plugins/admin/users/class_userManagement.inc:548
+#: plugins/admin/users/class_userManagement.inc:545
#: plugins/admin/users/user-list.xml:57
#: plugins/admin/groups/userSelect/user-list.xml:40
#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
@@ -4443,11 +4422,11 @@ msgstr "nessuno"
msgid "Given name"
msgstr "Nome"
-#: plugins/admin/users/class_userManagement.inc:799
+#: plugins/admin/users/class_userManagement.inc:796
msgid "Account locking"
msgstr "Blocco dell'account"
-#: plugins/admin/users/class_userManagement.inc:800
+#: plugins/admin/users/class_userManagement.inc:797
#, php-format
msgid ""
"Password method '%s' does not support locking. Account (%s) has not been "
@@ -4456,15 +4435,15 @@ msgstr ""
"Il formato '%s' di memorizzazione delle password non supporta il meccanismo "
"di bloccaggio. L'account (%s) non è statobloccato !"
-#: plugins/admin/users/class_userManagement.inc:873
+#: plugins/admin/users/class_userManagement.inc:870
msgid "Unlock account"
msgstr "Sblocca l'account"
-#: plugins/admin/users/class_userManagement.inc:875
+#: plugins/admin/users/class_userManagement.inc:872
msgid "Lock account"
msgstr "Blocca l'account"
-#: plugins/admin/users/class_userManagement.inc:903
+#: plugins/admin/users/class_userManagement.inc:900
#, fuzzy
msgid "Generic properties"
msgstr "Modifica le proprietà di base"
@@ -4556,7 +4535,8 @@ msgid "Remove user"
msgstr "Elimina utente"
#: plugins/admin/password/class_recoveryConfig.inc:35
-msgid "Password recovery config"
+#, fuzzy
+msgid "Password recovery"
msgstr "Configurazione per il recupero della password"
#: plugins/admin/password/class_recoveryConfig.inc:36
@@ -4903,7 +4883,6 @@ msgstr "Impostazioni generali del gruppo"
#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:23
#: plugins/admin/ogroups/class_ogroupManagement.inc:187
#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:79
-#: plugins/admin/ogroups/ogroup-list.xml:79
#: plugins/generic/references/class_reference.inc:55
#: plugins/personal/posix/groupSelect/group-list.xml:15
msgid "Group"
@@ -4995,8 +4974,8 @@ msgstr "Modifica le proprietà Samba"
#: plugins/generic/references/class_reference.inc:59
#: plugins/personal/posix/trustSelect/class_trustSelect.inc:81
#: plugins/personal/generic/class_user.inc:1180
-#: plugins/personal/generic/generic.tpl:399
-#: plugins/personal/generic/generic.tpl:586
+#: plugins/personal/generic/generic.tpl:376
+#: plugins/personal/generic/generic.tpl:563
msgid "Phone"
msgstr "Telefono"
@@ -5095,7 +5074,7 @@ msgstr "Nome della località "
#: plugins/admin/departments/generic.tpl:91
#: plugins/admin/departments/class_organizationGeneric.inc:129
#: plugins/personal/generic/class_user.inc:1410
-#: plugins/personal/generic/generic.tpl:448
+#: plugins/personal/generic/generic.tpl:425
msgid "Location"
msgstr "Luogo"
@@ -5112,8 +5091,8 @@ msgstr "Luogo"
#: plugins/admin/departments/generic.tpl:51
#: plugins/admin/departments/class_organizationGeneric.inc:126
#: plugins/personal/generic/class_user.inc:1399
-#: plugins/personal/generic/generic.tpl:341
-#: plugins/personal/generic/generic.tpl:362
+#: plugins/personal/generic/generic.tpl:318
+#: plugins/personal/generic/generic.tpl:339
msgid "Manager"
msgstr "Manager"
@@ -5264,7 +5243,7 @@ msgstr "Categoria di questa sottostruttura"
#: plugins/admin/departments/generic.tpl:83
#: plugins/admin/departments/class_organizationGeneric.inc:128
#: plugins/personal/generic/class_user.inc:1409
-#: plugins/personal/generic/generic.tpl:456
+#: plugins/personal/generic/generic.tpl:433
msgid "State"
msgstr "Stato"
@@ -5282,7 +5261,7 @@ msgstr "Localizzazione di questa sottostruttura"
#: plugins/admin/departments/class_department.inc:667
#: plugins/admin/departments/generic.tpl:99
#: plugins/personal/generic/generic.tpl:181
-#: plugins/personal/generic/generic.tpl:464
+#: plugins/personal/generic/generic.tpl:441
msgid "Address"
msgstr "Indirizzo"
@@ -5302,8 +5281,8 @@ msgstr "Numero di telefono principale di questa sottostruttura"
#: plugins/admin/departments/generic.tpl:114
#: plugins/admin/departments/class_organizationGeneric.inc:132
#: plugins/personal/generic/class_user.inc:1183
-#: plugins/personal/generic/generic.tpl:430
-#: plugins/personal/generic/generic.tpl:598
+#: plugins/personal/generic/generic.tpl:407
+#: plugins/personal/generic/generic.tpl:575
msgid "Fax"
msgstr "Fax"
@@ -5354,7 +5333,7 @@ msgstr "Nazione"
#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:15
#: plugins/generic/references/class_reference.inc:57
#: plugins/personal/generic/class_user.inc:1396
-#: plugins/personal/generic/generic.tpl:308
+#: plugins/personal/generic/generic.tpl:285
msgid "Department"
msgstr "Dipartimento"
@@ -5664,6 +5643,11 @@ msgstr "Oggetti membri"
msgid "List of object groups"
msgstr "Elenco di gruppi di oggetti"
+#: plugins/admin/ogroups/ogroup-list.xml:79
+#, fuzzy
+msgid "Objectgroup"
+msgstr "Gruppo di oggetti"
+
#: plugins/admin/ogroups/ogroup-list.xml:106
msgid "Send message"
msgstr "Invia messaggio"
@@ -5735,11 +5719,14 @@ msgid "Language"
msgstr "Lingua"
#: plugins/config/class_configInLdap.inc:82
+#, fuzzy
msgid ""
-"Default language to be used if the one asked by the browser is not available"
+"Language of the application. If 'automatic' or not available, the one asked "
+"by the browser will be used. This setting can be overriden per user."
msgstr ""
-"Lingua di default da usare nel caso in cui la lingua richiesta dal browser "
-"non sia disponibile"
+"A questo punto, puoi scegliere la lingua di default per FusionDirectory. "
+"Scegliendo 'automatica' verrà usata la lingua richiesta dal navigatore web. "
+"Questo parametro può essere configurato dall'utente."
#: plugins/config/class_configInLdap.inc:87
msgid "Theme to be used"
@@ -5754,7 +5741,8 @@ msgid "Schema setup"
msgstr "Impostazione schema"
#: plugins/config/class_configInLdap.inc:103
-msgid "rfc237bis"
+#, fuzzy
+msgid "rfc2307bis"
msgstr "rfc237bis"
#: plugins/config/class_configInLdap.inc:104
@@ -6013,7 +6001,7 @@ msgstr "Attributo da usare all'inizio del dn degli utenti"
#: plugins/config/class_configInLdap.inc:320
msgid "Use a placeholder pattern for generating account cns"
-msgstr ""
+msgstr "Usa un modello placeholder per generare gli account cns"
#: plugins/config/class_configInLdap.inc:324
msgid "Next id hook"
@@ -6525,12 +6513,12 @@ msgid "Homepage"
msgstr "Home Page"
#: plugins/personal/generic/class_user.inc:1186
-#: plugins/personal/generic/generic.tpl:411
+#: plugins/personal/generic/generic.tpl:388
msgid "Mobile"
msgstr "Cellulare"
#: plugins/personal/generic/class_user.inc:1189
-#: plugins/personal/generic/generic.tpl:422
+#: plugins/personal/generic/generic.tpl:399
msgid "Pager"
msgstr "Segreteria telefonica"
@@ -6541,57 +6529,57 @@ msgid "Date of birth"
msgstr "Data di nascita"
#: plugins/personal/generic/class_user.inc:1357
-#: plugins/personal/generic/generic.tpl:538
+#: plugins/personal/generic/generic.tpl:515
msgid "Unit"
msgstr "Unità "
#: plugins/personal/generic/class_user.inc:1358
-#: plugins/personal/generic/generic.tpl:563
+#: plugins/personal/generic/generic.tpl:540
msgid "House identifier"
msgstr "Identificativo della casa"
#: plugins/personal/generic/class_user.inc:1359
-#: plugins/personal/generic/generic.tpl:480
+#: plugins/personal/generic/generic.tpl:457
msgid "Vocation"
msgstr "Professione"
#: plugins/personal/generic/class_user.inc:1360
-#: plugins/personal/generic/generic.tpl:607
+#: plugins/personal/generic/generic.tpl:584
msgid "Last delivery"
msgstr "Ultima consegna"
#: plugins/personal/generic/class_user.inc:1361
-#: plugins/personal/generic/generic.tpl:529
+#: plugins/personal/generic/generic.tpl:506
msgid "Person locality"
msgstr "Luogo di residenza"
#: plugins/personal/generic/class_user.inc:1362
-#: plugins/personal/generic/generic.tpl:488
+#: plugins/personal/generic/generic.tpl:465
msgid "Unit description"
msgstr "Descrizione dell'unità "
#: plugins/personal/generic/class_user.inc:1363
-#: plugins/personal/generic/generic.tpl:497
+#: plugins/personal/generic/generic.tpl:474
msgid "Subject area"
msgstr "Area disciplinare"
#: plugins/personal/generic/class_user.inc:1364
-#: plugins/personal/generic/generic.tpl:506
+#: plugins/personal/generic/generic.tpl:483
msgid "Functional title"
msgstr "Funzione"
#: plugins/personal/generic/class_user.inc:1365
-#: plugins/personal/generic/generic.tpl:616
+#: plugins/personal/generic/generic.tpl:593
msgid "Public visible"
msgstr "Pubblico"
#: plugins/personal/generic/class_user.inc:1366
-#: plugins/personal/generic/generic.tpl:547
+#: plugins/personal/generic/generic.tpl:524
msgid "Street"
msgstr "Via"
#: plugins/personal/generic/class_user.inc:1368
-#: plugins/personal/generic/generic.tpl:555
+#: plugins/personal/generic/generic.tpl:532
msgid "Postal code"
msgstr "CAP"
@@ -6640,7 +6628,7 @@ msgid "Employee number"
msgstr "Matricola dell'impiegato"
#: plugins/personal/generic/class_user.inc:1401
-#: plugins/personal/generic/generic.tpl:332
+#: plugins/personal/generic/generic.tpl:309
msgid "Employee type"
msgstr "Qualifica"
@@ -6721,29 +6709,28 @@ msgstr "Algoritmo per la password"
msgid "Restrict login to"
msgstr "Restrizione d'accesso per"
-#: plugins/personal/generic/generic.tpl:248
-#: plugins/personal/generic/generic.tpl:267
+#: plugins/personal/generic/generic.tpl:246
msgid "IP or network"
msgstr "Indirizzo IP oppure network"
-#: plugins/personal/generic/generic.tpl:288
+#: plugins/personal/generic/generic.tpl:265
msgid "Organizational information"
msgstr "Informazioni organizzazione"
-#: plugins/personal/generic/generic.tpl:316
+#: plugins/personal/generic/generic.tpl:293
msgid "Department No."
msgstr "Dipartimento No."
-#: plugins/personal/generic/generic.tpl:324
+#: plugins/personal/generic/generic.tpl:301
msgid "Employee No."
msgstr "Matricola No."
-#: plugins/personal/generic/generic.tpl:390
-#: plugins/personal/generic/generic.tpl:578
+#: plugins/personal/generic/generic.tpl:367
+#: plugins/personal/generic/generic.tpl:555
msgid "Room No."
msgstr "Stanza No."
-#: plugins/personal/generic/generic.tpl:592
+#: plugins/personal/generic/generic.tpl:569
msgid "Please use the phone tab"
msgstr "Usa la linguetta del telefono"
@@ -6751,6 +6738,24 @@ msgstr "Usa la linguetta del telefono"
msgid "Your password hash method will not be changed!"
msgstr "L'algoritmo della tua password non puó essere cambiato !"
+#~ msgid "MDB2 mysql"
+#~ msgstr "MDB2 mysql"
+
+#~ msgid ""
+#~ "FusionDirectory requires this module to communicate with mysql databases."
+#~ msgstr ""
+#~ "FusionDirectory ha bisogno di questo modulo per comunicare con i database "
+#~ "mysql."
+
+#~ msgid "Restore"
+#~ msgstr "Restaura"
+
+#~ msgid "cut"
+#~ msgstr "Taglia"
+
+#~ msgid "copy"
+#~ msgstr "Copia"
+
#~ msgid "POSIX"
#~ msgstr "POSIX"
@@ -6765,3 +6770,10 @@ msgstr "L'algoritmo della tua password non puó essere cambiato !"
#~ msgid "Edit FAX properties"
#~ msgstr "Modifica le proprietà FAX"
+
+#~ msgid ""
+#~ "Default language to be used if the one asked by the browser is not "
+#~ "available"
+#~ msgstr ""
+#~ "Lingua di default da usare nel caso in cui la lingua richiesta dal "
+#~ "browser non sia disponibile"
diff --git a/locale/nb/messages.po b/locale/nb/fusiondirectory.po
similarity index 94%
rename from locale/nb/messages.po
rename to locale/nb/fusiondirectory.po
index 4ef313c848919547cfc0d07e0182da53ace21c88..4413bb517ce8fb775c8f3270bcf098984be82249 100644
--- a/locale/nb/messages.po
+++ b/locale/nb/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-24 14:48+0100\n"
+"POT-Creation-Date: 2013-04-14 20:13+0200\n"
"PO-Revision-Date: 2012-01-06 11:05+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,39 +17,39 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: html/main.php:140 html/class_passwordRecovery.inc:226
+#: html/main.php:135 html/class_passwordRecovery.inc:226
#: include/class_xml.inc:60 include/functions.inc:509
#: plugins/admin/departments/class_department.inc:431
msgid "Fatal error"
msgstr ""
-#: html/main.php:141
+#: html/main.php:136
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr ""
-#: html/main.php:162
+#: html/main.php:157
msgid "PHP configuration"
msgstr ""
-#: html/main.php:163
+#: html/main.php:158
msgid ""
"Fatal error: Register globals is on. FusionDirectory will refuse to login "
"unless this is fixed by an administrator."
msgstr ""
-#: html/main.php:192 ihtml/themes/default/password.tpl:40
-#: plugins/admin/users/class_userManagement.inc:393
+#: html/main.php:187 ihtml/themes/default/password.tpl:40
+#: plugins/admin/users/class_userManagement.inc:390
#: plugins/personal/password/class_password.inc:156
#: plugins/personal/password/class_password.inc:162
msgid "Password change"
msgstr ""
-#: html/main.php:192
+#: html/main.php:187
msgid "Your password is about to expire, please change your password!"
msgstr ""
-#: html/main.php:261 html/class_passwordRecovery.inc:301 html/index.php:147
+#: html/main.php:256 html/class_passwordRecovery.inc:296 html/index.php:147
#: html/index.php:208 include/class_SnapshotHandler.inc:57
#: include/class_SnapshotHandler.inc:70 include/class_SnapshotHandler.inc:88
#: include/class_pluglist.inc:272 include/functions.inc:933
@@ -63,30 +63,30 @@ msgstr ""
msgid "Configuration error"
msgstr ""
-#: html/main.php:261
+#: html/main.php:256
msgid "Running out of memory!"
msgstr ""
-#: html/main.php:316
+#: html/main.php:311
msgid "User ACL checks disabled"
msgstr ""
-#: html/main.php:362
+#: html/main.php:357
msgid "Plugin"
msgstr ""
-#: html/main.php:363
+#: html/main.php:358
#, php-format
msgid ""
"Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not "
"a file)!"
msgstr ""
-#: html/main.php:378
+#: html/main.php:373
msgid "Configuration Error"
msgstr ""
-#: html/main.php:379
+#: html/main.php:374
#, php-format
msgid ""
"Fatal error: not all POST variables have been transfered by PHP - please "
@@ -102,31 +102,31 @@ msgstr ""
msgid "Error: Password method not available!"
msgstr ""
-#: html/class_passwordRecovery.inc:227 html/index.php:147
+#: html/class_passwordRecovery.inc:227
#, php-format
msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
msgstr ""
-#: html/class_passwordRecovery.inc:302 html/setup.php:63 html/index.php:163
+#: html/class_passwordRecovery.inc:297 html/setup.php:63 html/index.php:163
#, php-format
msgid "Directory '%s' specified as compile directory is not accessible!"
msgstr ""
-#: html/class_passwordRecovery.inc:407
-#: plugins/admin/users/class_userManagement.inc:309
+#: html/class_passwordRecovery.inc:402
+#: plugins/admin/users/class_userManagement.inc:306
#: plugins/personal/password/class_password.inc:113
msgid ""
"The passwords you've entered as 'New password' and 'Repeated new password' "
"do not match."
msgstr ""
-#: html/class_passwordRecovery.inc:409 ihtml/themes/default/password.tpl:81
+#: html/class_passwordRecovery.inc:404 ihtml/themes/default/password.tpl:81
#: ihtml/themes/default/password.tpl:82
#: ihtml/themes/default/accountexpired.tpl:32
#: ihtml/themes/default/accountexpired.tpl:36
#: ihtml/themes/default/recovery.tpl:93 ihtml/themes/default/recovery.tpl:94
#: plugins/admin/users/password.tpl:17 plugins/admin/users/password.tpl:60
-#: plugins/admin/users/class_userManagement.inc:312
+#: plugins/admin/users/class_userManagement.inc:309
#: plugins/personal/password/password.tpl:27
#: plugins/personal/password/password.tpl:78
#: plugins/personal/generic/password.tpl:22
@@ -134,16 +134,16 @@ msgstr ""
msgid "New password"
msgstr ""
-#: html/class_passwordRecovery.inc:411
+#: html/class_passwordRecovery.inc:406
msgid "The password used as new is too short."
msgstr ""
-#: html/class_passwordRecovery.inc:413
+#: html/class_passwordRecovery.inc:408
#: plugins/personal/password/class_password.inc:121
msgid "The password contains possibly problematic Unicode characters!"
msgstr ""
-#: html/class_passwordRecovery.inc:437 html/index.php:58 html/index.php:64
+#: html/class_passwordRecovery.inc:432 html/index.php:58 html/index.php:64
#: html/index.php:403 ihtml/themes/default/conflict.tpl:6
#: ihtml/themes/default/islocked.tpl:6 ihtml/themes/default/remove.tpl:2
#: ihtml/themes/default/msg_dialog.tpl:59
@@ -166,39 +166,39 @@ msgstr ""
msgid "Warning"
msgstr ""
-#: html/class_passwordRecovery.inc:438
+#: html/class_passwordRecovery.inc:433
msgid "Session will not be encrypted."
msgstr ""
-#: html/class_passwordRecovery.inc:440
+#: html/class_passwordRecovery.inc:435
msgid "Enter SSL session"
msgstr ""
-#: html/class_passwordRecovery.inc:481
+#: html/class_passwordRecovery.inc:476
#, php-format
msgid "Did not found account %s"
msgstr ""
-#: html/class_passwordRecovery.inc:484
+#: html/class_passwordRecovery.inc:479
#, php-format
msgid "Found multiple accounts %s"
msgstr ""
-#: html/class_passwordRecovery.inc:498 ihtml/themes/default/recovery.tpl:142
+#: html/class_passwordRecovery.inc:493 ihtml/themes/default/recovery.tpl:142
msgid "Adresse mail"
msgstr ""
-#: html/class_passwordRecovery.inc:515
+#: html/class_passwordRecovery.inc:510
#, php-format
msgid "There is no account using email %s"
msgstr ""
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:513
#, php-format
msgid "There are several accounts using email %s"
msgstr ""
-#: html/class_passwordRecovery.inc:543 html/index.php:257 html/index.php:269
+#: html/class_passwordRecovery.inc:538 html/index.php:257 html/index.php:269
#: html/index.php:282 setup/class_setupStep_Migrate.inc:1138
#: setup/class_setupStep_Migrate.inc:1164
#: setup/class_setupStep_Migrate.inc:1213
@@ -210,20 +210,17 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:2549
#: setup/class_setupStep_Migrate.inc:2896
#: setup/class_setupStep_Migrate.inc:2910
-#: include/class_SnapshotHandler.inc:150 include/class_SnapshotHandler.inc:329
-#: include/class_SnapshotHandler.inc:378 include/class_SnapshotHandler.inc:382
-#: include/class_SnapshotHandler.inc:402 include/class_SnapshotHandler.inc:445
-#: include/class_SnapshotHandler.inc:508 include/class_SnapshotHandler.inc:577
-#: include/class_SnapshotHandler.inc:592 include/functions.inc:547
+#: include/class_SnapshotHandler.inc:150 include/class_SnapshotHandler.inc:335
+#: include/class_SnapshotHandler.inc:388 include/class_SnapshotHandler.inc:392
+#: include/class_SnapshotHandler.inc:412 include/class_SnapshotHandler.inc:455
+#: include/class_SnapshotHandler.inc:518 include/class_SnapshotHandler.inc:587
+#: include/class_SnapshotHandler.inc:602 include/functions.inc:547
#: include/functions.inc:583 include/functions.inc:591
#: include/functions.inc:639 include/functions.inc:948
#: include/functions.inc:998 include/functions.inc:1058
#: include/functions.inc:1113 include/functions.inc:3244
-#: include/functions.inc:3509 include/class_config.inc:330
-#: include/class_plugin.inc:1500 include/class_plugin.inc:1550
-#: include/class_plugin.inc:1554 include/class_plugin.inc:1574
-#: include/class_plugin.inc:1621 include/class_plugin.inc:1681
-#: include/class_plugin.inc:1751 include/class_plugin.inc:1766
+#: include/functions.inc:3514 include/class_SnapShotDialog.inc:104
+#: include/class_SnapShotDialog.inc:177 include/class_config.inc:330
#: include/class_acl.inc:1308 include/class_acl.inc:1413
#: include/class_ldap.inc:934 include/class_ldap.inc:1421
#: plugins/admin/acl/class_aclRole.inc:613
@@ -242,19 +239,19 @@ msgstr ""
msgid "LDAP error"
msgstr "LDAP-feil"
-#: html/class_passwordRecovery.inc:566
+#: html/class_passwordRecovery.inc:561
msgid "Contact your administrator, there was a problem with mail server"
msgstr ""
-#: html/class_passwordRecovery.inc:577
+#: html/class_passwordRecovery.inc:572
msgid "This token is invalid"
msgstr ""
-#: html/class_passwordRecovery.inc:615
+#: html/class_passwordRecovery.inc:610
msgid "External password changer reported a problem: "
msgstr ""
-#: html/class_passwordRecovery.inc:640
+#: html/class_passwordRecovery.inc:635
msgid "There was a problem with mail server, confirmation email not sent"
msgstr ""
@@ -272,6 +269,13 @@ msgid ""
"overridden by php.ini settings."
msgstr ""
+#: html/index.php:147
+#, php-format
+msgid ""
+"FusionDirectory configuration %s/%s is not readable. Please run "
+"fusiondirectory-setup --check-config to fix this."
+msgstr ""
+
#: html/index.php:163
msgid "Smarty error"
msgstr ""
@@ -286,22 +290,22 @@ msgstr ""
#: setup/setup_checks.tpl:91 setup/class_setupStep_Migrate.inc:1127
#: include/class_xml.inc:57 include/class_tabs.inc:74
#: include/class_management.inc:507 include/class_management.inc:657
-#: include/functions.inc:3613 include/functions.inc:3633
-#: include/functions.inc:3663 include/functions.inc:3671
-#: include/functions.inc:3683 include/functions.inc:3687
-#: include/functions.inc:3702 include/functions.inc:3711
-#: include/functions.inc:3779 include/class_listing.inc:522
+#: include/functions.inc:3618 include/functions.inc:3638
+#: include/functions.inc:3668 include/functions.inc:3676
+#: include/functions.inc:3688 include/functions.inc:3692
+#: include/functions.inc:3707 include/functions.inc:3716
+#: include/functions.inc:3784 include/class_listing.inc:521
#: include/class_config.inc:483 include/class_CopyPasteHandler.inc:264
#: include/password-methods/class_password-methods-sasl.inc:51
#: include/password-methods/class_password-methods-sasl.inc:63
#: include/password-methods/class_password-methods.inc:342
#: include/password-methods/class_password-methods.inc:447
#: include/password-methods/class_password-methods.inc:458
-#: include/class_plugin.inc:1368 include/class_plugin.inc:1843
-#: include/class_msg_dialog.inc:128 include/class_msgPool.inc:215
-#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:680 include/class_msgPool.inc:711
-#: include/class_msgPool.inc:738 include/class_databaseManagement.inc:78
+#: include/class_plugin.inc:1367 include/class_msg_dialog.inc:128
+#: include/class_msgPool.inc:215 include/class_msgPool.inc:235
+#: include/class_msgPool.inc:265 include/class_msgPool.inc:680
+#: include/class_msgPool.inc:711 include/class_msgPool.inc:738
+#: include/class_databaseManagement.inc:78
#: plugins/admin/acl/class_aclRole.inc:681
#: plugins/admin/groups/class_group.inc:521
#: plugins/admin/groups/class_group.inc:527
@@ -965,131 +969,128 @@ msgid ""
"databases."
msgstr ""
-#: setup/class_setupStep_Checks.inc:136
-msgid "MDB2 mysql"
-msgstr ""
-
-#: setup/class_setupStep_Checks.inc:137
+#: setup/class_setupStep_Checks.inc:134
msgid ""
-"FusionDirectory requires this module to communicate with mysql databases."
+"If you do not want to install MDB2 and won't use databases, remove the "
+"class_databaseManagement.inc file."
msgstr ""
-#: setup/class_setupStep_Checks.inc:143
+#: setup/class_setupStep_Checks.inc:138
msgid "imagick"
msgstr ""
-#: setup/class_setupStep_Checks.inc:144
+#: setup/class_setupStep_Checks.inc:139
msgid "FusionDirectory requires this extension to handle images."
msgstr ""
-#: setup/class_setupStep_Checks.inc:159
+#: setup/class_setupStep_Checks.inc:154
msgid "compression module"
msgstr ""
-#: setup/class_setupStep_Checks.inc:160
+#: setup/class_setupStep_Checks.inc:155
msgid "FusionDirectory requires this extension to handle snapshots."
msgstr ""
-#: setup/class_setupStep_Checks.inc:171
+#: setup/class_setupStep_Checks.inc:166
msgid ""
"register_globals is a PHP mechanism to register all global variables to be "
"accessible from scripts without changing the scope. This may be a security "
"risk."
msgstr ""
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStep_Checks.inc:167
msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:180
+#: setup/class_setupStep_Checks.inc:175
msgid "PHP uses this value for the garbage collector to delete old sessions."
msgstr ""
-#: setup/class_setupStep_Checks.inc:181
+#: setup/class_setupStep_Checks.inc:176
msgid ""
"Setting this value to one day will prevent loosing session and cookies "
"before they really timeout."
msgstr ""
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStep_Checks.inc:177
msgid ""
"Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
"higher."
msgstr ""
-#: setup/class_setupStep_Checks.inc:189 setup/class_setupStep_Checks.inc:205
-#: setup/class_setupStep_Checks.inc:221 setup/class_setupStep_Checks.inc:229
+#: setup/class_setupStep_Checks.inc:184 setup/class_setupStep_Checks.inc:200
+#: setup/class_setupStep_Checks.inc:216 setup/class_setupStep_Checks.inc:224
msgid "Off"
msgstr ""
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStep_Checks.inc:185
msgid ""
"In Order to use FusionDirectory without any trouble, the session.auto_start "
"option in your php.ini should be set to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStep_Checks.inc:186
msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStep_Checks.inc:193
msgid ""
"FusionDirectory needs at least 128MB of memory. Setting it below this limit "
"may cause errors that are not reproducable! Increase it for larger setups."
msgstr ""
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStep_Checks.inc:194
msgid ""
"Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
msgstr ""
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStep_Checks.inc:201
msgid ""
"This option influences the PHP output handling. Turn this Option off, to "
"increase performance."
msgstr ""
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStep_Checks.inc:202
msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStep_Checks.inc:209
msgid "The Execution time should be at least 30 seconds."
msgstr ""
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStep_Checks.inc:210
msgid ""
"Search for 'max_execution_time' in your php.ini and set it to '30' or higher."
msgstr ""
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStep_Checks.inc:217
msgid ""
"Increase the server security by setting expose_php to 'off'. PHP won't send "
"any information about the server you are running in this case."
msgstr ""
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStep_Checks.inc:218
msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:230
+#: setup/class_setupStep_Checks.inc:225
msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:231
+#: setup/class_setupStep_Checks.inc:226
msgid ""
"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:241
+#: setup/class_setupStep_Checks.inc:236
msgid "Configuration writeable"
msgstr ""
-#: setup/class_setupStep_Checks.inc:242
+#: setup/class_setupStep_Checks.inc:237
msgid "The configuration file can't be written"
msgstr ""
-#: setup/class_setupStep_Checks.inc:243
+#: setup/class_setupStep_Checks.inc:238
#, php-format
msgid ""
"FusionDirectory reads its configuration from a file located in (%s/%s). The "
@@ -1637,7 +1638,7 @@ msgstr ""
#: plugins/admin/departments/class_organizationGeneric.inc:115
#: plugins/admin/departments/class_organizationGeneric.inc:118
#: plugins/personal/generic/class_user.inc:1395
-#: plugins/personal/generic/generic.tpl:300
+#: plugins/personal/generic/generic.tpl:277
msgid "Organization"
msgstr ""
@@ -1647,8 +1648,8 @@ msgstr ""
#: plugins/admin/acl/class_aclRole.inc:702
#: plugins/admin/acl/class_aclRole.inc:715
#: plugins/admin/acl/class_aclRole.inc:725
-#: plugins/admin/users/class_userManagement.inc:545
-#: plugins/admin/users/class_userManagement.inc:592
+#: plugins/admin/users/class_userManagement.inc:542
+#: plugins/admin/users/class_userManagement.inc:589
#: plugins/admin/users/user-filter.tpl:26
#: plugins/admin/groups/group-filter.tpl:21
#: plugins/admin/groups/userSelect/user-filter.tpl:17
@@ -1729,7 +1730,7 @@ msgid ""
msgstr ""
#: setup/setup_feedback.tpl:52
-#: plugins/admin/users/class_userManagement.inc:903
+#: plugins/admin/users/class_userManagement.inc:900
#: plugins/admin/groups/class_group.inc:1106
#: plugins/admin/departments/class_department.inc:653
#: plugins/admin/ogroups/class_ogroup.inc:895
@@ -1869,7 +1870,7 @@ msgstr ""
#: setup/setup_migrate.tpl:101 setup/setup_migrate.tpl:153
#: setup/setup_migrate.tpl:320 setup/setup_migrate.tpl:373
#: setup/setup_migrate.tpl:416 setup/setup_migrate.tpl:459
-#: setup/setup_migrate.tpl:503 include/class_listing.inc:352
+#: setup/setup_migrate.tpl:503 include/class_listing.inc:351
msgid "Select all"
msgstr ""
@@ -2337,7 +2338,7 @@ msgid "Group will be moved from"
msgstr ""
#: setup/class_setupStep_Migrate.inc:1175
-#: setup/class_setupStep_Migrate.inc:1223 include/class_plugin.inc:2083
+#: setup/class_setupStep_Migrate.inc:1223 include/class_plugin.inc:1675
msgid "to"
msgstr ""
@@ -2412,8 +2413,7 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:2647 include/class_msgPool.inc:495
#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:83
#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:138
-#: plugins/personal/generic/generic.tpl:251
-#: plugins/personal/generic/generic.tpl:270
+#: plugins/personal/generic/generic.tpl:249
#, php-format
msgid "Add"
msgstr ""
@@ -2534,28 +2534,25 @@ msgstr ""
#: include/class_management.inc:333 include/class_management.inc:483
#: include/class_management.inc:536 include/class_management.inc:576
#: include/class_management.inc:590 include/class_CopyPasteHandler.inc:223
-#: include/class_plugin.inc:1791 include/class_plugin.inc:1803
-#: include/class_plugin.inc:1818 include/class_plugin.inc:1831
-#: plugins/admin/users/class_userManagement.inc:205
-#: plugins/admin/users/class_userManagement.inc:761
+#: plugins/admin/users/class_userManagement.inc:202
+#: plugins/admin/users/class_userManagement.inc:758
msgid "Permission"
msgstr ""
#: include/class_management.inc:403
-#: plugins/admin/acl/class_aclManagement.inc:100
-#: plugins/admin/users/class_userManagement.inc:719
-#: plugins/admin/users/class_userManagement.inc:723
+#: plugins/admin/acl/class_aclManagement.inc:101
+#: plugins/admin/users/class_userManagement.inc:716
+#: plugins/admin/users/class_userManagement.inc:720
msgid "Permission error"
msgstr ""
-#: include/class_management.inc:483 include/class_plugin.inc:1791
+#: include/class_management.inc:483
#, php-format
msgid "You are not allowed to create a snapshot for %s."
msgstr ""
#: include/class_management.inc:536 include/class_management.inc:576
-#: include/class_management.inc:590 include/class_plugin.inc:1803
-#: include/class_plugin.inc:1818 include/class_plugin.inc:1831
+#: include/class_management.inc:590
#, php-format
msgid "You are not allowed to restore a snapshot for %s."
msgstr ""
@@ -2756,87 +2753,87 @@ msgid ""
"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
msgstr ""
-#: include/functions.inc:3613 include/functions.inc:3633
-#: include/functions.inc:3671 include/functions.inc:3683
-#: include/functions.inc:3687 include/functions.inc:3702
-#: include/functions.inc:3711
+#: include/functions.inc:3618 include/functions.inc:3638
+#: include/functions.inc:3676 include/functions.inc:3688
+#: include/functions.inc:3692 include/functions.inc:3707
+#: include/functions.inc:3716
msgid "Cannot allocate a free ID:"
msgstr ""
-#: include/functions.inc:3613
+#: include/functions.inc:3618
msgid "unknown idAllocation method!"
msgstr ""
-#: include/functions.inc:3633
+#: include/functions.inc:3638
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3663
+#: include/functions.inc:3668
msgid "Cannot create sambaUnixIdPool entry!"
msgstr ""
-#: include/functions.inc:3671
+#: include/functions.inc:3676
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3683 include/functions.inc:3687
+#: include/functions.inc:3688 include/functions.inc:3692
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3711
+#: include/functions.inc:3716
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3779
+#: include/functions.inc:3784
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/class_listing.inc:291 include/class_listing.inc:1099
-#: include/class_listing.inc:1101 include/class_sortableListing.inc:343
+#: include/class_listing.inc:290 include/class_listing.inc:1105
+#: include/class_listing.inc:1107 include/class_sortableListing.inc:343
#: include/class_acl.inc:504 plugins/admin/acl/class_aclRole.inc:372
msgid "Up"
msgstr ""
-#: include/class_listing.inc:291 include/class_sortableListing.inc:343
+#: include/class_listing.inc:290 include/class_sortableListing.inc:343
#: include/class_acl.inc:506 plugins/admin/acl/class_aclRole.inc:374
msgid "Down"
msgstr ""
-#: include/class_listing.inc:564
+#: include/class_listing.inc:563
msgid "created by"
msgstr ""
-#: include/class_listing.inc:1091
+#: include/class_listing.inc:1097
msgid "Go to root department"
msgstr ""
-#: include/class_listing.inc:1091 include/class_listing.inc:1093
+#: include/class_listing.inc:1097 include/class_listing.inc:1099
#: include/class_baseSelector.inc:205
msgid "Root"
msgstr ""
-#: include/class_listing.inc:1099
+#: include/class_listing.inc:1105
msgid "Go up one department"
msgstr ""
-#: include/class_listing.inc:1107
+#: include/class_listing.inc:1113
msgid "Go to users department"
msgstr ""
-#: include/class_listing.inc:1107 include/class_listing.inc:1109
+#: include/class_listing.inc:1113 include/class_listing.inc:1115
msgid "Home"
msgstr ""
-#: include/class_listing.inc:1114
+#: include/class_listing.inc:1120
msgid "Reload list"
msgstr ""
-#: include/class_listing.inc:1114 include/class_baseSelector.inc:252
+#: include/class_listing.inc:1120 include/class_baseSelector.inc:252
msgid "Submit"
msgstr ""
-#: include/class_listing.inc:1211 plugins/admin/acl/acl-list.xml:65
+#: include/class_listing.inc:1217 plugins/admin/acl/acl-list.xml:65
#: plugins/admin/users/user-list.xml:78 plugins/admin/groups/group-list.xml:79
#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:64
#: plugins/admin/departments/dep-list.xml:87
@@ -2844,65 +2841,62 @@ msgstr ""
msgid "Actions"
msgstr ""
-#: include/class_listing.inc:1495 include/class_listing.inc:1545
-#: include/class_plugin.inc:2228
+#: include/class_listing.inc:1501 include/class_listing.inc:1551
msgid "Copy"
msgstr ""
-#: include/class_listing.inc:1501 include/class_listing.inc:1535
-#: include/class_plugin.inc:2232
+#: include/class_listing.inc:1507 include/class_listing.inc:1541
msgid "Cut"
msgstr ""
-#: include/class_listing.inc:1509 include/class_listing.inc:1511
-#: include/class_CopyPasteHandler.inc:400 include/class_plugin.inc:2239
-#: include/class_plugin.inc:2242
+#: include/class_listing.inc:1515 include/class_listing.inc:1517
+#: include/class_CopyPasteHandler.inc:400
msgid "Paste"
msgstr ""
-#: include/class_listing.inc:1535 include/class_plugin.inc:2186
+#: include/class_listing.inc:1541
msgid "Cut this entry"
msgstr ""
-#: include/class_listing.inc:1545 include/class_plugin.inc:2194
+#: include/class_listing.inc:1551
msgid "Copy this entry"
msgstr ""
-#: include/class_listing.inc:1577 include/class_listing.inc:1579
+#: include/class_listing.inc:1583 include/class_listing.inc:1585
msgid "Restore snapshots"
msgstr ""
-#: include/class_listing.inc:1593
+#: include/class_listing.inc:1599
msgid "Export list"
msgstr ""
-#: include/class_listing.inc:1628 include/class_listing.inc:1629
-#: include/class_SnapShotDialog.inc:153 include/class_plugin.inc:2160
+#: include/class_listing.inc:1634 include/class_listing.inc:1635
+#: include/class_SnapShotDialog.inc:298
msgid "Restore snapshot"
msgstr ""
-#: include/class_listing.inc:1638 include/class_plugin.inc:2167
+#: include/class_listing.inc:1644
msgid "Create snapshot"
msgstr ""
-#: include/class_listing.inc:1639 include/class_plugin.inc:2168
+#: include/class_listing.inc:1645
msgid "Create a new snapshot from this object"
msgstr ""
-#: include/class_SnapShotDialog.inc:99
+#: include/class_SnapShotDialog.inc:244
#, php-format
msgid "You're about to delete the snapshot '%s'."
msgstr ""
-#: include/class_SnapShotDialog.inc:155
+#: include/class_SnapShotDialog.inc:300
msgid "Remove snapshot"
msgstr ""
-#: include/class_SnapShotDialog.inc:157 include/class_SnapShotDialog.inc:177
+#: include/class_SnapShotDialog.inc:302 include/class_SnapShotDialog.inc:322
msgid "Y-m-d, H:i:s"
msgstr ""
-#: include/class_SnapShotDialog.inc:191 plugins/admin/acl/acl-list.xml:57
+#: include/class_SnapShotDialog.inc:336 plugins/admin/acl/acl-list.xml:57
#: plugins/admin/acl/acl_role.tpl:17 plugins/admin/acl/class_aclRole.inc:704
#: plugins/admin/groups/class_group.inc:1114
#: plugins/admin/groups/group-list.xml:66 plugins/admin/groups/generic.tpl:24
@@ -2977,32 +2971,20 @@ msgstr ""
msgid "Cannot find a suitable password method for the current hash!"
msgstr ""
-#: include/class_plugin.inc:563
+#: include/class_plugin.inc:562
msgid ""
"The object has changed since opened in FusionDirectory. All changes that may "
"be done by others get lost if you save this entry!"
msgstr ""
-#: include/class_plugin.inc:2082
+#: include/class_plugin.inc:1674
msgid "Changing ACL dn"
msgstr ""
-#: include/class_plugin.inc:2082
+#: include/class_plugin.inc:1674
msgid "from"
msgstr ""
-#: include/class_plugin.inc:2136 include/class_plugin.inc:2138
-msgid "Restore"
-msgstr ""
-
-#: include/class_plugin.inc:2186
-msgid "cut"
-msgstr ""
-
-#: include/class_plugin.inc:2194
-msgid "copy"
-msgstr ""
-
#: include/class_sortableListing.inc:303
msgid "Sortable list"
msgstr ""
@@ -3871,15 +3853,14 @@ msgstr ""
msgid "List of acls"
msgstr ""
-#: plugins/admin/acl/acl-list.xml:15
+#: plugins/admin/acl/acl-list.xml:15 plugins/admin/acl/acl-list.xml:82
#: plugins/admin/acl/class_aclManagement.inc:36
msgid "Acl"
msgstr ""
-#: plugins/admin/acl/acl-list.xml:23 plugins/admin/acl/acl-list.xml:82
-#: plugins/admin/acl/class_aclRole.inc:695
+#: plugins/admin/acl/acl-list.xml:23 plugins/admin/acl/class_aclRole.inc:695
#: plugins/personal/generic/class_user.inc:1367
-#: plugins/personal/generic/generic.tpl:515
+#: plugins/personal/generic/generic.tpl:492
msgid "Role"
msgstr ""
@@ -3919,7 +3900,7 @@ msgstr ""
msgid "Access control list management"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:160
+#: plugins/admin/acl/class_aclManagement.inc:161
msgid "ACL Assignment"
msgstr ""
@@ -4039,7 +4020,7 @@ msgid ""
msgstr ""
#: plugins/admin/users/template.tpl:15
-#: plugins/admin/users/class_userManagement.inc:542
+#: plugins/admin/users/class_userManagement.inc:539
#: plugins/admin/users/templatize.tpl:15 plugins/admin/users/user-list.xml:15
#: plugins/admin/users/user-list.xml:102
msgid "Template"
@@ -4074,23 +4055,23 @@ msgstr ""
msgid "Manage users"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:344
+#: plugins/admin/users/class_userManagement.inc:341
#: plugins/personal/password/class_password.inc:136
#, php-format
msgid "Check-hook reported a problem: %s. Password change canceled!"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:394
+#: plugins/admin/users/class_userManagement.inc:391
msgid "You have no permission to change this users password!"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:470
-#: plugins/admin/users/class_userManagement.inc:504
-#: plugins/admin/users/class_userManagement.inc:535
+#: plugins/admin/users/class_userManagement.inc:467
+#: plugins/admin/users/class_userManagement.inc:501
+#: plugins/admin/users/class_userManagement.inc:532
msgid "none"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:548
+#: plugins/admin/users/class_userManagement.inc:545
#: plugins/admin/users/user-list.xml:57
#: plugins/admin/groups/userSelect/user-list.xml:40
#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
@@ -4100,26 +4081,26 @@ msgstr ""
msgid "Given name"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:799
+#: plugins/admin/users/class_userManagement.inc:796
msgid "Account locking"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:800
+#: plugins/admin/users/class_userManagement.inc:797
#, php-format
msgid ""
"Password method '%s' does not support locking. Account (%s) has not been "
"locked!"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:873
+#: plugins/admin/users/class_userManagement.inc:870
msgid "Unlock account"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:875
+#: plugins/admin/users/class_userManagement.inc:872
msgid "Lock account"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:903
+#: plugins/admin/users/class_userManagement.inc:900
#, fuzzy
msgid "Generic properties"
msgstr "Egenskaper"
@@ -4209,7 +4190,7 @@ msgid "Remove user"
msgstr ""
#: plugins/admin/password/class_recoveryConfig.inc:35
-msgid "Password recovery config"
+msgid "Password recovery"
msgstr ""
#: plugins/admin/password/class_recoveryConfig.inc:36
@@ -4525,7 +4506,6 @@ msgstr ""
#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:23
#: plugins/admin/ogroups/class_ogroupManagement.inc:187
#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:79
-#: plugins/admin/ogroups/ogroup-list.xml:79
#: plugins/generic/references/class_reference.inc:55
#: plugins/personal/posix/groupSelect/group-list.xml:15
msgid "Group"
@@ -4617,8 +4597,8 @@ msgstr ""
#: plugins/generic/references/class_reference.inc:59
#: plugins/personal/posix/trustSelect/class_trustSelect.inc:81
#: plugins/personal/generic/class_user.inc:1180
-#: plugins/personal/generic/generic.tpl:399
-#: plugins/personal/generic/generic.tpl:586
+#: plugins/personal/generic/generic.tpl:376
+#: plugins/personal/generic/generic.tpl:563
msgid "Phone"
msgstr ""
@@ -4717,7 +4697,7 @@ msgstr ""
#: plugins/admin/departments/generic.tpl:91
#: plugins/admin/departments/class_organizationGeneric.inc:129
#: plugins/personal/generic/class_user.inc:1410
-#: plugins/personal/generic/generic.tpl:448
+#: plugins/personal/generic/generic.tpl:425
msgid "Location"
msgstr ""
@@ -4734,8 +4714,8 @@ msgstr ""
#: plugins/admin/departments/generic.tpl:51
#: plugins/admin/departments/class_organizationGeneric.inc:126
#: plugins/personal/generic/class_user.inc:1399
-#: plugins/personal/generic/generic.tpl:341
-#: plugins/personal/generic/generic.tpl:362
+#: plugins/personal/generic/generic.tpl:318
+#: plugins/personal/generic/generic.tpl:339
msgid "Manager"
msgstr ""
@@ -4873,7 +4853,7 @@ msgstr ""
#: plugins/admin/departments/generic.tpl:83
#: plugins/admin/departments/class_organizationGeneric.inc:128
#: plugins/personal/generic/class_user.inc:1409
-#: plugins/personal/generic/generic.tpl:456
+#: plugins/personal/generic/generic.tpl:433
msgid "State"
msgstr ""
@@ -4891,7 +4871,7 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:667
#: plugins/admin/departments/generic.tpl:99
#: plugins/personal/generic/generic.tpl:181
-#: plugins/personal/generic/generic.tpl:464
+#: plugins/personal/generic/generic.tpl:441
msgid "Address"
msgstr ""
@@ -4911,8 +4891,8 @@ msgstr ""
#: plugins/admin/departments/generic.tpl:114
#: plugins/admin/departments/class_organizationGeneric.inc:132
#: plugins/personal/generic/class_user.inc:1183
-#: plugins/personal/generic/generic.tpl:430
-#: plugins/personal/generic/generic.tpl:598
+#: plugins/personal/generic/generic.tpl:407
+#: plugins/personal/generic/generic.tpl:575
msgid "Fax"
msgstr ""
@@ -4963,7 +4943,7 @@ msgstr ""
#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:15
#: plugins/generic/references/class_reference.inc:57
#: plugins/personal/generic/class_user.inc:1396
-#: plugins/personal/generic/generic.tpl:308
+#: plugins/personal/generic/generic.tpl:285
msgid "Department"
msgstr ""
@@ -5267,6 +5247,10 @@ msgstr ""
msgid "List of object groups"
msgstr ""
+#: plugins/admin/ogroups/ogroup-list.xml:79
+msgid "Objectgroup"
+msgstr ""
+
#: plugins/admin/ogroups/ogroup-list.xml:106
msgid "Send message"
msgstr ""
@@ -5338,7 +5322,8 @@ msgstr ""
#: plugins/config/class_configInLdap.inc:82
msgid ""
-"Default language to be used if the one asked by the browser is not available"
+"Language of the application. If 'automatic' or not available, the one asked "
+"by the browser will be used. This setting can be overriden per user."
msgstr ""
#: plugins/config/class_configInLdap.inc:87
@@ -5354,7 +5339,7 @@ msgid "Schema setup"
msgstr ""
#: plugins/config/class_configInLdap.inc:103
-msgid "rfc237bis"
+msgid "rfc2307bis"
msgstr ""
#: plugins/config/class_configInLdap.inc:104
@@ -6056,12 +6041,12 @@ msgid "Homepage"
msgstr ""
#: plugins/personal/generic/class_user.inc:1186
-#: plugins/personal/generic/generic.tpl:411
+#: plugins/personal/generic/generic.tpl:388
msgid "Mobile"
msgstr ""
#: plugins/personal/generic/class_user.inc:1189
-#: plugins/personal/generic/generic.tpl:422
+#: plugins/personal/generic/generic.tpl:399
msgid "Pager"
msgstr ""
@@ -6072,57 +6057,57 @@ msgid "Date of birth"
msgstr ""
#: plugins/personal/generic/class_user.inc:1357
-#: plugins/personal/generic/generic.tpl:538
+#: plugins/personal/generic/generic.tpl:515
msgid "Unit"
msgstr ""
#: plugins/personal/generic/class_user.inc:1358
-#: plugins/personal/generic/generic.tpl:563
+#: plugins/personal/generic/generic.tpl:540
msgid "House identifier"
msgstr ""
#: plugins/personal/generic/class_user.inc:1359
-#: plugins/personal/generic/generic.tpl:480
+#: plugins/personal/generic/generic.tpl:457
msgid "Vocation"
msgstr ""
#: plugins/personal/generic/class_user.inc:1360
-#: plugins/personal/generic/generic.tpl:607
+#: plugins/personal/generic/generic.tpl:584
msgid "Last delivery"
msgstr ""
#: plugins/personal/generic/class_user.inc:1361
-#: plugins/personal/generic/generic.tpl:529
+#: plugins/personal/generic/generic.tpl:506
msgid "Person locality"
msgstr ""
#: plugins/personal/generic/class_user.inc:1362
-#: plugins/personal/generic/generic.tpl:488
+#: plugins/personal/generic/generic.tpl:465
msgid "Unit description"
msgstr ""
#: plugins/personal/generic/class_user.inc:1363
-#: plugins/personal/generic/generic.tpl:497
+#: plugins/personal/generic/generic.tpl:474
msgid "Subject area"
msgstr ""
#: plugins/personal/generic/class_user.inc:1364
-#: plugins/personal/generic/generic.tpl:506
+#: plugins/personal/generic/generic.tpl:483
msgid "Functional title"
msgstr ""
#: plugins/personal/generic/class_user.inc:1365
-#: plugins/personal/generic/generic.tpl:616
+#: plugins/personal/generic/generic.tpl:593
msgid "Public visible"
msgstr ""
#: plugins/personal/generic/class_user.inc:1366
-#: plugins/personal/generic/generic.tpl:547
+#: plugins/personal/generic/generic.tpl:524
msgid "Street"
msgstr ""
#: plugins/personal/generic/class_user.inc:1368
-#: plugins/personal/generic/generic.tpl:555
+#: plugins/personal/generic/generic.tpl:532
msgid "Postal code"
msgstr ""
@@ -6171,7 +6156,7 @@ msgid "Employee number"
msgstr ""
#: plugins/personal/generic/class_user.inc:1401
-#: plugins/personal/generic/generic.tpl:332
+#: plugins/personal/generic/generic.tpl:309
msgid "Employee type"
msgstr ""
@@ -6252,29 +6237,28 @@ msgstr ""
msgid "Restrict login to"
msgstr ""
-#: plugins/personal/generic/generic.tpl:248
-#: plugins/personal/generic/generic.tpl:267
+#: plugins/personal/generic/generic.tpl:246
msgid "IP or network"
msgstr ""
-#: plugins/personal/generic/generic.tpl:288
+#: plugins/personal/generic/generic.tpl:265
msgid "Organizational information"
msgstr ""
-#: plugins/personal/generic/generic.tpl:316
+#: plugins/personal/generic/generic.tpl:293
msgid "Department No."
msgstr ""
-#: plugins/personal/generic/generic.tpl:324
+#: plugins/personal/generic/generic.tpl:301
msgid "Employee No."
msgstr ""
-#: plugins/personal/generic/generic.tpl:390
-#: plugins/personal/generic/generic.tpl:578
+#: plugins/personal/generic/generic.tpl:367
+#: plugins/personal/generic/generic.tpl:555
msgid "Room No."
msgstr ""
-#: plugins/personal/generic/generic.tpl:592
+#: plugins/personal/generic/generic.tpl:569
msgid "Please use the phone tab"
msgstr ""
diff --git a/locale/nl/messages.po b/locale/nl/fusiondirectory.po
similarity index 95%
rename from locale/nl/messages.po
rename to locale/nl/fusiondirectory.po
index 4d9775c99b270f0388080e7aaee0c144123285f0..d854950b5592b7194d035fcbc159f6306a35abca 100644
--- a/locale/nl/messages.po
+++ b/locale/nl/fusiondirectory.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-24 14:48+0100\n"
-"PO-Revision-Date: 2013-03-06 21:40+0000\n"
+"POT-Creation-Date: 2013-04-14 20:13+0200\n"
+"PO-Revision-Date: 2013-03-24 15:00+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory/"
"language/nl/)\n"
@@ -22,22 +22,22 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: html/main.php:140 html/class_passwordRecovery.inc:226
+#: html/main.php:135 html/class_passwordRecovery.inc:226
#: include/class_xml.inc:60 include/functions.inc:509
#: plugins/admin/departments/class_department.inc:431
msgid "Fatal error"
msgstr "Fatale fout"
-#: html/main.php:141
+#: html/main.php:136
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr "Kan bestand '%s' niet vinden - gebruik aub '%s' om dit op te lossen"
-#: html/main.php:162
+#: html/main.php:157
msgid "PHP configuration"
msgstr "PHP configuratie"
-#: html/main.php:163
+#: html/main.php:158
msgid ""
"Fatal error: Register globals is on. FusionDirectory will refuse to login "
"unless this is fixed by an administrator."
@@ -45,18 +45,18 @@ msgstr ""
"Fatale error : Registreer globals in aan. FusionDirectory zal login weigeren "
"als dit niet opgelost wordt door een admin."
-#: html/main.php:192 ihtml/themes/default/password.tpl:40
-#: plugins/admin/users/class_userManagement.inc:393
+#: html/main.php:187 ihtml/themes/default/password.tpl:40
+#: plugins/admin/users/class_userManagement.inc:390
#: plugins/personal/password/class_password.inc:156
#: plugins/personal/password/class_password.inc:162
msgid "Password change"
msgstr "Paswoord wijzigen"
-#: html/main.php:192
+#: html/main.php:187
msgid "Your password is about to expire, please change your password!"
msgstr "Je paswoord gaat vervallen, gelieve je paswoord te wijzigen!"
-#: html/main.php:261 html/class_passwordRecovery.inc:301 html/index.php:147
+#: html/main.php:256 html/class_passwordRecovery.inc:296 html/index.php:147
#: html/index.php:208 include/class_SnapshotHandler.inc:57
#: include/class_SnapshotHandler.inc:70 include/class_SnapshotHandler.inc:88
#: include/class_pluglist.inc:272 include/functions.inc:933
@@ -70,30 +70,30 @@ msgstr "Je paswoord gaat vervallen, gelieve je paswoord te wijzigen!"
msgid "Configuration error"
msgstr "Configuratie error"
-#: html/main.php:261
+#: html/main.php:256
msgid "Running out of memory!"
msgstr "Bijna zonder geheugen!"
-#: html/main.php:316
+#: html/main.php:311
msgid "User ACL checks disabled"
msgstr "Gebruiker ACL verificatie is niet actief"
-#: html/main.php:362
+#: html/main.php:357
msgid "Plugin"
msgstr "Plugin"
-#: html/main.php:363
+#: html/main.php:358
#, php-format
msgid ""
"Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not "
"a file)!"
msgstr ""
-#: html/main.php:378
+#: html/main.php:373
msgid "Configuration Error"
msgstr "Configuratie Error"
-#: html/main.php:379
+#: html/main.php:374
#, php-format
msgid ""
"Fatal error: not all POST variables have been transfered by PHP - please "
@@ -111,19 +111,19 @@ msgstr "Paswoord methode"
msgid "Error: Password method not available!"
msgstr "Error. Paswoord methode niet beschikbaar!"
-#: html/class_passwordRecovery.inc:227 html/index.php:147
+#: html/class_passwordRecovery.inc:227
#, php-format
msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
msgstr "FusionDirectory configuratie %s/%s is niet leesbaar. Geannuleerd."
-#: html/class_passwordRecovery.inc:302 html/setup.php:63 html/index.php:163
+#: html/class_passwordRecovery.inc:297 html/setup.php:63 html/index.php:163
#, php-format
msgid "Directory '%s' specified as compile directory is not accessible!"
msgstr ""
"Directory '%s' die opgegeven is als compileer directory is niet toegankelijk!"
-#: html/class_passwordRecovery.inc:407
-#: plugins/admin/users/class_userManagement.inc:309
+#: html/class_passwordRecovery.inc:402
+#: plugins/admin/users/class_userManagement.inc:306
#: plugins/personal/password/class_password.inc:113
msgid ""
"The passwords you've entered as 'New password' and 'Repeated new password' "
@@ -132,13 +132,13 @@ msgstr ""
"Het nieuwe wachtwoord en het herhaalde wachtwoord komen niet met elkaar "
"overeen."
-#: html/class_passwordRecovery.inc:409 ihtml/themes/default/password.tpl:81
+#: html/class_passwordRecovery.inc:404 ihtml/themes/default/password.tpl:81
#: ihtml/themes/default/password.tpl:82
#: ihtml/themes/default/accountexpired.tpl:32
#: ihtml/themes/default/accountexpired.tpl:36
#: ihtml/themes/default/recovery.tpl:93 ihtml/themes/default/recovery.tpl:94
#: plugins/admin/users/password.tpl:17 plugins/admin/users/password.tpl:60
-#: plugins/admin/users/class_userManagement.inc:312
+#: plugins/admin/users/class_userManagement.inc:309
#: plugins/personal/password/password.tpl:27
#: plugins/personal/password/password.tpl:78
#: plugins/personal/generic/password.tpl:22
@@ -146,16 +146,16 @@ msgstr ""
msgid "New password"
msgstr "Nieuw wachtwoord"
-#: html/class_passwordRecovery.inc:411
+#: html/class_passwordRecovery.inc:406
msgid "The password used as new is too short."
msgstr ""
-#: html/class_passwordRecovery.inc:413
+#: html/class_passwordRecovery.inc:408
#: plugins/personal/password/class_password.inc:121
msgid "The password contains possibly problematic Unicode characters!"
msgstr "Het paswoord bevat mogelijke probleemgevende Unicode karakters!"
-#: html/class_passwordRecovery.inc:437 html/index.php:58 html/index.php:64
+#: html/class_passwordRecovery.inc:432 html/index.php:58 html/index.php:64
#: html/index.php:403 ihtml/themes/default/conflict.tpl:6
#: ihtml/themes/default/islocked.tpl:6 ihtml/themes/default/remove.tpl:2
#: ihtml/themes/default/msg_dialog.tpl:59
@@ -178,39 +178,39 @@ msgstr "Het paswoord bevat mogelijke probleemgevende Unicode karakters!"
msgid "Warning"
msgstr "Waarschuwing"
-#: html/class_passwordRecovery.inc:438
+#: html/class_passwordRecovery.inc:433
msgid "Session will not be encrypted."
msgstr "De sessie zal niet versleuteld zijn."
-#: html/class_passwordRecovery.inc:440
+#: html/class_passwordRecovery.inc:435
msgid "Enter SSL session"
msgstr "Gebruik een SSL sessie"
-#: html/class_passwordRecovery.inc:481
+#: html/class_passwordRecovery.inc:476
#, php-format
msgid "Did not found account %s"
msgstr "Kon account %s niet vinden"
-#: html/class_passwordRecovery.inc:484
+#: html/class_passwordRecovery.inc:479
#, php-format
msgid "Found multiple accounts %s"
msgstr "Meerdere %s accounts gevonden"
-#: html/class_passwordRecovery.inc:498 ihtml/themes/default/recovery.tpl:142
+#: html/class_passwordRecovery.inc:493 ihtml/themes/default/recovery.tpl:142
msgid "Adresse mail"
msgstr "Email adres"
-#: html/class_passwordRecovery.inc:515
+#: html/class_passwordRecovery.inc:510
#, php-format
msgid "There is no account using email %s"
msgstr "Er is geen account dat de email %s gebruikt"
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:513
#, php-format
msgid "There are several accounts using email %s"
msgstr "Er zijn verschillende accounts die email %s gebruiken"
-#: html/class_passwordRecovery.inc:543 html/index.php:257 html/index.php:269
+#: html/class_passwordRecovery.inc:538 html/index.php:257 html/index.php:269
#: html/index.php:282 setup/class_setupStep_Migrate.inc:1138
#: setup/class_setupStep_Migrate.inc:1164
#: setup/class_setupStep_Migrate.inc:1213
@@ -222,20 +222,17 @@ msgstr "Er zijn verschillende accounts die email %s gebruiken"
#: setup/class_setupStep_Migrate.inc:2549
#: setup/class_setupStep_Migrate.inc:2896
#: setup/class_setupStep_Migrate.inc:2910
-#: include/class_SnapshotHandler.inc:150 include/class_SnapshotHandler.inc:329
-#: include/class_SnapshotHandler.inc:378 include/class_SnapshotHandler.inc:382
-#: include/class_SnapshotHandler.inc:402 include/class_SnapshotHandler.inc:445
-#: include/class_SnapshotHandler.inc:508 include/class_SnapshotHandler.inc:577
-#: include/class_SnapshotHandler.inc:592 include/functions.inc:547
+#: include/class_SnapshotHandler.inc:150 include/class_SnapshotHandler.inc:335
+#: include/class_SnapshotHandler.inc:388 include/class_SnapshotHandler.inc:392
+#: include/class_SnapshotHandler.inc:412 include/class_SnapshotHandler.inc:455
+#: include/class_SnapshotHandler.inc:518 include/class_SnapshotHandler.inc:587
+#: include/class_SnapshotHandler.inc:602 include/functions.inc:547
#: include/functions.inc:583 include/functions.inc:591
#: include/functions.inc:639 include/functions.inc:948
#: include/functions.inc:998 include/functions.inc:1058
#: include/functions.inc:1113 include/functions.inc:3244
-#: include/functions.inc:3509 include/class_config.inc:330
-#: include/class_plugin.inc:1500 include/class_plugin.inc:1550
-#: include/class_plugin.inc:1554 include/class_plugin.inc:1574
-#: include/class_plugin.inc:1621 include/class_plugin.inc:1681
-#: include/class_plugin.inc:1751 include/class_plugin.inc:1766
+#: include/functions.inc:3514 include/class_SnapShotDialog.inc:104
+#: include/class_SnapShotDialog.inc:177 include/class_config.inc:330
#: include/class_acl.inc:1308 include/class_acl.inc:1413
#: include/class_ldap.inc:934 include/class_ldap.inc:1421
#: plugins/admin/acl/class_aclRole.inc:613
@@ -254,19 +251,19 @@ msgstr "Er zijn verschillende accounts die email %s gebruiken"
msgid "LDAP error"
msgstr "LDAP fout"
-#: html/class_passwordRecovery.inc:566
+#: html/class_passwordRecovery.inc:561
msgid "Contact your administrator, there was a problem with mail server"
msgstr "Contacteer je systeembeheerder, er was een probleem met de mailserver"
-#: html/class_passwordRecovery.inc:577
+#: html/class_passwordRecovery.inc:572
msgid "This token is invalid"
msgstr "Deze token is niet geldig"
-#: html/class_passwordRecovery.inc:615
+#: html/class_passwordRecovery.inc:610
msgid "External password changer reported a problem: "
msgstr "Extern wachtwoord verander mechanisme rapporteerde een probleem:"
-#: html/class_passwordRecovery.inc:640
+#: html/class_passwordRecovery.inc:635
msgid "There was a problem with mail server, confirmation email not sent"
msgstr ""
@@ -286,6 +283,13 @@ msgstr ""
"De levensduur van de sessie geconfigureerd in fusiondirectory.conf zal "
"overschreven worden door php.ini opties."
+#: html/index.php:147
+#, fuzzy, php-format
+msgid ""
+"FusionDirectory configuration %s/%s is not readable. Please run "
+"fusiondirectory-setup --check-config to fix this."
+msgstr "FusionDirectory configuratie %s/%s is niet leesbaar. Geannuleerd."
+
#: html/index.php:163
msgid "Smarty error"
msgstr "Smarty error"
@@ -300,22 +304,22 @@ msgstr "Er is een probleem met de authentificatie setup!"
#: setup/setup_checks.tpl:91 setup/class_setupStep_Migrate.inc:1127
#: include/class_xml.inc:57 include/class_tabs.inc:74
#: include/class_management.inc:507 include/class_management.inc:657
-#: include/functions.inc:3613 include/functions.inc:3633
-#: include/functions.inc:3663 include/functions.inc:3671
-#: include/functions.inc:3683 include/functions.inc:3687
-#: include/functions.inc:3702 include/functions.inc:3711
-#: include/functions.inc:3779 include/class_listing.inc:522
+#: include/functions.inc:3618 include/functions.inc:3638
+#: include/functions.inc:3668 include/functions.inc:3676
+#: include/functions.inc:3688 include/functions.inc:3692
+#: include/functions.inc:3707 include/functions.inc:3716
+#: include/functions.inc:3784 include/class_listing.inc:521
#: include/class_config.inc:483 include/class_CopyPasteHandler.inc:264
#: include/password-methods/class_password-methods-sasl.inc:51
#: include/password-methods/class_password-methods-sasl.inc:63
#: include/password-methods/class_password-methods.inc:342
#: include/password-methods/class_password-methods.inc:447
#: include/password-methods/class_password-methods.inc:458
-#: include/class_plugin.inc:1368 include/class_plugin.inc:1843
-#: include/class_msg_dialog.inc:128 include/class_msgPool.inc:215
-#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:680 include/class_msgPool.inc:711
-#: include/class_msgPool.inc:738 include/class_databaseManagement.inc:78
+#: include/class_plugin.inc:1367 include/class_msg_dialog.inc:128
+#: include/class_msgPool.inc:215 include/class_msgPool.inc:235
+#: include/class_msgPool.inc:265 include/class_msgPool.inc:680
+#: include/class_msgPool.inc:711 include/class_msgPool.inc:738
+#: include/class_databaseManagement.inc:78
#: plugins/admin/acl/class_aclRole.inc:681
#: plugins/admin/groups/class_group.inc:521
#: plugins/admin/groups/class_group.inc:527
@@ -1053,34 +1057,31 @@ msgstr ""
"FusionDirectory heeft deze module nodig om te kunnen communiceren met "
"verschillende gesupporteerde databanken."
-#: setup/class_setupStep_Checks.inc:136
-msgid "MDB2 mysql"
-msgstr ""
-
-#: setup/class_setupStep_Checks.inc:137
+#: setup/class_setupStep_Checks.inc:134
msgid ""
-"FusionDirectory requires this module to communicate with mysql databases."
+"If you do not want to install MDB2 and won't use databases, remove the "
+"class_databaseManagement.inc file."
msgstr ""
-#: setup/class_setupStep_Checks.inc:143
+#: setup/class_setupStep_Checks.inc:138
msgid "imagick"
msgstr "imagick"
-#: setup/class_setupStep_Checks.inc:144
+#: setup/class_setupStep_Checks.inc:139
msgid "FusionDirectory requires this extension to handle images."
msgstr ""
"FusionDirectory heeft deze extensie nodig om afbeeldingen te kunnen bewerken."
-#: setup/class_setupStep_Checks.inc:159
+#: setup/class_setupStep_Checks.inc:154
msgid "compression module"
msgstr "compressie module"
-#: setup/class_setupStep_Checks.inc:160
+#: setup/class_setupStep_Checks.inc:155
msgid "FusionDirectory requires this extension to handle snapshots."
msgstr ""
"FusionDirectory heeft deze extensie nodig om snapshots te kunnen behandelen."
-#: setup/class_setupStep_Checks.inc:171
+#: setup/class_setupStep_Checks.inc:166
msgid ""
"register_globals is a PHP mechanism to register all global variables to be "
"accessible from scripts without changing the scope. This may be a security "
@@ -1090,17 +1091,17 @@ msgstr ""
"registreren en toegankelijk te maken vanuit scripts zonder de scope te "
"moeten aanpassen. Dit kan een veiligheidsrisico vormen. "
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStep_Checks.inc:167
msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
msgstr "Zoek voor 'register_globals' in je php.ini en schakel het 'uit'."
-#: setup/class_setupStep_Checks.inc:180
+#: setup/class_setupStep_Checks.inc:175
msgid "PHP uses this value for the garbage collector to delete old sessions."
msgstr ""
"PHP gebruikt deze waarde voor de vuilbak verzamelaar en om oude sessies te "
"verwijderen."
-#: setup/class_setupStep_Checks.inc:181
+#: setup/class_setupStep_Checks.inc:176
msgid ""
"Setting this value to one day will prevent loosing session and cookies "
"before they really timeout."
@@ -1108,7 +1109,7 @@ msgstr ""
"Deze waarde naar 1 dag plaatsen kan het verliezen van de sessies en "
"cookiesdoor timeout voorkomen."
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStep_Checks.inc:177
msgid ""
"Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
"higher."
@@ -1116,34 +1117,34 @@ msgstr ""
"Zoek voor 'session.gc_maxlifetime' in je php.ini en plaats het naar 86400 of "
"hoger."
-#: setup/class_setupStep_Checks.inc:189 setup/class_setupStep_Checks.inc:205
-#: setup/class_setupStep_Checks.inc:221 setup/class_setupStep_Checks.inc:229
+#: setup/class_setupStep_Checks.inc:184 setup/class_setupStep_Checks.inc:200
+#: setup/class_setupStep_Checks.inc:216 setup/class_setupStep_Checks.inc:224
msgid "Off"
msgstr "Uit"
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStep_Checks.inc:185
msgid ""
"In Order to use FusionDirectory without any trouble, the session.auto_start "
"option in your php.ini should be set to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStep_Checks.inc:186
msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
msgstr ""
"Zoek naar 'session.auto_start' in je php.ini en zet de waarde naar 'Off'."
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStep_Checks.inc:193
msgid ""
"FusionDirectory needs at least 128MB of memory. Setting it below this limit "
"may cause errors that are not reproducable! Increase it for larger setups."
msgstr ""
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStep_Checks.inc:194
msgid ""
"Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
msgstr ""
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStep_Checks.inc:201
msgid ""
"This option influences the PHP output handling. Turn this Option off, to "
"increase performance."
@@ -1151,21 +1152,21 @@ msgstr ""
"Deze optie beinvloed de PHP output handling. Zet deze optie uit, om "
"performantie te verhogen."
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStep_Checks.inc:202
msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
msgstr "Zoek naar 'implicit_flush' in je php.ini and zet de waarde 'Off'."
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStep_Checks.inc:209
msgid "The Execution time should be at least 30 seconds."
msgstr "De uitvoertijd zou minstens 30 seconden moeten zijn."
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStep_Checks.inc:210
msgid ""
"Search for 'max_execution_time' in your php.ini and set it to '30' or higher."
msgstr ""
"Zoek naar 'max_execution_time' in je php.ini en zet het naar '30' of hoger."
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStep_Checks.inc:217
msgid ""
"Increase the server security by setting expose_php to 'off'. PHP won't send "
"any information about the server you are running in this case."
@@ -1174,32 +1175,32 @@ msgstr ""
"plaatsen. PHP zal geen informatie over de server die je draait verzenden als "
"je dit doet."
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStep_Checks.inc:218
msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
msgstr "Zoek naar 'expose_php' in je php.ini en zet het naar 'Off'."
-#: setup/class_setupStep_Checks.inc:230
+#: setup/class_setupStep_Checks.inc:225
msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
msgstr ""
"Verhoog je server performantie door de optie magic_quotes_gpc naar 'off' te "
"plaatsen."
-#: setup/class_setupStep_Checks.inc:231
+#: setup/class_setupStep_Checks.inc:226
msgid ""
"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to 'Off'."
msgstr ""
"Zoek naar 'zend.ze1_compatibility_mode' in je php.ini en plaats het naar "
"'Off'."
-#: setup/class_setupStep_Checks.inc:241
+#: setup/class_setupStep_Checks.inc:236
msgid "Configuration writeable"
msgstr "Configuratie schrijfbaar"
-#: setup/class_setupStep_Checks.inc:242
+#: setup/class_setupStep_Checks.inc:237
msgid "The configuration file can't be written"
msgstr "Het configuratie bestand kan niet worden beschreven. "
-#: setup/class_setupStep_Checks.inc:243
+#: setup/class_setupStep_Checks.inc:238
#, php-format
msgid ""
"FusionDirectory reads its configuration from a file located in (%s/%s). The "
@@ -1781,7 +1782,7 @@ msgstr "Registreer voor de fusiondirectory-users mailinglist"
#: plugins/admin/departments/class_organizationGeneric.inc:115
#: plugins/admin/departments/class_organizationGeneric.inc:118
#: plugins/personal/generic/class_user.inc:1395
-#: plugins/personal/generic/generic.tpl:300
+#: plugins/personal/generic/generic.tpl:277
msgid "Organization"
msgstr "Organisatie"
@@ -1791,8 +1792,8 @@ msgstr "Organisatie"
#: plugins/admin/acl/class_aclRole.inc:702
#: plugins/admin/acl/class_aclRole.inc:715
#: plugins/admin/acl/class_aclRole.inc:725
-#: plugins/admin/users/class_userManagement.inc:545
-#: plugins/admin/users/class_userManagement.inc:592
+#: plugins/admin/users/class_userManagement.inc:542
+#: plugins/admin/users/class_userManagement.inc:589
#: plugins/admin/users/user-filter.tpl:26
#: plugins/admin/groups/group-filter.tpl:21
#: plugins/admin/groups/userSelect/user-filter.tpl:17
@@ -1876,7 +1877,7 @@ msgstr ""
"sturen."
#: setup/setup_feedback.tpl:52
-#: plugins/admin/users/class_userManagement.inc:903
+#: plugins/admin/users/class_userManagement.inc:900
#: plugins/admin/groups/class_group.inc:1106
#: plugins/admin/departments/class_department.inc:653
#: plugins/admin/ogroups/class_ogroup.inc:895
@@ -2026,7 +2027,7 @@ msgstr "Verplaats geselecteerde groepen in deze group tree"
#: setup/setup_migrate.tpl:101 setup/setup_migrate.tpl:153
#: setup/setup_migrate.tpl:320 setup/setup_migrate.tpl:373
#: setup/setup_migrate.tpl:416 setup/setup_migrate.tpl:459
-#: setup/setup_migrate.tpl:503 include/class_listing.inc:352
+#: setup/setup_migrate.tpl:503 include/class_listing.inc:351
msgid "Select all"
msgstr "Selecteer alles"
@@ -2531,7 +2532,7 @@ msgid "Group will be moved from"
msgstr "Groep zal verplaats worden van"
#: setup/class_setupStep_Migrate.inc:1175
-#: setup/class_setupStep_Migrate.inc:1223 include/class_plugin.inc:2083
+#: setup/class_setupStep_Migrate.inc:1223 include/class_plugin.inc:1675
msgid "to"
msgstr "naar"
@@ -2609,8 +2610,7 @@ msgstr "Er zin %s diensten die gemigreerd moeten worden"
#: setup/class_setupStep_Migrate.inc:2647 include/class_msgPool.inc:495
#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:83
#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:138
-#: plugins/personal/generic/generic.tpl:251
-#: plugins/personal/generic/generic.tpl:270
+#: plugins/personal/generic/generic.tpl:249
#, php-format
msgid "Add"
msgstr "Toevoegen"
@@ -2737,28 +2737,25 @@ msgstr "De filter is niet volledig!"
#: include/class_management.inc:333 include/class_management.inc:483
#: include/class_management.inc:536 include/class_management.inc:576
#: include/class_management.inc:590 include/class_CopyPasteHandler.inc:223
-#: include/class_plugin.inc:1791 include/class_plugin.inc:1803
-#: include/class_plugin.inc:1818 include/class_plugin.inc:1831
-#: plugins/admin/users/class_userManagement.inc:205
-#: plugins/admin/users/class_userManagement.inc:761
+#: plugins/admin/users/class_userManagement.inc:202
+#: plugins/admin/users/class_userManagement.inc:758
msgid "Permission"
msgstr "Recht"
#: include/class_management.inc:403
-#: plugins/admin/acl/class_aclManagement.inc:100
-#: plugins/admin/users/class_userManagement.inc:719
-#: plugins/admin/users/class_userManagement.inc:723
+#: plugins/admin/acl/class_aclManagement.inc:101
+#: plugins/admin/users/class_userManagement.inc:716
+#: plugins/admin/users/class_userManagement.inc:720
msgid "Permission error"
msgstr "Permissiefout"
-#: include/class_management.inc:483 include/class_plugin.inc:1791
+#: include/class_management.inc:483
#, php-format
msgid "You are not allowed to create a snapshot for %s."
msgstr "Je hebt geen toelating om een snapshot te maken voor %s."
#: include/class_management.inc:536 include/class_management.inc:576
-#: include/class_management.inc:590 include/class_plugin.inc:1803
-#: include/class_plugin.inc:1818 include/class_plugin.inc:1831
+#: include/class_management.inc:590
#, php-format
msgid "You are not allowed to restore a snapshot for %s."
msgstr "Je hebt geen toelating om een snapshot voor %s te restaureren."
@@ -2986,87 +2983,87 @@ msgstr ""
"Het commando '%s' dat gespecificeerd is als POSTMODIFY voor module '%s' "
"bestaat niet."
-#: include/functions.inc:3613 include/functions.inc:3633
-#: include/functions.inc:3671 include/functions.inc:3683
-#: include/functions.inc:3687 include/functions.inc:3702
-#: include/functions.inc:3711
+#: include/functions.inc:3618 include/functions.inc:3638
+#: include/functions.inc:3676 include/functions.inc:3688
+#: include/functions.inc:3692 include/functions.inc:3707
+#: include/functions.inc:3716
msgid "Cannot allocate a free ID:"
msgstr "Kan geen vrij ID toekennen:"
-#: include/functions.inc:3613
+#: include/functions.inc:3618
msgid "unknown idAllocation method!"
msgstr "onbekende idAllocation methode!"
-#: include/functions.inc:3633
+#: include/functions.inc:3638
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr "%sPoolMin >=%sPoolMax!"
-#: include/functions.inc:3663
+#: include/functions.inc:3668
msgid "Cannot create sambaUnixIdPool entry!"
msgstr "Kan inzending sambaUnixIdPool niet aanmaken!"
-#: include/functions.inc:3671
+#: include/functions.inc:3676
msgid "sambaUnixIdPool is not unique!"
msgstr "sambaUnixIdPool is niet uniek!"
-#: include/functions.inc:3683 include/functions.inc:3687
+#: include/functions.inc:3688 include/functions.inc:3692
msgid "no ID available!"
msgstr "Geen ID beschikbaar!"
-#: include/functions.inc:3711
+#: include/functions.inc:3716
msgid "maximum tries exceeded!"
msgstr "maximum pogingen overschreden!"
-#: include/functions.inc:3779
+#: include/functions.inc:3784
msgid "Cannot allocate a free ID!"
msgstr "Kan geen vrij ID toekennen!"
-#: include/class_listing.inc:291 include/class_listing.inc:1099
-#: include/class_listing.inc:1101 include/class_sortableListing.inc:343
+#: include/class_listing.inc:290 include/class_listing.inc:1105
+#: include/class_listing.inc:1107 include/class_sortableListing.inc:343
#: include/class_acl.inc:504 plugins/admin/acl/class_aclRole.inc:372
msgid "Up"
msgstr "Omhoog"
-#: include/class_listing.inc:291 include/class_sortableListing.inc:343
+#: include/class_listing.inc:290 include/class_sortableListing.inc:343
#: include/class_acl.inc:506 plugins/admin/acl/class_aclRole.inc:374
msgid "Down"
msgstr "Omlaag"
-#: include/class_listing.inc:564
+#: include/class_listing.inc:563
msgid "created by"
msgstr "aangemaakt door"
-#: include/class_listing.inc:1091
+#: include/class_listing.inc:1097
msgid "Go to root department"
msgstr "Ga naar basis afdelingen"
-#: include/class_listing.inc:1091 include/class_listing.inc:1093
+#: include/class_listing.inc:1097 include/class_listing.inc:1099
#: include/class_baseSelector.inc:205
msgid "Root"
msgstr "Basis"
-#: include/class_listing.inc:1099
+#: include/class_listing.inc:1105
msgid "Go up one department"
msgstr "Ga een afdeling omhoog"
-#: include/class_listing.inc:1107
+#: include/class_listing.inc:1113
msgid "Go to users department"
msgstr "Ga naar gebruikers afdeling"
-#: include/class_listing.inc:1107 include/class_listing.inc:1109
+#: include/class_listing.inc:1113 include/class_listing.inc:1115
msgid "Home"
msgstr "Home"
-#: include/class_listing.inc:1114
+#: include/class_listing.inc:1120
msgid "Reload list"
msgstr "Lijst herladen"
-#: include/class_listing.inc:1114 include/class_baseSelector.inc:252
+#: include/class_listing.inc:1120 include/class_baseSelector.inc:252
msgid "Submit"
msgstr "Verwerk"
-#: include/class_listing.inc:1211 plugins/admin/acl/acl-list.xml:65
+#: include/class_listing.inc:1217 plugins/admin/acl/acl-list.xml:65
#: plugins/admin/users/user-list.xml:78 plugins/admin/groups/group-list.xml:79
#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:64
#: plugins/admin/departments/dep-list.xml:87
@@ -3074,65 +3071,62 @@ msgstr "Verwerk"
msgid "Actions"
msgstr "Acties"
-#: include/class_listing.inc:1495 include/class_listing.inc:1545
-#: include/class_plugin.inc:2228
+#: include/class_listing.inc:1501 include/class_listing.inc:1551
msgid "Copy"
msgstr "Kopieer"
-#: include/class_listing.inc:1501 include/class_listing.inc:1535
-#: include/class_plugin.inc:2232
+#: include/class_listing.inc:1507 include/class_listing.inc:1541
msgid "Cut"
msgstr "Knip"
-#: include/class_listing.inc:1509 include/class_listing.inc:1511
-#: include/class_CopyPasteHandler.inc:400 include/class_plugin.inc:2239
-#: include/class_plugin.inc:2242
+#: include/class_listing.inc:1515 include/class_listing.inc:1517
+#: include/class_CopyPasteHandler.inc:400
msgid "Paste"
msgstr "Plakken"
-#: include/class_listing.inc:1535 include/class_plugin.inc:2186
+#: include/class_listing.inc:1541
msgid "Cut this entry"
msgstr "Deze invoer knippen"
-#: include/class_listing.inc:1545 include/class_plugin.inc:2194
+#: include/class_listing.inc:1551
msgid "Copy this entry"
msgstr "Deze invoer kopieren"
-#: include/class_listing.inc:1577 include/class_listing.inc:1579
+#: include/class_listing.inc:1583 include/class_listing.inc:1585
msgid "Restore snapshots"
msgstr "Restaureer snapshots"
-#: include/class_listing.inc:1593
+#: include/class_listing.inc:1599
msgid "Export list"
msgstr "Export lijst"
-#: include/class_listing.inc:1628 include/class_listing.inc:1629
-#: include/class_SnapShotDialog.inc:153 include/class_plugin.inc:2160
+#: include/class_listing.inc:1634 include/class_listing.inc:1635
+#: include/class_SnapShotDialog.inc:298
msgid "Restore snapshot"
msgstr "Restaureer snapshot"
-#: include/class_listing.inc:1638 include/class_plugin.inc:2167
+#: include/class_listing.inc:1644
msgid "Create snapshot"
msgstr "Maak snapshot"
-#: include/class_listing.inc:1639 include/class_plugin.inc:2168
+#: include/class_listing.inc:1645
msgid "Create a new snapshot from this object"
msgstr "Maak een nieuw snapshot van dit object"
-#: include/class_SnapShotDialog.inc:99
+#: include/class_SnapShotDialog.inc:244
#, php-format
msgid "You're about to delete the snapshot '%s'."
msgstr "Je staat op het punt om de '%s' snapshot te verwijderen."
-#: include/class_SnapShotDialog.inc:155
+#: include/class_SnapShotDialog.inc:300
msgid "Remove snapshot"
msgstr "Verwijder snaphshot"
-#: include/class_SnapShotDialog.inc:157 include/class_SnapShotDialog.inc:177
+#: include/class_SnapShotDialog.inc:302 include/class_SnapShotDialog.inc:322
msgid "Y-m-d, H:i:s"
msgstr "Y-m-d,H-i:s"
-#: include/class_SnapShotDialog.inc:191 plugins/admin/acl/acl-list.xml:57
+#: include/class_SnapShotDialog.inc:336 plugins/admin/acl/acl-list.xml:57
#: plugins/admin/acl/acl_role.tpl:17 plugins/admin/acl/class_aclRole.inc:704
#: plugins/admin/groups/class_group.inc:1114
#: plugins/admin/groups/group-list.xml:66 plugins/admin/groups/generic.tpl:24
@@ -3207,7 +3201,7 @@ msgstr ""
msgid "Cannot find a suitable password method for the current hash!"
msgstr "Kan geen geschikte paswoord methode vinden voor de huidige hash!"
-#: include/class_plugin.inc:563
+#: include/class_plugin.inc:562
msgid ""
"The object has changed since opened in FusionDirectory. All changes that may "
"be done by others get lost if you save this entry!"
@@ -3216,26 +3210,14 @@ msgstr ""
"wijzigingen die gemaakt zijn door anderen zullen verloren gaan als je deze "
"inzending opslaat!"
-#: include/class_plugin.inc:2082
+#: include/class_plugin.inc:1674
msgid "Changing ACL dn"
msgstr "ACL dn wijzigen"
-#: include/class_plugin.inc:2082
+#: include/class_plugin.inc:1674
msgid "from"
msgstr "van"
-#: include/class_plugin.inc:2136 include/class_plugin.inc:2138
-msgid "Restore"
-msgstr "Restaureer"
-
-#: include/class_plugin.inc:2186
-msgid "cut"
-msgstr "knippen"
-
-#: include/class_plugin.inc:2194
-msgid "copy"
-msgstr "kopieer"
-
#: include/class_sortableListing.inc:303
msgid "Sortable list"
msgstr "Sorteerbare lijst"
@@ -4129,15 +4111,14 @@ msgstr "Activeer aub debugging voor details!"
msgid "List of acls"
msgstr "Lijst van acls"
-#: plugins/admin/acl/acl-list.xml:15
+#: plugins/admin/acl/acl-list.xml:15 plugins/admin/acl/acl-list.xml:82
#: plugins/admin/acl/class_aclManagement.inc:36
msgid "Acl"
msgstr "Acl"
-#: plugins/admin/acl/acl-list.xml:23 plugins/admin/acl/acl-list.xml:82
-#: plugins/admin/acl/class_aclRole.inc:695
+#: plugins/admin/acl/acl-list.xml:23 plugins/admin/acl/class_aclRole.inc:695
#: plugins/personal/generic/class_user.inc:1367
-#: plugins/personal/generic/generic.tpl:515
+#: plugins/personal/generic/generic.tpl:492
msgid "Role"
msgstr "Funktie"
@@ -4180,7 +4161,7 @@ msgstr ""
msgid "Access control list management"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:160
+#: plugins/admin/acl/class_aclManagement.inc:161
msgid "ACL Assignment"
msgstr "ACL toekenning"
@@ -4309,7 +4290,7 @@ msgstr ""
"gebruik van sjablonen over te slaan."
#: plugins/admin/users/template.tpl:15
-#: plugins/admin/users/class_userManagement.inc:542
+#: plugins/admin/users/class_userManagement.inc:539
#: plugins/admin/users/templatize.tpl:15 plugins/admin/users/user-list.xml:15
#: plugins/admin/users/user-list.xml:102
msgid "Template"
@@ -4344,24 +4325,24 @@ msgstr "Inlognaam"
msgid "Manage users"
msgstr "Beheer gebruikers"
-#: plugins/admin/users/class_userManagement.inc:344
+#: plugins/admin/users/class_userManagement.inc:341
#: plugins/personal/password/class_password.inc:136
#, php-format
msgid "Check-hook reported a problem: %s. Password change canceled!"
msgstr ""
"Check-hook rapporteerde een probleem: %s. Paswoord wijzigen geannuleerd!"
-#: plugins/admin/users/class_userManagement.inc:394
+#: plugins/admin/users/class_userManagement.inc:391
msgid "You have no permission to change this users password!"
msgstr "Je hebt geen rechten om deze gebruiker zijn paswoord te wijzigen!"
-#: plugins/admin/users/class_userManagement.inc:470
-#: plugins/admin/users/class_userManagement.inc:504
-#: plugins/admin/users/class_userManagement.inc:535
+#: plugins/admin/users/class_userManagement.inc:467
+#: plugins/admin/users/class_userManagement.inc:501
+#: plugins/admin/users/class_userManagement.inc:532
msgid "none"
msgstr "geen"
-#: plugins/admin/users/class_userManagement.inc:548
+#: plugins/admin/users/class_userManagement.inc:545
#: plugins/admin/users/user-list.xml:57
#: plugins/admin/groups/userSelect/user-list.xml:40
#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
@@ -4371,11 +4352,11 @@ msgstr "geen"
msgid "Given name"
msgstr "Naam"
-#: plugins/admin/users/class_userManagement.inc:799
+#: plugins/admin/users/class_userManagement.inc:796
msgid "Account locking"
msgstr "Account locking"
-#: plugins/admin/users/class_userManagement.inc:800
+#: plugins/admin/users/class_userManagement.inc:797
#, php-format
msgid ""
"Password method '%s' does not support locking. Account (%s) has not been "
@@ -4384,15 +4365,15 @@ msgstr ""
"Paswoord methode '%s' ondersteund geen locking. Account (%s) is niet "
"gelocked!"
-#: plugins/admin/users/class_userManagement.inc:873
+#: plugins/admin/users/class_userManagement.inc:870
msgid "Unlock account"
msgstr "Deblokkeer account"
-#: plugins/admin/users/class_userManagement.inc:875
+#: plugins/admin/users/class_userManagement.inc:872
msgid "Lock account"
msgstr "Blokkeer account"
-#: plugins/admin/users/class_userManagement.inc:903
+#: plugins/admin/users/class_userManagement.inc:900
#, fuzzy
msgid "Generic properties"
msgstr "Bewerk algemene eigenschappen"
@@ -4484,7 +4465,8 @@ msgid "Remove user"
msgstr "Verwijder gebruiker"
#: plugins/admin/password/class_recoveryConfig.inc:35
-msgid "Password recovery config"
+#, fuzzy
+msgid "Password recovery"
msgstr "Paswoord herstel config"
#: plugins/admin/password/class_recoveryConfig.inc:36
@@ -4813,7 +4795,6 @@ msgstr "Generieke groep opties"
#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:23
#: plugins/admin/ogroups/class_ogroupManagement.inc:187
#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:79
-#: plugins/admin/ogroups/ogroup-list.xml:79
#: plugins/generic/references/class_reference.inc:55
#: plugins/personal/posix/groupSelect/group-list.xml:15
msgid "Group"
@@ -4905,8 +4886,8 @@ msgstr "Bewerk Samba eigenschappen"
#: plugins/generic/references/class_reference.inc:59
#: plugins/personal/posix/trustSelect/class_trustSelect.inc:81
#: plugins/personal/generic/class_user.inc:1180
-#: plugins/personal/generic/generic.tpl:399
-#: plugins/personal/generic/generic.tpl:586
+#: plugins/personal/generic/generic.tpl:376
+#: plugins/personal/generic/generic.tpl:563
msgid "Phone"
msgstr "Telefoon"
@@ -5005,7 +4986,7 @@ msgstr "Localiteit"
#: plugins/admin/departments/generic.tpl:91
#: plugins/admin/departments/class_organizationGeneric.inc:129
#: plugins/personal/generic/class_user.inc:1410
-#: plugins/personal/generic/generic.tpl:448
+#: plugins/personal/generic/generic.tpl:425
msgid "Location"
msgstr "Plaats"
@@ -5022,8 +5003,8 @@ msgstr "Plaats"
#: plugins/admin/departments/generic.tpl:51
#: plugins/admin/departments/class_organizationGeneric.inc:126
#: plugins/personal/generic/class_user.inc:1399
-#: plugins/personal/generic/generic.tpl:341
-#: plugins/personal/generic/generic.tpl:362
+#: plugins/personal/generic/generic.tpl:318
+#: plugins/personal/generic/generic.tpl:339
msgid "Manager"
msgstr "Beheerder"
@@ -5174,7 +5155,7 @@ msgstr "Categorie voor deze subtree"
#: plugins/admin/departments/generic.tpl:83
#: plugins/admin/departments/class_organizationGeneric.inc:128
#: plugins/personal/generic/class_user.inc:1409
-#: plugins/personal/generic/generic.tpl:456
+#: plugins/personal/generic/generic.tpl:433
msgid "State"
msgstr "Provincie"
@@ -5192,7 +5173,7 @@ msgstr "Plaats van deze subtree"
#: plugins/admin/departments/class_department.inc:667
#: plugins/admin/departments/generic.tpl:99
#: plugins/personal/generic/generic.tpl:181
-#: plugins/personal/generic/generic.tpl:464
+#: plugins/personal/generic/generic.tpl:441
msgid "Address"
msgstr "Adres"
@@ -5212,8 +5193,8 @@ msgstr "Basis telefoonnummer van deze subtree"
#: plugins/admin/departments/generic.tpl:114
#: plugins/admin/departments/class_organizationGeneric.inc:132
#: plugins/personal/generic/class_user.inc:1183
-#: plugins/personal/generic/generic.tpl:430
-#: plugins/personal/generic/generic.tpl:598
+#: plugins/personal/generic/generic.tpl:407
+#: plugins/personal/generic/generic.tpl:575
msgid "Fax"
msgstr "Fax"
@@ -5264,7 +5245,7 @@ msgstr "Land"
#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:15
#: plugins/generic/references/class_reference.inc:57
#: plugins/personal/generic/class_user.inc:1396
-#: plugins/personal/generic/generic.tpl:308
+#: plugins/personal/generic/generic.tpl:285
msgid "Department"
msgstr "Afdeling"
@@ -5572,6 +5553,11 @@ msgstr "Lidmaatschap objecten"
msgid "List of object groups"
msgstr "Lijst met objectgroepen"
+#: plugins/admin/ogroups/ogroup-list.xml:79
+#, fuzzy
+msgid "Objectgroup"
+msgstr "Objectgroep"
+
#: plugins/admin/ogroups/ogroup-list.xml:106
msgid "Send message"
msgstr "Stuur bericht"
@@ -5642,9 +5628,14 @@ msgid "Language"
msgstr "Taal"
#: plugins/config/class_configInLdap.inc:82
+#, fuzzy
msgid ""
-"Default language to be used if the one asked by the browser is not available"
+"Language of the application. If 'automatic' or not available, the one asked "
+"by the browser will be used. This setting can be overriden per user."
msgstr ""
+"Op dit punt,kan je de standaard taal kiezen voor de site, 'automatic' komt "
+"overeen met de taal van de browser. Deze optie kan worden overroepen door de "
+"gebruiker."
#: plugins/config/class_configInLdap.inc:87
msgid "Theme to be used"
@@ -5659,7 +5650,7 @@ msgid "Schema setup"
msgstr ""
#: plugins/config/class_configInLdap.inc:103
-msgid "rfc237bis"
+msgid "rfc2307bis"
msgstr ""
#: plugins/config/class_configInLdap.inc:104
@@ -6372,12 +6363,12 @@ msgid "Homepage"
msgstr "Homepage"
#: plugins/personal/generic/class_user.inc:1186
-#: plugins/personal/generic/generic.tpl:411
+#: plugins/personal/generic/generic.tpl:388
msgid "Mobile"
msgstr "GSM"
#: plugins/personal/generic/class_user.inc:1189
-#: plugins/personal/generic/generic.tpl:422
+#: plugins/personal/generic/generic.tpl:399
msgid "Pager"
msgstr "Pieper"
@@ -6388,57 +6379,57 @@ msgid "Date of birth"
msgstr "Geboortedatum"
#: plugins/personal/generic/class_user.inc:1357
-#: plugins/personal/generic/generic.tpl:538
+#: plugins/personal/generic/generic.tpl:515
msgid "Unit"
msgstr "Eenheid"
#: plugins/personal/generic/class_user.inc:1358
-#: plugins/personal/generic/generic.tpl:563
+#: plugins/personal/generic/generic.tpl:540
msgid "House identifier"
msgstr "Huis identificatie"
#: plugins/personal/generic/class_user.inc:1359
-#: plugins/personal/generic/generic.tpl:480
+#: plugins/personal/generic/generic.tpl:457
msgid "Vocation"
msgstr "Beroep"
#: plugins/personal/generic/class_user.inc:1360
-#: plugins/personal/generic/generic.tpl:607
+#: plugins/personal/generic/generic.tpl:584
msgid "Last delivery"
msgstr "Laatste levering"
#: plugins/personal/generic/class_user.inc:1361
-#: plugins/personal/generic/generic.tpl:529
+#: plugins/personal/generic/generic.tpl:506
msgid "Person locality"
msgstr "Werkplaats"
#: plugins/personal/generic/class_user.inc:1362
-#: plugins/personal/generic/generic.tpl:488
+#: plugins/personal/generic/generic.tpl:465
msgid "Unit description"
msgstr "Eenheid omschrijving"
#: plugins/personal/generic/class_user.inc:1363
-#: plugins/personal/generic/generic.tpl:497
+#: plugins/personal/generic/generic.tpl:474
msgid "Subject area"
msgstr "Werkgebied"
#: plugins/personal/generic/class_user.inc:1364
-#: plugins/personal/generic/generic.tpl:506
+#: plugins/personal/generic/generic.tpl:483
msgid "Functional title"
msgstr "Functionele titel"
#: plugins/personal/generic/class_user.inc:1365
-#: plugins/personal/generic/generic.tpl:616
+#: plugins/personal/generic/generic.tpl:593
msgid "Public visible"
msgstr "Publiek zichtbaar"
#: plugins/personal/generic/class_user.inc:1366
-#: plugins/personal/generic/generic.tpl:547
+#: plugins/personal/generic/generic.tpl:524
msgid "Street"
msgstr "Straat"
#: plugins/personal/generic/class_user.inc:1368
-#: plugins/personal/generic/generic.tpl:555
+#: plugins/personal/generic/generic.tpl:532
msgid "Postal code"
msgstr "Postcode"
@@ -6487,7 +6478,7 @@ msgid "Employee number"
msgstr "Werknemer nummer"
#: plugins/personal/generic/class_user.inc:1401
-#: plugins/personal/generic/generic.tpl:332
+#: plugins/personal/generic/generic.tpl:309
msgid "Employee type"
msgstr "Functie"
@@ -6568,29 +6559,28 @@ msgstr "Wachtwoord encryptie"
msgid "Restrict login to"
msgstr "Restricteer login op"
-#: plugins/personal/generic/generic.tpl:248
-#: plugins/personal/generic/generic.tpl:267
+#: plugins/personal/generic/generic.tpl:246
msgid "IP or network"
msgstr "IP of netwerk"
-#: plugins/personal/generic/generic.tpl:288
+#: plugins/personal/generic/generic.tpl:265
msgid "Organizational information"
msgstr "Organisatie informatie"
-#: plugins/personal/generic/generic.tpl:316
+#: plugins/personal/generic/generic.tpl:293
msgid "Department No."
msgstr "Afdeling nr."
-#: plugins/personal/generic/generic.tpl:324
+#: plugins/personal/generic/generic.tpl:301
msgid "Employee No."
msgstr "Personeel nr."
-#: plugins/personal/generic/generic.tpl:390
-#: plugins/personal/generic/generic.tpl:578
+#: plugins/personal/generic/generic.tpl:367
+#: plugins/personal/generic/generic.tpl:555
msgid "Room No."
msgstr "Kamer nr."
-#: plugins/personal/generic/generic.tpl:592
+#: plugins/personal/generic/generic.tpl:569
msgid "Please use the phone tab"
msgstr "Gebruik a.u.b. de telefoon tab"
@@ -6598,6 +6588,15 @@ msgstr "Gebruik a.u.b. de telefoon tab"
msgid "Your password hash method will not be changed!"
msgstr "Je paswoord hash methode zal niet worden aangepast!"
+#~ msgid "Restore"
+#~ msgstr "Restaureer"
+
+#~ msgid "cut"
+#~ msgstr "knippen"
+
+#~ msgid "copy"
+#~ msgstr "kopieer"
+
#~ msgid "POSIX"
#~ msgstr "POSIX"
diff --git a/locale/pl/messages.po b/locale/pl/fusiondirectory.po
similarity index 94%
rename from locale/pl/messages.po
rename to locale/pl/fusiondirectory.po
index a4e59ecb1bd515415cce65222d1f5e4fb165ec86..c10f6a42c344a768f6024632fa4d8ba85aa988c6 100644
--- a/locale/pl/messages.po
+++ b/locale/pl/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-24 14:48+0100\n"
-"PO-Revision-Date: 2013-03-06 21:40+0000\n"
+"POT-Creation-Date: 2013-04-14 20:13+0200\n"
+"PO-Revision-Date: 2013-03-24 15:00+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory/"
"language/pl/)\n"
@@ -19,39 +19,39 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2);\n"
-#: html/main.php:140 html/class_passwordRecovery.inc:226
+#: html/main.php:135 html/class_passwordRecovery.inc:226
#: include/class_xml.inc:60 include/functions.inc:509
#: plugins/admin/departments/class_department.inc:431
msgid "Fatal error"
msgstr "BÅ‚Ä…d krytyczny"
-#: html/main.php:141
+#: html/main.php:136
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr ""
-#: html/main.php:162
+#: html/main.php:157
msgid "PHP configuration"
msgstr "Konfiguracja PHP"
-#: html/main.php:163
+#: html/main.php:158
msgid ""
"Fatal error: Register globals is on. FusionDirectory will refuse to login "
"unless this is fixed by an administrator."
msgstr ""
-#: html/main.php:192 ihtml/themes/default/password.tpl:40
-#: plugins/admin/users/class_userManagement.inc:393
+#: html/main.php:187 ihtml/themes/default/password.tpl:40
+#: plugins/admin/users/class_userManagement.inc:390
#: plugins/personal/password/class_password.inc:156
#: plugins/personal/password/class_password.inc:162
msgid "Password change"
msgstr "Zmiana hasła"
-#: html/main.php:192
+#: html/main.php:187
msgid "Your password is about to expire, please change your password!"
msgstr ""
-#: html/main.php:261 html/class_passwordRecovery.inc:301 html/index.php:147
+#: html/main.php:256 html/class_passwordRecovery.inc:296 html/index.php:147
#: html/index.php:208 include/class_SnapshotHandler.inc:57
#: include/class_SnapshotHandler.inc:70 include/class_SnapshotHandler.inc:88
#: include/class_pluglist.inc:272 include/functions.inc:933
@@ -65,30 +65,30 @@ msgstr ""
msgid "Configuration error"
msgstr "BÅ‚Ä…d konfiguracji"
-#: html/main.php:261
+#: html/main.php:256
msgid "Running out of memory!"
msgstr ""
-#: html/main.php:316
+#: html/main.php:311
msgid "User ACL checks disabled"
msgstr ""
-#: html/main.php:362
+#: html/main.php:357
msgid "Plugin"
msgstr "Dodatek"
-#: html/main.php:363
+#: html/main.php:358
#, php-format
msgid ""
"Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not "
"a file)!"
msgstr ""
-#: html/main.php:378
+#: html/main.php:373
msgid "Configuration Error"
msgstr "BÅ‚Ä…d konfiguracji"
-#: html/main.php:379
+#: html/main.php:374
#, php-format
msgid ""
"Fatal error: not all POST variables have been transfered by PHP - please "
@@ -104,31 +104,31 @@ msgstr ""
msgid "Error: Password method not available!"
msgstr ""
-#: html/class_passwordRecovery.inc:227 html/index.php:147
+#: html/class_passwordRecovery.inc:227
#, php-format
msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
msgstr ""
-#: html/class_passwordRecovery.inc:302 html/setup.php:63 html/index.php:163
+#: html/class_passwordRecovery.inc:297 html/setup.php:63 html/index.php:163
#, php-format
msgid "Directory '%s' specified as compile directory is not accessible!"
msgstr "Katalog '%s' podany jako katalog kompilacji jest niedostępny!"
-#: html/class_passwordRecovery.inc:407
-#: plugins/admin/users/class_userManagement.inc:309
+#: html/class_passwordRecovery.inc:402
+#: plugins/admin/users/class_userManagement.inc:306
#: plugins/personal/password/class_password.inc:113
msgid ""
"The passwords you've entered as 'New password' and 'Repeated new password' "
"do not match."
msgstr "Podane hasła 'Nowe hasło' oraz 'Powtórz nowe hasło' nie są itentyczne."
-#: html/class_passwordRecovery.inc:409 ihtml/themes/default/password.tpl:81
+#: html/class_passwordRecovery.inc:404 ihtml/themes/default/password.tpl:81
#: ihtml/themes/default/password.tpl:82
#: ihtml/themes/default/accountexpired.tpl:32
#: ihtml/themes/default/accountexpired.tpl:36
#: ihtml/themes/default/recovery.tpl:93 ihtml/themes/default/recovery.tpl:94
#: plugins/admin/users/password.tpl:17 plugins/admin/users/password.tpl:60
-#: plugins/admin/users/class_userManagement.inc:312
+#: plugins/admin/users/class_userManagement.inc:309
#: plugins/personal/password/password.tpl:27
#: plugins/personal/password/password.tpl:78
#: plugins/personal/generic/password.tpl:22
@@ -136,16 +136,16 @@ msgstr "Podane hasła 'Nowe hasło' oraz 'Powtórz nowe hasło' nie są itentycz
msgid "New password"
msgstr "Nowe hasło"
-#: html/class_passwordRecovery.inc:411
+#: html/class_passwordRecovery.inc:406
msgid "The password used as new is too short."
msgstr ""
-#: html/class_passwordRecovery.inc:413
+#: html/class_passwordRecovery.inc:408
#: plugins/personal/password/class_password.inc:121
msgid "The password contains possibly problematic Unicode characters!"
msgstr ""
-#: html/class_passwordRecovery.inc:437 html/index.php:58 html/index.php:64
+#: html/class_passwordRecovery.inc:432 html/index.php:58 html/index.php:64
#: html/index.php:403 ihtml/themes/default/conflict.tpl:6
#: ihtml/themes/default/islocked.tpl:6 ihtml/themes/default/remove.tpl:2
#: ihtml/themes/default/msg_dialog.tpl:59
@@ -168,39 +168,39 @@ msgstr ""
msgid "Warning"
msgstr "Ostrzeżenie"
-#: html/class_passwordRecovery.inc:438
+#: html/class_passwordRecovery.inc:433
msgid "Session will not be encrypted."
msgstr "Sesja nie będzie szyfrowana."
-#: html/class_passwordRecovery.inc:440
+#: html/class_passwordRecovery.inc:435
msgid "Enter SSL session"
msgstr "Sprowadź sesję SSL"
-#: html/class_passwordRecovery.inc:481
+#: html/class_passwordRecovery.inc:476
#, php-format
msgid "Did not found account %s"
msgstr ""
-#: html/class_passwordRecovery.inc:484
+#: html/class_passwordRecovery.inc:479
#, php-format
msgid "Found multiple accounts %s"
msgstr ""
-#: html/class_passwordRecovery.inc:498 ihtml/themes/default/recovery.tpl:142
+#: html/class_passwordRecovery.inc:493 ihtml/themes/default/recovery.tpl:142
msgid "Adresse mail"
msgstr ""
-#: html/class_passwordRecovery.inc:515
+#: html/class_passwordRecovery.inc:510
#, php-format
msgid "There is no account using email %s"
msgstr ""
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:513
#, php-format
msgid "There are several accounts using email %s"
msgstr ""
-#: html/class_passwordRecovery.inc:543 html/index.php:257 html/index.php:269
+#: html/class_passwordRecovery.inc:538 html/index.php:257 html/index.php:269
#: html/index.php:282 setup/class_setupStep_Migrate.inc:1138
#: setup/class_setupStep_Migrate.inc:1164
#: setup/class_setupStep_Migrate.inc:1213
@@ -212,20 +212,17 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:2549
#: setup/class_setupStep_Migrate.inc:2896
#: setup/class_setupStep_Migrate.inc:2910
-#: include/class_SnapshotHandler.inc:150 include/class_SnapshotHandler.inc:329
-#: include/class_SnapshotHandler.inc:378 include/class_SnapshotHandler.inc:382
-#: include/class_SnapshotHandler.inc:402 include/class_SnapshotHandler.inc:445
-#: include/class_SnapshotHandler.inc:508 include/class_SnapshotHandler.inc:577
-#: include/class_SnapshotHandler.inc:592 include/functions.inc:547
+#: include/class_SnapshotHandler.inc:150 include/class_SnapshotHandler.inc:335
+#: include/class_SnapshotHandler.inc:388 include/class_SnapshotHandler.inc:392
+#: include/class_SnapshotHandler.inc:412 include/class_SnapshotHandler.inc:455
+#: include/class_SnapshotHandler.inc:518 include/class_SnapshotHandler.inc:587
+#: include/class_SnapshotHandler.inc:602 include/functions.inc:547
#: include/functions.inc:583 include/functions.inc:591
#: include/functions.inc:639 include/functions.inc:948
#: include/functions.inc:998 include/functions.inc:1058
#: include/functions.inc:1113 include/functions.inc:3244
-#: include/functions.inc:3509 include/class_config.inc:330
-#: include/class_plugin.inc:1500 include/class_plugin.inc:1550
-#: include/class_plugin.inc:1554 include/class_plugin.inc:1574
-#: include/class_plugin.inc:1621 include/class_plugin.inc:1681
-#: include/class_plugin.inc:1751 include/class_plugin.inc:1766
+#: include/functions.inc:3514 include/class_SnapShotDialog.inc:104
+#: include/class_SnapShotDialog.inc:177 include/class_config.inc:330
#: include/class_acl.inc:1308 include/class_acl.inc:1413
#: include/class_ldap.inc:934 include/class_ldap.inc:1421
#: plugins/admin/acl/class_aclRole.inc:613
@@ -244,19 +241,19 @@ msgstr ""
msgid "LDAP error"
msgstr "błąd LDAP"
-#: html/class_passwordRecovery.inc:566
+#: html/class_passwordRecovery.inc:561
msgid "Contact your administrator, there was a problem with mail server"
msgstr ""
-#: html/class_passwordRecovery.inc:577
+#: html/class_passwordRecovery.inc:572
msgid "This token is invalid"
msgstr ""
-#: html/class_passwordRecovery.inc:615
+#: html/class_passwordRecovery.inc:610
msgid "External password changer reported a problem: "
msgstr "Zewnętrzny program do zmiany hasła zgłosił następujący problem:"
-#: html/class_passwordRecovery.inc:640
+#: html/class_passwordRecovery.inc:635
msgid "There was a problem with mail server, confirmation email not sent"
msgstr ""
@@ -274,6 +271,13 @@ msgid ""
"overridden by php.ini settings."
msgstr ""
+#: html/index.php:147
+#, php-format
+msgid ""
+"FusionDirectory configuration %s/%s is not readable. Please run "
+"fusiondirectory-setup --check-config to fix this."
+msgstr ""
+
#: html/index.php:163
msgid "Smarty error"
msgstr "BÅ‚Ä…d Smarty"
@@ -288,22 +292,22 @@ msgstr "Istnieje problem z ustawieniami autentykacji!"
#: setup/setup_checks.tpl:91 setup/class_setupStep_Migrate.inc:1127
#: include/class_xml.inc:57 include/class_tabs.inc:74
#: include/class_management.inc:507 include/class_management.inc:657
-#: include/functions.inc:3613 include/functions.inc:3633
-#: include/functions.inc:3663 include/functions.inc:3671
-#: include/functions.inc:3683 include/functions.inc:3687
-#: include/functions.inc:3702 include/functions.inc:3711
-#: include/functions.inc:3779 include/class_listing.inc:522
+#: include/functions.inc:3618 include/functions.inc:3638
+#: include/functions.inc:3668 include/functions.inc:3676
+#: include/functions.inc:3688 include/functions.inc:3692
+#: include/functions.inc:3707 include/functions.inc:3716
+#: include/functions.inc:3784 include/class_listing.inc:521
#: include/class_config.inc:483 include/class_CopyPasteHandler.inc:264
#: include/password-methods/class_password-methods-sasl.inc:51
#: include/password-methods/class_password-methods-sasl.inc:63
#: include/password-methods/class_password-methods.inc:342
#: include/password-methods/class_password-methods.inc:447
#: include/password-methods/class_password-methods.inc:458
-#: include/class_plugin.inc:1368 include/class_plugin.inc:1843
-#: include/class_msg_dialog.inc:128 include/class_msgPool.inc:215
-#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:680 include/class_msgPool.inc:711
-#: include/class_msgPool.inc:738 include/class_databaseManagement.inc:78
+#: include/class_plugin.inc:1367 include/class_msg_dialog.inc:128
+#: include/class_msgPool.inc:215 include/class_msgPool.inc:235
+#: include/class_msgPool.inc:265 include/class_msgPool.inc:680
+#: include/class_msgPool.inc:711 include/class_msgPool.inc:738
+#: include/class_databaseManagement.inc:78
#: plugins/admin/acl/class_aclRole.inc:681
#: plugins/admin/groups/class_group.inc:521
#: plugins/admin/groups/class_group.inc:527
@@ -989,131 +993,128 @@ msgid ""
"databases."
msgstr ""
-#: setup/class_setupStep_Checks.inc:136
-msgid "MDB2 mysql"
-msgstr ""
-
-#: setup/class_setupStep_Checks.inc:137
+#: setup/class_setupStep_Checks.inc:134
msgid ""
-"FusionDirectory requires this module to communicate with mysql databases."
+"If you do not want to install MDB2 and won't use databases, remove the "
+"class_databaseManagement.inc file."
msgstr ""
-#: setup/class_setupStep_Checks.inc:143
+#: setup/class_setupStep_Checks.inc:138
msgid "imagick"
msgstr "imagick"
-#: setup/class_setupStep_Checks.inc:144
+#: setup/class_setupStep_Checks.inc:139
msgid "FusionDirectory requires this extension to handle images."
msgstr ""
-#: setup/class_setupStep_Checks.inc:159
+#: setup/class_setupStep_Checks.inc:154
msgid "compression module"
msgstr "moduł kompresji"
-#: setup/class_setupStep_Checks.inc:160
+#: setup/class_setupStep_Checks.inc:155
msgid "FusionDirectory requires this extension to handle snapshots."
msgstr ""
-#: setup/class_setupStep_Checks.inc:171
+#: setup/class_setupStep_Checks.inc:166
msgid ""
"register_globals is a PHP mechanism to register all global variables to be "
"accessible from scripts without changing the scope. This may be a security "
"risk."
msgstr ""
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStep_Checks.inc:167
msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:180
+#: setup/class_setupStep_Checks.inc:175
msgid "PHP uses this value for the garbage collector to delete old sessions."
msgstr ""
-#: setup/class_setupStep_Checks.inc:181
+#: setup/class_setupStep_Checks.inc:176
msgid ""
"Setting this value to one day will prevent loosing session and cookies "
"before they really timeout."
msgstr ""
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStep_Checks.inc:177
msgid ""
"Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
"higher."
msgstr ""
-#: setup/class_setupStep_Checks.inc:189 setup/class_setupStep_Checks.inc:205
-#: setup/class_setupStep_Checks.inc:221 setup/class_setupStep_Checks.inc:229
+#: setup/class_setupStep_Checks.inc:184 setup/class_setupStep_Checks.inc:200
+#: setup/class_setupStep_Checks.inc:216 setup/class_setupStep_Checks.inc:224
msgid "Off"
msgstr "Wyłączone"
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStep_Checks.inc:185
msgid ""
"In Order to use FusionDirectory without any trouble, the session.auto_start "
"option in your php.ini should be set to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStep_Checks.inc:186
msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStep_Checks.inc:193
msgid ""
"FusionDirectory needs at least 128MB of memory. Setting it below this limit "
"may cause errors that are not reproducable! Increase it for larger setups."
msgstr ""
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStep_Checks.inc:194
msgid ""
"Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
msgstr ""
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStep_Checks.inc:201
msgid ""
"This option influences the PHP output handling. Turn this Option off, to "
"increase performance."
msgstr ""
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStep_Checks.inc:202
msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStep_Checks.inc:209
msgid "The Execution time should be at least 30 seconds."
msgstr ""
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStep_Checks.inc:210
msgid ""
"Search for 'max_execution_time' in your php.ini and set it to '30' or higher."
msgstr ""
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStep_Checks.inc:217
msgid ""
"Increase the server security by setting expose_php to 'off'. PHP won't send "
"any information about the server you are running in this case."
msgstr ""
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStep_Checks.inc:218
msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:230
+#: setup/class_setupStep_Checks.inc:225
msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:231
+#: setup/class_setupStep_Checks.inc:226
msgid ""
"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:241
+#: setup/class_setupStep_Checks.inc:236
msgid "Configuration writeable"
msgstr "Plik konfiguracyjny zapisywalny"
-#: setup/class_setupStep_Checks.inc:242
+#: setup/class_setupStep_Checks.inc:237
msgid "The configuration file can't be written"
msgstr ""
-#: setup/class_setupStep_Checks.inc:243
+#: setup/class_setupStep_Checks.inc:238
#, php-format
msgid ""
"FusionDirectory reads its configuration from a file located in (%s/%s). The "
@@ -1661,7 +1662,7 @@ msgstr ""
#: plugins/admin/departments/class_organizationGeneric.inc:115
#: plugins/admin/departments/class_organizationGeneric.inc:118
#: plugins/personal/generic/class_user.inc:1395
-#: plugins/personal/generic/generic.tpl:300
+#: plugins/personal/generic/generic.tpl:277
msgid "Organization"
msgstr "Organizacja"
@@ -1671,8 +1672,8 @@ msgstr "Organizacja"
#: plugins/admin/acl/class_aclRole.inc:702
#: plugins/admin/acl/class_aclRole.inc:715
#: plugins/admin/acl/class_aclRole.inc:725
-#: plugins/admin/users/class_userManagement.inc:545
-#: plugins/admin/users/class_userManagement.inc:592
+#: plugins/admin/users/class_userManagement.inc:542
+#: plugins/admin/users/class_userManagement.inc:589
#: plugins/admin/users/user-filter.tpl:26
#: plugins/admin/groups/group-filter.tpl:21
#: plugins/admin/groups/userSelect/user-filter.tpl:17
@@ -1753,7 +1754,7 @@ msgid ""
msgstr ""
#: setup/setup_feedback.tpl:52
-#: plugins/admin/users/class_userManagement.inc:903
+#: plugins/admin/users/class_userManagement.inc:900
#: plugins/admin/groups/class_group.inc:1106
#: plugins/admin/departments/class_department.inc:653
#: plugins/admin/ogroups/class_ogroup.inc:895
@@ -1893,7 +1894,7 @@ msgstr ""
#: setup/setup_migrate.tpl:101 setup/setup_migrate.tpl:153
#: setup/setup_migrate.tpl:320 setup/setup_migrate.tpl:373
#: setup/setup_migrate.tpl:416 setup/setup_migrate.tpl:459
-#: setup/setup_migrate.tpl:503 include/class_listing.inc:352
+#: setup/setup_migrate.tpl:503 include/class_listing.inc:351
msgid "Select all"
msgstr "Wybierz wszystko"
@@ -2361,7 +2362,7 @@ msgid "Group will be moved from"
msgstr ""
#: setup/class_setupStep_Migrate.inc:1175
-#: setup/class_setupStep_Migrate.inc:1223 include/class_plugin.inc:2083
+#: setup/class_setupStep_Migrate.inc:1223 include/class_plugin.inc:1675
msgid "to"
msgstr "do"
@@ -2436,8 +2437,7 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:2647 include/class_msgPool.inc:495
#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:83
#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:138
-#: plugins/personal/generic/generic.tpl:251
-#: plugins/personal/generic/generic.tpl:270
+#: plugins/personal/generic/generic.tpl:249
#, php-format
msgid "Add"
msgstr "Dodaj"
@@ -2558,28 +2558,25 @@ msgstr ""
#: include/class_management.inc:333 include/class_management.inc:483
#: include/class_management.inc:536 include/class_management.inc:576
#: include/class_management.inc:590 include/class_CopyPasteHandler.inc:223
-#: include/class_plugin.inc:1791 include/class_plugin.inc:1803
-#: include/class_plugin.inc:1818 include/class_plugin.inc:1831
-#: plugins/admin/users/class_userManagement.inc:205
-#: plugins/admin/users/class_userManagement.inc:761
+#: plugins/admin/users/class_userManagement.inc:202
+#: plugins/admin/users/class_userManagement.inc:758
msgid "Permission"
msgstr "Uprawnienie"
#: include/class_management.inc:403
-#: plugins/admin/acl/class_aclManagement.inc:100
-#: plugins/admin/users/class_userManagement.inc:719
-#: plugins/admin/users/class_userManagement.inc:723
+#: plugins/admin/acl/class_aclManagement.inc:101
+#: plugins/admin/users/class_userManagement.inc:716
+#: plugins/admin/users/class_userManagement.inc:720
msgid "Permission error"
msgstr ""
-#: include/class_management.inc:483 include/class_plugin.inc:1791
+#: include/class_management.inc:483
#, php-format
msgid "You are not allowed to create a snapshot for %s."
msgstr ""
#: include/class_management.inc:536 include/class_management.inc:576
-#: include/class_management.inc:590 include/class_plugin.inc:1803
-#: include/class_plugin.inc:1818 include/class_plugin.inc:1831
+#: include/class_management.inc:590
#, php-format
msgid "You are not allowed to restore a snapshot for %s."
msgstr ""
@@ -2782,87 +2779,87 @@ msgid ""
"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
msgstr "Polecenie '%s', podane jako POSTMODIFY dla dodatku '%s' nie istnieje."
-#: include/functions.inc:3613 include/functions.inc:3633
-#: include/functions.inc:3671 include/functions.inc:3683
-#: include/functions.inc:3687 include/functions.inc:3702
-#: include/functions.inc:3711
+#: include/functions.inc:3618 include/functions.inc:3638
+#: include/functions.inc:3676 include/functions.inc:3688
+#: include/functions.inc:3692 include/functions.inc:3707
+#: include/functions.inc:3716
msgid "Cannot allocate a free ID:"
msgstr ""
-#: include/functions.inc:3613
+#: include/functions.inc:3618
msgid "unknown idAllocation method!"
msgstr ""
-#: include/functions.inc:3633
+#: include/functions.inc:3638
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3663
+#: include/functions.inc:3668
msgid "Cannot create sambaUnixIdPool entry!"
msgstr ""
-#: include/functions.inc:3671
+#: include/functions.inc:3676
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3683 include/functions.inc:3687
+#: include/functions.inc:3688 include/functions.inc:3692
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3711
+#: include/functions.inc:3716
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3779
+#: include/functions.inc:3784
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/class_listing.inc:291 include/class_listing.inc:1099
-#: include/class_listing.inc:1101 include/class_sortableListing.inc:343
+#: include/class_listing.inc:290 include/class_listing.inc:1105
+#: include/class_listing.inc:1107 include/class_sortableListing.inc:343
#: include/class_acl.inc:504 plugins/admin/acl/class_aclRole.inc:372
msgid "Up"
msgstr "Góra"
-#: include/class_listing.inc:291 include/class_sortableListing.inc:343
+#: include/class_listing.inc:290 include/class_sortableListing.inc:343
#: include/class_acl.inc:506 plugins/admin/acl/class_aclRole.inc:374
msgid "Down"
msgstr "W dół"
-#: include/class_listing.inc:564
+#: include/class_listing.inc:563
msgid "created by"
msgstr "utworzone przez"
-#: include/class_listing.inc:1091
+#: include/class_listing.inc:1097
msgid "Go to root department"
msgstr "Idź do głównego departamentu"
-#: include/class_listing.inc:1091 include/class_listing.inc:1093
+#: include/class_listing.inc:1097 include/class_listing.inc:1099
#: include/class_baseSelector.inc:205
msgid "Root"
msgstr "Główny"
-#: include/class_listing.inc:1099
+#: include/class_listing.inc:1105
msgid "Go up one department"
msgstr "Idź jeden departament wyżej"
-#: include/class_listing.inc:1107
+#: include/class_listing.inc:1113
msgid "Go to users department"
msgstr "Przejdź do departamentu użytkowników"
-#: include/class_listing.inc:1107 include/class_listing.inc:1109
+#: include/class_listing.inc:1113 include/class_listing.inc:1115
msgid "Home"
msgstr "Katalog domowy"
-#: include/class_listing.inc:1114
+#: include/class_listing.inc:1120
msgid "Reload list"
msgstr "Przeładuj listę"
-#: include/class_listing.inc:1114 include/class_baseSelector.inc:252
+#: include/class_listing.inc:1120 include/class_baseSelector.inc:252
msgid "Submit"
msgstr "Wyślij"
-#: include/class_listing.inc:1211 plugins/admin/acl/acl-list.xml:65
+#: include/class_listing.inc:1217 plugins/admin/acl/acl-list.xml:65
#: plugins/admin/users/user-list.xml:78 plugins/admin/groups/group-list.xml:79
#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:64
#: plugins/admin/departments/dep-list.xml:87
@@ -2870,65 +2867,62 @@ msgstr "Wyślij"
msgid "Actions"
msgstr "Akcje"
-#: include/class_listing.inc:1495 include/class_listing.inc:1545
-#: include/class_plugin.inc:2228
+#: include/class_listing.inc:1501 include/class_listing.inc:1551
msgid "Copy"
msgstr "Kopiuj"
-#: include/class_listing.inc:1501 include/class_listing.inc:1535
-#: include/class_plugin.inc:2232
+#: include/class_listing.inc:1507 include/class_listing.inc:1541
msgid "Cut"
msgstr "Wytnij"
-#: include/class_listing.inc:1509 include/class_listing.inc:1511
-#: include/class_CopyPasteHandler.inc:400 include/class_plugin.inc:2239
-#: include/class_plugin.inc:2242
+#: include/class_listing.inc:1515 include/class_listing.inc:1517
+#: include/class_CopyPasteHandler.inc:400
msgid "Paste"
msgstr "Wklej"
-#: include/class_listing.inc:1535 include/class_plugin.inc:2186
+#: include/class_listing.inc:1541
msgid "Cut this entry"
msgstr "Wytnij ten obiekt"
-#: include/class_listing.inc:1545 include/class_plugin.inc:2194
+#: include/class_listing.inc:1551
msgid "Copy this entry"
msgstr "Kopiuj ten obiekt"
-#: include/class_listing.inc:1577 include/class_listing.inc:1579
+#: include/class_listing.inc:1583 include/class_listing.inc:1585
msgid "Restore snapshots"
msgstr ""
-#: include/class_listing.inc:1593
+#: include/class_listing.inc:1599
msgid "Export list"
msgstr ""
-#: include/class_listing.inc:1628 include/class_listing.inc:1629
-#: include/class_SnapShotDialog.inc:153 include/class_plugin.inc:2160
+#: include/class_listing.inc:1634 include/class_listing.inc:1635
+#: include/class_SnapShotDialog.inc:298
msgid "Restore snapshot"
msgstr "Odtwórz snapshot"
-#: include/class_listing.inc:1638 include/class_plugin.inc:2167
+#: include/class_listing.inc:1644
msgid "Create snapshot"
msgstr "Utwórz spanshot"
-#: include/class_listing.inc:1639 include/class_plugin.inc:2168
+#: include/class_listing.inc:1645
msgid "Create a new snapshot from this object"
msgstr "Utwórz nowy snapshot z tego obiektu"
-#: include/class_SnapShotDialog.inc:99
+#: include/class_SnapShotDialog.inc:244
#, php-format
msgid "You're about to delete the snapshot '%s'."
msgstr "Zamierzasz usunąć snapshot '%s'."
-#: include/class_SnapShotDialog.inc:155
+#: include/class_SnapShotDialog.inc:300
msgid "Remove snapshot"
msgstr "Usuń snapshot"
-#: include/class_SnapShotDialog.inc:157 include/class_SnapShotDialog.inc:177
+#: include/class_SnapShotDialog.inc:302 include/class_SnapShotDialog.inc:322
msgid "Y-m-d, H:i:s"
msgstr "Y-m-d, H:i:s"
-#: include/class_SnapShotDialog.inc:191 plugins/admin/acl/acl-list.xml:57
+#: include/class_SnapShotDialog.inc:336 plugins/admin/acl/acl-list.xml:57
#: plugins/admin/acl/acl_role.tpl:17 plugins/admin/acl/class_aclRole.inc:704
#: plugins/admin/groups/class_group.inc:1114
#: plugins/admin/groups/group-list.xml:66 plugins/admin/groups/generic.tpl:24
@@ -3003,32 +2997,20 @@ msgstr ""
msgid "Cannot find a suitable password method for the current hash!"
msgstr ""
-#: include/class_plugin.inc:563
+#: include/class_plugin.inc:562
msgid ""
"The object has changed since opened in FusionDirectory. All changes that may "
"be done by others get lost if you save this entry!"
msgstr ""
-#: include/class_plugin.inc:2082
+#: include/class_plugin.inc:1674
msgid "Changing ACL dn"
msgstr ""
-#: include/class_plugin.inc:2082
+#: include/class_plugin.inc:1674
msgid "from"
msgstr "od"
-#: include/class_plugin.inc:2136 include/class_plugin.inc:2138
-msgid "Restore"
-msgstr "Odtwórz"
-
-#: include/class_plugin.inc:2186
-msgid "cut"
-msgstr "wytnij"
-
-#: include/class_plugin.inc:2194
-msgid "copy"
-msgstr "kopiuj"
-
#: include/class_sortableListing.inc:303
msgid "Sortable list"
msgstr ""
@@ -3899,15 +3881,14 @@ msgstr ""
msgid "List of acls"
msgstr "Lista ACLi"
-#: plugins/admin/acl/acl-list.xml:15
+#: plugins/admin/acl/acl-list.xml:15 plugins/admin/acl/acl-list.xml:82
#: plugins/admin/acl/class_aclManagement.inc:36
msgid "Acl"
msgstr ""
-#: plugins/admin/acl/acl-list.xml:23 plugins/admin/acl/acl-list.xml:82
-#: plugins/admin/acl/class_aclRole.inc:695
+#: plugins/admin/acl/acl-list.xml:23 plugins/admin/acl/class_aclRole.inc:695
#: plugins/personal/generic/class_user.inc:1367
-#: plugins/personal/generic/generic.tpl:515
+#: plugins/personal/generic/generic.tpl:492
msgid "Role"
msgstr "Pełniona funkcja"
@@ -3947,7 +3928,7 @@ msgstr ""
msgid "Access control list management"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:160
+#: plugins/admin/acl/class_aclManagement.inc:161
msgid "ACL Assignment"
msgstr ""
@@ -4075,7 +4056,7 @@ msgstr ""
"użycie szablonów."
#: plugins/admin/users/template.tpl:15
-#: plugins/admin/users/class_userManagement.inc:542
+#: plugins/admin/users/class_userManagement.inc:539
#: plugins/admin/users/templatize.tpl:15 plugins/admin/users/user-list.xml:15
#: plugins/admin/users/user-list.xml:102
msgid "Template"
@@ -4110,23 +4091,23 @@ msgstr "Login"
msgid "Manage users"
msgstr "Zarządzaj użytkownikami"
-#: plugins/admin/users/class_userManagement.inc:344
+#: plugins/admin/users/class_userManagement.inc:341
#: plugins/personal/password/class_password.inc:136
#, php-format
msgid "Check-hook reported a problem: %s. Password change canceled!"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:394
+#: plugins/admin/users/class_userManagement.inc:391
msgid "You have no permission to change this users password!"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:470
-#: plugins/admin/users/class_userManagement.inc:504
-#: plugins/admin/users/class_userManagement.inc:535
+#: plugins/admin/users/class_userManagement.inc:467
+#: plugins/admin/users/class_userManagement.inc:501
+#: plugins/admin/users/class_userManagement.inc:532
msgid "none"
msgstr "żaden"
-#: plugins/admin/users/class_userManagement.inc:548
+#: plugins/admin/users/class_userManagement.inc:545
#: plugins/admin/users/user-list.xml:57
#: plugins/admin/groups/userSelect/user-list.xml:40
#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
@@ -4136,26 +4117,26 @@ msgstr "żaden"
msgid "Given name"
msgstr "ImiÄ™"
-#: plugins/admin/users/class_userManagement.inc:799
+#: plugins/admin/users/class_userManagement.inc:796
msgid "Account locking"
msgstr "Blokowanie konta"
-#: plugins/admin/users/class_userManagement.inc:800
+#: plugins/admin/users/class_userManagement.inc:797
#, php-format
msgid ""
"Password method '%s' does not support locking. Account (%s) has not been "
"locked!"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:873
+#: plugins/admin/users/class_userManagement.inc:870
msgid "Unlock account"
msgstr "Odblokuj konto"
-#: plugins/admin/users/class_userManagement.inc:875
+#: plugins/admin/users/class_userManagement.inc:872
msgid "Lock account"
msgstr "Zablokuj konto"
-#: plugins/admin/users/class_userManagement.inc:903
+#: plugins/admin/users/class_userManagement.inc:900
#, fuzzy
msgid "Generic properties"
msgstr "Edytuj ogólne właściwości"
@@ -4245,8 +4226,9 @@ msgid "Remove user"
msgstr ""
#: plugins/admin/password/class_recoveryConfig.inc:35
-msgid "Password recovery config"
-msgstr ""
+#, fuzzy
+msgid "Password recovery"
+msgstr "Błąd hasła"
#: plugins/admin/password/class_recoveryConfig.inc:36
msgid "Settings for the password recovery feature"
@@ -4561,7 +4543,6 @@ msgstr "Ogólne ustawienia grupy"
#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:23
#: plugins/admin/ogroups/class_ogroupManagement.inc:187
#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:79
-#: plugins/admin/ogroups/ogroup-list.xml:79
#: plugins/generic/references/class_reference.inc:55
#: plugins/personal/posix/groupSelect/group-list.xml:15
msgid "Group"
@@ -4653,8 +4634,8 @@ msgstr "Edytuj właściwości Samba"
#: plugins/generic/references/class_reference.inc:59
#: plugins/personal/posix/trustSelect/class_trustSelect.inc:81
#: plugins/personal/generic/class_user.inc:1180
-#: plugins/personal/generic/generic.tpl:399
-#: plugins/personal/generic/generic.tpl:586
+#: plugins/personal/generic/generic.tpl:376
+#: plugins/personal/generic/generic.tpl:563
msgid "Phone"
msgstr "Telefon"
@@ -4753,7 +4734,7 @@ msgstr ""
#: plugins/admin/departments/generic.tpl:91
#: plugins/admin/departments/class_organizationGeneric.inc:129
#: plugins/personal/generic/class_user.inc:1410
-#: plugins/personal/generic/generic.tpl:448
+#: plugins/personal/generic/generic.tpl:425
msgid "Location"
msgstr "Lokalizacja"
@@ -4770,8 +4751,8 @@ msgstr "Lokalizacja"
#: plugins/admin/departments/generic.tpl:51
#: plugins/admin/departments/class_organizationGeneric.inc:126
#: plugins/personal/generic/class_user.inc:1399
-#: plugins/personal/generic/generic.tpl:341
-#: plugins/personal/generic/generic.tpl:362
+#: plugins/personal/generic/generic.tpl:318
+#: plugins/personal/generic/generic.tpl:339
msgid "Manager"
msgstr ""
@@ -4913,7 +4894,7 @@ msgstr "Kategoria dla tego poddrzewa"
#: plugins/admin/departments/generic.tpl:83
#: plugins/admin/departments/class_organizationGeneric.inc:128
#: plugins/personal/generic/class_user.inc:1409
-#: plugins/personal/generic/generic.tpl:456
+#: plugins/personal/generic/generic.tpl:433
msgid "State"
msgstr "Stan"
@@ -4931,7 +4912,7 @@ msgstr "Lokalizacja tego poddrzewa"
#: plugins/admin/departments/class_department.inc:667
#: plugins/admin/departments/generic.tpl:99
#: plugins/personal/generic/generic.tpl:181
-#: plugins/personal/generic/generic.tpl:464
+#: plugins/personal/generic/generic.tpl:441
msgid "Address"
msgstr "Adres"
@@ -4951,8 +4932,8 @@ msgstr "Bazowy numer telefonu tego poddrzewa"
#: plugins/admin/departments/generic.tpl:114
#: plugins/admin/departments/class_organizationGeneric.inc:132
#: plugins/personal/generic/class_user.inc:1183
-#: plugins/personal/generic/generic.tpl:430
-#: plugins/personal/generic/generic.tpl:598
+#: plugins/personal/generic/generic.tpl:407
+#: plugins/personal/generic/generic.tpl:575
msgid "Fax"
msgstr "Fax"
@@ -5003,7 +4984,7 @@ msgstr "Kraj"
#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:15
#: plugins/generic/references/class_reference.inc:57
#: plugins/personal/generic/class_user.inc:1396
-#: plugins/personal/generic/generic.tpl:308
+#: plugins/personal/generic/generic.tpl:285
msgid "Department"
msgstr "Departament"
@@ -5307,6 +5288,11 @@ msgstr "Dodaj członka"
msgid "List of object groups"
msgstr "Lista grupy obiektów"
+#: plugins/admin/ogroups/ogroup-list.xml:79
+#, fuzzy
+msgid "Objectgroup"
+msgstr "Grupa obiektu"
+
#: plugins/admin/ogroups/ogroup-list.xml:106
msgid "Send message"
msgstr "Wyślij wiadomość"
@@ -5378,7 +5364,8 @@ msgstr "Język"
#: plugins/config/class_configInLdap.inc:82
msgid ""
-"Default language to be used if the one asked by the browser is not available"
+"Language of the application. If 'automatic' or not available, the one asked "
+"by the browser will be used. This setting can be overriden per user."
msgstr ""
#: plugins/config/class_configInLdap.inc:87
@@ -5394,7 +5381,7 @@ msgid "Schema setup"
msgstr ""
#: plugins/config/class_configInLdap.inc:103
-msgid "rfc237bis"
+msgid "rfc2307bis"
msgstr ""
#: plugins/config/class_configInLdap.inc:104
@@ -6101,12 +6088,12 @@ msgid "Homepage"
msgstr "Strona domowa"
#: plugins/personal/generic/class_user.inc:1186
-#: plugins/personal/generic/generic.tpl:411
+#: plugins/personal/generic/generic.tpl:388
msgid "Mobile"
msgstr "Komórka"
#: plugins/personal/generic/class_user.inc:1189
-#: plugins/personal/generic/generic.tpl:422
+#: plugins/personal/generic/generic.tpl:399
msgid "Pager"
msgstr "Pager"
@@ -6117,57 +6104,57 @@ msgid "Date of birth"
msgstr "Data urodzenia"
#: plugins/personal/generic/class_user.inc:1357
-#: plugins/personal/generic/generic.tpl:538
+#: plugins/personal/generic/generic.tpl:515
msgid "Unit"
msgstr "Jednostka"
#: plugins/personal/generic/class_user.inc:1358
-#: plugins/personal/generic/generic.tpl:563
+#: plugins/personal/generic/generic.tpl:540
msgid "House identifier"
msgstr "Identyfikator budynku"
#: plugins/personal/generic/class_user.inc:1359
-#: plugins/personal/generic/generic.tpl:480
+#: plugins/personal/generic/generic.tpl:457
msgid "Vocation"
msgstr "Wywołanie"
#: plugins/personal/generic/class_user.inc:1360
-#: plugins/personal/generic/generic.tpl:607
+#: plugins/personal/generic/generic.tpl:584
msgid "Last delivery"
msgstr "Ostatnia dostawa"
#: plugins/personal/generic/class_user.inc:1361
-#: plugins/personal/generic/generic.tpl:529
+#: plugins/personal/generic/generic.tpl:506
msgid "Person locality"
msgstr "Lokalizacja osoby"
#: plugins/personal/generic/class_user.inc:1362
-#: plugins/personal/generic/generic.tpl:488
+#: plugins/personal/generic/generic.tpl:465
msgid "Unit description"
msgstr "Opis jednostki"
#: plugins/personal/generic/class_user.inc:1363
-#: plugins/personal/generic/generic.tpl:497
+#: plugins/personal/generic/generic.tpl:474
msgid "Subject area"
msgstr "Sektor"
#: plugins/personal/generic/class_user.inc:1364
-#: plugins/personal/generic/generic.tpl:506
+#: plugins/personal/generic/generic.tpl:483
msgid "Functional title"
msgstr "Tytuł funkcjonalny"
#: plugins/personal/generic/class_user.inc:1365
-#: plugins/personal/generic/generic.tpl:616
+#: plugins/personal/generic/generic.tpl:593
msgid "Public visible"
msgstr "Publicznie widoczne"
#: plugins/personal/generic/class_user.inc:1366
-#: plugins/personal/generic/generic.tpl:547
+#: plugins/personal/generic/generic.tpl:524
msgid "Street"
msgstr "Ulica"
#: plugins/personal/generic/class_user.inc:1368
-#: plugins/personal/generic/generic.tpl:555
+#: plugins/personal/generic/generic.tpl:532
msgid "Postal code"
msgstr "Kod pocztowy"
@@ -6216,7 +6203,7 @@ msgid "Employee number"
msgstr "Numer pracownika"
#: plugins/personal/generic/class_user.inc:1401
-#: plugins/personal/generic/generic.tpl:332
+#: plugins/personal/generic/generic.tpl:309
msgid "Employee type"
msgstr "Typ pracownika"
@@ -6297,29 +6284,28 @@ msgstr "Przechowywanie hasła"
msgid "Restrict login to"
msgstr "Ogranicz logowanie do"
-#: plugins/personal/generic/generic.tpl:248
-#: plugins/personal/generic/generic.tpl:267
+#: plugins/personal/generic/generic.tpl:246
msgid "IP or network"
msgstr "IP lub sieć"
-#: plugins/personal/generic/generic.tpl:288
+#: plugins/personal/generic/generic.tpl:265
msgid "Organizational information"
msgstr "Informacje organizacyjne"
-#: plugins/personal/generic/generic.tpl:316
+#: plugins/personal/generic/generic.tpl:293
msgid "Department No."
msgstr "Numer departamentu"
-#: plugins/personal/generic/generic.tpl:324
+#: plugins/personal/generic/generic.tpl:301
msgid "Employee No."
msgstr "Numer pracownika"
-#: plugins/personal/generic/generic.tpl:390
-#: plugins/personal/generic/generic.tpl:578
+#: plugins/personal/generic/generic.tpl:367
+#: plugins/personal/generic/generic.tpl:555
msgid "Room No."
msgstr "Numer pokoju"
-#: plugins/personal/generic/generic.tpl:592
+#: plugins/personal/generic/generic.tpl:569
msgid "Please use the phone tab"
msgstr "Proszę użyć zakładki telefony"
@@ -6327,6 +6313,15 @@ msgstr "Proszę użyć zakładki telefony"
msgid "Your password hash method will not be changed!"
msgstr ""
+#~ msgid "Restore"
+#~ msgstr "Odtwórz"
+
+#~ msgid "cut"
+#~ msgstr "wytnij"
+
+#~ msgid "copy"
+#~ msgstr "kopiuj"
+
#~ msgid "POSIX"
#~ msgstr "POSIX"
diff --git a/locale/pt/messages.po b/locale/pt/fusiondirectory.po
similarity index 94%
rename from locale/pt/messages.po
rename to locale/pt/fusiondirectory.po
index 9cade8eced40563c42823a30afdd0d6676b9bf58..b199a67b932e96f0bdcc58b2f83c5070f95282dc 100644
--- a/locale/pt/messages.po
+++ b/locale/pt/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-24 14:48+0100\n"
-"PO-Revision-Date: 2013-03-06 21:40+0000\n"
+"POT-Creation-Date: 2013-04-14 20:13+0200\n"
+"PO-Revision-Date: 2013-03-24 15:00+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: pt\n"
@@ -18,39 +18,39 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: html/main.php:140 html/class_passwordRecovery.inc:226
+#: html/main.php:135 html/class_passwordRecovery.inc:226
#: include/class_xml.inc:60 include/functions.inc:509
#: plugins/admin/departments/class_department.inc:431
msgid "Fatal error"
msgstr ""
-#: html/main.php:141
+#: html/main.php:136
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr ""
-#: html/main.php:162
+#: html/main.php:157
msgid "PHP configuration"
msgstr ""
-#: html/main.php:163
+#: html/main.php:158
msgid ""
"Fatal error: Register globals is on. FusionDirectory will refuse to login "
"unless this is fixed by an administrator."
msgstr ""
-#: html/main.php:192 ihtml/themes/default/password.tpl:40
-#: plugins/admin/users/class_userManagement.inc:393
+#: html/main.php:187 ihtml/themes/default/password.tpl:40
+#: plugins/admin/users/class_userManagement.inc:390
#: plugins/personal/password/class_password.inc:156
#: plugins/personal/password/class_password.inc:162
msgid "Password change"
msgstr "Senha alterada"
-#: html/main.php:192
+#: html/main.php:187
msgid "Your password is about to expire, please change your password!"
msgstr ""
-#: html/main.php:261 html/class_passwordRecovery.inc:301 html/index.php:147
+#: html/main.php:256 html/class_passwordRecovery.inc:296 html/index.php:147
#: html/index.php:208 include/class_SnapshotHandler.inc:57
#: include/class_SnapshotHandler.inc:70 include/class_SnapshotHandler.inc:88
#: include/class_pluglist.inc:272 include/functions.inc:933
@@ -64,30 +64,30 @@ msgstr ""
msgid "Configuration error"
msgstr "Erro de configuração"
-#: html/main.php:261
+#: html/main.php:256
msgid "Running out of memory!"
msgstr ""
-#: html/main.php:316
+#: html/main.php:311
msgid "User ACL checks disabled"
msgstr ""
-#: html/main.php:362
+#: html/main.php:357
msgid "Plugin"
msgstr ""
-#: html/main.php:363
+#: html/main.php:358
#, php-format
msgid ""
"Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not "
"a file)!"
msgstr ""
-#: html/main.php:378
+#: html/main.php:373
msgid "Configuration Error"
msgstr ""
-#: html/main.php:379
+#: html/main.php:374
#, php-format
msgid ""
"Fatal error: not all POST variables have been transfered by PHP - please "
@@ -103,18 +103,18 @@ msgstr ""
msgid "Error: Password method not available!"
msgstr "Erro: Método de senha não disponÃvel!"
-#: html/class_passwordRecovery.inc:227 html/index.php:147
+#: html/class_passwordRecovery.inc:227
#, php-format
msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
msgstr ""
-#: html/class_passwordRecovery.inc:302 html/setup.php:63 html/index.php:163
+#: html/class_passwordRecovery.inc:297 html/setup.php:63 html/index.php:163
#, php-format
msgid "Directory '%s' specified as compile directory is not accessible!"
msgstr ""
-#: html/class_passwordRecovery.inc:407
-#: plugins/admin/users/class_userManagement.inc:309
+#: html/class_passwordRecovery.inc:402
+#: plugins/admin/users/class_userManagement.inc:306
#: plugins/personal/password/class_password.inc:113
msgid ""
"The passwords you've entered as 'New password' and 'Repeated new password' "
@@ -122,13 +122,13 @@ msgid ""
msgstr ""
"A senha digitada nos campos 'Nova senha' e 'Repita nova senha' não conferem."
-#: html/class_passwordRecovery.inc:409 ihtml/themes/default/password.tpl:81
+#: html/class_passwordRecovery.inc:404 ihtml/themes/default/password.tpl:81
#: ihtml/themes/default/password.tpl:82
#: ihtml/themes/default/accountexpired.tpl:32
#: ihtml/themes/default/accountexpired.tpl:36
#: ihtml/themes/default/recovery.tpl:93 ihtml/themes/default/recovery.tpl:94
#: plugins/admin/users/password.tpl:17 plugins/admin/users/password.tpl:60
-#: plugins/admin/users/class_userManagement.inc:312
+#: plugins/admin/users/class_userManagement.inc:309
#: plugins/personal/password/password.tpl:27
#: plugins/personal/password/password.tpl:78
#: plugins/personal/generic/password.tpl:22
@@ -136,16 +136,16 @@ msgstr ""
msgid "New password"
msgstr "Nova senha"
-#: html/class_passwordRecovery.inc:411
+#: html/class_passwordRecovery.inc:406
msgid "The password used as new is too short."
msgstr ""
-#: html/class_passwordRecovery.inc:413
+#: html/class_passwordRecovery.inc:408
#: plugins/personal/password/class_password.inc:121
msgid "The password contains possibly problematic Unicode characters!"
msgstr ""
-#: html/class_passwordRecovery.inc:437 html/index.php:58 html/index.php:64
+#: html/class_passwordRecovery.inc:432 html/index.php:58 html/index.php:64
#: html/index.php:403 ihtml/themes/default/conflict.tpl:6
#: ihtml/themes/default/islocked.tpl:6 ihtml/themes/default/remove.tpl:2
#: ihtml/themes/default/msg_dialog.tpl:59
@@ -168,39 +168,39 @@ msgstr ""
msgid "Warning"
msgstr "Atenção"
-#: html/class_passwordRecovery.inc:438
+#: html/class_passwordRecovery.inc:433
msgid "Session will not be encrypted."
msgstr "A sessão não será criptografada."
-#: html/class_passwordRecovery.inc:440
+#: html/class_passwordRecovery.inc:435
msgid "Enter SSL session"
msgstr "Entre com a sessão SSL"
-#: html/class_passwordRecovery.inc:481
+#: html/class_passwordRecovery.inc:476
#, php-format
msgid "Did not found account %s"
msgstr ""
-#: html/class_passwordRecovery.inc:484
+#: html/class_passwordRecovery.inc:479
#, php-format
msgid "Found multiple accounts %s"
msgstr ""
-#: html/class_passwordRecovery.inc:498 ihtml/themes/default/recovery.tpl:142
+#: html/class_passwordRecovery.inc:493 ihtml/themes/default/recovery.tpl:142
msgid "Adresse mail"
msgstr ""
-#: html/class_passwordRecovery.inc:515
+#: html/class_passwordRecovery.inc:510
#, php-format
msgid "There is no account using email %s"
msgstr ""
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:513
#, php-format
msgid "There are several accounts using email %s"
msgstr ""
-#: html/class_passwordRecovery.inc:543 html/index.php:257 html/index.php:269
+#: html/class_passwordRecovery.inc:538 html/index.php:257 html/index.php:269
#: html/index.php:282 setup/class_setupStep_Migrate.inc:1138
#: setup/class_setupStep_Migrate.inc:1164
#: setup/class_setupStep_Migrate.inc:1213
@@ -212,20 +212,17 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:2549
#: setup/class_setupStep_Migrate.inc:2896
#: setup/class_setupStep_Migrate.inc:2910
-#: include/class_SnapshotHandler.inc:150 include/class_SnapshotHandler.inc:329
-#: include/class_SnapshotHandler.inc:378 include/class_SnapshotHandler.inc:382
-#: include/class_SnapshotHandler.inc:402 include/class_SnapshotHandler.inc:445
-#: include/class_SnapshotHandler.inc:508 include/class_SnapshotHandler.inc:577
-#: include/class_SnapshotHandler.inc:592 include/functions.inc:547
+#: include/class_SnapshotHandler.inc:150 include/class_SnapshotHandler.inc:335
+#: include/class_SnapshotHandler.inc:388 include/class_SnapshotHandler.inc:392
+#: include/class_SnapshotHandler.inc:412 include/class_SnapshotHandler.inc:455
+#: include/class_SnapshotHandler.inc:518 include/class_SnapshotHandler.inc:587
+#: include/class_SnapshotHandler.inc:602 include/functions.inc:547
#: include/functions.inc:583 include/functions.inc:591
#: include/functions.inc:639 include/functions.inc:948
#: include/functions.inc:998 include/functions.inc:1058
#: include/functions.inc:1113 include/functions.inc:3244
-#: include/functions.inc:3509 include/class_config.inc:330
-#: include/class_plugin.inc:1500 include/class_plugin.inc:1550
-#: include/class_plugin.inc:1554 include/class_plugin.inc:1574
-#: include/class_plugin.inc:1621 include/class_plugin.inc:1681
-#: include/class_plugin.inc:1751 include/class_plugin.inc:1766
+#: include/functions.inc:3514 include/class_SnapShotDialog.inc:104
+#: include/class_SnapShotDialog.inc:177 include/class_config.inc:330
#: include/class_acl.inc:1308 include/class_acl.inc:1413
#: include/class_ldap.inc:934 include/class_ldap.inc:1421
#: plugins/admin/acl/class_aclRole.inc:613
@@ -244,19 +241,19 @@ msgstr ""
msgid "LDAP error"
msgstr "Erro de LDAP"
-#: html/class_passwordRecovery.inc:566
+#: html/class_passwordRecovery.inc:561
msgid "Contact your administrator, there was a problem with mail server"
msgstr ""
-#: html/class_passwordRecovery.inc:577
+#: html/class_passwordRecovery.inc:572
msgid "This token is invalid"
msgstr ""
-#: html/class_passwordRecovery.inc:615
+#: html/class_passwordRecovery.inc:610
msgid "External password changer reported a problem: "
msgstr "O alterador externo de senhas reportou um problema:"
-#: html/class_passwordRecovery.inc:640
+#: html/class_passwordRecovery.inc:635
msgid "There was a problem with mail server, confirmation email not sent"
msgstr ""
@@ -274,6 +271,13 @@ msgid ""
"overridden by php.ini settings."
msgstr ""
+#: html/index.php:147
+#, php-format
+msgid ""
+"FusionDirectory configuration %s/%s is not readable. Please run "
+"fusiondirectory-setup --check-config to fix this."
+msgstr ""
+
#: html/index.php:163
msgid "Smarty error"
msgstr ""
@@ -288,22 +292,22 @@ msgstr ""
#: setup/setup_checks.tpl:91 setup/class_setupStep_Migrate.inc:1127
#: include/class_xml.inc:57 include/class_tabs.inc:74
#: include/class_management.inc:507 include/class_management.inc:657
-#: include/functions.inc:3613 include/functions.inc:3633
-#: include/functions.inc:3663 include/functions.inc:3671
-#: include/functions.inc:3683 include/functions.inc:3687
-#: include/functions.inc:3702 include/functions.inc:3711
-#: include/functions.inc:3779 include/class_listing.inc:522
+#: include/functions.inc:3618 include/functions.inc:3638
+#: include/functions.inc:3668 include/functions.inc:3676
+#: include/functions.inc:3688 include/functions.inc:3692
+#: include/functions.inc:3707 include/functions.inc:3716
+#: include/functions.inc:3784 include/class_listing.inc:521
#: include/class_config.inc:483 include/class_CopyPasteHandler.inc:264
#: include/password-methods/class_password-methods-sasl.inc:51
#: include/password-methods/class_password-methods-sasl.inc:63
#: include/password-methods/class_password-methods.inc:342
#: include/password-methods/class_password-methods.inc:447
#: include/password-methods/class_password-methods.inc:458
-#: include/class_plugin.inc:1368 include/class_plugin.inc:1843
-#: include/class_msg_dialog.inc:128 include/class_msgPool.inc:215
-#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:680 include/class_msgPool.inc:711
-#: include/class_msgPool.inc:738 include/class_databaseManagement.inc:78
+#: include/class_plugin.inc:1367 include/class_msg_dialog.inc:128
+#: include/class_msgPool.inc:215 include/class_msgPool.inc:235
+#: include/class_msgPool.inc:265 include/class_msgPool.inc:680
+#: include/class_msgPool.inc:711 include/class_msgPool.inc:738
+#: include/class_databaseManagement.inc:78
#: plugins/admin/acl/class_aclRole.inc:681
#: plugins/admin/groups/class_group.inc:521
#: plugins/admin/groups/class_group.inc:527
@@ -974,131 +978,128 @@ msgid ""
"databases."
msgstr ""
-#: setup/class_setupStep_Checks.inc:136
-msgid "MDB2 mysql"
-msgstr ""
-
-#: setup/class_setupStep_Checks.inc:137
+#: setup/class_setupStep_Checks.inc:134
msgid ""
-"FusionDirectory requires this module to communicate with mysql databases."
+"If you do not want to install MDB2 and won't use databases, remove the "
+"class_databaseManagement.inc file."
msgstr ""
-#: setup/class_setupStep_Checks.inc:143
+#: setup/class_setupStep_Checks.inc:138
msgid "imagick"
msgstr ""
-#: setup/class_setupStep_Checks.inc:144
+#: setup/class_setupStep_Checks.inc:139
msgid "FusionDirectory requires this extension to handle images."
msgstr ""
-#: setup/class_setupStep_Checks.inc:159
+#: setup/class_setupStep_Checks.inc:154
msgid "compression module"
msgstr ""
-#: setup/class_setupStep_Checks.inc:160
+#: setup/class_setupStep_Checks.inc:155
msgid "FusionDirectory requires this extension to handle snapshots."
msgstr ""
-#: setup/class_setupStep_Checks.inc:171
+#: setup/class_setupStep_Checks.inc:166
msgid ""
"register_globals is a PHP mechanism to register all global variables to be "
"accessible from scripts without changing the scope. This may be a security "
"risk."
msgstr ""
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStep_Checks.inc:167
msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:180
+#: setup/class_setupStep_Checks.inc:175
msgid "PHP uses this value for the garbage collector to delete old sessions."
msgstr ""
-#: setup/class_setupStep_Checks.inc:181
+#: setup/class_setupStep_Checks.inc:176
msgid ""
"Setting this value to one day will prevent loosing session and cookies "
"before they really timeout."
msgstr ""
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStep_Checks.inc:177
msgid ""
"Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
"higher."
msgstr ""
-#: setup/class_setupStep_Checks.inc:189 setup/class_setupStep_Checks.inc:205
-#: setup/class_setupStep_Checks.inc:221 setup/class_setupStep_Checks.inc:229
+#: setup/class_setupStep_Checks.inc:184 setup/class_setupStep_Checks.inc:200
+#: setup/class_setupStep_Checks.inc:216 setup/class_setupStep_Checks.inc:224
msgid "Off"
msgstr ""
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStep_Checks.inc:185
msgid ""
"In Order to use FusionDirectory without any trouble, the session.auto_start "
"option in your php.ini should be set to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStep_Checks.inc:186
msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStep_Checks.inc:193
msgid ""
"FusionDirectory needs at least 128MB of memory. Setting it below this limit "
"may cause errors that are not reproducable! Increase it for larger setups."
msgstr ""
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStep_Checks.inc:194
msgid ""
"Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
msgstr ""
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStep_Checks.inc:201
msgid ""
"This option influences the PHP output handling. Turn this Option off, to "
"increase performance."
msgstr ""
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStep_Checks.inc:202
msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStep_Checks.inc:209
msgid "The Execution time should be at least 30 seconds."
msgstr ""
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStep_Checks.inc:210
msgid ""
"Search for 'max_execution_time' in your php.ini and set it to '30' or higher."
msgstr ""
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStep_Checks.inc:217
msgid ""
"Increase the server security by setting expose_php to 'off'. PHP won't send "
"any information about the server you are running in this case."
msgstr ""
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStep_Checks.inc:218
msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:230
+#: setup/class_setupStep_Checks.inc:225
msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:231
+#: setup/class_setupStep_Checks.inc:226
msgid ""
"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:241
+#: setup/class_setupStep_Checks.inc:236
msgid "Configuration writeable"
msgstr ""
-#: setup/class_setupStep_Checks.inc:242
+#: setup/class_setupStep_Checks.inc:237
msgid "The configuration file can't be written"
msgstr ""
-#: setup/class_setupStep_Checks.inc:243
+#: setup/class_setupStep_Checks.inc:238
#, php-format
msgid ""
"FusionDirectory reads its configuration from a file located in (%s/%s). The "
@@ -1646,7 +1647,7 @@ msgstr ""
#: plugins/admin/departments/class_organizationGeneric.inc:115
#: plugins/admin/departments/class_organizationGeneric.inc:118
#: plugins/personal/generic/class_user.inc:1395
-#: plugins/personal/generic/generic.tpl:300
+#: plugins/personal/generic/generic.tpl:277
msgid "Organization"
msgstr "Organização"
@@ -1656,8 +1657,8 @@ msgstr "Organização"
#: plugins/admin/acl/class_aclRole.inc:702
#: plugins/admin/acl/class_aclRole.inc:715
#: plugins/admin/acl/class_aclRole.inc:725
-#: plugins/admin/users/class_userManagement.inc:545
-#: plugins/admin/users/class_userManagement.inc:592
+#: plugins/admin/users/class_userManagement.inc:542
+#: plugins/admin/users/class_userManagement.inc:589
#: plugins/admin/users/user-filter.tpl:26
#: plugins/admin/groups/group-filter.tpl:21
#: plugins/admin/groups/userSelect/user-filter.tpl:17
@@ -1738,7 +1739,7 @@ msgid ""
msgstr ""
#: setup/setup_feedback.tpl:52
-#: plugins/admin/users/class_userManagement.inc:903
+#: plugins/admin/users/class_userManagement.inc:900
#: plugins/admin/groups/class_group.inc:1106
#: plugins/admin/departments/class_department.inc:653
#: plugins/admin/ogroups/class_ogroup.inc:895
@@ -1878,7 +1879,7 @@ msgstr ""
#: setup/setup_migrate.tpl:101 setup/setup_migrate.tpl:153
#: setup/setup_migrate.tpl:320 setup/setup_migrate.tpl:373
#: setup/setup_migrate.tpl:416 setup/setup_migrate.tpl:459
-#: setup/setup_migrate.tpl:503 include/class_listing.inc:352
+#: setup/setup_migrate.tpl:503 include/class_listing.inc:351
msgid "Select all"
msgstr ""
@@ -2346,7 +2347,7 @@ msgid "Group will be moved from"
msgstr ""
#: setup/class_setupStep_Migrate.inc:1175
-#: setup/class_setupStep_Migrate.inc:1223 include/class_plugin.inc:2083
+#: setup/class_setupStep_Migrate.inc:1223 include/class_plugin.inc:1675
msgid "to"
msgstr ""
@@ -2421,8 +2422,7 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:2647 include/class_msgPool.inc:495
#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:83
#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:138
-#: plugins/personal/generic/generic.tpl:251
-#: plugins/personal/generic/generic.tpl:270
+#: plugins/personal/generic/generic.tpl:249
#, php-format
msgid "Add"
msgstr "Adicionar"
@@ -2545,28 +2545,25 @@ msgstr ""
#: include/class_management.inc:333 include/class_management.inc:483
#: include/class_management.inc:536 include/class_management.inc:576
#: include/class_management.inc:590 include/class_CopyPasteHandler.inc:223
-#: include/class_plugin.inc:1791 include/class_plugin.inc:1803
-#: include/class_plugin.inc:1818 include/class_plugin.inc:1831
-#: plugins/admin/users/class_userManagement.inc:205
-#: plugins/admin/users/class_userManagement.inc:761
+#: plugins/admin/users/class_userManagement.inc:202
+#: plugins/admin/users/class_userManagement.inc:758
msgid "Permission"
msgstr ""
#: include/class_management.inc:403
-#: plugins/admin/acl/class_aclManagement.inc:100
-#: plugins/admin/users/class_userManagement.inc:719
-#: plugins/admin/users/class_userManagement.inc:723
+#: plugins/admin/acl/class_aclManagement.inc:101
+#: plugins/admin/users/class_userManagement.inc:716
+#: plugins/admin/users/class_userManagement.inc:720
msgid "Permission error"
msgstr ""
-#: include/class_management.inc:483 include/class_plugin.inc:1791
+#: include/class_management.inc:483
#, php-format
msgid "You are not allowed to create a snapshot for %s."
msgstr ""
#: include/class_management.inc:536 include/class_management.inc:576
-#: include/class_management.inc:590 include/class_plugin.inc:1803
-#: include/class_plugin.inc:1818 include/class_plugin.inc:1831
+#: include/class_management.inc:590
#, php-format
msgid "You are not allowed to restore a snapshot for %s."
msgstr ""
@@ -2767,87 +2764,87 @@ msgid ""
"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
msgstr ""
-#: include/functions.inc:3613 include/functions.inc:3633
-#: include/functions.inc:3671 include/functions.inc:3683
-#: include/functions.inc:3687 include/functions.inc:3702
-#: include/functions.inc:3711
+#: include/functions.inc:3618 include/functions.inc:3638
+#: include/functions.inc:3676 include/functions.inc:3688
+#: include/functions.inc:3692 include/functions.inc:3707
+#: include/functions.inc:3716
msgid "Cannot allocate a free ID:"
msgstr ""
-#: include/functions.inc:3613
+#: include/functions.inc:3618
msgid "unknown idAllocation method!"
msgstr ""
-#: include/functions.inc:3633
+#: include/functions.inc:3638
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3663
+#: include/functions.inc:3668
msgid "Cannot create sambaUnixIdPool entry!"
msgstr ""
-#: include/functions.inc:3671
+#: include/functions.inc:3676
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3683 include/functions.inc:3687
+#: include/functions.inc:3688 include/functions.inc:3692
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3711
+#: include/functions.inc:3716
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3779
+#: include/functions.inc:3784
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/class_listing.inc:291 include/class_listing.inc:1099
-#: include/class_listing.inc:1101 include/class_sortableListing.inc:343
+#: include/class_listing.inc:290 include/class_listing.inc:1105
+#: include/class_listing.inc:1107 include/class_sortableListing.inc:343
#: include/class_acl.inc:504 plugins/admin/acl/class_aclRole.inc:372
msgid "Up"
msgstr "Para cima"
-#: include/class_listing.inc:291 include/class_sortableListing.inc:343
+#: include/class_listing.inc:290 include/class_sortableListing.inc:343
#: include/class_acl.inc:506 plugins/admin/acl/class_aclRole.inc:374
msgid "Down"
msgstr "Para baixo"
-#: include/class_listing.inc:564
+#: include/class_listing.inc:563
msgid "created by"
msgstr ""
-#: include/class_listing.inc:1091
+#: include/class_listing.inc:1097
msgid "Go to root department"
msgstr "Ir para departamento raiz"
-#: include/class_listing.inc:1091 include/class_listing.inc:1093
+#: include/class_listing.inc:1097 include/class_listing.inc:1099
#: include/class_baseSelector.inc:205
msgid "Root"
msgstr "Raiz"
-#: include/class_listing.inc:1099
+#: include/class_listing.inc:1105
msgid "Go up one department"
msgstr "Subir um departamento"
-#: include/class_listing.inc:1107
+#: include/class_listing.inc:1113
msgid "Go to users department"
msgstr "Ir para departamento de usuários"
-#: include/class_listing.inc:1107 include/class_listing.inc:1109
+#: include/class_listing.inc:1113 include/class_listing.inc:1115
msgid "Home"
msgstr "Origem"
-#: include/class_listing.inc:1114
+#: include/class_listing.inc:1120
msgid "Reload list"
msgstr "Recarregar lista"
-#: include/class_listing.inc:1114 include/class_baseSelector.inc:252
+#: include/class_listing.inc:1120 include/class_baseSelector.inc:252
msgid "Submit"
msgstr "Submeter"
-#: include/class_listing.inc:1211 plugins/admin/acl/acl-list.xml:65
+#: include/class_listing.inc:1217 plugins/admin/acl/acl-list.xml:65
#: plugins/admin/users/user-list.xml:78 plugins/admin/groups/group-list.xml:79
#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:64
#: plugins/admin/departments/dep-list.xml:87
@@ -2855,65 +2852,62 @@ msgstr "Submeter"
msgid "Actions"
msgstr "Ações"
-#: include/class_listing.inc:1495 include/class_listing.inc:1545
-#: include/class_plugin.inc:2228
+#: include/class_listing.inc:1501 include/class_listing.inc:1551
msgid "Copy"
msgstr ""
-#: include/class_listing.inc:1501 include/class_listing.inc:1535
-#: include/class_plugin.inc:2232
+#: include/class_listing.inc:1507 include/class_listing.inc:1541
msgid "Cut"
msgstr ""
-#: include/class_listing.inc:1509 include/class_listing.inc:1511
-#: include/class_CopyPasteHandler.inc:400 include/class_plugin.inc:2239
-#: include/class_plugin.inc:2242
+#: include/class_listing.inc:1515 include/class_listing.inc:1517
+#: include/class_CopyPasteHandler.inc:400
msgid "Paste"
msgstr "Colar"
-#: include/class_listing.inc:1535 include/class_plugin.inc:2186
+#: include/class_listing.inc:1541
msgid "Cut this entry"
msgstr ""
-#: include/class_listing.inc:1545 include/class_plugin.inc:2194
+#: include/class_listing.inc:1551
msgid "Copy this entry"
msgstr ""
-#: include/class_listing.inc:1577 include/class_listing.inc:1579
+#: include/class_listing.inc:1583 include/class_listing.inc:1585
msgid "Restore snapshots"
msgstr ""
-#: include/class_listing.inc:1593
+#: include/class_listing.inc:1599
msgid "Export list"
msgstr ""
-#: include/class_listing.inc:1628 include/class_listing.inc:1629
-#: include/class_SnapShotDialog.inc:153 include/class_plugin.inc:2160
+#: include/class_listing.inc:1634 include/class_listing.inc:1635
+#: include/class_SnapShotDialog.inc:298
msgid "Restore snapshot"
msgstr ""
-#: include/class_listing.inc:1638 include/class_plugin.inc:2167
+#: include/class_listing.inc:1644
msgid "Create snapshot"
msgstr ""
-#: include/class_listing.inc:1639 include/class_plugin.inc:2168
+#: include/class_listing.inc:1645
msgid "Create a new snapshot from this object"
msgstr ""
-#: include/class_SnapShotDialog.inc:99
+#: include/class_SnapShotDialog.inc:244
#, php-format
msgid "You're about to delete the snapshot '%s'."
msgstr ""
-#: include/class_SnapShotDialog.inc:155
+#: include/class_SnapShotDialog.inc:300
msgid "Remove snapshot"
msgstr ""
-#: include/class_SnapShotDialog.inc:157 include/class_SnapShotDialog.inc:177
+#: include/class_SnapShotDialog.inc:302 include/class_SnapShotDialog.inc:322
msgid "Y-m-d, H:i:s"
msgstr ""
-#: include/class_SnapShotDialog.inc:191 plugins/admin/acl/acl-list.xml:57
+#: include/class_SnapShotDialog.inc:336 plugins/admin/acl/acl-list.xml:57
#: plugins/admin/acl/acl_role.tpl:17 plugins/admin/acl/class_aclRole.inc:704
#: plugins/admin/groups/class_group.inc:1114
#: plugins/admin/groups/group-list.xml:66 plugins/admin/groups/generic.tpl:24
@@ -2990,32 +2984,20 @@ msgstr ""
msgid "Cannot find a suitable password method for the current hash!"
msgstr ""
-#: include/class_plugin.inc:563
+#: include/class_plugin.inc:562
msgid ""
"The object has changed since opened in FusionDirectory. All changes that may "
"be done by others get lost if you save this entry!"
msgstr ""
-#: include/class_plugin.inc:2082
+#: include/class_plugin.inc:1674
msgid "Changing ACL dn"
msgstr ""
-#: include/class_plugin.inc:2082
+#: include/class_plugin.inc:1674
msgid "from"
msgstr "de"
-#: include/class_plugin.inc:2136 include/class_plugin.inc:2138
-msgid "Restore"
-msgstr ""
-
-#: include/class_plugin.inc:2186
-msgid "cut"
-msgstr ""
-
-#: include/class_plugin.inc:2194
-msgid "copy"
-msgstr ""
-
#: include/class_sortableListing.inc:303
msgid "Sortable list"
msgstr ""
@@ -3893,15 +3875,14 @@ msgstr ""
msgid "List of acls"
msgstr ""
-#: plugins/admin/acl/acl-list.xml:15
+#: plugins/admin/acl/acl-list.xml:15 plugins/admin/acl/acl-list.xml:82
#: plugins/admin/acl/class_aclManagement.inc:36
msgid "Acl"
msgstr ""
-#: plugins/admin/acl/acl-list.xml:23 plugins/admin/acl/acl-list.xml:82
-#: plugins/admin/acl/class_aclRole.inc:695
+#: plugins/admin/acl/acl-list.xml:23 plugins/admin/acl/class_aclRole.inc:695
#: plugins/personal/generic/class_user.inc:1367
-#: plugins/personal/generic/generic.tpl:515
+#: plugins/personal/generic/generic.tpl:492
msgid "Role"
msgstr "Papel"
@@ -3941,7 +3922,7 @@ msgstr ""
msgid "Access control list management"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:160
+#: plugins/admin/acl/class_aclManagement.inc:161
msgid "ACL Assignment"
msgstr ""
@@ -4069,7 +4050,7 @@ msgstr ""
"modelos."
#: plugins/admin/users/template.tpl:15
-#: plugins/admin/users/class_userManagement.inc:542
+#: plugins/admin/users/class_userManagement.inc:539
#: plugins/admin/users/templatize.tpl:15 plugins/admin/users/user-list.xml:15
#: plugins/admin/users/user-list.xml:102
msgid "Template"
@@ -4104,23 +4085,23 @@ msgstr "Login"
msgid "Manage users"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:344
+#: plugins/admin/users/class_userManagement.inc:341
#: plugins/personal/password/class_password.inc:136
#, php-format
msgid "Check-hook reported a problem: %s. Password change canceled!"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:394
+#: plugins/admin/users/class_userManagement.inc:391
msgid "You have no permission to change this users password!"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:470
-#: plugins/admin/users/class_userManagement.inc:504
-#: plugins/admin/users/class_userManagement.inc:535
+#: plugins/admin/users/class_userManagement.inc:467
+#: plugins/admin/users/class_userManagement.inc:501
+#: plugins/admin/users/class_userManagement.inc:532
msgid "none"
msgstr "nenhum"
-#: plugins/admin/users/class_userManagement.inc:548
+#: plugins/admin/users/class_userManagement.inc:545
#: plugins/admin/users/user-list.xml:57
#: plugins/admin/groups/userSelect/user-list.xml:40
#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
@@ -4130,26 +4111,26 @@ msgstr "nenhum"
msgid "Given name"
msgstr "Nome fornecido"
-#: plugins/admin/users/class_userManagement.inc:799
+#: plugins/admin/users/class_userManagement.inc:796
msgid "Account locking"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:800
+#: plugins/admin/users/class_userManagement.inc:797
#, php-format
msgid ""
"Password method '%s' does not support locking. Account (%s) has not been "
"locked!"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:873
+#: plugins/admin/users/class_userManagement.inc:870
msgid "Unlock account"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:875
+#: plugins/admin/users/class_userManagement.inc:872
msgid "Lock account"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:903
+#: plugins/admin/users/class_userManagement.inc:900
#, fuzzy
msgid "Generic properties"
msgstr "Editar propriedades gerais"
@@ -4239,8 +4220,9 @@ msgid "Remove user"
msgstr ""
#: plugins/admin/password/class_recoveryConfig.inc:35
-msgid "Password recovery config"
-msgstr ""
+#, fuzzy
+msgid "Password recovery"
+msgstr "Senha alterada"
#: plugins/admin/password/class_recoveryConfig.inc:36
msgid "Settings for the password recovery feature"
@@ -4555,7 +4537,6 @@ msgstr ""
#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:23
#: plugins/admin/ogroups/class_ogroupManagement.inc:187
#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:79
-#: plugins/admin/ogroups/ogroup-list.xml:79
#: plugins/generic/references/class_reference.inc:55
#: plugins/personal/posix/groupSelect/group-list.xml:15
msgid "Group"
@@ -4647,8 +4628,8 @@ msgstr "Editar propriedades do samba"
#: plugins/generic/references/class_reference.inc:59
#: plugins/personal/posix/trustSelect/class_trustSelect.inc:81
#: plugins/personal/generic/class_user.inc:1180
-#: plugins/personal/generic/generic.tpl:399
-#: plugins/personal/generic/generic.tpl:586
+#: plugins/personal/generic/generic.tpl:376
+#: plugins/personal/generic/generic.tpl:563
msgid "Phone"
msgstr "Fone"
@@ -4747,7 +4728,7 @@ msgstr ""
#: plugins/admin/departments/generic.tpl:91
#: plugins/admin/departments/class_organizationGeneric.inc:129
#: plugins/personal/generic/class_user.inc:1410
-#: plugins/personal/generic/generic.tpl:448
+#: plugins/personal/generic/generic.tpl:425
msgid "Location"
msgstr "Localização"
@@ -4764,8 +4745,8 @@ msgstr "Localização"
#: plugins/admin/departments/generic.tpl:51
#: plugins/admin/departments/class_organizationGeneric.inc:126
#: plugins/personal/generic/class_user.inc:1399
-#: plugins/personal/generic/generic.tpl:341
-#: plugins/personal/generic/generic.tpl:362
+#: plugins/personal/generic/generic.tpl:318
+#: plugins/personal/generic/generic.tpl:339
msgid "Manager"
msgstr ""
@@ -4906,7 +4887,7 @@ msgstr ""
#: plugins/admin/departments/generic.tpl:83
#: plugins/admin/departments/class_organizationGeneric.inc:128
#: plugins/personal/generic/class_user.inc:1409
-#: plugins/personal/generic/generic.tpl:456
+#: plugins/personal/generic/generic.tpl:433
msgid "State"
msgstr "Estado"
@@ -4924,7 +4905,7 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:667
#: plugins/admin/departments/generic.tpl:99
#: plugins/personal/generic/generic.tpl:181
-#: plugins/personal/generic/generic.tpl:464
+#: plugins/personal/generic/generic.tpl:441
msgid "Address"
msgstr "Endereço"
@@ -4944,8 +4925,8 @@ msgstr ""
#: plugins/admin/departments/generic.tpl:114
#: plugins/admin/departments/class_organizationGeneric.inc:132
#: plugins/personal/generic/class_user.inc:1183
-#: plugins/personal/generic/generic.tpl:430
-#: plugins/personal/generic/generic.tpl:598
+#: plugins/personal/generic/generic.tpl:407
+#: plugins/personal/generic/generic.tpl:575
msgid "Fax"
msgstr "Fax"
@@ -4996,7 +4977,7 @@ msgstr "PaÃs"
#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:15
#: plugins/generic/references/class_reference.inc:57
#: plugins/personal/generic/class_user.inc:1396
-#: plugins/personal/generic/generic.tpl:308
+#: plugins/personal/generic/generic.tpl:285
msgid "Department"
msgstr "Departamento"
@@ -5300,6 +5281,11 @@ msgstr ""
msgid "List of object groups"
msgstr ""
+#: plugins/admin/ogroups/ogroup-list.xml:79
+#, fuzzy
+msgid "Objectgroup"
+msgstr "Grupos de objeto"
+
#: plugins/admin/ogroups/ogroup-list.xml:106
msgid "Send message"
msgstr ""
@@ -5371,7 +5357,8 @@ msgstr ""
#: plugins/config/class_configInLdap.inc:82
msgid ""
-"Default language to be used if the one asked by the browser is not available"
+"Language of the application. If 'automatic' or not available, the one asked "
+"by the browser will be used. This setting can be overriden per user."
msgstr ""
#: plugins/config/class_configInLdap.inc:87
@@ -5387,7 +5374,7 @@ msgid "Schema setup"
msgstr ""
#: plugins/config/class_configInLdap.inc:103
-msgid "rfc237bis"
+msgid "rfc2307bis"
msgstr ""
#: plugins/config/class_configInLdap.inc:104
@@ -6094,12 +6081,12 @@ msgid "Homepage"
msgstr "Página pessoal"
#: plugins/personal/generic/class_user.inc:1186
-#: plugins/personal/generic/generic.tpl:411
+#: plugins/personal/generic/generic.tpl:388
msgid "Mobile"
msgstr "Celular"
#: plugins/personal/generic/class_user.inc:1189
-#: plugins/personal/generic/generic.tpl:422
+#: plugins/personal/generic/generic.tpl:399
msgid "Pager"
msgstr "Pager"
@@ -6110,57 +6097,57 @@ msgid "Date of birth"
msgstr "Data de nascimento"
#: plugins/personal/generic/class_user.inc:1357
-#: plugins/personal/generic/generic.tpl:538
+#: plugins/personal/generic/generic.tpl:515
msgid "Unit"
msgstr "Unidade"
#: plugins/personal/generic/class_user.inc:1358
-#: plugins/personal/generic/generic.tpl:563
+#: plugins/personal/generic/generic.tpl:540
msgid "House identifier"
msgstr "Identificação da residência"
#: plugins/personal/generic/class_user.inc:1359
-#: plugins/personal/generic/generic.tpl:480
+#: plugins/personal/generic/generic.tpl:457
msgid "Vocation"
msgstr "Vocação"
#: plugins/personal/generic/class_user.inc:1360
-#: plugins/personal/generic/generic.tpl:607
+#: plugins/personal/generic/generic.tpl:584
msgid "Last delivery"
msgstr "Última entrega"
#: plugins/personal/generic/class_user.inc:1361
-#: plugins/personal/generic/generic.tpl:529
+#: plugins/personal/generic/generic.tpl:506
msgid "Person locality"
msgstr "Localização da pessoa"
#: plugins/personal/generic/class_user.inc:1362
-#: plugins/personal/generic/generic.tpl:488
+#: plugins/personal/generic/generic.tpl:465
msgid "Unit description"
msgstr "Descrição da unidade"
#: plugins/personal/generic/class_user.inc:1363
-#: plugins/personal/generic/generic.tpl:497
+#: plugins/personal/generic/generic.tpl:474
msgid "Subject area"
msgstr "Ãrea de assunto"
#: plugins/personal/generic/class_user.inc:1364
-#: plugins/personal/generic/generic.tpl:506
+#: plugins/personal/generic/generic.tpl:483
msgid "Functional title"
msgstr "TÃtulo funcional"
#: plugins/personal/generic/class_user.inc:1365
-#: plugins/personal/generic/generic.tpl:616
+#: plugins/personal/generic/generic.tpl:593
msgid "Public visible"
msgstr "VisÃvel publicamente"
#: plugins/personal/generic/class_user.inc:1366
-#: plugins/personal/generic/generic.tpl:547
+#: plugins/personal/generic/generic.tpl:524
msgid "Street"
msgstr "Rua"
#: plugins/personal/generic/class_user.inc:1368
-#: plugins/personal/generic/generic.tpl:555
+#: plugins/personal/generic/generic.tpl:532
msgid "Postal code"
msgstr "CEP"
@@ -6209,7 +6196,7 @@ msgid "Employee number"
msgstr ""
#: plugins/personal/generic/class_user.inc:1401
-#: plugins/personal/generic/generic.tpl:332
+#: plugins/personal/generic/generic.tpl:309
msgid "Employee type"
msgstr "Tipo de empregado"
@@ -6290,29 +6277,28 @@ msgstr "Armazenamento da senha"
msgid "Restrict login to"
msgstr ""
-#: plugins/personal/generic/generic.tpl:248
-#: plugins/personal/generic/generic.tpl:267
+#: plugins/personal/generic/generic.tpl:246
msgid "IP or network"
msgstr ""
-#: plugins/personal/generic/generic.tpl:288
+#: plugins/personal/generic/generic.tpl:265
msgid "Organizational information"
msgstr "Informação organizacional"
-#: plugins/personal/generic/generic.tpl:316
+#: plugins/personal/generic/generic.tpl:293
msgid "Department No."
msgstr "Nº do departamento"
-#: plugins/personal/generic/generic.tpl:324
+#: plugins/personal/generic/generic.tpl:301
msgid "Employee No."
msgstr "Nº do empregado"
-#: plugins/personal/generic/generic.tpl:390
-#: plugins/personal/generic/generic.tpl:578
+#: plugins/personal/generic/generic.tpl:367
+#: plugins/personal/generic/generic.tpl:555
msgid "Room No."
msgstr "Nº da sala"
-#: plugins/personal/generic/generic.tpl:592
+#: plugins/personal/generic/generic.tpl:569
msgid "Please use the phone tab"
msgstr "Por favor, utilize a orelha telefone"
diff --git a/locale/ru/messages.po b/locale/ru/fusiondirectory.po
similarity index 94%
rename from locale/ru/messages.po
rename to locale/ru/fusiondirectory.po
index edb0cf16ccd7fcedd8eb8d47c88c807c41b7e90b..65dfb54b4269e8fde35a6e39b84b6f4ff231840a 100644
--- a/locale/ru/messages.po
+++ b/locale/ru/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-24 14:48+0100\n"
-"PO-Revision-Date: 2013-03-06 21:40+0000\n"
+"POT-Creation-Date: 2013-04-14 20:13+0200\n"
+"PO-Revision-Date: 2013-03-24 15:00+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory/"
"language/ru/)\n"
@@ -20,39 +20,39 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: html/main.php:140 html/class_passwordRecovery.inc:226
+#: html/main.php:135 html/class_passwordRecovery.inc:226
#: include/class_xml.inc:60 include/functions.inc:509
#: plugins/admin/departments/class_department.inc:431
msgid "Fatal error"
msgstr ""
-#: html/main.php:141
+#: html/main.php:136
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr ""
-#: html/main.php:162
+#: html/main.php:157
msgid "PHP configuration"
msgstr ""
-#: html/main.php:163
+#: html/main.php:158
msgid ""
"Fatal error: Register globals is on. FusionDirectory will refuse to login "
"unless this is fixed by an administrator."
msgstr ""
-#: html/main.php:192 ihtml/themes/default/password.tpl:40
-#: plugins/admin/users/class_userManagement.inc:393
+#: html/main.php:187 ihtml/themes/default/password.tpl:40
+#: plugins/admin/users/class_userManagement.inc:390
#: plugins/personal/password/class_password.inc:156
#: plugins/personal/password/class_password.inc:162
msgid "Password change"
msgstr ""
-#: html/main.php:192
+#: html/main.php:187
msgid "Your password is about to expire, please change your password!"
msgstr ""
-#: html/main.php:261 html/class_passwordRecovery.inc:301 html/index.php:147
+#: html/main.php:256 html/class_passwordRecovery.inc:296 html/index.php:147
#: html/index.php:208 include/class_SnapshotHandler.inc:57
#: include/class_SnapshotHandler.inc:70 include/class_SnapshotHandler.inc:88
#: include/class_pluglist.inc:272 include/functions.inc:933
@@ -66,30 +66,30 @@ msgstr ""
msgid "Configuration error"
msgstr ""
-#: html/main.php:261
+#: html/main.php:256
msgid "Running out of memory!"
msgstr ""
-#: html/main.php:316
+#: html/main.php:311
msgid "User ACL checks disabled"
msgstr ""
-#: html/main.php:362
+#: html/main.php:357
msgid "Plugin"
msgstr ""
-#: html/main.php:363
+#: html/main.php:358
#, php-format
msgid ""
"Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not "
"a file)!"
msgstr ""
-#: html/main.php:378
+#: html/main.php:373
msgid "Configuration Error"
msgstr ""
-#: html/main.php:379
+#: html/main.php:374
#, php-format
msgid ""
"Fatal error: not all POST variables have been transfered by PHP - please "
@@ -105,31 +105,31 @@ msgstr ""
msgid "Error: Password method not available!"
msgstr ""
-#: html/class_passwordRecovery.inc:227 html/index.php:147
+#: html/class_passwordRecovery.inc:227
#, php-format
msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
msgstr ""
-#: html/class_passwordRecovery.inc:302 html/setup.php:63 html/index.php:163
+#: html/class_passwordRecovery.inc:297 html/setup.php:63 html/index.php:163
#, php-format
msgid "Directory '%s' specified as compile directory is not accessible!"
msgstr ""
-#: html/class_passwordRecovery.inc:407
-#: plugins/admin/users/class_userManagement.inc:309
+#: html/class_passwordRecovery.inc:402
+#: plugins/admin/users/class_userManagement.inc:306
#: plugins/personal/password/class_password.inc:113
msgid ""
"The passwords you've entered as 'New password' and 'Repeated new password' "
"do not match."
msgstr "Введенные пароли не Ñовпадают!"
-#: html/class_passwordRecovery.inc:409 ihtml/themes/default/password.tpl:81
+#: html/class_passwordRecovery.inc:404 ihtml/themes/default/password.tpl:81
#: ihtml/themes/default/password.tpl:82
#: ihtml/themes/default/accountexpired.tpl:32
#: ihtml/themes/default/accountexpired.tpl:36
#: ihtml/themes/default/recovery.tpl:93 ihtml/themes/default/recovery.tpl:94
#: plugins/admin/users/password.tpl:17 plugins/admin/users/password.tpl:60
-#: plugins/admin/users/class_userManagement.inc:312
+#: plugins/admin/users/class_userManagement.inc:309
#: plugins/personal/password/password.tpl:27
#: plugins/personal/password/password.tpl:78
#: plugins/personal/generic/password.tpl:22
@@ -137,16 +137,16 @@ msgstr "Введенные пароли не Ñовпадают!"
msgid "New password"
msgstr "Ðовый пароль"
-#: html/class_passwordRecovery.inc:411
+#: html/class_passwordRecovery.inc:406
msgid "The password used as new is too short."
msgstr ""
-#: html/class_passwordRecovery.inc:413
+#: html/class_passwordRecovery.inc:408
#: plugins/personal/password/class_password.inc:121
msgid "The password contains possibly problematic Unicode characters!"
msgstr ""
-#: html/class_passwordRecovery.inc:437 html/index.php:58 html/index.php:64
+#: html/class_passwordRecovery.inc:432 html/index.php:58 html/index.php:64
#: html/index.php:403 ihtml/themes/default/conflict.tpl:6
#: ihtml/themes/default/islocked.tpl:6 ihtml/themes/default/remove.tpl:2
#: ihtml/themes/default/msg_dialog.tpl:59
@@ -169,39 +169,39 @@ msgstr ""
msgid "Warning"
msgstr "Предупреждение"
-#: html/class_passwordRecovery.inc:438
+#: html/class_passwordRecovery.inc:433
msgid "Session will not be encrypted."
msgstr "Данные, передаваемые в течение Ñтого ÑеанÑа, не будут зашифрованы."
-#: html/class_passwordRecovery.inc:440
+#: html/class_passwordRecovery.inc:435
msgid "Enter SSL session"
msgstr "ИÑпользовать шифрование SSL"
-#: html/class_passwordRecovery.inc:481
+#: html/class_passwordRecovery.inc:476
#, php-format
msgid "Did not found account %s"
msgstr ""
-#: html/class_passwordRecovery.inc:484
+#: html/class_passwordRecovery.inc:479
#, php-format
msgid "Found multiple accounts %s"
msgstr ""
-#: html/class_passwordRecovery.inc:498 ihtml/themes/default/recovery.tpl:142
+#: html/class_passwordRecovery.inc:493 ihtml/themes/default/recovery.tpl:142
msgid "Adresse mail"
msgstr ""
-#: html/class_passwordRecovery.inc:515
+#: html/class_passwordRecovery.inc:510
#, php-format
msgid "There is no account using email %s"
msgstr ""
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:513
#, php-format
msgid "There are several accounts using email %s"
msgstr ""
-#: html/class_passwordRecovery.inc:543 html/index.php:257 html/index.php:269
+#: html/class_passwordRecovery.inc:538 html/index.php:257 html/index.php:269
#: html/index.php:282 setup/class_setupStep_Migrate.inc:1138
#: setup/class_setupStep_Migrate.inc:1164
#: setup/class_setupStep_Migrate.inc:1213
@@ -213,20 +213,17 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:2549
#: setup/class_setupStep_Migrate.inc:2896
#: setup/class_setupStep_Migrate.inc:2910
-#: include/class_SnapshotHandler.inc:150 include/class_SnapshotHandler.inc:329
-#: include/class_SnapshotHandler.inc:378 include/class_SnapshotHandler.inc:382
-#: include/class_SnapshotHandler.inc:402 include/class_SnapshotHandler.inc:445
-#: include/class_SnapshotHandler.inc:508 include/class_SnapshotHandler.inc:577
-#: include/class_SnapshotHandler.inc:592 include/functions.inc:547
+#: include/class_SnapshotHandler.inc:150 include/class_SnapshotHandler.inc:335
+#: include/class_SnapshotHandler.inc:388 include/class_SnapshotHandler.inc:392
+#: include/class_SnapshotHandler.inc:412 include/class_SnapshotHandler.inc:455
+#: include/class_SnapshotHandler.inc:518 include/class_SnapshotHandler.inc:587
+#: include/class_SnapshotHandler.inc:602 include/functions.inc:547
#: include/functions.inc:583 include/functions.inc:591
#: include/functions.inc:639 include/functions.inc:948
#: include/functions.inc:998 include/functions.inc:1058
#: include/functions.inc:1113 include/functions.inc:3244
-#: include/functions.inc:3509 include/class_config.inc:330
-#: include/class_plugin.inc:1500 include/class_plugin.inc:1550
-#: include/class_plugin.inc:1554 include/class_plugin.inc:1574
-#: include/class_plugin.inc:1621 include/class_plugin.inc:1681
-#: include/class_plugin.inc:1751 include/class_plugin.inc:1766
+#: include/functions.inc:3514 include/class_SnapShotDialog.inc:104
+#: include/class_SnapShotDialog.inc:177 include/class_config.inc:330
#: include/class_acl.inc:1308 include/class_acl.inc:1413
#: include/class_ldap.inc:934 include/class_ldap.inc:1421
#: plugins/admin/acl/class_aclRole.inc:613
@@ -245,19 +242,19 @@ msgstr ""
msgid "LDAP error"
msgstr "Ошибка LDAP"
-#: html/class_passwordRecovery.inc:566
+#: html/class_passwordRecovery.inc:561
msgid "Contact your administrator, there was a problem with mail server"
msgstr ""
-#: html/class_passwordRecovery.inc:577
+#: html/class_passwordRecovery.inc:572
msgid "This token is invalid"
msgstr ""
-#: html/class_passwordRecovery.inc:615
+#: html/class_passwordRecovery.inc:610
msgid "External password changer reported a problem: "
msgstr "При попытке Ñменить пароль извне возникла проблема: "
-#: html/class_passwordRecovery.inc:640
+#: html/class_passwordRecovery.inc:635
msgid "There was a problem with mail server, confirmation email not sent"
msgstr ""
@@ -275,6 +272,13 @@ msgid ""
"overridden by php.ini settings."
msgstr ""
+#: html/index.php:147
+#, php-format
+msgid ""
+"FusionDirectory configuration %s/%s is not readable. Please run "
+"fusiondirectory-setup --check-config to fix this."
+msgstr ""
+
#: html/index.php:163
msgid "Smarty error"
msgstr ""
@@ -289,22 +293,22 @@ msgstr ""
#: setup/setup_checks.tpl:91 setup/class_setupStep_Migrate.inc:1127
#: include/class_xml.inc:57 include/class_tabs.inc:74
#: include/class_management.inc:507 include/class_management.inc:657
-#: include/functions.inc:3613 include/functions.inc:3633
-#: include/functions.inc:3663 include/functions.inc:3671
-#: include/functions.inc:3683 include/functions.inc:3687
-#: include/functions.inc:3702 include/functions.inc:3711
-#: include/functions.inc:3779 include/class_listing.inc:522
+#: include/functions.inc:3618 include/functions.inc:3638
+#: include/functions.inc:3668 include/functions.inc:3676
+#: include/functions.inc:3688 include/functions.inc:3692
+#: include/functions.inc:3707 include/functions.inc:3716
+#: include/functions.inc:3784 include/class_listing.inc:521
#: include/class_config.inc:483 include/class_CopyPasteHandler.inc:264
#: include/password-methods/class_password-methods-sasl.inc:51
#: include/password-methods/class_password-methods-sasl.inc:63
#: include/password-methods/class_password-methods.inc:342
#: include/password-methods/class_password-methods.inc:447
#: include/password-methods/class_password-methods.inc:458
-#: include/class_plugin.inc:1368 include/class_plugin.inc:1843
-#: include/class_msg_dialog.inc:128 include/class_msgPool.inc:215
-#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:680 include/class_msgPool.inc:711
-#: include/class_msgPool.inc:738 include/class_databaseManagement.inc:78
+#: include/class_plugin.inc:1367 include/class_msg_dialog.inc:128
+#: include/class_msgPool.inc:215 include/class_msgPool.inc:235
+#: include/class_msgPool.inc:265 include/class_msgPool.inc:680
+#: include/class_msgPool.inc:711 include/class_msgPool.inc:738
+#: include/class_databaseManagement.inc:78
#: plugins/admin/acl/class_aclRole.inc:681
#: plugins/admin/groups/class_group.inc:521
#: plugins/admin/groups/class_group.inc:527
@@ -975,131 +979,128 @@ msgid ""
"databases."
msgstr ""
-#: setup/class_setupStep_Checks.inc:136
-msgid "MDB2 mysql"
-msgstr ""
-
-#: setup/class_setupStep_Checks.inc:137
+#: setup/class_setupStep_Checks.inc:134
msgid ""
-"FusionDirectory requires this module to communicate with mysql databases."
+"If you do not want to install MDB2 and won't use databases, remove the "
+"class_databaseManagement.inc file."
msgstr ""
-#: setup/class_setupStep_Checks.inc:143
+#: setup/class_setupStep_Checks.inc:138
msgid "imagick"
msgstr ""
-#: setup/class_setupStep_Checks.inc:144
+#: setup/class_setupStep_Checks.inc:139
msgid "FusionDirectory requires this extension to handle images."
msgstr ""
-#: setup/class_setupStep_Checks.inc:159
+#: setup/class_setupStep_Checks.inc:154
msgid "compression module"
msgstr ""
-#: setup/class_setupStep_Checks.inc:160
+#: setup/class_setupStep_Checks.inc:155
msgid "FusionDirectory requires this extension to handle snapshots."
msgstr ""
-#: setup/class_setupStep_Checks.inc:171
+#: setup/class_setupStep_Checks.inc:166
msgid ""
"register_globals is a PHP mechanism to register all global variables to be "
"accessible from scripts without changing the scope. This may be a security "
"risk."
msgstr ""
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStep_Checks.inc:167
msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:180
+#: setup/class_setupStep_Checks.inc:175
msgid "PHP uses this value for the garbage collector to delete old sessions."
msgstr ""
-#: setup/class_setupStep_Checks.inc:181
+#: setup/class_setupStep_Checks.inc:176
msgid ""
"Setting this value to one day will prevent loosing session and cookies "
"before they really timeout."
msgstr ""
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStep_Checks.inc:177
msgid ""
"Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
"higher."
msgstr ""
-#: setup/class_setupStep_Checks.inc:189 setup/class_setupStep_Checks.inc:205
-#: setup/class_setupStep_Checks.inc:221 setup/class_setupStep_Checks.inc:229
+#: setup/class_setupStep_Checks.inc:184 setup/class_setupStep_Checks.inc:200
+#: setup/class_setupStep_Checks.inc:216 setup/class_setupStep_Checks.inc:224
msgid "Off"
msgstr ""
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStep_Checks.inc:185
msgid ""
"In Order to use FusionDirectory without any trouble, the session.auto_start "
"option in your php.ini should be set to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStep_Checks.inc:186
msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStep_Checks.inc:193
msgid ""
"FusionDirectory needs at least 128MB of memory. Setting it below this limit "
"may cause errors that are not reproducable! Increase it for larger setups."
msgstr ""
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStep_Checks.inc:194
msgid ""
"Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
msgstr ""
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStep_Checks.inc:201
msgid ""
"This option influences the PHP output handling. Turn this Option off, to "
"increase performance."
msgstr ""
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStep_Checks.inc:202
msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStep_Checks.inc:209
msgid "The Execution time should be at least 30 seconds."
msgstr ""
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStep_Checks.inc:210
msgid ""
"Search for 'max_execution_time' in your php.ini and set it to '30' or higher."
msgstr ""
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStep_Checks.inc:217
msgid ""
"Increase the server security by setting expose_php to 'off'. PHP won't send "
"any information about the server you are running in this case."
msgstr ""
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStep_Checks.inc:218
msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:230
+#: setup/class_setupStep_Checks.inc:225
msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:231
+#: setup/class_setupStep_Checks.inc:226
msgid ""
"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:241
+#: setup/class_setupStep_Checks.inc:236
msgid "Configuration writeable"
msgstr ""
-#: setup/class_setupStep_Checks.inc:242
+#: setup/class_setupStep_Checks.inc:237
msgid "The configuration file can't be written"
msgstr ""
-#: setup/class_setupStep_Checks.inc:243
+#: setup/class_setupStep_Checks.inc:238
#, php-format
msgid ""
"FusionDirectory reads its configuration from a file located in (%s/%s). The "
@@ -1647,7 +1648,7 @@ msgstr ""
#: plugins/admin/departments/class_organizationGeneric.inc:115
#: plugins/admin/departments/class_organizationGeneric.inc:118
#: plugins/personal/generic/class_user.inc:1395
-#: plugins/personal/generic/generic.tpl:300
+#: plugins/personal/generic/generic.tpl:277
msgid "Organization"
msgstr "ОрганизациÑ"
@@ -1657,8 +1658,8 @@ msgstr "ОрганизациÑ"
#: plugins/admin/acl/class_aclRole.inc:702
#: plugins/admin/acl/class_aclRole.inc:715
#: plugins/admin/acl/class_aclRole.inc:725
-#: plugins/admin/users/class_userManagement.inc:545
-#: plugins/admin/users/class_userManagement.inc:592
+#: plugins/admin/users/class_userManagement.inc:542
+#: plugins/admin/users/class_userManagement.inc:589
#: plugins/admin/users/user-filter.tpl:26
#: plugins/admin/groups/group-filter.tpl:21
#: plugins/admin/groups/userSelect/user-filter.tpl:17
@@ -1739,7 +1740,7 @@ msgid ""
msgstr ""
#: setup/setup_feedback.tpl:52
-#: plugins/admin/users/class_userManagement.inc:903
+#: plugins/admin/users/class_userManagement.inc:900
#: plugins/admin/groups/class_group.inc:1106
#: plugins/admin/departments/class_department.inc:653
#: plugins/admin/ogroups/class_ogroup.inc:895
@@ -1879,7 +1880,7 @@ msgstr ""
#: setup/setup_migrate.tpl:101 setup/setup_migrate.tpl:153
#: setup/setup_migrate.tpl:320 setup/setup_migrate.tpl:373
#: setup/setup_migrate.tpl:416 setup/setup_migrate.tpl:459
-#: setup/setup_migrate.tpl:503 include/class_listing.inc:352
+#: setup/setup_migrate.tpl:503 include/class_listing.inc:351
msgid "Select all"
msgstr ""
@@ -2347,7 +2348,7 @@ msgid "Group will be moved from"
msgstr ""
#: setup/class_setupStep_Migrate.inc:1175
-#: setup/class_setupStep_Migrate.inc:1223 include/class_plugin.inc:2083
+#: setup/class_setupStep_Migrate.inc:1223 include/class_plugin.inc:1675
msgid "to"
msgstr ""
@@ -2422,8 +2423,7 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:2647 include/class_msgPool.inc:495
#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:83
#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:138
-#: plugins/personal/generic/generic.tpl:251
-#: plugins/personal/generic/generic.tpl:270
+#: plugins/personal/generic/generic.tpl:249
#, php-format
msgid "Add"
msgstr "Добавить"
@@ -2544,28 +2544,25 @@ msgstr ""
#: include/class_management.inc:333 include/class_management.inc:483
#: include/class_management.inc:536 include/class_management.inc:576
#: include/class_management.inc:590 include/class_CopyPasteHandler.inc:223
-#: include/class_plugin.inc:1791 include/class_plugin.inc:1803
-#: include/class_plugin.inc:1818 include/class_plugin.inc:1831
-#: plugins/admin/users/class_userManagement.inc:205
-#: plugins/admin/users/class_userManagement.inc:761
+#: plugins/admin/users/class_userManagement.inc:202
+#: plugins/admin/users/class_userManagement.inc:758
msgid "Permission"
msgstr ""
#: include/class_management.inc:403
-#: plugins/admin/acl/class_aclManagement.inc:100
-#: plugins/admin/users/class_userManagement.inc:719
-#: plugins/admin/users/class_userManagement.inc:723
+#: plugins/admin/acl/class_aclManagement.inc:101
+#: plugins/admin/users/class_userManagement.inc:716
+#: plugins/admin/users/class_userManagement.inc:720
msgid "Permission error"
msgstr ""
-#: include/class_management.inc:483 include/class_plugin.inc:1791
+#: include/class_management.inc:483
#, php-format
msgid "You are not allowed to create a snapshot for %s."
msgstr ""
#: include/class_management.inc:536 include/class_management.inc:576
-#: include/class_management.inc:590 include/class_plugin.inc:1803
-#: include/class_plugin.inc:1818 include/class_plugin.inc:1831
+#: include/class_management.inc:590
#, php-format
msgid "You are not allowed to restore a snapshot for %s."
msgstr ""
@@ -2768,87 +2765,87 @@ msgid ""
"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
msgstr ""
-#: include/functions.inc:3613 include/functions.inc:3633
-#: include/functions.inc:3671 include/functions.inc:3683
-#: include/functions.inc:3687 include/functions.inc:3702
-#: include/functions.inc:3711
+#: include/functions.inc:3618 include/functions.inc:3638
+#: include/functions.inc:3676 include/functions.inc:3688
+#: include/functions.inc:3692 include/functions.inc:3707
+#: include/functions.inc:3716
msgid "Cannot allocate a free ID:"
msgstr ""
-#: include/functions.inc:3613
+#: include/functions.inc:3618
msgid "unknown idAllocation method!"
msgstr ""
-#: include/functions.inc:3633
+#: include/functions.inc:3638
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3663
+#: include/functions.inc:3668
msgid "Cannot create sambaUnixIdPool entry!"
msgstr ""
-#: include/functions.inc:3671
+#: include/functions.inc:3676
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3683 include/functions.inc:3687
+#: include/functions.inc:3688 include/functions.inc:3692
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3711
+#: include/functions.inc:3716
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3779
+#: include/functions.inc:3784
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/class_listing.inc:291 include/class_listing.inc:1099
-#: include/class_listing.inc:1101 include/class_sortableListing.inc:343
+#: include/class_listing.inc:290 include/class_listing.inc:1105
+#: include/class_listing.inc:1107 include/class_sortableListing.inc:343
#: include/class_acl.inc:504 plugins/admin/acl/class_aclRole.inc:372
msgid "Up"
msgstr ""
-#: include/class_listing.inc:291 include/class_sortableListing.inc:343
+#: include/class_listing.inc:290 include/class_sortableListing.inc:343
#: include/class_acl.inc:506 plugins/admin/acl/class_aclRole.inc:374
msgid "Down"
msgstr ""
-#: include/class_listing.inc:564
+#: include/class_listing.inc:563
msgid "created by"
msgstr ""
-#: include/class_listing.inc:1091
+#: include/class_listing.inc:1097
msgid "Go to root department"
msgstr ""
-#: include/class_listing.inc:1091 include/class_listing.inc:1093
+#: include/class_listing.inc:1097 include/class_listing.inc:1099
#: include/class_baseSelector.inc:205
msgid "Root"
msgstr ""
-#: include/class_listing.inc:1099
+#: include/class_listing.inc:1105
msgid "Go up one department"
msgstr ""
-#: include/class_listing.inc:1107
+#: include/class_listing.inc:1113
msgid "Go to users department"
msgstr ""
-#: include/class_listing.inc:1107 include/class_listing.inc:1109
+#: include/class_listing.inc:1113 include/class_listing.inc:1115
msgid "Home"
msgstr ""
-#: include/class_listing.inc:1114
+#: include/class_listing.inc:1120
msgid "Reload list"
msgstr ""
-#: include/class_listing.inc:1114 include/class_baseSelector.inc:252
+#: include/class_listing.inc:1120 include/class_baseSelector.inc:252
msgid "Submit"
msgstr ""
-#: include/class_listing.inc:1211 plugins/admin/acl/acl-list.xml:65
+#: include/class_listing.inc:1217 plugins/admin/acl/acl-list.xml:65
#: plugins/admin/users/user-list.xml:78 plugins/admin/groups/group-list.xml:79
#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:64
#: plugins/admin/departments/dep-list.xml:87
@@ -2856,65 +2853,62 @@ msgstr ""
msgid "Actions"
msgstr "ДейÑтвиÑ"
-#: include/class_listing.inc:1495 include/class_listing.inc:1545
-#: include/class_plugin.inc:2228
+#: include/class_listing.inc:1501 include/class_listing.inc:1551
msgid "Copy"
msgstr ""
-#: include/class_listing.inc:1501 include/class_listing.inc:1535
-#: include/class_plugin.inc:2232
+#: include/class_listing.inc:1507 include/class_listing.inc:1541
msgid "Cut"
msgstr ""
-#: include/class_listing.inc:1509 include/class_listing.inc:1511
-#: include/class_CopyPasteHandler.inc:400 include/class_plugin.inc:2239
-#: include/class_plugin.inc:2242
+#: include/class_listing.inc:1515 include/class_listing.inc:1517
+#: include/class_CopyPasteHandler.inc:400
msgid "Paste"
msgstr ""
-#: include/class_listing.inc:1535 include/class_plugin.inc:2186
+#: include/class_listing.inc:1541
msgid "Cut this entry"
msgstr ""
-#: include/class_listing.inc:1545 include/class_plugin.inc:2194
+#: include/class_listing.inc:1551
msgid "Copy this entry"
msgstr ""
-#: include/class_listing.inc:1577 include/class_listing.inc:1579
+#: include/class_listing.inc:1583 include/class_listing.inc:1585
msgid "Restore snapshots"
msgstr ""
-#: include/class_listing.inc:1593
+#: include/class_listing.inc:1599
msgid "Export list"
msgstr ""
-#: include/class_listing.inc:1628 include/class_listing.inc:1629
-#: include/class_SnapShotDialog.inc:153 include/class_plugin.inc:2160
+#: include/class_listing.inc:1634 include/class_listing.inc:1635
+#: include/class_SnapShotDialog.inc:298
msgid "Restore snapshot"
msgstr ""
-#: include/class_listing.inc:1638 include/class_plugin.inc:2167
+#: include/class_listing.inc:1644
msgid "Create snapshot"
msgstr ""
-#: include/class_listing.inc:1639 include/class_plugin.inc:2168
+#: include/class_listing.inc:1645
msgid "Create a new snapshot from this object"
msgstr ""
-#: include/class_SnapShotDialog.inc:99
+#: include/class_SnapShotDialog.inc:244
#, php-format
msgid "You're about to delete the snapshot '%s'."
msgstr ""
-#: include/class_SnapShotDialog.inc:155
+#: include/class_SnapShotDialog.inc:300
msgid "Remove snapshot"
msgstr ""
-#: include/class_SnapShotDialog.inc:157 include/class_SnapShotDialog.inc:177
+#: include/class_SnapShotDialog.inc:302 include/class_SnapShotDialog.inc:322
msgid "Y-m-d, H:i:s"
msgstr ""
-#: include/class_SnapShotDialog.inc:191 plugins/admin/acl/acl-list.xml:57
+#: include/class_SnapShotDialog.inc:336 plugins/admin/acl/acl-list.xml:57
#: plugins/admin/acl/acl_role.tpl:17 plugins/admin/acl/class_aclRole.inc:704
#: plugins/admin/groups/class_group.inc:1114
#: plugins/admin/groups/group-list.xml:66 plugins/admin/groups/generic.tpl:24
@@ -2989,32 +2983,20 @@ msgstr ""
msgid "Cannot find a suitable password method for the current hash!"
msgstr ""
-#: include/class_plugin.inc:563
+#: include/class_plugin.inc:562
msgid ""
"The object has changed since opened in FusionDirectory. All changes that may "
"be done by others get lost if you save this entry!"
msgstr ""
-#: include/class_plugin.inc:2082
+#: include/class_plugin.inc:1674
msgid "Changing ACL dn"
msgstr ""
-#: include/class_plugin.inc:2082
+#: include/class_plugin.inc:1674
msgid "from"
msgstr ""
-#: include/class_plugin.inc:2136 include/class_plugin.inc:2138
-msgid "Restore"
-msgstr ""
-
-#: include/class_plugin.inc:2186
-msgid "cut"
-msgstr ""
-
-#: include/class_plugin.inc:2194
-msgid "copy"
-msgstr ""
-
#: include/class_sortableListing.inc:303
msgid "Sortable list"
msgstr ""
@@ -3883,15 +3865,14 @@ msgstr ""
msgid "List of acls"
msgstr ""
-#: plugins/admin/acl/acl-list.xml:15
+#: plugins/admin/acl/acl-list.xml:15 plugins/admin/acl/acl-list.xml:82
#: plugins/admin/acl/class_aclManagement.inc:36
msgid "Acl"
msgstr ""
-#: plugins/admin/acl/acl-list.xml:23 plugins/admin/acl/acl-list.xml:82
-#: plugins/admin/acl/class_aclRole.inc:695
+#: plugins/admin/acl/acl-list.xml:23 plugins/admin/acl/class_aclRole.inc:695
#: plugins/personal/generic/class_user.inc:1367
-#: plugins/personal/generic/generic.tpl:515
+#: plugins/personal/generic/generic.tpl:492
msgid "Role"
msgstr "Роль"
@@ -3931,7 +3912,7 @@ msgstr ""
msgid "Access control list management"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:160
+#: plugins/admin/acl/class_aclManagement.inc:161
msgid "ACL Assignment"
msgstr ""
@@ -4051,7 +4032,7 @@ msgid ""
msgstr ""
#: plugins/admin/users/template.tpl:15
-#: plugins/admin/users/class_userManagement.inc:542
+#: plugins/admin/users/class_userManagement.inc:539
#: plugins/admin/users/templatize.tpl:15 plugins/admin/users/user-list.xml:15
#: plugins/admin/users/user-list.xml:102
msgid "Template"
@@ -4086,23 +4067,23 @@ msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
msgid "Manage users"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:344
+#: plugins/admin/users/class_userManagement.inc:341
#: plugins/personal/password/class_password.inc:136
#, php-format
msgid "Check-hook reported a problem: %s. Password change canceled!"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:394
+#: plugins/admin/users/class_userManagement.inc:391
msgid "You have no permission to change this users password!"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:470
-#: plugins/admin/users/class_userManagement.inc:504
-#: plugins/admin/users/class_userManagement.inc:535
+#: plugins/admin/users/class_userManagement.inc:467
+#: plugins/admin/users/class_userManagement.inc:501
+#: plugins/admin/users/class_userManagement.inc:532
msgid "none"
msgstr "нет"
-#: plugins/admin/users/class_userManagement.inc:548
+#: plugins/admin/users/class_userManagement.inc:545
#: plugins/admin/users/user-list.xml:57
#: plugins/admin/groups/userSelect/user-list.xml:40
#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
@@ -4112,26 +4093,26 @@ msgstr "нет"
msgid "Given name"
msgstr "ИмÑ"
-#: plugins/admin/users/class_userManagement.inc:799
+#: plugins/admin/users/class_userManagement.inc:796
msgid "Account locking"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:800
+#: plugins/admin/users/class_userManagement.inc:797
#, php-format
msgid ""
"Password method '%s' does not support locking. Account (%s) has not been "
"locked!"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:873
+#: plugins/admin/users/class_userManagement.inc:870
msgid "Unlock account"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:875
+#: plugins/admin/users/class_userManagement.inc:872
msgid "Lock account"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:903
+#: plugins/admin/users/class_userManagement.inc:900
#, fuzzy
msgid "Generic properties"
msgstr "СвойÑтва"
@@ -4221,8 +4202,9 @@ msgid "Remove user"
msgstr ""
#: plugins/admin/password/class_recoveryConfig.inc:35
-msgid "Password recovery config"
-msgstr ""
+#, fuzzy
+msgid "Password recovery"
+msgstr "Ð¥Ñширование паролей"
#: plugins/admin/password/class_recoveryConfig.inc:36
msgid "Settings for the password recovery feature"
@@ -4539,7 +4521,6 @@ msgstr ""
#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:23
#: plugins/admin/ogroups/class_ogroupManagement.inc:187
#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:79
-#: plugins/admin/ogroups/ogroup-list.xml:79
#: plugins/generic/references/class_reference.inc:55
#: plugins/personal/posix/groupSelect/group-list.xml:15
msgid "Group"
@@ -4631,8 +4612,8 @@ msgstr ""
#: plugins/generic/references/class_reference.inc:59
#: plugins/personal/posix/trustSelect/class_trustSelect.inc:81
#: plugins/personal/generic/class_user.inc:1180
-#: plugins/personal/generic/generic.tpl:399
-#: plugins/personal/generic/generic.tpl:586
+#: plugins/personal/generic/generic.tpl:376
+#: plugins/personal/generic/generic.tpl:563
msgid "Phone"
msgstr "Телефон"
@@ -4731,7 +4712,7 @@ msgstr ""
#: plugins/admin/departments/generic.tpl:91
#: plugins/admin/departments/class_organizationGeneric.inc:129
#: plugins/personal/generic/class_user.inc:1410
-#: plugins/personal/generic/generic.tpl:448
+#: plugins/personal/generic/generic.tpl:425
msgid "Location"
msgstr "МеÑтоположение"
@@ -4748,8 +4729,8 @@ msgstr "МеÑтоположение"
#: plugins/admin/departments/generic.tpl:51
#: plugins/admin/departments/class_organizationGeneric.inc:126
#: plugins/personal/generic/class_user.inc:1399
-#: plugins/personal/generic/generic.tpl:341
-#: plugins/personal/generic/generic.tpl:362
+#: plugins/personal/generic/generic.tpl:318
+#: plugins/personal/generic/generic.tpl:339
msgid "Manager"
msgstr ""
@@ -4887,7 +4868,7 @@ msgstr "ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ Ñтой ветки"
#: plugins/admin/departments/generic.tpl:83
#: plugins/admin/departments/class_organizationGeneric.inc:128
#: plugins/personal/generic/class_user.inc:1409
-#: plugins/personal/generic/generic.tpl:456
+#: plugins/personal/generic/generic.tpl:433
msgid "State"
msgstr "Ðдм. единица"
@@ -4905,7 +4886,7 @@ msgstr "МеÑтоположение ветки"
#: plugins/admin/departments/class_department.inc:667
#: plugins/admin/departments/generic.tpl:99
#: plugins/personal/generic/generic.tpl:181
-#: plugins/personal/generic/generic.tpl:464
+#: plugins/personal/generic/generic.tpl:441
msgid "Address"
msgstr "ÐдреÑ"
@@ -4925,8 +4906,8 @@ msgstr "ОÑновный телефонный номер Ð´Ð»Ñ Ð²ÐµÑ‚ÐºÐ¸"
#: plugins/admin/departments/generic.tpl:114
#: plugins/admin/departments/class_organizationGeneric.inc:132
#: plugins/personal/generic/class_user.inc:1183
-#: plugins/personal/generic/generic.tpl:430
-#: plugins/personal/generic/generic.tpl:598
+#: plugins/personal/generic/generic.tpl:407
+#: plugins/personal/generic/generic.tpl:575
msgid "Fax"
msgstr "ФакÑ"
@@ -4977,7 +4958,7 @@ msgstr "Страна"
#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:15
#: plugins/generic/references/class_reference.inc:57
#: plugins/personal/generic/class_user.inc:1396
-#: plugins/personal/generic/generic.tpl:308
+#: plugins/personal/generic/generic.tpl:285
msgid "Department"
msgstr "Подразделение"
@@ -5281,6 +5262,11 @@ msgstr "Включаемые объекты"
msgid "List of object groups"
msgstr ""
+#: plugins/admin/ogroups/ogroup-list.xml:79
+#, fuzzy
+msgid "Objectgroup"
+msgstr "Объект группы"
+
#: plugins/admin/ogroups/ogroup-list.xml:106
msgid "Send message"
msgstr ""
@@ -5352,7 +5338,8 @@ msgstr "Язык"
#: plugins/config/class_configInLdap.inc:82
msgid ""
-"Default language to be used if the one asked by the browser is not available"
+"Language of the application. If 'automatic' or not available, the one asked "
+"by the browser will be used. This setting can be overriden per user."
msgstr ""
#: plugins/config/class_configInLdap.inc:87
@@ -5368,7 +5355,7 @@ msgid "Schema setup"
msgstr ""
#: plugins/config/class_configInLdap.inc:103
-msgid "rfc237bis"
+msgid "rfc2307bis"
msgstr ""
#: plugins/config/class_configInLdap.inc:104
@@ -6072,12 +6059,12 @@ msgid "Homepage"
msgstr "ДомашнÑÑ Ñтраница"
#: plugins/personal/generic/class_user.inc:1186
-#: plugins/personal/generic/generic.tpl:411
+#: plugins/personal/generic/generic.tpl:388
msgid "Mobile"
msgstr "Мобильный"
#: plugins/personal/generic/class_user.inc:1189
-#: plugins/personal/generic/generic.tpl:422
+#: plugins/personal/generic/generic.tpl:399
msgid "Pager"
msgstr "Пейджер"
@@ -6088,57 +6075,57 @@ msgid "Date of birth"
msgstr "Дата рождениÑ"
#: plugins/personal/generic/class_user.inc:1357
-#: plugins/personal/generic/generic.tpl:538
+#: plugins/personal/generic/generic.tpl:515
msgid "Unit"
msgstr "Подразделение"
#: plugins/personal/generic/class_user.inc:1358
-#: plugins/personal/generic/generic.tpl:563
+#: plugins/personal/generic/generic.tpl:540
msgid "House identifier"
msgstr "Ðомер дома"
#: plugins/personal/generic/class_user.inc:1359
-#: plugins/personal/generic/generic.tpl:480
+#: plugins/personal/generic/generic.tpl:457
msgid "Vocation"
msgstr "СпециальноÑÑ‚ÑŒ"
#: plugins/personal/generic/class_user.inc:1360
-#: plugins/personal/generic/generic.tpl:607
+#: plugins/personal/generic/generic.tpl:584
msgid "Last delivery"
msgstr "ПоÑледнÑÑ Ð´Ð¾Ñтавка"
#: plugins/personal/generic/class_user.inc:1361
-#: plugins/personal/generic/generic.tpl:529
+#: plugins/personal/generic/generic.tpl:506
msgid "Person locality"
msgstr "МеÑтоположение Ñотрудника"
#: plugins/personal/generic/class_user.inc:1362
-#: plugins/personal/generic/generic.tpl:488
+#: plugins/personal/generic/generic.tpl:465
msgid "Unit description"
msgstr "ОпиÑание подразделениÑ"
#: plugins/personal/generic/class_user.inc:1363
-#: plugins/personal/generic/generic.tpl:497
+#: plugins/personal/generic/generic.tpl:474
msgid "Subject area"
msgstr "ОблаÑÑ‚ÑŒ деÑтельноÑти"
#: plugins/personal/generic/class_user.inc:1364
-#: plugins/personal/generic/generic.tpl:506
+#: plugins/personal/generic/generic.tpl:483
msgid "Functional title"
msgstr "ДолжноÑÑ‚ÑŒ"
#: plugins/personal/generic/class_user.inc:1365
-#: plugins/personal/generic/generic.tpl:616
+#: plugins/personal/generic/generic.tpl:593
msgid "Public visible"
msgstr "Видимый вÑем"
#: plugins/personal/generic/class_user.inc:1366
-#: plugins/personal/generic/generic.tpl:547
+#: plugins/personal/generic/generic.tpl:524
msgid "Street"
msgstr "Улица"
#: plugins/personal/generic/class_user.inc:1368
-#: plugins/personal/generic/generic.tpl:555
+#: plugins/personal/generic/generic.tpl:532
msgid "Postal code"
msgstr "Почтовый индекÑ"
@@ -6187,7 +6174,7 @@ msgid "Employee number"
msgstr ""
#: plugins/personal/generic/class_user.inc:1401
-#: plugins/personal/generic/generic.tpl:332
+#: plugins/personal/generic/generic.tpl:309
msgid "Employee type"
msgstr "Форма трудоуÑтройÑтва"
@@ -6268,29 +6255,28 @@ msgstr "Ð¥Ñширование паролей"
msgid "Restrict login to"
msgstr ""
-#: plugins/personal/generic/generic.tpl:248
-#: plugins/personal/generic/generic.tpl:267
+#: plugins/personal/generic/generic.tpl:246
msgid "IP or network"
msgstr ""
-#: plugins/personal/generic/generic.tpl:288
+#: plugins/personal/generic/generic.tpl:265
msgid "Organizational information"
msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾Ð± организации"
-#: plugins/personal/generic/generic.tpl:316
+#: plugins/personal/generic/generic.tpl:293
msgid "Department No."
msgstr "Ðомер подразделениÑ"
-#: plugins/personal/generic/generic.tpl:324
+#: plugins/personal/generic/generic.tpl:301
msgid "Employee No."
msgstr "Ðомер работника"
-#: plugins/personal/generic/generic.tpl:390
-#: plugins/personal/generic/generic.tpl:578
+#: plugins/personal/generic/generic.tpl:367
+#: plugins/personal/generic/generic.tpl:555
msgid "Room No."
msgstr "Ðомер комнаты"
-#: plugins/personal/generic/generic.tpl:592
+#: plugins/personal/generic/generic.tpl:569
msgid "Please use the phone tab"
msgstr "ВоÑпользуйтеÑÑŒ закладкой \"Телефон\""
diff --git a/locale/ug/messages.po b/locale/ug/fusiondirectory.po
similarity index 94%
rename from locale/ug/messages.po
rename to locale/ug/fusiondirectory.po
index 4322bc8dced24793977677837b23372972b19dd9..0429c87ce82072a556db11bcad499c7a05ddaeab 100644
--- a/locale/ug/messages.po
+++ b/locale/ug/fusiondirectory.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-24 14:48+0100\n"
+"POT-Creation-Date: 2013-04-14 20:13+0200\n"
"PO-Revision-Date: 2013-02-12 10:26+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory/"
@@ -18,39 +18,39 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: html/main.php:140 html/class_passwordRecovery.inc:226
+#: html/main.php:135 html/class_passwordRecovery.inc:226
#: include/class_xml.inc:60 include/functions.inc:509
#: plugins/admin/departments/class_department.inc:431
msgid "Fatal error"
msgstr ""
-#: html/main.php:141
+#: html/main.php:136
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr ""
-#: html/main.php:162
+#: html/main.php:157
msgid "PHP configuration"
msgstr ""
-#: html/main.php:163
+#: html/main.php:158
msgid ""
"Fatal error: Register globals is on. FusionDirectory will refuse to login "
"unless this is fixed by an administrator."
msgstr ""
-#: html/main.php:192 ihtml/themes/default/password.tpl:40
-#: plugins/admin/users/class_userManagement.inc:393
+#: html/main.php:187 ihtml/themes/default/password.tpl:40
+#: plugins/admin/users/class_userManagement.inc:390
#: plugins/personal/password/class_password.inc:156
#: plugins/personal/password/class_password.inc:162
msgid "Password change"
msgstr ""
-#: html/main.php:192
+#: html/main.php:187
msgid "Your password is about to expire, please change your password!"
msgstr ""
-#: html/main.php:261 html/class_passwordRecovery.inc:301 html/index.php:147
+#: html/main.php:256 html/class_passwordRecovery.inc:296 html/index.php:147
#: html/index.php:208 include/class_SnapshotHandler.inc:57
#: include/class_SnapshotHandler.inc:70 include/class_SnapshotHandler.inc:88
#: include/class_pluglist.inc:272 include/functions.inc:933
@@ -64,30 +64,30 @@ msgstr ""
msgid "Configuration error"
msgstr ""
-#: html/main.php:261
+#: html/main.php:256
msgid "Running out of memory!"
msgstr ""
-#: html/main.php:316
+#: html/main.php:311
msgid "User ACL checks disabled"
msgstr ""
-#: html/main.php:362
+#: html/main.php:357
msgid "Plugin"
msgstr ""
-#: html/main.php:363
+#: html/main.php:358
#, php-format
msgid ""
"Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not "
"a file)!"
msgstr ""
-#: html/main.php:378
+#: html/main.php:373
msgid "Configuration Error"
msgstr ""
-#: html/main.php:379
+#: html/main.php:374
#, php-format
msgid ""
"Fatal error: not all POST variables have been transfered by PHP - please "
@@ -103,31 +103,31 @@ msgstr ""
msgid "Error: Password method not available!"
msgstr ""
-#: html/class_passwordRecovery.inc:227 html/index.php:147
+#: html/class_passwordRecovery.inc:227
#, php-format
msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
msgstr ""
-#: html/class_passwordRecovery.inc:302 html/setup.php:63 html/index.php:163
+#: html/class_passwordRecovery.inc:297 html/setup.php:63 html/index.php:163
#, php-format
msgid "Directory '%s' specified as compile directory is not accessible!"
msgstr ""
-#: html/class_passwordRecovery.inc:407
-#: plugins/admin/users/class_userManagement.inc:309
+#: html/class_passwordRecovery.inc:402
+#: plugins/admin/users/class_userManagement.inc:306
#: plugins/personal/password/class_password.inc:113
msgid ""
"The passwords you've entered as 'New password' and 'Repeated new password' "
"do not match."
msgstr ""
-#: html/class_passwordRecovery.inc:409 ihtml/themes/default/password.tpl:81
+#: html/class_passwordRecovery.inc:404 ihtml/themes/default/password.tpl:81
#: ihtml/themes/default/password.tpl:82
#: ihtml/themes/default/accountexpired.tpl:32
#: ihtml/themes/default/accountexpired.tpl:36
#: ihtml/themes/default/recovery.tpl:93 ihtml/themes/default/recovery.tpl:94
#: plugins/admin/users/password.tpl:17 plugins/admin/users/password.tpl:60
-#: plugins/admin/users/class_userManagement.inc:312
+#: plugins/admin/users/class_userManagement.inc:309
#: plugins/personal/password/password.tpl:27
#: plugins/personal/password/password.tpl:78
#: plugins/personal/generic/password.tpl:22
@@ -135,16 +135,16 @@ msgstr ""
msgid "New password"
msgstr ""
-#: html/class_passwordRecovery.inc:411
+#: html/class_passwordRecovery.inc:406
msgid "The password used as new is too short."
msgstr ""
-#: html/class_passwordRecovery.inc:413
+#: html/class_passwordRecovery.inc:408
#: plugins/personal/password/class_password.inc:121
msgid "The password contains possibly problematic Unicode characters!"
msgstr ""
-#: html/class_passwordRecovery.inc:437 html/index.php:58 html/index.php:64
+#: html/class_passwordRecovery.inc:432 html/index.php:58 html/index.php:64
#: html/index.php:403 ihtml/themes/default/conflict.tpl:6
#: ihtml/themes/default/islocked.tpl:6 ihtml/themes/default/remove.tpl:2
#: ihtml/themes/default/msg_dialog.tpl:59
@@ -167,39 +167,39 @@ msgstr ""
msgid "Warning"
msgstr ""
-#: html/class_passwordRecovery.inc:438
+#: html/class_passwordRecovery.inc:433
msgid "Session will not be encrypted."
msgstr ""
-#: html/class_passwordRecovery.inc:440
+#: html/class_passwordRecovery.inc:435
msgid "Enter SSL session"
msgstr ""
-#: html/class_passwordRecovery.inc:481
+#: html/class_passwordRecovery.inc:476
#, php-format
msgid "Did not found account %s"
msgstr ""
-#: html/class_passwordRecovery.inc:484
+#: html/class_passwordRecovery.inc:479
#, php-format
msgid "Found multiple accounts %s"
msgstr ""
-#: html/class_passwordRecovery.inc:498 ihtml/themes/default/recovery.tpl:142
+#: html/class_passwordRecovery.inc:493 ihtml/themes/default/recovery.tpl:142
msgid "Adresse mail"
msgstr ""
-#: html/class_passwordRecovery.inc:515
+#: html/class_passwordRecovery.inc:510
#, php-format
msgid "There is no account using email %s"
msgstr ""
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:513
#, php-format
msgid "There are several accounts using email %s"
msgstr ""
-#: html/class_passwordRecovery.inc:543 html/index.php:257 html/index.php:269
+#: html/class_passwordRecovery.inc:538 html/index.php:257 html/index.php:269
#: html/index.php:282 setup/class_setupStep_Migrate.inc:1138
#: setup/class_setupStep_Migrate.inc:1164
#: setup/class_setupStep_Migrate.inc:1213
@@ -211,20 +211,17 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:2549
#: setup/class_setupStep_Migrate.inc:2896
#: setup/class_setupStep_Migrate.inc:2910
-#: include/class_SnapshotHandler.inc:150 include/class_SnapshotHandler.inc:329
-#: include/class_SnapshotHandler.inc:378 include/class_SnapshotHandler.inc:382
-#: include/class_SnapshotHandler.inc:402 include/class_SnapshotHandler.inc:445
-#: include/class_SnapshotHandler.inc:508 include/class_SnapshotHandler.inc:577
-#: include/class_SnapshotHandler.inc:592 include/functions.inc:547
+#: include/class_SnapshotHandler.inc:150 include/class_SnapshotHandler.inc:335
+#: include/class_SnapshotHandler.inc:388 include/class_SnapshotHandler.inc:392
+#: include/class_SnapshotHandler.inc:412 include/class_SnapshotHandler.inc:455
+#: include/class_SnapshotHandler.inc:518 include/class_SnapshotHandler.inc:587
+#: include/class_SnapshotHandler.inc:602 include/functions.inc:547
#: include/functions.inc:583 include/functions.inc:591
#: include/functions.inc:639 include/functions.inc:948
#: include/functions.inc:998 include/functions.inc:1058
#: include/functions.inc:1113 include/functions.inc:3244
-#: include/functions.inc:3509 include/class_config.inc:330
-#: include/class_plugin.inc:1500 include/class_plugin.inc:1550
-#: include/class_plugin.inc:1554 include/class_plugin.inc:1574
-#: include/class_plugin.inc:1621 include/class_plugin.inc:1681
-#: include/class_plugin.inc:1751 include/class_plugin.inc:1766
+#: include/functions.inc:3514 include/class_SnapShotDialog.inc:104
+#: include/class_SnapShotDialog.inc:177 include/class_config.inc:330
#: include/class_acl.inc:1308 include/class_acl.inc:1413
#: include/class_ldap.inc:934 include/class_ldap.inc:1421
#: plugins/admin/acl/class_aclRole.inc:613
@@ -243,19 +240,19 @@ msgstr ""
msgid "LDAP error"
msgstr ""
-#: html/class_passwordRecovery.inc:566
+#: html/class_passwordRecovery.inc:561
msgid "Contact your administrator, there was a problem with mail server"
msgstr ""
-#: html/class_passwordRecovery.inc:577
+#: html/class_passwordRecovery.inc:572
msgid "This token is invalid"
msgstr ""
-#: html/class_passwordRecovery.inc:615
+#: html/class_passwordRecovery.inc:610
msgid "External password changer reported a problem: "
msgstr ""
-#: html/class_passwordRecovery.inc:640
+#: html/class_passwordRecovery.inc:635
msgid "There was a problem with mail server, confirmation email not sent"
msgstr ""
@@ -273,6 +270,13 @@ msgid ""
"overridden by php.ini settings."
msgstr ""
+#: html/index.php:147
+#, php-format
+msgid ""
+"FusionDirectory configuration %s/%s is not readable. Please run "
+"fusiondirectory-setup --check-config to fix this."
+msgstr ""
+
#: html/index.php:163
msgid "Smarty error"
msgstr ""
@@ -287,22 +291,22 @@ msgstr ""
#: setup/setup_checks.tpl:91 setup/class_setupStep_Migrate.inc:1127
#: include/class_xml.inc:57 include/class_tabs.inc:74
#: include/class_management.inc:507 include/class_management.inc:657
-#: include/functions.inc:3613 include/functions.inc:3633
-#: include/functions.inc:3663 include/functions.inc:3671
-#: include/functions.inc:3683 include/functions.inc:3687
-#: include/functions.inc:3702 include/functions.inc:3711
-#: include/functions.inc:3779 include/class_listing.inc:522
+#: include/functions.inc:3618 include/functions.inc:3638
+#: include/functions.inc:3668 include/functions.inc:3676
+#: include/functions.inc:3688 include/functions.inc:3692
+#: include/functions.inc:3707 include/functions.inc:3716
+#: include/functions.inc:3784 include/class_listing.inc:521
#: include/class_config.inc:483 include/class_CopyPasteHandler.inc:264
#: include/password-methods/class_password-methods-sasl.inc:51
#: include/password-methods/class_password-methods-sasl.inc:63
#: include/password-methods/class_password-methods.inc:342
#: include/password-methods/class_password-methods.inc:447
#: include/password-methods/class_password-methods.inc:458
-#: include/class_plugin.inc:1368 include/class_plugin.inc:1843
-#: include/class_msg_dialog.inc:128 include/class_msgPool.inc:215
-#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:680 include/class_msgPool.inc:711
-#: include/class_msgPool.inc:738 include/class_databaseManagement.inc:78
+#: include/class_plugin.inc:1367 include/class_msg_dialog.inc:128
+#: include/class_msgPool.inc:215 include/class_msgPool.inc:235
+#: include/class_msgPool.inc:265 include/class_msgPool.inc:680
+#: include/class_msgPool.inc:711 include/class_msgPool.inc:738
+#: include/class_databaseManagement.inc:78
#: plugins/admin/acl/class_aclRole.inc:681
#: plugins/admin/groups/class_group.inc:521
#: plugins/admin/groups/class_group.inc:527
@@ -966,131 +970,128 @@ msgid ""
"databases."
msgstr ""
-#: setup/class_setupStep_Checks.inc:136
-msgid "MDB2 mysql"
-msgstr ""
-
-#: setup/class_setupStep_Checks.inc:137
+#: setup/class_setupStep_Checks.inc:134
msgid ""
-"FusionDirectory requires this module to communicate with mysql databases."
+"If you do not want to install MDB2 and won't use databases, remove the "
+"class_databaseManagement.inc file."
msgstr ""
-#: setup/class_setupStep_Checks.inc:143
+#: setup/class_setupStep_Checks.inc:138
msgid "imagick"
msgstr ""
-#: setup/class_setupStep_Checks.inc:144
+#: setup/class_setupStep_Checks.inc:139
msgid "FusionDirectory requires this extension to handle images."
msgstr ""
-#: setup/class_setupStep_Checks.inc:159
+#: setup/class_setupStep_Checks.inc:154
msgid "compression module"
msgstr ""
-#: setup/class_setupStep_Checks.inc:160
+#: setup/class_setupStep_Checks.inc:155
msgid "FusionDirectory requires this extension to handle snapshots."
msgstr ""
-#: setup/class_setupStep_Checks.inc:171
+#: setup/class_setupStep_Checks.inc:166
msgid ""
"register_globals is a PHP mechanism to register all global variables to be "
"accessible from scripts without changing the scope. This may be a security "
"risk."
msgstr ""
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStep_Checks.inc:167
msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:180
+#: setup/class_setupStep_Checks.inc:175
msgid "PHP uses this value for the garbage collector to delete old sessions."
msgstr ""
-#: setup/class_setupStep_Checks.inc:181
+#: setup/class_setupStep_Checks.inc:176
msgid ""
"Setting this value to one day will prevent loosing session and cookies "
"before they really timeout."
msgstr ""
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStep_Checks.inc:177
msgid ""
"Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
"higher."
msgstr ""
-#: setup/class_setupStep_Checks.inc:189 setup/class_setupStep_Checks.inc:205
-#: setup/class_setupStep_Checks.inc:221 setup/class_setupStep_Checks.inc:229
+#: setup/class_setupStep_Checks.inc:184 setup/class_setupStep_Checks.inc:200
+#: setup/class_setupStep_Checks.inc:216 setup/class_setupStep_Checks.inc:224
msgid "Off"
msgstr ""
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStep_Checks.inc:185
msgid ""
"In Order to use FusionDirectory without any trouble, the session.auto_start "
"option in your php.ini should be set to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStep_Checks.inc:186
msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStep_Checks.inc:193
msgid ""
"FusionDirectory needs at least 128MB of memory. Setting it below this limit "
"may cause errors that are not reproducable! Increase it for larger setups."
msgstr ""
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStep_Checks.inc:194
msgid ""
"Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
msgstr ""
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStep_Checks.inc:201
msgid ""
"This option influences the PHP output handling. Turn this Option off, to "
"increase performance."
msgstr ""
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStep_Checks.inc:202
msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStep_Checks.inc:209
msgid "The Execution time should be at least 30 seconds."
msgstr ""
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStep_Checks.inc:210
msgid ""
"Search for 'max_execution_time' in your php.ini and set it to '30' or higher."
msgstr ""
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStep_Checks.inc:217
msgid ""
"Increase the server security by setting expose_php to 'off'. PHP won't send "
"any information about the server you are running in this case."
msgstr ""
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStep_Checks.inc:218
msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:230
+#: setup/class_setupStep_Checks.inc:225
msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:231
+#: setup/class_setupStep_Checks.inc:226
msgid ""
"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:241
+#: setup/class_setupStep_Checks.inc:236
msgid "Configuration writeable"
msgstr ""
-#: setup/class_setupStep_Checks.inc:242
+#: setup/class_setupStep_Checks.inc:237
msgid "The configuration file can't be written"
msgstr ""
-#: setup/class_setupStep_Checks.inc:243
+#: setup/class_setupStep_Checks.inc:238
#, php-format
msgid ""
"FusionDirectory reads its configuration from a file located in (%s/%s). The "
@@ -1638,7 +1639,7 @@ msgstr ""
#: plugins/admin/departments/class_organizationGeneric.inc:115
#: plugins/admin/departments/class_organizationGeneric.inc:118
#: plugins/personal/generic/class_user.inc:1395
-#: plugins/personal/generic/generic.tpl:300
+#: plugins/personal/generic/generic.tpl:277
msgid "Organization"
msgstr ""
@@ -1648,8 +1649,8 @@ msgstr ""
#: plugins/admin/acl/class_aclRole.inc:702
#: plugins/admin/acl/class_aclRole.inc:715
#: plugins/admin/acl/class_aclRole.inc:725
-#: plugins/admin/users/class_userManagement.inc:545
-#: plugins/admin/users/class_userManagement.inc:592
+#: plugins/admin/users/class_userManagement.inc:542
+#: plugins/admin/users/class_userManagement.inc:589
#: plugins/admin/users/user-filter.tpl:26
#: plugins/admin/groups/group-filter.tpl:21
#: plugins/admin/groups/userSelect/user-filter.tpl:17
@@ -1730,7 +1731,7 @@ msgid ""
msgstr ""
#: setup/setup_feedback.tpl:52
-#: plugins/admin/users/class_userManagement.inc:903
+#: plugins/admin/users/class_userManagement.inc:900
#: plugins/admin/groups/class_group.inc:1106
#: plugins/admin/departments/class_department.inc:653
#: plugins/admin/ogroups/class_ogroup.inc:895
@@ -1870,7 +1871,7 @@ msgstr ""
#: setup/setup_migrate.tpl:101 setup/setup_migrate.tpl:153
#: setup/setup_migrate.tpl:320 setup/setup_migrate.tpl:373
#: setup/setup_migrate.tpl:416 setup/setup_migrate.tpl:459
-#: setup/setup_migrate.tpl:503 include/class_listing.inc:352
+#: setup/setup_migrate.tpl:503 include/class_listing.inc:351
msgid "Select all"
msgstr ""
@@ -2338,7 +2339,7 @@ msgid "Group will be moved from"
msgstr ""
#: setup/class_setupStep_Migrate.inc:1175
-#: setup/class_setupStep_Migrate.inc:1223 include/class_plugin.inc:2083
+#: setup/class_setupStep_Migrate.inc:1223 include/class_plugin.inc:1675
msgid "to"
msgstr ""
@@ -2413,8 +2414,7 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:2647 include/class_msgPool.inc:495
#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:83
#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:138
-#: plugins/personal/generic/generic.tpl:251
-#: plugins/personal/generic/generic.tpl:270
+#: plugins/personal/generic/generic.tpl:249
#, php-format
msgid "Add"
msgstr ""
@@ -2535,28 +2535,25 @@ msgstr ""
#: include/class_management.inc:333 include/class_management.inc:483
#: include/class_management.inc:536 include/class_management.inc:576
#: include/class_management.inc:590 include/class_CopyPasteHandler.inc:223
-#: include/class_plugin.inc:1791 include/class_plugin.inc:1803
-#: include/class_plugin.inc:1818 include/class_plugin.inc:1831
-#: plugins/admin/users/class_userManagement.inc:205
-#: plugins/admin/users/class_userManagement.inc:761
+#: plugins/admin/users/class_userManagement.inc:202
+#: plugins/admin/users/class_userManagement.inc:758
msgid "Permission"
msgstr ""
#: include/class_management.inc:403
-#: plugins/admin/acl/class_aclManagement.inc:100
-#: plugins/admin/users/class_userManagement.inc:719
-#: plugins/admin/users/class_userManagement.inc:723
+#: plugins/admin/acl/class_aclManagement.inc:101
+#: plugins/admin/users/class_userManagement.inc:716
+#: plugins/admin/users/class_userManagement.inc:720
msgid "Permission error"
msgstr ""
-#: include/class_management.inc:483 include/class_plugin.inc:1791
+#: include/class_management.inc:483
#, php-format
msgid "You are not allowed to create a snapshot for %s."
msgstr ""
#: include/class_management.inc:536 include/class_management.inc:576
-#: include/class_management.inc:590 include/class_plugin.inc:1803
-#: include/class_plugin.inc:1818 include/class_plugin.inc:1831
+#: include/class_management.inc:590
#, php-format
msgid "You are not allowed to restore a snapshot for %s."
msgstr ""
@@ -2757,87 +2754,87 @@ msgid ""
"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
msgstr ""
-#: include/functions.inc:3613 include/functions.inc:3633
-#: include/functions.inc:3671 include/functions.inc:3683
-#: include/functions.inc:3687 include/functions.inc:3702
-#: include/functions.inc:3711
+#: include/functions.inc:3618 include/functions.inc:3638
+#: include/functions.inc:3676 include/functions.inc:3688
+#: include/functions.inc:3692 include/functions.inc:3707
+#: include/functions.inc:3716
msgid "Cannot allocate a free ID:"
msgstr ""
-#: include/functions.inc:3613
+#: include/functions.inc:3618
msgid "unknown idAllocation method!"
msgstr ""
-#: include/functions.inc:3633
+#: include/functions.inc:3638
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3663
+#: include/functions.inc:3668
msgid "Cannot create sambaUnixIdPool entry!"
msgstr ""
-#: include/functions.inc:3671
+#: include/functions.inc:3676
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3683 include/functions.inc:3687
+#: include/functions.inc:3688 include/functions.inc:3692
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3711
+#: include/functions.inc:3716
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3779
+#: include/functions.inc:3784
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/class_listing.inc:291 include/class_listing.inc:1099
-#: include/class_listing.inc:1101 include/class_sortableListing.inc:343
+#: include/class_listing.inc:290 include/class_listing.inc:1105
+#: include/class_listing.inc:1107 include/class_sortableListing.inc:343
#: include/class_acl.inc:504 plugins/admin/acl/class_aclRole.inc:372
msgid "Up"
msgstr ""
-#: include/class_listing.inc:291 include/class_sortableListing.inc:343
+#: include/class_listing.inc:290 include/class_sortableListing.inc:343
#: include/class_acl.inc:506 plugins/admin/acl/class_aclRole.inc:374
msgid "Down"
msgstr ""
-#: include/class_listing.inc:564
+#: include/class_listing.inc:563
msgid "created by"
msgstr ""
-#: include/class_listing.inc:1091
+#: include/class_listing.inc:1097
msgid "Go to root department"
msgstr ""
-#: include/class_listing.inc:1091 include/class_listing.inc:1093
+#: include/class_listing.inc:1097 include/class_listing.inc:1099
#: include/class_baseSelector.inc:205
msgid "Root"
msgstr ""
-#: include/class_listing.inc:1099
+#: include/class_listing.inc:1105
msgid "Go up one department"
msgstr ""
-#: include/class_listing.inc:1107
+#: include/class_listing.inc:1113
msgid "Go to users department"
msgstr ""
-#: include/class_listing.inc:1107 include/class_listing.inc:1109
+#: include/class_listing.inc:1113 include/class_listing.inc:1115
msgid "Home"
msgstr ""
-#: include/class_listing.inc:1114
+#: include/class_listing.inc:1120
msgid "Reload list"
msgstr ""
-#: include/class_listing.inc:1114 include/class_baseSelector.inc:252
+#: include/class_listing.inc:1120 include/class_baseSelector.inc:252
msgid "Submit"
msgstr ""
-#: include/class_listing.inc:1211 plugins/admin/acl/acl-list.xml:65
+#: include/class_listing.inc:1217 plugins/admin/acl/acl-list.xml:65
#: plugins/admin/users/user-list.xml:78 plugins/admin/groups/group-list.xml:79
#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:64
#: plugins/admin/departments/dep-list.xml:87
@@ -2845,65 +2842,62 @@ msgstr ""
msgid "Actions"
msgstr ""
-#: include/class_listing.inc:1495 include/class_listing.inc:1545
-#: include/class_plugin.inc:2228
+#: include/class_listing.inc:1501 include/class_listing.inc:1551
msgid "Copy"
msgstr ""
-#: include/class_listing.inc:1501 include/class_listing.inc:1535
-#: include/class_plugin.inc:2232
+#: include/class_listing.inc:1507 include/class_listing.inc:1541
msgid "Cut"
msgstr ""
-#: include/class_listing.inc:1509 include/class_listing.inc:1511
-#: include/class_CopyPasteHandler.inc:400 include/class_plugin.inc:2239
-#: include/class_plugin.inc:2242
+#: include/class_listing.inc:1515 include/class_listing.inc:1517
+#: include/class_CopyPasteHandler.inc:400
msgid "Paste"
msgstr ""
-#: include/class_listing.inc:1535 include/class_plugin.inc:2186
+#: include/class_listing.inc:1541
msgid "Cut this entry"
msgstr ""
-#: include/class_listing.inc:1545 include/class_plugin.inc:2194
+#: include/class_listing.inc:1551
msgid "Copy this entry"
msgstr ""
-#: include/class_listing.inc:1577 include/class_listing.inc:1579
+#: include/class_listing.inc:1583 include/class_listing.inc:1585
msgid "Restore snapshots"
msgstr ""
-#: include/class_listing.inc:1593
+#: include/class_listing.inc:1599
msgid "Export list"
msgstr ""
-#: include/class_listing.inc:1628 include/class_listing.inc:1629
-#: include/class_SnapShotDialog.inc:153 include/class_plugin.inc:2160
+#: include/class_listing.inc:1634 include/class_listing.inc:1635
+#: include/class_SnapShotDialog.inc:298
msgid "Restore snapshot"
msgstr ""
-#: include/class_listing.inc:1638 include/class_plugin.inc:2167
+#: include/class_listing.inc:1644
msgid "Create snapshot"
msgstr ""
-#: include/class_listing.inc:1639 include/class_plugin.inc:2168
+#: include/class_listing.inc:1645
msgid "Create a new snapshot from this object"
msgstr ""
-#: include/class_SnapShotDialog.inc:99
+#: include/class_SnapShotDialog.inc:244
#, php-format
msgid "You're about to delete the snapshot '%s'."
msgstr ""
-#: include/class_SnapShotDialog.inc:155
+#: include/class_SnapShotDialog.inc:300
msgid "Remove snapshot"
msgstr ""
-#: include/class_SnapShotDialog.inc:157 include/class_SnapShotDialog.inc:177
+#: include/class_SnapShotDialog.inc:302 include/class_SnapShotDialog.inc:322
msgid "Y-m-d, H:i:s"
msgstr ""
-#: include/class_SnapShotDialog.inc:191 plugins/admin/acl/acl-list.xml:57
+#: include/class_SnapShotDialog.inc:336 plugins/admin/acl/acl-list.xml:57
#: plugins/admin/acl/acl_role.tpl:17 plugins/admin/acl/class_aclRole.inc:704
#: plugins/admin/groups/class_group.inc:1114
#: plugins/admin/groups/group-list.xml:66 plugins/admin/groups/generic.tpl:24
@@ -2978,32 +2972,20 @@ msgstr ""
msgid "Cannot find a suitable password method for the current hash!"
msgstr ""
-#: include/class_plugin.inc:563
+#: include/class_plugin.inc:562
msgid ""
"The object has changed since opened in FusionDirectory. All changes that may "
"be done by others get lost if you save this entry!"
msgstr ""
-#: include/class_plugin.inc:2082
+#: include/class_plugin.inc:1674
msgid "Changing ACL dn"
msgstr ""
-#: include/class_plugin.inc:2082
+#: include/class_plugin.inc:1674
msgid "from"
msgstr ""
-#: include/class_plugin.inc:2136 include/class_plugin.inc:2138
-msgid "Restore"
-msgstr ""
-
-#: include/class_plugin.inc:2186
-msgid "cut"
-msgstr ""
-
-#: include/class_plugin.inc:2194
-msgid "copy"
-msgstr ""
-
#: include/class_sortableListing.inc:303
msgid "Sortable list"
msgstr ""
@@ -3872,15 +3854,14 @@ msgstr ""
msgid "List of acls"
msgstr ""
-#: plugins/admin/acl/acl-list.xml:15
+#: plugins/admin/acl/acl-list.xml:15 plugins/admin/acl/acl-list.xml:82
#: plugins/admin/acl/class_aclManagement.inc:36
msgid "Acl"
msgstr ""
-#: plugins/admin/acl/acl-list.xml:23 plugins/admin/acl/acl-list.xml:82
-#: plugins/admin/acl/class_aclRole.inc:695
+#: plugins/admin/acl/acl-list.xml:23 plugins/admin/acl/class_aclRole.inc:695
#: plugins/personal/generic/class_user.inc:1367
-#: plugins/personal/generic/generic.tpl:515
+#: plugins/personal/generic/generic.tpl:492
msgid "Role"
msgstr ""
@@ -3920,7 +3901,7 @@ msgstr ""
msgid "Access control list management"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:160
+#: plugins/admin/acl/class_aclManagement.inc:161
msgid "ACL Assignment"
msgstr ""
@@ -4040,7 +4021,7 @@ msgid ""
msgstr ""
#: plugins/admin/users/template.tpl:15
-#: plugins/admin/users/class_userManagement.inc:542
+#: plugins/admin/users/class_userManagement.inc:539
#: plugins/admin/users/templatize.tpl:15 plugins/admin/users/user-list.xml:15
#: plugins/admin/users/user-list.xml:102
msgid "Template"
@@ -4075,23 +4056,23 @@ msgstr ""
msgid "Manage users"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:344
+#: plugins/admin/users/class_userManagement.inc:341
#: plugins/personal/password/class_password.inc:136
#, php-format
msgid "Check-hook reported a problem: %s. Password change canceled!"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:394
+#: plugins/admin/users/class_userManagement.inc:391
msgid "You have no permission to change this users password!"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:470
-#: plugins/admin/users/class_userManagement.inc:504
-#: plugins/admin/users/class_userManagement.inc:535
+#: plugins/admin/users/class_userManagement.inc:467
+#: plugins/admin/users/class_userManagement.inc:501
+#: plugins/admin/users/class_userManagement.inc:532
msgid "none"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:548
+#: plugins/admin/users/class_userManagement.inc:545
#: plugins/admin/users/user-list.xml:57
#: plugins/admin/groups/userSelect/user-list.xml:40
#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
@@ -4101,26 +4082,26 @@ msgstr ""
msgid "Given name"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:799
+#: plugins/admin/users/class_userManagement.inc:796
msgid "Account locking"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:800
+#: plugins/admin/users/class_userManagement.inc:797
#, php-format
msgid ""
"Password method '%s' does not support locking. Account (%s) has not been "
"locked!"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:873
+#: plugins/admin/users/class_userManagement.inc:870
msgid "Unlock account"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:875
+#: plugins/admin/users/class_userManagement.inc:872
msgid "Lock account"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:903
+#: plugins/admin/users/class_userManagement.inc:900
msgid "Generic properties"
msgstr ""
@@ -4209,7 +4190,7 @@ msgid "Remove user"
msgstr ""
#: plugins/admin/password/class_recoveryConfig.inc:35
-msgid "Password recovery config"
+msgid "Password recovery"
msgstr ""
#: plugins/admin/password/class_recoveryConfig.inc:36
@@ -4525,7 +4506,6 @@ msgstr ""
#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:23
#: plugins/admin/ogroups/class_ogroupManagement.inc:187
#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:79
-#: plugins/admin/ogroups/ogroup-list.xml:79
#: plugins/generic/references/class_reference.inc:55
#: plugins/personal/posix/groupSelect/group-list.xml:15
msgid "Group"
@@ -4617,8 +4597,8 @@ msgstr ""
#: plugins/generic/references/class_reference.inc:59
#: plugins/personal/posix/trustSelect/class_trustSelect.inc:81
#: plugins/personal/generic/class_user.inc:1180
-#: plugins/personal/generic/generic.tpl:399
-#: plugins/personal/generic/generic.tpl:586
+#: plugins/personal/generic/generic.tpl:376
+#: plugins/personal/generic/generic.tpl:563
msgid "Phone"
msgstr ""
@@ -4717,7 +4697,7 @@ msgstr ""
#: plugins/admin/departments/generic.tpl:91
#: plugins/admin/departments/class_organizationGeneric.inc:129
#: plugins/personal/generic/class_user.inc:1410
-#: plugins/personal/generic/generic.tpl:448
+#: plugins/personal/generic/generic.tpl:425
msgid "Location"
msgstr ""
@@ -4734,8 +4714,8 @@ msgstr ""
#: plugins/admin/departments/generic.tpl:51
#: plugins/admin/departments/class_organizationGeneric.inc:126
#: plugins/personal/generic/class_user.inc:1399
-#: plugins/personal/generic/generic.tpl:341
-#: plugins/personal/generic/generic.tpl:362
+#: plugins/personal/generic/generic.tpl:318
+#: plugins/personal/generic/generic.tpl:339
msgid "Manager"
msgstr ""
@@ -4873,7 +4853,7 @@ msgstr ""
#: plugins/admin/departments/generic.tpl:83
#: plugins/admin/departments/class_organizationGeneric.inc:128
#: plugins/personal/generic/class_user.inc:1409
-#: plugins/personal/generic/generic.tpl:456
+#: plugins/personal/generic/generic.tpl:433
msgid "State"
msgstr ""
@@ -4891,7 +4871,7 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:667
#: plugins/admin/departments/generic.tpl:99
#: plugins/personal/generic/generic.tpl:181
-#: plugins/personal/generic/generic.tpl:464
+#: plugins/personal/generic/generic.tpl:441
msgid "Address"
msgstr ""
@@ -4911,8 +4891,8 @@ msgstr ""
#: plugins/admin/departments/generic.tpl:114
#: plugins/admin/departments/class_organizationGeneric.inc:132
#: plugins/personal/generic/class_user.inc:1183
-#: plugins/personal/generic/generic.tpl:430
-#: plugins/personal/generic/generic.tpl:598
+#: plugins/personal/generic/generic.tpl:407
+#: plugins/personal/generic/generic.tpl:575
msgid "Fax"
msgstr ""
@@ -4963,7 +4943,7 @@ msgstr ""
#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:15
#: plugins/generic/references/class_reference.inc:57
#: plugins/personal/generic/class_user.inc:1396
-#: plugins/personal/generic/generic.tpl:308
+#: plugins/personal/generic/generic.tpl:285
msgid "Department"
msgstr ""
@@ -5267,6 +5247,10 @@ msgstr ""
msgid "List of object groups"
msgstr ""
+#: plugins/admin/ogroups/ogroup-list.xml:79
+msgid "Objectgroup"
+msgstr ""
+
#: plugins/admin/ogroups/ogroup-list.xml:106
msgid "Send message"
msgstr ""
@@ -5338,7 +5322,8 @@ msgstr ""
#: plugins/config/class_configInLdap.inc:82
msgid ""
-"Default language to be used if the one asked by the browser is not available"
+"Language of the application. If 'automatic' or not available, the one asked "
+"by the browser will be used. This setting can be overriden per user."
msgstr ""
#: plugins/config/class_configInLdap.inc:87
@@ -5354,7 +5339,7 @@ msgid "Schema setup"
msgstr ""
#: plugins/config/class_configInLdap.inc:103
-msgid "rfc237bis"
+msgid "rfc2307bis"
msgstr ""
#: plugins/config/class_configInLdap.inc:104
@@ -6056,12 +6041,12 @@ msgid "Homepage"
msgstr ""
#: plugins/personal/generic/class_user.inc:1186
-#: plugins/personal/generic/generic.tpl:411
+#: plugins/personal/generic/generic.tpl:388
msgid "Mobile"
msgstr ""
#: plugins/personal/generic/class_user.inc:1189
-#: plugins/personal/generic/generic.tpl:422
+#: plugins/personal/generic/generic.tpl:399
msgid "Pager"
msgstr ""
@@ -6072,57 +6057,57 @@ msgid "Date of birth"
msgstr ""
#: plugins/personal/generic/class_user.inc:1357
-#: plugins/personal/generic/generic.tpl:538
+#: plugins/personal/generic/generic.tpl:515
msgid "Unit"
msgstr ""
#: plugins/personal/generic/class_user.inc:1358
-#: plugins/personal/generic/generic.tpl:563
+#: plugins/personal/generic/generic.tpl:540
msgid "House identifier"
msgstr ""
#: plugins/personal/generic/class_user.inc:1359
-#: plugins/personal/generic/generic.tpl:480
+#: plugins/personal/generic/generic.tpl:457
msgid "Vocation"
msgstr ""
#: plugins/personal/generic/class_user.inc:1360
-#: plugins/personal/generic/generic.tpl:607
+#: plugins/personal/generic/generic.tpl:584
msgid "Last delivery"
msgstr ""
#: plugins/personal/generic/class_user.inc:1361
-#: plugins/personal/generic/generic.tpl:529
+#: plugins/personal/generic/generic.tpl:506
msgid "Person locality"
msgstr ""
#: plugins/personal/generic/class_user.inc:1362
-#: plugins/personal/generic/generic.tpl:488
+#: plugins/personal/generic/generic.tpl:465
msgid "Unit description"
msgstr ""
#: plugins/personal/generic/class_user.inc:1363
-#: plugins/personal/generic/generic.tpl:497
+#: plugins/personal/generic/generic.tpl:474
msgid "Subject area"
msgstr ""
#: plugins/personal/generic/class_user.inc:1364
-#: plugins/personal/generic/generic.tpl:506
+#: plugins/personal/generic/generic.tpl:483
msgid "Functional title"
msgstr ""
#: plugins/personal/generic/class_user.inc:1365
-#: plugins/personal/generic/generic.tpl:616
+#: plugins/personal/generic/generic.tpl:593
msgid "Public visible"
msgstr ""
#: plugins/personal/generic/class_user.inc:1366
-#: plugins/personal/generic/generic.tpl:547
+#: plugins/personal/generic/generic.tpl:524
msgid "Street"
msgstr ""
#: plugins/personal/generic/class_user.inc:1368
-#: plugins/personal/generic/generic.tpl:555
+#: plugins/personal/generic/generic.tpl:532
msgid "Postal code"
msgstr ""
@@ -6171,7 +6156,7 @@ msgid "Employee number"
msgstr ""
#: plugins/personal/generic/class_user.inc:1401
-#: plugins/personal/generic/generic.tpl:332
+#: plugins/personal/generic/generic.tpl:309
msgid "Employee type"
msgstr ""
@@ -6252,29 +6237,28 @@ msgstr ""
msgid "Restrict login to"
msgstr ""
-#: plugins/personal/generic/generic.tpl:248
-#: plugins/personal/generic/generic.tpl:267
+#: plugins/personal/generic/generic.tpl:246
msgid "IP or network"
msgstr ""
-#: plugins/personal/generic/generic.tpl:288
+#: plugins/personal/generic/generic.tpl:265
msgid "Organizational information"
msgstr ""
-#: plugins/personal/generic/generic.tpl:316
+#: plugins/personal/generic/generic.tpl:293
msgid "Department No."
msgstr ""
-#: plugins/personal/generic/generic.tpl:324
+#: plugins/personal/generic/generic.tpl:301
msgid "Employee No."
msgstr ""
-#: plugins/personal/generic/generic.tpl:390
-#: plugins/personal/generic/generic.tpl:578
+#: plugins/personal/generic/generic.tpl:367
+#: plugins/personal/generic/generic.tpl:555
msgid "Room No."
msgstr ""
-#: plugins/personal/generic/generic.tpl:592
+#: plugins/personal/generic/generic.tpl:569
msgid "Please use the phone tab"
msgstr ""
diff --git a/locale/vi/messages.po b/locale/vi/fusiondirectory.po
similarity index 95%
rename from locale/vi/messages.po
rename to locale/vi/fusiondirectory.po
index ad4da5f6e721ba05408332aae3a12cf377567303..d9c69bde356111a3452a176d591a8bc826eb9f3e 100644
--- a/locale/vi/messages.po
+++ b/locale/vi/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-24 14:48+0100\n"
-"PO-Revision-Date: 2013-03-06 21:40+0000\n"
+"POT-Creation-Date: 2013-04-14 20:13+0200\n"
+"PO-Revision-Date: 2013-03-24 15:00+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: vi\n"
@@ -18,39 +18,39 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: html/main.php:140 html/class_passwordRecovery.inc:226
+#: html/main.php:135 html/class_passwordRecovery.inc:226
#: include/class_xml.inc:60 include/functions.inc:509
#: plugins/admin/departments/class_department.inc:431
msgid "Fatal error"
msgstr "Lỗi nặng"
-#: html/main.php:141
+#: html/main.php:136
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr "Không thể xác định vị trà file '%s'- xin hãy chạy '%s' để sá»a lá»—i nà y!"
-#: html/main.php:162
+#: html/main.php:157
msgid "PHP configuration"
msgstr "Cấu hình PHP"
-#: html/main.php:163
+#: html/main.php:158
msgid ""
"Fatal error: Register globals is on. FusionDirectory will refuse to login "
"unless this is fixed by an administrator."
msgstr ""
-#: html/main.php:192 ihtml/themes/default/password.tpl:40
-#: plugins/admin/users/class_userManagement.inc:393
+#: html/main.php:187 ihtml/themes/default/password.tpl:40
+#: plugins/admin/users/class_userManagement.inc:390
#: plugins/personal/password/class_password.inc:156
#: plugins/personal/password/class_password.inc:162
msgid "Password change"
msgstr "Thay đổi máºt khẩu"
-#: html/main.php:192
+#: html/main.php:187
msgid "Your password is about to expire, please change your password!"
msgstr "Máºt khẩu của bạn chuẩn bị hết hạn, xin hãy thay đối máºt khẩu của bạn!"
-#: html/main.php:261 html/class_passwordRecovery.inc:301 html/index.php:147
+#: html/main.php:256 html/class_passwordRecovery.inc:296 html/index.php:147
#: html/index.php:208 include/class_SnapshotHandler.inc:57
#: include/class_SnapshotHandler.inc:70 include/class_SnapshotHandler.inc:88
#: include/class_pluglist.inc:272 include/functions.inc:933
@@ -64,30 +64,30 @@ msgstr "Máºt khẩu của bạn chuẩn bị hết hạn, xin hãy thay đối
msgid "Configuration error"
msgstr "Lỗi cấu hình"
-#: html/main.php:261
+#: html/main.php:256
msgid "Running out of memory!"
msgstr "Hết dung lượng bộ nhớ!"
-#: html/main.php:316
+#: html/main.php:311
msgid "User ACL checks disabled"
msgstr "Vô hiệu việc kiểm tra ACL của ngÆ°á»i dùng"
-#: html/main.php:362
+#: html/main.php:357
msgid "Plugin"
msgstr "Plugin"
-#: html/main.php:363
+#: html/main.php:358
#, php-format
msgid ""
"Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not "
"a file)!"
msgstr ""
-#: html/main.php:378
+#: html/main.php:373
msgid "Configuration Error"
msgstr ""
-#: html/main.php:379
+#: html/main.php:374
#, php-format
msgid ""
"Fatal error: not all POST variables have been transfered by PHP - please "
@@ -103,19 +103,19 @@ msgstr "PhÆ°Æ¡ng pháp láºp máºt khẩu"
msgid "Error: Password method not available!"
msgstr "Lá»—i: PhÆ°Æ¡ng pháp máºt khẩu không có!"
-#: html/class_passwordRecovery.inc:227 html/index.php:147
+#: html/class_passwordRecovery.inc:227
#, php-format
msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
msgstr ""
-#: html/class_passwordRecovery.inc:302 html/setup.php:63 html/index.php:163
+#: html/class_passwordRecovery.inc:297 html/setup.php:63 html/index.php:163
#, php-format
msgid "Directory '%s' specified as compile directory is not accessible!"
msgstr ""
"Không thể truy cáºp và o thÆ° mục '%s' được xác định là thÆ° mục soạn thảo!"
-#: html/class_passwordRecovery.inc:407
-#: plugins/admin/users/class_userManagement.inc:309
+#: html/class_passwordRecovery.inc:402
+#: plugins/admin/users/class_userManagement.inc:306
#: plugins/personal/password/class_password.inc:113
msgid ""
"The passwords you've entered as 'New password' and 'Repeated new password' "
@@ -124,13 +124,13 @@ msgstr ""
"Các máºt khẩu bạn vừa nháºp và o: \"Máºt khẩu má»›i\" và \"Máºt khẩu lặp lại\" "
"không giống nhau."
-#: html/class_passwordRecovery.inc:409 ihtml/themes/default/password.tpl:81
+#: html/class_passwordRecovery.inc:404 ihtml/themes/default/password.tpl:81
#: ihtml/themes/default/password.tpl:82
#: ihtml/themes/default/accountexpired.tpl:32
#: ihtml/themes/default/accountexpired.tpl:36
#: ihtml/themes/default/recovery.tpl:93 ihtml/themes/default/recovery.tpl:94
#: plugins/admin/users/password.tpl:17 plugins/admin/users/password.tpl:60
-#: plugins/admin/users/class_userManagement.inc:312
+#: plugins/admin/users/class_userManagement.inc:309
#: plugins/personal/password/password.tpl:27
#: plugins/personal/password/password.tpl:78
#: plugins/personal/generic/password.tpl:22
@@ -138,16 +138,16 @@ msgstr ""
msgid "New password"
msgstr "Máºt khẩu má»›i"
-#: html/class_passwordRecovery.inc:411
+#: html/class_passwordRecovery.inc:406
msgid "The password used as new is too short."
msgstr ""
-#: html/class_passwordRecovery.inc:413
+#: html/class_passwordRecovery.inc:408
#: plugins/personal/password/class_password.inc:121
msgid "The password contains possibly problematic Unicode characters!"
msgstr ""
-#: html/class_passwordRecovery.inc:437 html/index.php:58 html/index.php:64
+#: html/class_passwordRecovery.inc:432 html/index.php:58 html/index.php:64
#: html/index.php:403 ihtml/themes/default/conflict.tpl:6
#: ihtml/themes/default/islocked.tpl:6 ihtml/themes/default/remove.tpl:2
#: ihtml/themes/default/msg_dialog.tpl:59
@@ -170,39 +170,39 @@ msgstr ""
msgid "Warning"
msgstr "Cảnh báo"
-#: html/class_passwordRecovery.inc:438
+#: html/class_passwordRecovery.inc:433
msgid "Session will not be encrypted."
msgstr "Phiên sẽ không được mã hóa."
-#: html/class_passwordRecovery.inc:440
+#: html/class_passwordRecovery.inc:435
msgid "Enter SSL session"
msgstr "Và o phiên SSL"
-#: html/class_passwordRecovery.inc:481
+#: html/class_passwordRecovery.inc:476
#, php-format
msgid "Did not found account %s"
msgstr ""
-#: html/class_passwordRecovery.inc:484
+#: html/class_passwordRecovery.inc:479
#, php-format
msgid "Found multiple accounts %s"
msgstr ""
-#: html/class_passwordRecovery.inc:498 ihtml/themes/default/recovery.tpl:142
+#: html/class_passwordRecovery.inc:493 ihtml/themes/default/recovery.tpl:142
msgid "Adresse mail"
msgstr ""
-#: html/class_passwordRecovery.inc:515
+#: html/class_passwordRecovery.inc:510
#, php-format
msgid "There is no account using email %s"
msgstr ""
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:513
#, php-format
msgid "There are several accounts using email %s"
msgstr ""
-#: html/class_passwordRecovery.inc:543 html/index.php:257 html/index.php:269
+#: html/class_passwordRecovery.inc:538 html/index.php:257 html/index.php:269
#: html/index.php:282 setup/class_setupStep_Migrate.inc:1138
#: setup/class_setupStep_Migrate.inc:1164
#: setup/class_setupStep_Migrate.inc:1213
@@ -214,20 +214,17 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:2549
#: setup/class_setupStep_Migrate.inc:2896
#: setup/class_setupStep_Migrate.inc:2910
-#: include/class_SnapshotHandler.inc:150 include/class_SnapshotHandler.inc:329
-#: include/class_SnapshotHandler.inc:378 include/class_SnapshotHandler.inc:382
-#: include/class_SnapshotHandler.inc:402 include/class_SnapshotHandler.inc:445
-#: include/class_SnapshotHandler.inc:508 include/class_SnapshotHandler.inc:577
-#: include/class_SnapshotHandler.inc:592 include/functions.inc:547
+#: include/class_SnapshotHandler.inc:150 include/class_SnapshotHandler.inc:335
+#: include/class_SnapshotHandler.inc:388 include/class_SnapshotHandler.inc:392
+#: include/class_SnapshotHandler.inc:412 include/class_SnapshotHandler.inc:455
+#: include/class_SnapshotHandler.inc:518 include/class_SnapshotHandler.inc:587
+#: include/class_SnapshotHandler.inc:602 include/functions.inc:547
#: include/functions.inc:583 include/functions.inc:591
#: include/functions.inc:639 include/functions.inc:948
#: include/functions.inc:998 include/functions.inc:1058
#: include/functions.inc:1113 include/functions.inc:3244
-#: include/functions.inc:3509 include/class_config.inc:330
-#: include/class_plugin.inc:1500 include/class_plugin.inc:1550
-#: include/class_plugin.inc:1554 include/class_plugin.inc:1574
-#: include/class_plugin.inc:1621 include/class_plugin.inc:1681
-#: include/class_plugin.inc:1751 include/class_plugin.inc:1766
+#: include/functions.inc:3514 include/class_SnapShotDialog.inc:104
+#: include/class_SnapShotDialog.inc:177 include/class_config.inc:330
#: include/class_acl.inc:1308 include/class_acl.inc:1413
#: include/class_ldap.inc:934 include/class_ldap.inc:1421
#: plugins/admin/acl/class_aclRole.inc:613
@@ -246,19 +243,19 @@ msgstr ""
msgid "LDAP error"
msgstr "Lá»—i LDAP"
-#: html/class_passwordRecovery.inc:566
+#: html/class_passwordRecovery.inc:561
msgid "Contact your administrator, there was a problem with mail server"
msgstr ""
-#: html/class_passwordRecovery.inc:577
+#: html/class_passwordRecovery.inc:572
msgid "This token is invalid"
msgstr ""
-#: html/class_passwordRecovery.inc:615
+#: html/class_passwordRecovery.inc:610
msgid "External password changer reported a problem: "
msgstr "Bá»™ thay đổi máºt khẩu bên ngoà i báo cáo má»™t vấn Ä‘á»: "
-#: html/class_passwordRecovery.inc:640
+#: html/class_passwordRecovery.inc:635
msgid "There was a problem with mail server, confirmation email not sent"
msgstr ""
@@ -278,6 +275,13 @@ msgstr ""
"Thá»i gian hạn định của phiên được cấu hình trong file fusiondirectory.conf "
"của bạn sẽ được ghi đè lên bởi các thiết láºp php.ini."
+#: html/index.php:147
+#, php-format
+msgid ""
+"FusionDirectory configuration %s/%s is not readable. Please run "
+"fusiondirectory-setup --check-config to fix this."
+msgstr ""
+
#: html/index.php:163
msgid "Smarty error"
msgstr "Lá»—i Smarty"
@@ -292,22 +296,22 @@ msgstr "Có vấn đỠvới việc cà i đặt chức năng xác định th
#: setup/setup_checks.tpl:91 setup/class_setupStep_Migrate.inc:1127
#: include/class_xml.inc:57 include/class_tabs.inc:74
#: include/class_management.inc:507 include/class_management.inc:657
-#: include/functions.inc:3613 include/functions.inc:3633
-#: include/functions.inc:3663 include/functions.inc:3671
-#: include/functions.inc:3683 include/functions.inc:3687
-#: include/functions.inc:3702 include/functions.inc:3711
-#: include/functions.inc:3779 include/class_listing.inc:522
+#: include/functions.inc:3618 include/functions.inc:3638
+#: include/functions.inc:3668 include/functions.inc:3676
+#: include/functions.inc:3688 include/functions.inc:3692
+#: include/functions.inc:3707 include/functions.inc:3716
+#: include/functions.inc:3784 include/class_listing.inc:521
#: include/class_config.inc:483 include/class_CopyPasteHandler.inc:264
#: include/password-methods/class_password-methods-sasl.inc:51
#: include/password-methods/class_password-methods-sasl.inc:63
#: include/password-methods/class_password-methods.inc:342
#: include/password-methods/class_password-methods.inc:447
#: include/password-methods/class_password-methods.inc:458
-#: include/class_plugin.inc:1368 include/class_plugin.inc:1843
-#: include/class_msg_dialog.inc:128 include/class_msgPool.inc:215
-#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:680 include/class_msgPool.inc:711
-#: include/class_msgPool.inc:738 include/class_databaseManagement.inc:78
+#: include/class_plugin.inc:1367 include/class_msg_dialog.inc:128
+#: include/class_msgPool.inc:215 include/class_msgPool.inc:235
+#: include/class_msgPool.inc:265 include/class_msgPool.inc:680
+#: include/class_msgPool.inc:711 include/class_msgPool.inc:738
+#: include/class_databaseManagement.inc:78
#: plugins/admin/acl/class_aclRole.inc:681
#: plugins/admin/groups/class_group.inc:521
#: plugins/admin/groups/class_group.inc:527
@@ -1016,32 +1020,29 @@ msgid ""
"databases."
msgstr ""
-#: setup/class_setupStep_Checks.inc:136
-msgid "MDB2 mysql"
-msgstr ""
-
-#: setup/class_setupStep_Checks.inc:137
+#: setup/class_setupStep_Checks.inc:134
msgid ""
-"FusionDirectory requires this module to communicate with mysql databases."
+"If you do not want to install MDB2 and won't use databases, remove the "
+"class_databaseManagement.inc file."
msgstr ""
-#: setup/class_setupStep_Checks.inc:143
+#: setup/class_setupStep_Checks.inc:138
msgid "imagick"
msgstr ""
-#: setup/class_setupStep_Checks.inc:144
+#: setup/class_setupStep_Checks.inc:139
msgid "FusionDirectory requires this extension to handle images."
msgstr ""
-#: setup/class_setupStep_Checks.inc:159
+#: setup/class_setupStep_Checks.inc:154
msgid "compression module"
msgstr ""
-#: setup/class_setupStep_Checks.inc:160
+#: setup/class_setupStep_Checks.inc:155
msgid "FusionDirectory requires this extension to handle snapshots."
msgstr ""
-#: setup/class_setupStep_Checks.inc:171
+#: setup/class_setupStep_Checks.inc:166
msgid ""
"register_globals is a PHP mechanism to register all global variables to be "
"accessible from scripts without changing the scope. This may be a security "
@@ -1051,18 +1052,18 @@ msgstr ""
"các biến số toà n cầu mà có thể truy cáºp từ các táºp lệnh mà không phải thay "
"đổi phạm vi. Äây có thể là má»™t rủi ro vá» bảo máºt."
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStep_Checks.inc:167
msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
msgstr ""
"Tìm kiếm 'register_globals' trong thư mục php.ini của bạn và chuyển nó thà nh "
"'Off'."
-#: setup/class_setupStep_Checks.inc:180
+#: setup/class_setupStep_Checks.inc:175
msgid "PHP uses this value for the garbage collector to delete old sessions."
msgstr ""
"PHP sá» dụng giá trị nà y để phần má»m thu dá»n rác có thể sóa các phiên cÅ© Ä‘i."
-#: setup/class_setupStep_Checks.inc:181
+#: setup/class_setupStep_Checks.inc:176
msgid ""
"Setting this value to one day will prevent loosing session and cookies "
"before they really timeout."
@@ -1070,7 +1071,7 @@ msgstr ""
"Thiết láºp giá trị nà y đến má»™t ngà y sẽ ngăn cản việc mất Ä‘i các phiên và "
"cookies trước khi chúng thực sự hết hạn."
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStep_Checks.inc:177
msgid ""
"Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
"higher."
@@ -1078,35 +1079,35 @@ msgstr ""
"Tìm kiếm 'session.gc_maxlifetime' trong thư mục php.ini của bạn và thiết "
"láºp nó đển 86400 hoặc cao hÆ¡n."
-#: setup/class_setupStep_Checks.inc:189 setup/class_setupStep_Checks.inc:205
-#: setup/class_setupStep_Checks.inc:221 setup/class_setupStep_Checks.inc:229
+#: setup/class_setupStep_Checks.inc:184 setup/class_setupStep_Checks.inc:200
+#: setup/class_setupStep_Checks.inc:216 setup/class_setupStep_Checks.inc:224
msgid "Off"
msgstr "Tắt"
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStep_Checks.inc:185
msgid ""
"In Order to use FusionDirectory without any trouble, the session.auto_start "
"option in your php.ini should be set to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStep_Checks.inc:186
msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
msgstr ""
"Tìm kiếm 'session.auto_start' trong thư mục php.ini của bạn và đặt nó thà nh "
"'Off'."
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStep_Checks.inc:193
msgid ""
"FusionDirectory needs at least 128MB of memory. Setting it below this limit "
"may cause errors that are not reproducable! Increase it for larger setups."
msgstr ""
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStep_Checks.inc:194
msgid ""
"Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
msgstr ""
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStep_Checks.inc:201
msgid ""
"This option influences the PHP output handling. Turn this Option off, to "
"increase performance."
@@ -1114,24 +1115,24 @@ msgstr ""
"Lá»±a chá»n nà y sẽ ảnh hưởng tá»›i việc sá» lý đầu và o PHP. Tắt chức năng nà y Ä‘i, "
"để tăng khả năng hoạt động."
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStep_Checks.inc:202
msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
msgstr ""
"Tìm kiếm 'implicit_flush' trong thư mục php.ini của bạn và chuyển nó sang "
"'Off'."
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStep_Checks.inc:209
msgid "The Execution time should be at least 30 seconds."
msgstr "Thá»i gian chạy Ãt nhất là 30 giây."
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStep_Checks.inc:210
msgid ""
"Search for 'max_execution_time' in your php.ini and set it to '30' or higher."
msgstr ""
"Tìm kiếm 'max_execution_time' trong thÆ° mục php.ini của bạn và thiết láºp nó "
"đến '30' hoặc cao hơn."
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStep_Checks.inc:217
msgid ""
"Increase the server security by setting expose_php to 'off'. PHP won't send "
"any information about the server you are running in this case."
@@ -1140,34 +1141,34 @@ msgstr ""
"sẽ không gá»i bất cứ thông tin nà o vá» server bạn Ä‘ang chạy trong trÆ°á»ng hợp "
"nà y."
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStep_Checks.inc:218
msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
msgstr ""
"Tìm kiếm 'expose_php' trong thư much php.ini của bạn và chuyển nó thà nh "
"'Off'."
-#: setup/class_setupStep_Checks.inc:230
+#: setup/class_setupStep_Checks.inc:225
msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
msgstr ""
"Tăng cÆ°á»ng khả năng hoạt Ä‘á»™ng cho server của bạn bằng việc thiết láºp "
"magic_quotes_gpc thà nh 'off'."
-#: setup/class_setupStep_Checks.inc:231
+#: setup/class_setupStep_Checks.inc:226
msgid ""
"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to 'Off'."
msgstr ""
"Tìm kiếm 'zend.ze1_compatibility_mode' trong thư mục php.ini và chuyển nó "
"thà nh 'Off'."
-#: setup/class_setupStep_Checks.inc:241
+#: setup/class_setupStep_Checks.inc:236
msgid "Configuration writeable"
msgstr "Cấu hình có thể lưu trữ dữ liệu (writable)"
-#: setup/class_setupStep_Checks.inc:242
+#: setup/class_setupStep_Checks.inc:237
msgid "The configuration file can't be written"
msgstr "Không thể viết lên File cấu hình "
-#: setup/class_setupStep_Checks.inc:243
+#: setup/class_setupStep_Checks.inc:238
#, php-format
msgid ""
"FusionDirectory reads its configuration from a file located in (%s/%s). The "
@@ -1720,7 +1721,7 @@ msgstr ""
#: plugins/admin/departments/class_organizationGeneric.inc:115
#: plugins/admin/departments/class_organizationGeneric.inc:118
#: plugins/personal/generic/class_user.inc:1395
-#: plugins/personal/generic/generic.tpl:300
+#: plugins/personal/generic/generic.tpl:277
msgid "Organization"
msgstr "Tổ chức"
@@ -1730,8 +1731,8 @@ msgstr "Tổ chức"
#: plugins/admin/acl/class_aclRole.inc:702
#: plugins/admin/acl/class_aclRole.inc:715
#: plugins/admin/acl/class_aclRole.inc:725
-#: plugins/admin/users/class_userManagement.inc:545
-#: plugins/admin/users/class_userManagement.inc:592
+#: plugins/admin/users/class_userManagement.inc:542
+#: plugins/admin/users/class_userManagement.inc:589
#: plugins/admin/users/user-filter.tpl:26
#: plugins/admin/groups/group-filter.tpl:21
#: plugins/admin/groups/userSelect/user-filter.tpl:17
@@ -1812,7 +1813,7 @@ msgid ""
msgstr ""
#: setup/setup_feedback.tpl:52
-#: plugins/admin/users/class_userManagement.inc:903
+#: plugins/admin/users/class_userManagement.inc:900
#: plugins/admin/groups/class_group.inc:1106
#: plugins/admin/departments/class_department.inc:653
#: plugins/admin/ogroups/class_ogroup.inc:895
@@ -1954,7 +1955,7 @@ msgstr "Chuyển các nhóm đã chá»n và o trong các cây nhóm"
#: setup/setup_migrate.tpl:101 setup/setup_migrate.tpl:153
#: setup/setup_migrate.tpl:320 setup/setup_migrate.tpl:373
#: setup/setup_migrate.tpl:416 setup/setup_migrate.tpl:459
-#: setup/setup_migrate.tpl:503 include/class_listing.inc:352
+#: setup/setup_migrate.tpl:503 include/class_listing.inc:351
msgid "Select all"
msgstr "Chá»n tất"
@@ -2428,7 +2429,7 @@ msgid "Group will be moved from"
msgstr "Nhóm sẽ được chuyển từ"
#: setup/class_setupStep_Migrate.inc:1175
-#: setup/class_setupStep_Migrate.inc:1223 include/class_plugin.inc:2083
+#: setup/class_setupStep_Migrate.inc:1223 include/class_plugin.inc:1675
msgid "to"
msgstr "đến"
@@ -2505,8 +2506,7 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:2647 include/class_msgPool.inc:495
#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:83
#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:138
-#: plugins/personal/generic/generic.tpl:251
-#: plugins/personal/generic/generic.tpl:270
+#: plugins/personal/generic/generic.tpl:249
#, php-format
msgid "Add"
msgstr "Thêm và o"
@@ -2629,28 +2629,25 @@ msgstr ""
#: include/class_management.inc:333 include/class_management.inc:483
#: include/class_management.inc:536 include/class_management.inc:576
#: include/class_management.inc:590 include/class_CopyPasteHandler.inc:223
-#: include/class_plugin.inc:1791 include/class_plugin.inc:1803
-#: include/class_plugin.inc:1818 include/class_plugin.inc:1831
-#: plugins/admin/users/class_userManagement.inc:205
-#: plugins/admin/users/class_userManagement.inc:761
+#: plugins/admin/users/class_userManagement.inc:202
+#: plugins/admin/users/class_userManagement.inc:758
msgid "Permission"
msgstr "Cho phép"
#: include/class_management.inc:403
-#: plugins/admin/acl/class_aclManagement.inc:100
-#: plugins/admin/users/class_userManagement.inc:719
-#: plugins/admin/users/class_userManagement.inc:723
+#: plugins/admin/acl/class_aclManagement.inc:101
+#: plugins/admin/users/class_userManagement.inc:716
+#: plugins/admin/users/class_userManagement.inc:720
msgid "Permission error"
msgstr "Lỗi vỠcấp phép"
-#: include/class_management.inc:483 include/class_plugin.inc:1791
+#: include/class_management.inc:483
#, php-format
msgid "You are not allowed to create a snapshot for %s."
msgstr "Bạn không được phép tạo ra snapshot cho %s."
#: include/class_management.inc:536 include/class_management.inc:576
-#: include/class_management.inc:590 include/class_plugin.inc:1803
-#: include/class_plugin.inc:1818 include/class_plugin.inc:1831
+#: include/class_management.inc:590
#, php-format
msgid "You are not allowed to restore a snapshot for %s."
msgstr "Bạn không được phép phục hồi một snapshot cho %s."
@@ -2875,87 +2872,87 @@ msgstr ""
"Lệnh '%s', được xác định là POSTMODIFY (thay đổi sau) cho chế độ plugin '%s' "
"hình như không tồn tại."
-#: include/functions.inc:3613 include/functions.inc:3633
-#: include/functions.inc:3671 include/functions.inc:3683
-#: include/functions.inc:3687 include/functions.inc:3702
-#: include/functions.inc:3711
+#: include/functions.inc:3618 include/functions.inc:3638
+#: include/functions.inc:3676 include/functions.inc:3688
+#: include/functions.inc:3692 include/functions.inc:3707
+#: include/functions.inc:3716
msgid "Cannot allocate a free ID:"
msgstr ""
-#: include/functions.inc:3613
+#: include/functions.inc:3618
msgid "unknown idAllocation method!"
msgstr ""
-#: include/functions.inc:3633
+#: include/functions.inc:3638
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3663
+#: include/functions.inc:3668
msgid "Cannot create sambaUnixIdPool entry!"
msgstr ""
-#: include/functions.inc:3671
+#: include/functions.inc:3676
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3683 include/functions.inc:3687
+#: include/functions.inc:3688 include/functions.inc:3692
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3711
+#: include/functions.inc:3716
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3779
+#: include/functions.inc:3784
msgid "Cannot allocate a free ID!"
msgstr "Không thể phân phối má»™t ID miá»…n phÃ!"
-#: include/class_listing.inc:291 include/class_listing.inc:1099
-#: include/class_listing.inc:1101 include/class_sortableListing.inc:343
+#: include/class_listing.inc:290 include/class_listing.inc:1105
+#: include/class_listing.inc:1107 include/class_sortableListing.inc:343
#: include/class_acl.inc:504 plugins/admin/acl/class_aclRole.inc:372
msgid "Up"
msgstr "Lên"
-#: include/class_listing.inc:291 include/class_sortableListing.inc:343
+#: include/class_listing.inc:290 include/class_sortableListing.inc:343
#: include/class_acl.inc:506 plugins/admin/acl/class_aclRole.inc:374
msgid "Down"
msgstr "Xuống"
-#: include/class_listing.inc:564
+#: include/class_listing.inc:563
msgid "created by"
msgstr ""
-#: include/class_listing.inc:1091
+#: include/class_listing.inc:1097
msgid "Go to root department"
msgstr "Äi đến bá»™ pháºn gốc"
-#: include/class_listing.inc:1091 include/class_listing.inc:1093
+#: include/class_listing.inc:1097 include/class_listing.inc:1099
#: include/class_baseSelector.inc:205
msgid "Root"
msgstr "Gốc"
-#: include/class_listing.inc:1099
+#: include/class_listing.inc:1105
msgid "Go up one department"
msgstr "Äi lên má»™t bá»™ pháºn"
-#: include/class_listing.inc:1107
+#: include/class_listing.inc:1113
msgid "Go to users department"
msgstr "Äi đến bá»™ pháºn ngÆ°á»i dùng"
-#: include/class_listing.inc:1107 include/class_listing.inc:1109
+#: include/class_listing.inc:1113 include/class_listing.inc:1115
msgid "Home"
msgstr "Nhà "
-#: include/class_listing.inc:1114
+#: include/class_listing.inc:1120
msgid "Reload list"
msgstr "Danh sách reload"
-#: include/class_listing.inc:1114 include/class_baseSelector.inc:252
+#: include/class_listing.inc:1120 include/class_baseSelector.inc:252
msgid "Submit"
msgstr "Ná»™p"
-#: include/class_listing.inc:1211 plugins/admin/acl/acl-list.xml:65
+#: include/class_listing.inc:1217 plugins/admin/acl/acl-list.xml:65
#: plugins/admin/users/user-list.xml:78 plugins/admin/groups/group-list.xml:79
#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:64
#: plugins/admin/departments/dep-list.xml:87
@@ -2963,65 +2960,62 @@ msgstr "Ná»™p"
msgid "Actions"
msgstr "Các thao tác"
-#: include/class_listing.inc:1495 include/class_listing.inc:1545
-#: include/class_plugin.inc:2228
+#: include/class_listing.inc:1501 include/class_listing.inc:1551
msgid "Copy"
msgstr "Copy"
-#: include/class_listing.inc:1501 include/class_listing.inc:1535
-#: include/class_plugin.inc:2232
+#: include/class_listing.inc:1507 include/class_listing.inc:1541
msgid "Cut"
msgstr "Cut"
-#: include/class_listing.inc:1509 include/class_listing.inc:1511
-#: include/class_CopyPasteHandler.inc:400 include/class_plugin.inc:2239
-#: include/class_plugin.inc:2242
+#: include/class_listing.inc:1515 include/class_listing.inc:1517
+#: include/class_CopyPasteHandler.inc:400
msgid "Paste"
msgstr "Paste"
-#: include/class_listing.inc:1535 include/class_plugin.inc:2186
+#: include/class_listing.inc:1541
msgid "Cut this entry"
msgstr "Cắt entry nà y"
-#: include/class_listing.inc:1545 include/class_plugin.inc:2194
+#: include/class_listing.inc:1551
msgid "Copy this entry"
msgstr "Copy entry nà y"
-#: include/class_listing.inc:1577 include/class_listing.inc:1579
+#: include/class_listing.inc:1583 include/class_listing.inc:1585
msgid "Restore snapshots"
msgstr ""
-#: include/class_listing.inc:1593
+#: include/class_listing.inc:1599
msgid "Export list"
msgstr ""
-#: include/class_listing.inc:1628 include/class_listing.inc:1629
-#: include/class_SnapShotDialog.inc:153 include/class_plugin.inc:2160
+#: include/class_listing.inc:1634 include/class_listing.inc:1635
+#: include/class_SnapShotDialog.inc:298
msgid "Restore snapshot"
msgstr "Phục hồi lại snapshot"
-#: include/class_listing.inc:1638 include/class_plugin.inc:2167
+#: include/class_listing.inc:1644
msgid "Create snapshot"
msgstr "Tạo ra snapshot"
-#: include/class_listing.inc:1639 include/class_plugin.inc:2168
+#: include/class_listing.inc:1645
msgid "Create a new snapshot from this object"
msgstr "Tạo ra một snapshot mới từ đối tượng nà y"
-#: include/class_SnapShotDialog.inc:99
+#: include/class_SnapShotDialog.inc:244
#, php-format
msgid "You're about to delete the snapshot '%s'."
msgstr "Bạn chuẩn bị xóa chế độ snapshot '%s'."
-#: include/class_SnapShotDialog.inc:155
+#: include/class_SnapShotDialog.inc:300
msgid "Remove snapshot"
msgstr "Xóa snapshot"
-#: include/class_SnapShotDialog.inc:157 include/class_SnapShotDialog.inc:177
+#: include/class_SnapShotDialog.inc:302 include/class_SnapShotDialog.inc:322
msgid "Y-m-d, H:i:s"
msgstr "Y-m-d, H:i:s (Năm-tháng-ngà y)"
-#: include/class_SnapShotDialog.inc:191 plugins/admin/acl/acl-list.xml:57
+#: include/class_SnapShotDialog.inc:336 plugins/admin/acl/acl-list.xml:57
#: plugins/admin/acl/acl_role.tpl:17 plugins/admin/acl/class_aclRole.inc:704
#: plugins/admin/groups/class_group.inc:1114
#: plugins/admin/groups/group-list.xml:66 plugins/admin/groups/generic.tpl:24
@@ -3097,32 +3091,20 @@ msgid "Cannot find a suitable password method for the current hash!"
msgstr ""
"Không thể tìm thấy má»™t phÆ°Æ¡ng pháp máºt khẩu phù hợp cho hà m băm hiện tại!"
-#: include/class_plugin.inc:563
+#: include/class_plugin.inc:562
msgid ""
"The object has changed since opened in FusionDirectory. All changes that may "
"be done by others get lost if you save this entry!"
msgstr ""
-#: include/class_plugin.inc:2082
+#: include/class_plugin.inc:1674
msgid "Changing ACL dn"
msgstr "Thay đổi ACL dn"
-#: include/class_plugin.inc:2082
+#: include/class_plugin.inc:1674
msgid "from"
msgstr "Từ"
-#: include/class_plugin.inc:2136 include/class_plugin.inc:2138
-msgid "Restore"
-msgstr "Phục hồi"
-
-#: include/class_plugin.inc:2186
-msgid "cut"
-msgstr "cắt"
-
-#: include/class_plugin.inc:2194
-msgid "copy"
-msgstr "Copy"
-
#: include/class_sortableListing.inc:303
msgid "Sortable list"
msgstr ""
@@ -4010,15 +3992,14 @@ msgstr ""
msgid "List of acls"
msgstr "Danh sách các ads"
-#: plugins/admin/acl/acl-list.xml:15
+#: plugins/admin/acl/acl-list.xml:15 plugins/admin/acl/acl-list.xml:82
#: plugins/admin/acl/class_aclManagement.inc:36
msgid "Acl"
msgstr ""
-#: plugins/admin/acl/acl-list.xml:23 plugins/admin/acl/acl-list.xml:82
-#: plugins/admin/acl/class_aclRole.inc:695
+#: plugins/admin/acl/acl-list.xml:23 plugins/admin/acl/class_aclRole.inc:695
#: plugins/personal/generic/class_user.inc:1367
-#: plugins/personal/generic/generic.tpl:515
+#: plugins/personal/generic/generic.tpl:492
msgid "Role"
msgstr "Vai trò"
@@ -4058,7 +4039,7 @@ msgstr ""
msgid "Access control list management"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:160
+#: plugins/admin/acl/class_aclManagement.inc:161
msgid "ACL Assignment"
msgstr ""
@@ -4188,7 +4169,7 @@ msgstr ""
"các mẫu."
#: plugins/admin/users/template.tpl:15
-#: plugins/admin/users/class_userManagement.inc:542
+#: plugins/admin/users/class_userManagement.inc:539
#: plugins/admin/users/templatize.tpl:15 plugins/admin/users/user-list.xml:15
#: plugins/admin/users/user-list.xml:102
msgid "Template"
@@ -4223,23 +4204,23 @@ msgstr "Äăng nháºp"
msgid "Manage users"
msgstr "Quản lý ngÆ°á»i dùng"
-#: plugins/admin/users/class_userManagement.inc:344
+#: plugins/admin/users/class_userManagement.inc:341
#: plugins/personal/password/class_password.inc:136
#, php-format
msgid "Check-hook reported a problem: %s. Password change canceled!"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:394
+#: plugins/admin/users/class_userManagement.inc:391
msgid "You have no permission to change this users password!"
msgstr "Bạn không được phép thay đổi máºt mã ngÆ°á»i dùng nà y!"
-#: plugins/admin/users/class_userManagement.inc:470
-#: plugins/admin/users/class_userManagement.inc:504
-#: plugins/admin/users/class_userManagement.inc:535
+#: plugins/admin/users/class_userManagement.inc:467
+#: plugins/admin/users/class_userManagement.inc:501
+#: plugins/admin/users/class_userManagement.inc:532
msgid "none"
msgstr "không có"
-#: plugins/admin/users/class_userManagement.inc:548
+#: plugins/admin/users/class_userManagement.inc:545
#: plugins/admin/users/user-list.xml:57
#: plugins/admin/groups/userSelect/user-list.xml:40
#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
@@ -4249,26 +4230,26 @@ msgstr "không có"
msgid "Given name"
msgstr "Tên tháºt"
-#: plugins/admin/users/class_userManagement.inc:799
+#: plugins/admin/users/class_userManagement.inc:796
msgid "Account locking"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:800
+#: plugins/admin/users/class_userManagement.inc:797
#, php-format
msgid ""
"Password method '%s' does not support locking. Account (%s) has not been "
"locked!"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:873
+#: plugins/admin/users/class_userManagement.inc:870
msgid "Unlock account"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:875
+#: plugins/admin/users/class_userManagement.inc:872
msgid "Lock account"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:903
+#: plugins/admin/users/class_userManagement.inc:900
#, fuzzy
msgid "Generic properties"
msgstr "Hiệu chỉnh các tÃnh năng chung"
@@ -4360,8 +4341,9 @@ msgid "Remove user"
msgstr ""
#: plugins/admin/password/class_recoveryConfig.inc:35
-msgid "Password recovery config"
-msgstr ""
+#, fuzzy
+msgid "Password recovery"
+msgstr "Lá»—i máºt mã"
#: plugins/admin/password/class_recoveryConfig.inc:36
msgid "Settings for the password recovery feature"
@@ -4679,7 +4661,6 @@ msgstr "Thiết láºp nhóm chung"
#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:23
#: plugins/admin/ogroups/class_ogroupManagement.inc:187
#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:79
-#: plugins/admin/ogroups/ogroup-list.xml:79
#: plugins/generic/references/class_reference.inc:55
#: plugins/personal/posix/groupSelect/group-list.xml:15
msgid "Group"
@@ -4771,8 +4752,8 @@ msgstr "Hiệu chỉnh các tÃnh năng samba"
#: plugins/generic/references/class_reference.inc:59
#: plugins/personal/posix/trustSelect/class_trustSelect.inc:81
#: plugins/personal/generic/class_user.inc:1180
-#: plugins/personal/generic/generic.tpl:399
-#: plugins/personal/generic/generic.tpl:586
+#: plugins/personal/generic/generic.tpl:376
+#: plugins/personal/generic/generic.tpl:563
msgid "Phone"
msgstr "Số điện thoại"
@@ -4871,7 +4852,7 @@ msgstr ""
#: plugins/admin/departments/generic.tpl:91
#: plugins/admin/departments/class_organizationGeneric.inc:129
#: plugins/personal/generic/class_user.inc:1410
-#: plugins/personal/generic/generic.tpl:448
+#: plugins/personal/generic/generic.tpl:425
msgid "Location"
msgstr "Vị trÃ"
@@ -4888,8 +4869,8 @@ msgstr "Vị trÃ"
#: plugins/admin/departments/generic.tpl:51
#: plugins/admin/departments/class_organizationGeneric.inc:126
#: plugins/personal/generic/class_user.inc:1399
-#: plugins/personal/generic/generic.tpl:341
-#: plugins/personal/generic/generic.tpl:362
+#: plugins/personal/generic/generic.tpl:318
+#: plugins/personal/generic/generic.tpl:339
msgid "Manager"
msgstr ""
@@ -5036,7 +5017,7 @@ msgstr "Các danh mục cho cây con"
#: plugins/admin/departments/generic.tpl:83
#: plugins/admin/departments/class_organizationGeneric.inc:128
#: plugins/personal/generic/class_user.inc:1409
-#: plugins/personal/generic/generic.tpl:456
+#: plugins/personal/generic/generic.tpl:433
msgid "State"
msgstr "Bang"
@@ -5054,7 +5035,7 @@ msgstr "Vị trà của cây con"
#: plugins/admin/departments/class_department.inc:667
#: plugins/admin/departments/generic.tpl:99
#: plugins/personal/generic/generic.tpl:181
-#: plugins/personal/generic/generic.tpl:464
+#: plugins/personal/generic/generic.tpl:441
msgid "Address"
msgstr "Äịa chỉ"
@@ -5074,8 +5055,8 @@ msgstr "Äặt số Ä‘iện thoại của cây con nà y"
#: plugins/admin/departments/generic.tpl:114
#: plugins/admin/departments/class_organizationGeneric.inc:132
#: plugins/personal/generic/class_user.inc:1183
-#: plugins/personal/generic/generic.tpl:430
-#: plugins/personal/generic/generic.tpl:598
+#: plugins/personal/generic/generic.tpl:407
+#: plugins/personal/generic/generic.tpl:575
msgid "Fax"
msgstr "Số fax"
@@ -5126,7 +5107,7 @@ msgstr "Quốc Gia"
#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:15
#: plugins/generic/references/class_reference.inc:57
#: plugins/personal/generic/class_user.inc:1396
-#: plugins/personal/generic/generic.tpl:308
+#: plugins/personal/generic/generic.tpl:285
msgid "Department"
msgstr "Bá»™ pháºn"
@@ -5432,6 +5413,11 @@ msgstr "Các đối tượng thà nh viên"
msgid "List of object groups"
msgstr "Danh sách các nhóm đối tượng"
+#: plugins/admin/ogroups/ogroup-list.xml:79
+#, fuzzy
+msgid "Objectgroup"
+msgstr "Nhóm đối tượng"
+
#: plugins/admin/ogroups/ogroup-list.xml:106
msgid "Send message"
msgstr ""
@@ -5502,9 +5488,14 @@ msgid "Language"
msgstr ""
#: plugins/config/class_configInLdap.inc:82
+#, fuzzy
msgid ""
-"Default language to be used if the one asked by the browser is not available"
+"Language of the application. If 'automatic' or not available, the one asked "
+"by the browser will be used. This setting can be overriden per user."
msgstr ""
+"Tại thá»i Ä‘iểm nà y, bạn có thể lá»±a chá»n trang nà y vá»›i ngôn ngữ mặc định. Nếu "
+"chá»n 'tá»± Ä‘á»™ng', bạn sẽ sá» dụng ngôn ngữ được yêu cẩu bởi trình duyệt nà y. "
+"Việc thiết láºp nà y có bị ghi đè vá»›i má»—i má»™t ngÆ°á»i dùng."
#: plugins/config/class_configInLdap.inc:87
msgid "Theme to be used"
@@ -5519,7 +5510,7 @@ msgid "Schema setup"
msgstr ""
#: plugins/config/class_configInLdap.inc:103
-msgid "rfc237bis"
+msgid "rfc2307bis"
msgstr ""
#: plugins/config/class_configInLdap.inc:104
@@ -6227,12 +6218,12 @@ msgid "Homepage"
msgstr "Trang chủ"
#: plugins/personal/generic/class_user.inc:1186
-#: plugins/personal/generic/generic.tpl:411
+#: plugins/personal/generic/generic.tpl:388
msgid "Mobile"
msgstr "Äiện thoại di Ä‘á»™ng"
#: plugins/personal/generic/class_user.inc:1189
-#: plugins/personal/generic/generic.tpl:422
+#: plugins/personal/generic/generic.tpl:399
msgid "Pager"
msgstr "Máy nhắn tin"
@@ -6243,57 +6234,57 @@ msgid "Date of birth"
msgstr "Ngà y sinh"
#: plugins/personal/generic/class_user.inc:1357
-#: plugins/personal/generic/generic.tpl:538
+#: plugins/personal/generic/generic.tpl:515
msgid "Unit"
msgstr "ÄÆ¡n vị"
#: plugins/personal/generic/class_user.inc:1358
-#: plugins/personal/generic/generic.tpl:563
+#: plugins/personal/generic/generic.tpl:540
msgid "House identifier"
msgstr "Mô tả căn nhà "
#: plugins/personal/generic/class_user.inc:1359
-#: plugins/personal/generic/generic.tpl:480
+#: plugins/personal/generic/generic.tpl:457
msgid "Vocation"
msgstr "NghỠnghiệp"
#: plugins/personal/generic/class_user.inc:1360
-#: plugins/personal/generic/generic.tpl:607
+#: plugins/personal/generic/generic.tpl:584
msgid "Last delivery"
msgstr "Lần cung cấp cuối"
#: plugins/personal/generic/class_user.inc:1361
-#: plugins/personal/generic/generic.tpl:529
+#: plugins/personal/generic/generic.tpl:506
msgid "Person locality"
msgstr "Äịa phÆ°Æ¡ng của ngÆ°á»i dùng"
#: plugins/personal/generic/class_user.inc:1362
-#: plugins/personal/generic/generic.tpl:488
+#: plugins/personal/generic/generic.tpl:465
msgid "Unit description"
msgstr "Mô tả đơn vị "
#: plugins/personal/generic/class_user.inc:1363
-#: plugins/personal/generic/generic.tpl:497
+#: plugins/personal/generic/generic.tpl:474
msgid "Subject area"
msgstr "Lĩnh vực chuyên môn"
#: plugins/personal/generic/class_user.inc:1364
-#: plugins/personal/generic/generic.tpl:506
+#: plugins/personal/generic/generic.tpl:483
msgid "Functional title"
msgstr "Danh xưng chức năng"
#: plugins/personal/generic/class_user.inc:1365
-#: plugins/personal/generic/generic.tpl:616
+#: plugins/personal/generic/generic.tpl:593
msgid "Public visible"
msgstr "Hiển thị vá»›i tất cả má»i ngÆ°á»i"
#: plugins/personal/generic/class_user.inc:1366
-#: plugins/personal/generic/generic.tpl:547
+#: plugins/personal/generic/generic.tpl:524
msgid "Street"
msgstr "Phố"
#: plugins/personal/generic/class_user.inc:1368
-#: plugins/personal/generic/generic.tpl:555
+#: plugins/personal/generic/generic.tpl:532
msgid "Postal code"
msgstr "Mã bưu điện"
@@ -6342,7 +6333,7 @@ msgid "Employee number"
msgstr "Số nhân viên"
#: plugins/personal/generic/class_user.inc:1401
-#: plugins/personal/generic/generic.tpl:332
+#: plugins/personal/generic/generic.tpl:309
msgid "Employee type"
msgstr "Loại nhân viên"
@@ -6423,29 +6414,28 @@ msgstr "Kho lÆ°u máºt khẩu"
msgid "Restrict login to"
msgstr ""
-#: plugins/personal/generic/generic.tpl:248
-#: plugins/personal/generic/generic.tpl:267
+#: plugins/personal/generic/generic.tpl:246
msgid "IP or network"
msgstr ""
-#: plugins/personal/generic/generic.tpl:288
+#: plugins/personal/generic/generic.tpl:265
msgid "Organizational information"
msgstr "Thông tin vỠtổ chức"
-#: plugins/personal/generic/generic.tpl:316
+#: plugins/personal/generic/generic.tpl:293
msgid "Department No."
msgstr "Số phòng ban"
-#: plugins/personal/generic/generic.tpl:324
+#: plugins/personal/generic/generic.tpl:301
msgid "Employee No."
msgstr "Số nhân viên"
-#: plugins/personal/generic/generic.tpl:390
-#: plugins/personal/generic/generic.tpl:578
+#: plugins/personal/generic/generic.tpl:367
+#: plugins/personal/generic/generic.tpl:555
msgid "Room No."
msgstr "Số phòng"
-#: plugins/personal/generic/generic.tpl:592
+#: plugins/personal/generic/generic.tpl:569
msgid "Please use the phone tab"
msgstr "Xin hãy sỠdụng Phone Tab"
@@ -6453,6 +6443,15 @@ msgstr "Xin hãy sỠdụng Phone Tab"
msgid "Your password hash method will not be changed!"
msgstr ""
+#~ msgid "Restore"
+#~ msgstr "Phục hồi"
+
+#~ msgid "cut"
+#~ msgstr "cắt"
+
+#~ msgid "copy"
+#~ msgstr "Copy"
+
#~ msgid "POSIX"
#~ msgstr "POSIX (giao diện hệ Ä‘iá»u hà nh lÆ°u Ä‘á»™ng)"
diff --git a/locale/zh/messages.po b/locale/zh/fusiondirectory.po
similarity index 94%
rename from locale/zh/messages.po
rename to locale/zh/fusiondirectory.po
index 9b940b16fe68b24571869c284dc145f7b0dc1412..a98f2ba9a189d0ee8b6cd5cdd314ab063a1762cb 100644
--- a/locale/zh/messages.po
+++ b/locale/zh/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-24 14:48+0100\n"
-"PO-Revision-Date: 2013-03-06 21:40+0000\n"
+"POT-Creation-Date: 2013-04-14 20:13+0200\n"
+"PO-Revision-Date: 2013-03-24 15:00+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory/"
"language/zh/)\n"
@@ -19,39 +19,39 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: html/main.php:140 html/class_passwordRecovery.inc:226
+#: html/main.php:135 html/class_passwordRecovery.inc:226
#: include/class_xml.inc:60 include/functions.inc:509
#: plugins/admin/departments/class_department.inc:431
msgid "Fatal error"
msgstr ""
-#: html/main.php:141
+#: html/main.php:136
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr ""
-#: html/main.php:162
+#: html/main.php:157
msgid "PHP configuration"
msgstr ""
-#: html/main.php:163
+#: html/main.php:158
msgid ""
"Fatal error: Register globals is on. FusionDirectory will refuse to login "
"unless this is fixed by an administrator."
msgstr ""
-#: html/main.php:192 ihtml/themes/default/password.tpl:40
-#: plugins/admin/users/class_userManagement.inc:393
+#: html/main.php:187 ihtml/themes/default/password.tpl:40
+#: plugins/admin/users/class_userManagement.inc:390
#: plugins/personal/password/class_password.inc:156
#: plugins/personal/password/class_password.inc:162
msgid "Password change"
msgstr ""
-#: html/main.php:192
+#: html/main.php:187
msgid "Your password is about to expire, please change your password!"
msgstr ""
-#: html/main.php:261 html/class_passwordRecovery.inc:301 html/index.php:147
+#: html/main.php:256 html/class_passwordRecovery.inc:296 html/index.php:147
#: html/index.php:208 include/class_SnapshotHandler.inc:57
#: include/class_SnapshotHandler.inc:70 include/class_SnapshotHandler.inc:88
#: include/class_pluglist.inc:272 include/functions.inc:933
@@ -65,30 +65,30 @@ msgstr ""
msgid "Configuration error"
msgstr ""
-#: html/main.php:261
+#: html/main.php:256
msgid "Running out of memory!"
msgstr ""
-#: html/main.php:316
+#: html/main.php:311
msgid "User ACL checks disabled"
msgstr ""
-#: html/main.php:362
+#: html/main.php:357
msgid "Plugin"
msgstr ""
-#: html/main.php:363
+#: html/main.php:358
#, php-format
msgid ""
"Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not "
"a file)!"
msgstr ""
-#: html/main.php:378
+#: html/main.php:373
msgid "Configuration Error"
msgstr ""
-#: html/main.php:379
+#: html/main.php:374
#, php-format
msgid ""
"Fatal error: not all POST variables have been transfered by PHP - please "
@@ -104,31 +104,31 @@ msgstr ""
msgid "Error: Password method not available!"
msgstr ""
-#: html/class_passwordRecovery.inc:227 html/index.php:147
+#: html/class_passwordRecovery.inc:227
#, php-format
msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
msgstr ""
-#: html/class_passwordRecovery.inc:302 html/setup.php:63 html/index.php:163
+#: html/class_passwordRecovery.inc:297 html/setup.php:63 html/index.php:163
#, php-format
msgid "Directory '%s' specified as compile directory is not accessible!"
msgstr "目录 '%s' ä½œä¸ºç¼–è¯‘ç›®å½•æ— æ³•è®¿é—®ï¼"
-#: html/class_passwordRecovery.inc:407
-#: plugins/admin/users/class_userManagement.inc:309
+#: html/class_passwordRecovery.inc:402
+#: plugins/admin/users/class_userManagement.inc:306
#: plugins/personal/password/class_password.inc:113
msgid ""
"The passwords you've entered as 'New password' and 'Repeated new password' "
"do not match."
msgstr "您输入的“新å£ä»¤â€å’Œâ€œé‡å¤æ–°å£ä»¤â€ä¸åŒ¹é…。"
-#: html/class_passwordRecovery.inc:409 ihtml/themes/default/password.tpl:81
+#: html/class_passwordRecovery.inc:404 ihtml/themes/default/password.tpl:81
#: ihtml/themes/default/password.tpl:82
#: ihtml/themes/default/accountexpired.tpl:32
#: ihtml/themes/default/accountexpired.tpl:36
#: ihtml/themes/default/recovery.tpl:93 ihtml/themes/default/recovery.tpl:94
#: plugins/admin/users/password.tpl:17 plugins/admin/users/password.tpl:60
-#: plugins/admin/users/class_userManagement.inc:312
+#: plugins/admin/users/class_userManagement.inc:309
#: plugins/personal/password/password.tpl:27
#: plugins/personal/password/password.tpl:78
#: plugins/personal/generic/password.tpl:22
@@ -136,16 +136,16 @@ msgstr "您输入的“新å£ä»¤â€å’Œâ€œé‡å¤æ–°å£ä»¤â€ä¸åŒ¹é…。"
msgid "New password"
msgstr "æ–°å£ä»¤"
-#: html/class_passwordRecovery.inc:411
+#: html/class_passwordRecovery.inc:406
msgid "The password used as new is too short."
msgstr ""
-#: html/class_passwordRecovery.inc:413
+#: html/class_passwordRecovery.inc:408
#: plugins/personal/password/class_password.inc:121
msgid "The password contains possibly problematic Unicode characters!"
msgstr ""
-#: html/class_passwordRecovery.inc:437 html/index.php:58 html/index.php:64
+#: html/class_passwordRecovery.inc:432 html/index.php:58 html/index.php:64
#: html/index.php:403 ihtml/themes/default/conflict.tpl:6
#: ihtml/themes/default/islocked.tpl:6 ihtml/themes/default/remove.tpl:2
#: ihtml/themes/default/msg_dialog.tpl:59
@@ -168,39 +168,39 @@ msgstr ""
msgid "Warning"
msgstr "è¦å‘Š"
-#: html/class_passwordRecovery.inc:438
+#: html/class_passwordRecovery.inc:433
msgid "Session will not be encrypted."
msgstr "会è¯ä¸ä¼šè¢«åŠ 密。"
-#: html/class_passwordRecovery.inc:440
+#: html/class_passwordRecovery.inc:435
msgid "Enter SSL session"
msgstr "进入 SSL 会è¯"
-#: html/class_passwordRecovery.inc:481
+#: html/class_passwordRecovery.inc:476
#, php-format
msgid "Did not found account %s"
msgstr ""
-#: html/class_passwordRecovery.inc:484
+#: html/class_passwordRecovery.inc:479
#, php-format
msgid "Found multiple accounts %s"
msgstr ""
-#: html/class_passwordRecovery.inc:498 ihtml/themes/default/recovery.tpl:142
+#: html/class_passwordRecovery.inc:493 ihtml/themes/default/recovery.tpl:142
msgid "Adresse mail"
msgstr ""
-#: html/class_passwordRecovery.inc:515
+#: html/class_passwordRecovery.inc:510
#, php-format
msgid "There is no account using email %s"
msgstr ""
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:513
#, php-format
msgid "There are several accounts using email %s"
msgstr ""
-#: html/class_passwordRecovery.inc:543 html/index.php:257 html/index.php:269
+#: html/class_passwordRecovery.inc:538 html/index.php:257 html/index.php:269
#: html/index.php:282 setup/class_setupStep_Migrate.inc:1138
#: setup/class_setupStep_Migrate.inc:1164
#: setup/class_setupStep_Migrate.inc:1213
@@ -212,20 +212,17 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:2549
#: setup/class_setupStep_Migrate.inc:2896
#: setup/class_setupStep_Migrate.inc:2910
-#: include/class_SnapshotHandler.inc:150 include/class_SnapshotHandler.inc:329
-#: include/class_SnapshotHandler.inc:378 include/class_SnapshotHandler.inc:382
-#: include/class_SnapshotHandler.inc:402 include/class_SnapshotHandler.inc:445
-#: include/class_SnapshotHandler.inc:508 include/class_SnapshotHandler.inc:577
-#: include/class_SnapshotHandler.inc:592 include/functions.inc:547
+#: include/class_SnapshotHandler.inc:150 include/class_SnapshotHandler.inc:335
+#: include/class_SnapshotHandler.inc:388 include/class_SnapshotHandler.inc:392
+#: include/class_SnapshotHandler.inc:412 include/class_SnapshotHandler.inc:455
+#: include/class_SnapshotHandler.inc:518 include/class_SnapshotHandler.inc:587
+#: include/class_SnapshotHandler.inc:602 include/functions.inc:547
#: include/functions.inc:583 include/functions.inc:591
#: include/functions.inc:639 include/functions.inc:948
#: include/functions.inc:998 include/functions.inc:1058
#: include/functions.inc:1113 include/functions.inc:3244
-#: include/functions.inc:3509 include/class_config.inc:330
-#: include/class_plugin.inc:1500 include/class_plugin.inc:1550
-#: include/class_plugin.inc:1554 include/class_plugin.inc:1574
-#: include/class_plugin.inc:1621 include/class_plugin.inc:1681
-#: include/class_plugin.inc:1751 include/class_plugin.inc:1766
+#: include/functions.inc:3514 include/class_SnapShotDialog.inc:104
+#: include/class_SnapShotDialog.inc:177 include/class_config.inc:330
#: include/class_acl.inc:1308 include/class_acl.inc:1413
#: include/class_ldap.inc:934 include/class_ldap.inc:1421
#: plugins/admin/acl/class_aclRole.inc:613
@@ -244,19 +241,19 @@ msgstr ""
msgid "LDAP error"
msgstr "LDAP 错误"
-#: html/class_passwordRecovery.inc:566
+#: html/class_passwordRecovery.inc:561
msgid "Contact your administrator, there was a problem with mail server"
msgstr ""
-#: html/class_passwordRecovery.inc:577
+#: html/class_passwordRecovery.inc:572
msgid "This token is invalid"
msgstr ""
-#: html/class_passwordRecovery.inc:615
+#: html/class_passwordRecovery.inc:610
msgid "External password changer reported a problem: "
msgstr "外部å£ä»¤æ›´æ”¹ç¨‹åºæŠ¥å‘Šé”™è¯¯ï¼š"
-#: html/class_passwordRecovery.inc:640
+#: html/class_passwordRecovery.inc:635
msgid "There was a problem with mail server, confirmation email not sent"
msgstr ""
@@ -274,6 +271,13 @@ msgid ""
"overridden by php.ini settings."
msgstr ""
+#: html/index.php:147
+#, php-format
+msgid ""
+"FusionDirectory configuration %s/%s is not readable. Please run "
+"fusiondirectory-setup --check-config to fix this."
+msgstr ""
+
#: html/index.php:163
msgid "Smarty error"
msgstr ""
@@ -288,22 +292,22 @@ msgstr ""
#: setup/setup_checks.tpl:91 setup/class_setupStep_Migrate.inc:1127
#: include/class_xml.inc:57 include/class_tabs.inc:74
#: include/class_management.inc:507 include/class_management.inc:657
-#: include/functions.inc:3613 include/functions.inc:3633
-#: include/functions.inc:3663 include/functions.inc:3671
-#: include/functions.inc:3683 include/functions.inc:3687
-#: include/functions.inc:3702 include/functions.inc:3711
-#: include/functions.inc:3779 include/class_listing.inc:522
+#: include/functions.inc:3618 include/functions.inc:3638
+#: include/functions.inc:3668 include/functions.inc:3676
+#: include/functions.inc:3688 include/functions.inc:3692
+#: include/functions.inc:3707 include/functions.inc:3716
+#: include/functions.inc:3784 include/class_listing.inc:521
#: include/class_config.inc:483 include/class_CopyPasteHandler.inc:264
#: include/password-methods/class_password-methods-sasl.inc:51
#: include/password-methods/class_password-methods-sasl.inc:63
#: include/password-methods/class_password-methods.inc:342
#: include/password-methods/class_password-methods.inc:447
#: include/password-methods/class_password-methods.inc:458
-#: include/class_plugin.inc:1368 include/class_plugin.inc:1843
-#: include/class_msg_dialog.inc:128 include/class_msgPool.inc:215
-#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:680 include/class_msgPool.inc:711
-#: include/class_msgPool.inc:738 include/class_databaseManagement.inc:78
+#: include/class_plugin.inc:1367 include/class_msg_dialog.inc:128
+#: include/class_msgPool.inc:215 include/class_msgPool.inc:235
+#: include/class_msgPool.inc:265 include/class_msgPool.inc:680
+#: include/class_msgPool.inc:711 include/class_msgPool.inc:738
+#: include/class_databaseManagement.inc:78
#: plugins/admin/acl/class_aclRole.inc:681
#: plugins/admin/groups/class_group.inc:521
#: plugins/admin/groups/class_group.inc:527
@@ -972,131 +976,128 @@ msgid ""
"databases."
msgstr ""
-#: setup/class_setupStep_Checks.inc:136
-msgid "MDB2 mysql"
-msgstr ""
-
-#: setup/class_setupStep_Checks.inc:137
+#: setup/class_setupStep_Checks.inc:134
msgid ""
-"FusionDirectory requires this module to communicate with mysql databases."
+"If you do not want to install MDB2 and won't use databases, remove the "
+"class_databaseManagement.inc file."
msgstr ""
-#: setup/class_setupStep_Checks.inc:143
+#: setup/class_setupStep_Checks.inc:138
msgid "imagick"
msgstr ""
-#: setup/class_setupStep_Checks.inc:144
+#: setup/class_setupStep_Checks.inc:139
msgid "FusionDirectory requires this extension to handle images."
msgstr ""
-#: setup/class_setupStep_Checks.inc:159
+#: setup/class_setupStep_Checks.inc:154
msgid "compression module"
msgstr ""
-#: setup/class_setupStep_Checks.inc:160
+#: setup/class_setupStep_Checks.inc:155
msgid "FusionDirectory requires this extension to handle snapshots."
msgstr ""
-#: setup/class_setupStep_Checks.inc:171
+#: setup/class_setupStep_Checks.inc:166
msgid ""
"register_globals is a PHP mechanism to register all global variables to be "
"accessible from scripts without changing the scope. This may be a security "
"risk."
msgstr ""
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStep_Checks.inc:167
msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:180
+#: setup/class_setupStep_Checks.inc:175
msgid "PHP uses this value for the garbage collector to delete old sessions."
msgstr ""
-#: setup/class_setupStep_Checks.inc:181
+#: setup/class_setupStep_Checks.inc:176
msgid ""
"Setting this value to one day will prevent loosing session and cookies "
"before they really timeout."
msgstr ""
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStep_Checks.inc:177
msgid ""
"Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
"higher."
msgstr ""
-#: setup/class_setupStep_Checks.inc:189 setup/class_setupStep_Checks.inc:205
-#: setup/class_setupStep_Checks.inc:221 setup/class_setupStep_Checks.inc:229
+#: setup/class_setupStep_Checks.inc:184 setup/class_setupStep_Checks.inc:200
+#: setup/class_setupStep_Checks.inc:216 setup/class_setupStep_Checks.inc:224
msgid "Off"
msgstr ""
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStep_Checks.inc:185
msgid ""
"In Order to use FusionDirectory without any trouble, the session.auto_start "
"option in your php.ini should be set to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStep_Checks.inc:186
msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStep_Checks.inc:193
msgid ""
"FusionDirectory needs at least 128MB of memory. Setting it below this limit "
"may cause errors that are not reproducable! Increase it for larger setups."
msgstr ""
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStep_Checks.inc:194
msgid ""
"Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
msgstr ""
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStep_Checks.inc:201
msgid ""
"This option influences the PHP output handling. Turn this Option off, to "
"increase performance."
msgstr ""
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStep_Checks.inc:202
msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStep_Checks.inc:209
msgid "The Execution time should be at least 30 seconds."
msgstr ""
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStep_Checks.inc:210
msgid ""
"Search for 'max_execution_time' in your php.ini and set it to '30' or higher."
msgstr ""
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStep_Checks.inc:217
msgid ""
"Increase the server security by setting expose_php to 'off'. PHP won't send "
"any information about the server you are running in this case."
msgstr ""
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStep_Checks.inc:218
msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:230
+#: setup/class_setupStep_Checks.inc:225
msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:231
+#: setup/class_setupStep_Checks.inc:226
msgid ""
"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to 'Off'."
msgstr ""
-#: setup/class_setupStep_Checks.inc:241
+#: setup/class_setupStep_Checks.inc:236
msgid "Configuration writeable"
msgstr ""
-#: setup/class_setupStep_Checks.inc:242
+#: setup/class_setupStep_Checks.inc:237
msgid "The configuration file can't be written"
msgstr ""
-#: setup/class_setupStep_Checks.inc:243
+#: setup/class_setupStep_Checks.inc:238
#, php-format
msgid ""
"FusionDirectory reads its configuration from a file located in (%s/%s). The "
@@ -1644,7 +1645,7 @@ msgstr ""
#: plugins/admin/departments/class_organizationGeneric.inc:115
#: plugins/admin/departments/class_organizationGeneric.inc:118
#: plugins/personal/generic/class_user.inc:1395
-#: plugins/personal/generic/generic.tpl:300
+#: plugins/personal/generic/generic.tpl:277
msgid "Organization"
msgstr "组织/å…¬å¸"
@@ -1654,8 +1655,8 @@ msgstr "组织/å…¬å¸"
#: plugins/admin/acl/class_aclRole.inc:702
#: plugins/admin/acl/class_aclRole.inc:715
#: plugins/admin/acl/class_aclRole.inc:725
-#: plugins/admin/users/class_userManagement.inc:545
-#: plugins/admin/users/class_userManagement.inc:592
+#: plugins/admin/users/class_userManagement.inc:542
+#: plugins/admin/users/class_userManagement.inc:589
#: plugins/admin/users/user-filter.tpl:26
#: plugins/admin/groups/group-filter.tpl:21
#: plugins/admin/groups/userSelect/user-filter.tpl:17
@@ -1736,7 +1737,7 @@ msgid ""
msgstr ""
#: setup/setup_feedback.tpl:52
-#: plugins/admin/users/class_userManagement.inc:903
+#: plugins/admin/users/class_userManagement.inc:900
#: plugins/admin/groups/class_group.inc:1106
#: plugins/admin/departments/class_department.inc:653
#: plugins/admin/ogroups/class_ogroup.inc:895
@@ -1876,7 +1877,7 @@ msgstr ""
#: setup/setup_migrate.tpl:101 setup/setup_migrate.tpl:153
#: setup/setup_migrate.tpl:320 setup/setup_migrate.tpl:373
#: setup/setup_migrate.tpl:416 setup/setup_migrate.tpl:459
-#: setup/setup_migrate.tpl:503 include/class_listing.inc:352
+#: setup/setup_migrate.tpl:503 include/class_listing.inc:351
msgid "Select all"
msgstr ""
@@ -2344,7 +2345,7 @@ msgid "Group will be moved from"
msgstr ""
#: setup/class_setupStep_Migrate.inc:1175
-#: setup/class_setupStep_Migrate.inc:1223 include/class_plugin.inc:2083
+#: setup/class_setupStep_Migrate.inc:1223 include/class_plugin.inc:1675
msgid "to"
msgstr ""
@@ -2419,8 +2420,7 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:2647 include/class_msgPool.inc:495
#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:83
#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:138
-#: plugins/personal/generic/generic.tpl:251
-#: plugins/personal/generic/generic.tpl:270
+#: plugins/personal/generic/generic.tpl:249
#, php-format
msgid "Add"
msgstr "æ·»åŠ "
@@ -2541,28 +2541,25 @@ msgstr ""
#: include/class_management.inc:333 include/class_management.inc:483
#: include/class_management.inc:536 include/class_management.inc:576
#: include/class_management.inc:590 include/class_CopyPasteHandler.inc:223
-#: include/class_plugin.inc:1791 include/class_plugin.inc:1803
-#: include/class_plugin.inc:1818 include/class_plugin.inc:1831
-#: plugins/admin/users/class_userManagement.inc:205
-#: plugins/admin/users/class_userManagement.inc:761
+#: plugins/admin/users/class_userManagement.inc:202
+#: plugins/admin/users/class_userManagement.inc:758
msgid "Permission"
msgstr ""
#: include/class_management.inc:403
-#: plugins/admin/acl/class_aclManagement.inc:100
-#: plugins/admin/users/class_userManagement.inc:719
-#: plugins/admin/users/class_userManagement.inc:723
+#: plugins/admin/acl/class_aclManagement.inc:101
+#: plugins/admin/users/class_userManagement.inc:716
+#: plugins/admin/users/class_userManagement.inc:720
msgid "Permission error"
msgstr ""
-#: include/class_management.inc:483 include/class_plugin.inc:1791
+#: include/class_management.inc:483
#, php-format
msgid "You are not allowed to create a snapshot for %s."
msgstr ""
#: include/class_management.inc:536 include/class_management.inc:576
-#: include/class_management.inc:590 include/class_plugin.inc:1803
-#: include/class_plugin.inc:1818 include/class_plugin.inc:1831
+#: include/class_management.inc:590
#, php-format
msgid "You are not allowed to restore a snapshot for %s."
msgstr ""
@@ -2763,87 +2760,87 @@ msgid ""
"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
msgstr "命令 '%s'，作为æ’件 '%s' çš„ POSTMODIFY 好åƒå¹¶ä¸å˜åœ¨ã€‚"
-#: include/functions.inc:3613 include/functions.inc:3633
-#: include/functions.inc:3671 include/functions.inc:3683
-#: include/functions.inc:3687 include/functions.inc:3702
-#: include/functions.inc:3711
+#: include/functions.inc:3618 include/functions.inc:3638
+#: include/functions.inc:3676 include/functions.inc:3688
+#: include/functions.inc:3692 include/functions.inc:3707
+#: include/functions.inc:3716
msgid "Cannot allocate a free ID:"
msgstr ""
-#: include/functions.inc:3613
+#: include/functions.inc:3618
msgid "unknown idAllocation method!"
msgstr ""
-#: include/functions.inc:3633
+#: include/functions.inc:3638
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3663
+#: include/functions.inc:3668
msgid "Cannot create sambaUnixIdPool entry!"
msgstr ""
-#: include/functions.inc:3671
+#: include/functions.inc:3676
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3683 include/functions.inc:3687
+#: include/functions.inc:3688 include/functions.inc:3692
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3711
+#: include/functions.inc:3716
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3779
+#: include/functions.inc:3784
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/class_listing.inc:291 include/class_listing.inc:1099
-#: include/class_listing.inc:1101 include/class_sortableListing.inc:343
+#: include/class_listing.inc:290 include/class_listing.inc:1105
+#: include/class_listing.inc:1107 include/class_sortableListing.inc:343
#: include/class_acl.inc:504 plugins/admin/acl/class_aclRole.inc:372
msgid "Up"
msgstr "上"
-#: include/class_listing.inc:291 include/class_sortableListing.inc:343
+#: include/class_listing.inc:290 include/class_sortableListing.inc:343
#: include/class_acl.inc:506 plugins/admin/acl/class_aclRole.inc:374
msgid "Down"
msgstr "å…³é—"
-#: include/class_listing.inc:564
+#: include/class_listing.inc:563
msgid "created by"
msgstr ""
-#: include/class_listing.inc:1091
+#: include/class_listing.inc:1097
msgid "Go to root department"
msgstr "è½¬åˆ°æ ¹éƒ¨é—¨"
-#: include/class_listing.inc:1091 include/class_listing.inc:1093
+#: include/class_listing.inc:1097 include/class_listing.inc:1099
#: include/class_baseSelector.inc:205
msgid "Root"
msgstr "æ ¹"
-#: include/class_listing.inc:1099
+#: include/class_listing.inc:1105
msgid "Go up one department"
msgstr "å‘上跳转一个部门"
-#: include/class_listing.inc:1107
+#: include/class_listing.inc:1113
msgid "Go to users department"
msgstr "转到用户部门"
-#: include/class_listing.inc:1107 include/class_listing.inc:1109
+#: include/class_listing.inc:1113 include/class_listing.inc:1115
msgid "Home"
msgstr ""
-#: include/class_listing.inc:1114
+#: include/class_listing.inc:1120
msgid "Reload list"
msgstr "é‡æ–°åŠ 载列表"
-#: include/class_listing.inc:1114 include/class_baseSelector.inc:252
+#: include/class_listing.inc:1120 include/class_baseSelector.inc:252
msgid "Submit"
msgstr "æ交"
-#: include/class_listing.inc:1211 plugins/admin/acl/acl-list.xml:65
+#: include/class_listing.inc:1217 plugins/admin/acl/acl-list.xml:65
#: plugins/admin/users/user-list.xml:78 plugins/admin/groups/group-list.xml:79
#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:64
#: plugins/admin/departments/dep-list.xml:87
@@ -2851,65 +2848,62 @@ msgstr "æ交"
msgid "Actions"
msgstr "动作"
-#: include/class_listing.inc:1495 include/class_listing.inc:1545
-#: include/class_plugin.inc:2228
+#: include/class_listing.inc:1501 include/class_listing.inc:1551
msgid "Copy"
msgstr ""
-#: include/class_listing.inc:1501 include/class_listing.inc:1535
-#: include/class_plugin.inc:2232
+#: include/class_listing.inc:1507 include/class_listing.inc:1541
msgid "Cut"
msgstr ""
-#: include/class_listing.inc:1509 include/class_listing.inc:1511
-#: include/class_CopyPasteHandler.inc:400 include/class_plugin.inc:2239
-#: include/class_plugin.inc:2242
+#: include/class_listing.inc:1515 include/class_listing.inc:1517
+#: include/class_CopyPasteHandler.inc:400
msgid "Paste"
msgstr "粘贴"
-#: include/class_listing.inc:1535 include/class_plugin.inc:2186
+#: include/class_listing.inc:1541
msgid "Cut this entry"
msgstr "剪切æ¡ç›®"
-#: include/class_listing.inc:1545 include/class_plugin.inc:2194
+#: include/class_listing.inc:1551
msgid "Copy this entry"
msgstr "æ‹·è´æ¡ç›®"
-#: include/class_listing.inc:1577 include/class_listing.inc:1579
+#: include/class_listing.inc:1583 include/class_listing.inc:1585
msgid "Restore snapshots"
msgstr ""
-#: include/class_listing.inc:1593
+#: include/class_listing.inc:1599
msgid "Export list"
msgstr ""
-#: include/class_listing.inc:1628 include/class_listing.inc:1629
-#: include/class_SnapShotDialog.inc:153 include/class_plugin.inc:2160
+#: include/class_listing.inc:1634 include/class_listing.inc:1635
+#: include/class_SnapShotDialog.inc:298
msgid "Restore snapshot"
msgstr ""
-#: include/class_listing.inc:1638 include/class_plugin.inc:2167
+#: include/class_listing.inc:1644
msgid "Create snapshot"
msgstr ""
-#: include/class_listing.inc:1639 include/class_plugin.inc:2168
+#: include/class_listing.inc:1645
msgid "Create a new snapshot from this object"
msgstr ""
-#: include/class_SnapShotDialog.inc:99
+#: include/class_SnapShotDialog.inc:244
#, php-format
msgid "You're about to delete the snapshot '%s'."
msgstr ""
-#: include/class_SnapShotDialog.inc:155
+#: include/class_SnapShotDialog.inc:300
msgid "Remove snapshot"
msgstr ""
-#: include/class_SnapShotDialog.inc:157 include/class_SnapShotDialog.inc:177
+#: include/class_SnapShotDialog.inc:302 include/class_SnapShotDialog.inc:322
msgid "Y-m-d, H:i:s"
msgstr ""
-#: include/class_SnapShotDialog.inc:191 plugins/admin/acl/acl-list.xml:57
+#: include/class_SnapShotDialog.inc:336 plugins/admin/acl/acl-list.xml:57
#: plugins/admin/acl/acl_role.tpl:17 plugins/admin/acl/class_aclRole.inc:704
#: plugins/admin/groups/class_group.inc:1114
#: plugins/admin/groups/group-list.xml:66 plugins/admin/groups/generic.tpl:24
@@ -2984,32 +2978,20 @@ msgstr ""
msgid "Cannot find a suitable password method for the current hash!"
msgstr ""
-#: include/class_plugin.inc:563
+#: include/class_plugin.inc:562
msgid ""
"The object has changed since opened in FusionDirectory. All changes that may "
"be done by others get lost if you save this entry!"
msgstr ""
-#: include/class_plugin.inc:2082
+#: include/class_plugin.inc:1674
msgid "Changing ACL dn"
msgstr ""
-#: include/class_plugin.inc:2082
+#: include/class_plugin.inc:1674
msgid "from"
msgstr "从"
-#: include/class_plugin.inc:2136 include/class_plugin.inc:2138
-msgid "Restore"
-msgstr ""
-
-#: include/class_plugin.inc:2186
-msgid "cut"
-msgstr "剪切"
-
-#: include/class_plugin.inc:2194
-msgid "copy"
-msgstr "å¤åˆ¶"
-
#: include/class_sortableListing.inc:303
msgid "Sortable list"
msgstr ""
@@ -3878,15 +3860,14 @@ msgstr ""
msgid "List of acls"
msgstr ""
-#: plugins/admin/acl/acl-list.xml:15
+#: plugins/admin/acl/acl-list.xml:15 plugins/admin/acl/acl-list.xml:82
#: plugins/admin/acl/class_aclManagement.inc:36
msgid "Acl"
msgstr ""
-#: plugins/admin/acl/acl-list.xml:23 plugins/admin/acl/acl-list.xml:82
-#: plugins/admin/acl/class_aclRole.inc:695
+#: plugins/admin/acl/acl-list.xml:23 plugins/admin/acl/class_aclRole.inc:695
#: plugins/personal/generic/class_user.inc:1367
-#: plugins/personal/generic/generic.tpl:515
+#: plugins/personal/generic/generic.tpl:492
msgid "Role"
msgstr "角色"
@@ -3926,7 +3907,7 @@ msgstr ""
msgid "Access control list management"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:160
+#: plugins/admin/acl/class_aclManagement.inc:161
msgid "ACL Assignment"
msgstr ""
@@ -4048,7 +4029,7 @@ msgstr ""
"æ¿é€‰æ‹©ã€‚"
#: plugins/admin/users/template.tpl:15
-#: plugins/admin/users/class_userManagement.inc:542
+#: plugins/admin/users/class_userManagement.inc:539
#: plugins/admin/users/templatize.tpl:15 plugins/admin/users/user-list.xml:15
#: plugins/admin/users/user-list.xml:102
msgid "Template"
@@ -4083,23 +4064,23 @@ msgstr "登录å"
msgid "Manage users"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:344
+#: plugins/admin/users/class_userManagement.inc:341
#: plugins/personal/password/class_password.inc:136
#, php-format
msgid "Check-hook reported a problem: %s. Password change canceled!"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:394
+#: plugins/admin/users/class_userManagement.inc:391
msgid "You have no permission to change this users password!"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:470
-#: plugins/admin/users/class_userManagement.inc:504
-#: plugins/admin/users/class_userManagement.inc:535
+#: plugins/admin/users/class_userManagement.inc:467
+#: plugins/admin/users/class_userManagement.inc:501
+#: plugins/admin/users/class_userManagement.inc:532
msgid "none"
msgstr "æ— "
-#: plugins/admin/users/class_userManagement.inc:548
+#: plugins/admin/users/class_userManagement.inc:545
#: plugins/admin/users/user-list.xml:57
#: plugins/admin/groups/userSelect/user-list.xml:40
#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
@@ -4109,26 +4090,26 @@ msgstr "æ— "
msgid "Given name"
msgstr "å"
-#: plugins/admin/users/class_userManagement.inc:799
+#: plugins/admin/users/class_userManagement.inc:796
msgid "Account locking"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:800
+#: plugins/admin/users/class_userManagement.inc:797
#, php-format
msgid ""
"Password method '%s' does not support locking. Account (%s) has not been "
"locked!"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:873
+#: plugins/admin/users/class_userManagement.inc:870
msgid "Unlock account"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:875
+#: plugins/admin/users/class_userManagement.inc:872
msgid "Lock account"
msgstr ""
-#: plugins/admin/users/class_userManagement.inc:903
+#: plugins/admin/users/class_userManagement.inc:900
#, fuzzy
msgid "Generic properties"
msgstr "编辑通用属性"
@@ -4218,8 +4199,9 @@ msgid "Remove user"
msgstr ""
#: plugins/admin/password/class_recoveryConfig.inc:35
-msgid "Password recovery config"
-msgstr ""
+#, fuzzy
+msgid "Password recovery"
+msgstr "å£ä»¤å˜å‚¨"
#: plugins/admin/password/class_recoveryConfig.inc:36
msgid "Settings for the password recovery feature"
@@ -4534,7 +4516,6 @@ msgstr ""
#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:23
#: plugins/admin/ogroups/class_ogroupManagement.inc:187
#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:79
-#: plugins/admin/ogroups/ogroup-list.xml:79
#: plugins/generic/references/class_reference.inc:55
#: plugins/personal/posix/groupSelect/group-list.xml:15
msgid "Group"
@@ -4626,8 +4607,8 @@ msgstr "编辑 samba 属性"
#: plugins/generic/references/class_reference.inc:59
#: plugins/personal/posix/trustSelect/class_trustSelect.inc:81
#: plugins/personal/generic/class_user.inc:1180
-#: plugins/personal/generic/generic.tpl:399
-#: plugins/personal/generic/generic.tpl:586
+#: plugins/personal/generic/generic.tpl:376
+#: plugins/personal/generic/generic.tpl:563
msgid "Phone"
msgstr "电è¯"
@@ -4726,7 +4707,7 @@ msgstr ""
#: plugins/admin/departments/generic.tpl:91
#: plugins/admin/departments/class_organizationGeneric.inc:129
#: plugins/personal/generic/class_user.inc:1410
-#: plugins/personal/generic/generic.tpl:448
+#: plugins/personal/generic/generic.tpl:425
msgid "Location"
msgstr "ä½ç½®"
@@ -4743,8 +4724,8 @@ msgstr "ä½ç½®"
#: plugins/admin/departments/generic.tpl:51
#: plugins/admin/departments/class_organizationGeneric.inc:126
#: plugins/personal/generic/class_user.inc:1399
-#: plugins/personal/generic/generic.tpl:341
-#: plugins/personal/generic/generic.tpl:362
+#: plugins/personal/generic/generic.tpl:318
+#: plugins/personal/generic/generic.tpl:339
msgid "Manager"
msgstr ""
@@ -4884,7 +4865,7 @@ msgstr "这个åæ ‘çš„åˆ†ç±»"
#: plugins/admin/departments/generic.tpl:83
#: plugins/admin/departments/class_organizationGeneric.inc:128
#: plugins/personal/generic/class_user.inc:1409
-#: plugins/personal/generic/generic.tpl:456
+#: plugins/personal/generic/generic.tpl:433
msgid "State"
msgstr "å·ž/çœ"
@@ -4902,7 +4883,7 @@ msgstr "这个åæ ‘çš„ä½ç½®"
#: plugins/admin/departments/class_department.inc:667
#: plugins/admin/departments/generic.tpl:99
#: plugins/personal/generic/generic.tpl:181
-#: plugins/personal/generic/generic.tpl:464
+#: plugins/personal/generic/generic.tpl:441
msgid "Address"
msgstr "ä½å€"
@@ -4922,8 +4903,8 @@ msgstr "这个åæ ‘çš„ç”µè¯å·ç "
#: plugins/admin/departments/generic.tpl:114
#: plugins/admin/departments/class_organizationGeneric.inc:132
#: plugins/personal/generic/class_user.inc:1183
-#: plugins/personal/generic/generic.tpl:430
-#: plugins/personal/generic/generic.tpl:598
+#: plugins/personal/generic/generic.tpl:407
+#: plugins/personal/generic/generic.tpl:575
msgid "Fax"
msgstr "ä¼ çœŸ"
@@ -4974,7 +4955,7 @@ msgstr "国家"
#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:15
#: plugins/generic/references/class_reference.inc:57
#: plugins/personal/generic/class_user.inc:1396
-#: plugins/personal/generic/generic.tpl:308
+#: plugins/personal/generic/generic.tpl:285
msgid "Department"
msgstr "部门"
@@ -5278,6 +5259,11 @@ msgstr "æˆå‘˜å¯¹è±¡"
msgid "List of object groups"
msgstr "对象组列表"
+#: plugins/admin/ogroups/ogroup-list.xml:79
+#, fuzzy
+msgid "Objectgroup"
+msgstr "对象组"
+
#: plugins/admin/ogroups/ogroup-list.xml:106
msgid "Send message"
msgstr ""
@@ -5349,7 +5335,8 @@ msgstr "è¯è¨€"
#: plugins/config/class_configInLdap.inc:82
msgid ""
-"Default language to be used if the one asked by the browser is not available"
+"Language of the application. If 'automatic' or not available, the one asked "
+"by the browser will be used. This setting can be overriden per user."
msgstr ""
#: plugins/config/class_configInLdap.inc:87
@@ -5365,7 +5352,7 @@ msgid "Schema setup"
msgstr ""
#: plugins/config/class_configInLdap.inc:103
-msgid "rfc237bis"
+msgid "rfc2307bis"
msgstr ""
#: plugins/config/class_configInLdap.inc:104
@@ -6069,12 +6056,12 @@ msgid "Homepage"
msgstr "个人主页"
#: plugins/personal/generic/class_user.inc:1186
-#: plugins/personal/generic/generic.tpl:411
+#: plugins/personal/generic/generic.tpl:388
msgid "Mobile"
msgstr "手机"
#: plugins/personal/generic/class_user.inc:1189
-#: plugins/personal/generic/generic.tpl:422
+#: plugins/personal/generic/generic.tpl:399
msgid "Pager"
msgstr "呼机"
@@ -6085,57 +6072,57 @@ msgid "Date of birth"
msgstr "生日"
#: plugins/personal/generic/class_user.inc:1357
-#: plugins/personal/generic/generic.tpl:538
+#: plugins/personal/generic/generic.tpl:515
msgid "Unit"
msgstr "å•å…ƒ"
#: plugins/personal/generic/class_user.inc:1358
-#: plugins/personal/generic/generic.tpl:563
+#: plugins/personal/generic/generic.tpl:540
msgid "House identifier"
msgstr "家åºè§’色"
#: plugins/personal/generic/class_user.inc:1359
-#: plugins/personal/generic/generic.tpl:480
+#: plugins/personal/generic/generic.tpl:457
msgid "Vocation"
msgstr "行业"
#: plugins/personal/generic/class_user.inc:1360
-#: plugins/personal/generic/generic.tpl:607
+#: plugins/personal/generic/generic.tpl:584
msgid "Last delivery"
msgstr "最åŽä¼ 递"
#: plugins/personal/generic/class_user.inc:1361
-#: plugins/personal/generic/generic.tpl:529
+#: plugins/personal/generic/generic.tpl:506
msgid "Person locality"
msgstr ""
#: plugins/personal/generic/class_user.inc:1362
-#: plugins/personal/generic/generic.tpl:488
+#: plugins/personal/generic/generic.tpl:465
msgid "Unit description"
msgstr "å•å…ƒæè¿°"
#: plugins/personal/generic/class_user.inc:1363
-#: plugins/personal/generic/generic.tpl:497
+#: plugins/personal/generic/generic.tpl:474
msgid "Subject area"
msgstr ""
#: plugins/personal/generic/class_user.inc:1364
-#: plugins/personal/generic/generic.tpl:506
+#: plugins/personal/generic/generic.tpl:483
msgid "Functional title"
msgstr "å•ä½èŒç§°"
#: plugins/personal/generic/class_user.inc:1365
-#: plugins/personal/generic/generic.tpl:616
+#: plugins/personal/generic/generic.tpl:593
msgid "Public visible"
msgstr "公开"
#: plugins/personal/generic/class_user.inc:1366
-#: plugins/personal/generic/generic.tpl:547
+#: plugins/personal/generic/generic.tpl:524
msgid "Street"
msgstr "è¡—é“"
#: plugins/personal/generic/class_user.inc:1368
-#: plugins/personal/generic/generic.tpl:555
+#: plugins/personal/generic/generic.tpl:532
msgid "Postal code"
msgstr "邮编"
@@ -6184,7 +6171,7 @@ msgid "Employee number"
msgstr ""
#: plugins/personal/generic/class_user.inc:1401
-#: plugins/personal/generic/generic.tpl:332
+#: plugins/personal/generic/generic.tpl:309
msgid "Employee type"
msgstr "员工类别"
@@ -6265,29 +6252,28 @@ msgstr "å£ä»¤å˜å‚¨"
msgid "Restrict login to"
msgstr ""
-#: plugins/personal/generic/generic.tpl:248
-#: plugins/personal/generic/generic.tpl:267
+#: plugins/personal/generic/generic.tpl:246
msgid "IP or network"
msgstr ""
-#: plugins/personal/generic/generic.tpl:288
+#: plugins/personal/generic/generic.tpl:265
msgid "Organizational information"
msgstr "组织信æ¯"
-#: plugins/personal/generic/generic.tpl:316
+#: plugins/personal/generic/generic.tpl:293
msgid "Department No."
msgstr "部门编å·"
-#: plugins/personal/generic/generic.tpl:324
+#: plugins/personal/generic/generic.tpl:301
msgid "Employee No."
msgstr "员工编å·"
-#: plugins/personal/generic/generic.tpl:390
-#: plugins/personal/generic/generic.tpl:578
+#: plugins/personal/generic/generic.tpl:367
+#: plugins/personal/generic/generic.tpl:555
msgid "Room No."
msgstr "房间å·"
-#: plugins/personal/generic/generic.tpl:592
+#: plugins/personal/generic/generic.tpl:569
msgid "Please use the phone tab"
msgstr "请使用电è¯é¡µé¢"
@@ -6295,6 +6281,12 @@ msgstr "请使用电è¯é¡µé¢"
msgid "Your password hash method will not be changed!"
msgstr ""
+#~ msgid "cut"
+#~ msgstr "剪切"
+
+#~ msgid "copy"
+#~ msgstr "å¤åˆ¶"
+
#~ msgid "Netatalk"
#~ msgstr "Netatalk"