The branch, master has been updated
via 512def68ed7 Georgian translation for tools
via 1bb25c0e01d Revert "ldb: User hexchars_upper from replace.h"
via 2c51cf118a1 s3:libads: Set udp_preference_limit = 0 for MIT Kerberos
via 92601536ba0 s3:libads: Set a request timeout for Kerberos requests
via 6074124b71b wscript: Fix double quoting for USING_SYSTEM_MITKRB5
from 0b430f42c34 s4:selftest: move tests that want to be last, last
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 512def68ed7aa51da74fc4f33047e9c52096de14
Author: Ekaterine Papava <[email protected]>
Date: Tue Sep 23 14:44:35 2025 +0200
Georgian translation for tools
Signed-off-by: Ekaterine Papava <[email protected]>
Reviewed-by: Alexander Bokovoy <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
Autobuild-User(master): Andreas Schneider <[email protected]>
Autobuild-Date(master): Wed Dec 3 10:54:19 UTC 2025 on atb-devel-224
commit 1bb25c0e01d35b1adb3137cb193de27f5c5a65f0
Author: Andreas Schneider <[email protected]>
Date: Tue Dec 2 14:02:08 2025 +0100
Revert "ldb: User hexchars_upper from replace.h"
This reverts commit 542cf01bfe530a83dfbc8a606d182c0a5a622059.
We shouldn't put a hard requirement for libreplace in libldb! We do not need
libreplace on Linux until we start using hexbytes_upper.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15961
Signed-off-by: Andreas Schneider <[email protected]>
Reviewed-by: Douglas Bagnall <[email protected]>
commit 2c51cf118a1d9b7a5956a62e71df8fa1e576599c
Author: Andreas Schneider <[email protected]>
Date: Thu Nov 27 11:04:30 2025 +0100
s3:libads: Set udp_preference_limit = 0 for MIT Kerberos
This option enable TCP connection before UDP, when sending a message to
the KDC.
Signed-off-by: Andreas Schneider <[email protected]>
Reviewed-by: Alexander Bokovoy <[email protected]>
commit 92601536ba0490bdfb5dd632fff2e5c0b541620c
Author: Andreas Schneider <[email protected]>
Date: Wed Nov 19 14:42:24 2025 +0100
s3:libads: Set a request timeout for Kerberos requests
Without this, libkrb5 can wait indefinitely after creating a TCP
connection. This means winbind is stuck forever till it is restarted.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15955
Signed-off-by: Andreas Schneider <[email protected]>
Reviewed-by: Alexander Bokovoy <[email protected]>
commit 6074124b71b7d7c02699799c7e3eee75f70e94a3
Author: Andreas Schneider <[email protected]>
Date: Wed Nov 19 14:51:31 2025 +0100
wscript: Fix double quoting for USING_SYSTEM_MITKRB5
Signed-off-by: Andreas Schneider <[email protected]>
Reviewed-by: Alexander Bokovoy <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
lib/ldb/common/ldb_dn.c | 11 +-
source3/libads/kerberos.c | 16 +
source3/locale/net/LINGUAS | 1 +
source3/locale/net/{de.po => ka.po} | 2994 +++++++++++++++++++++--------------
source3/locale/pam_winbind/LINGUAS | 1 +
source3/locale/pam_winbind/ka.po | 548 +++++++
wscript_configure_system_mitkrb5 | 2 +-
7 files changed, 2410 insertions(+), 1163 deletions(-)
copy source3/locale/net/{de.po => ka.po} (55%)
create mode 100644 source3/locale/pam_winbind/ka.po
Changeset truncated at 500 lines:
diff --git a/lib/ldb/common/ldb_dn.c b/lib/ldb/common/ldb_dn.c
index 5b8c0f4f580..389da444904 100644
--- a/lib/ldb/common/ldb_dn.c
+++ b/lib/ldb/common/ldb_dn.c
@@ -232,10 +232,15 @@ static int ldb_dn_escape_internal(char *dst, const char
*src, int len)
case '\0': {
/* any others get \XX form */
unsigned char v;
+ /*
+ * Do not use libreplace for this. We don't want to have
+ * a hard requirement for it.
+ */
+ const char *hexbytes = "0123456789ABCDEF";
v = (const unsigned char)c;
*d++ = '\\';
- *d++ = hexchars_upper[v>>4];
- *d++ = hexchars_upper[v&0xF];
+ *d++ = hexbytes[v>>4];
+ *d++ = hexbytes[v&0xF];
break;
}
default:
@@ -2100,7 +2105,7 @@ int ldb_dn_set_extended_component(struct ldb_dn *dn,
unsigned int i;
struct ldb_val v2;
const struct ldb_dn_extended_syntax *ext_syntax;
-
+
if ( ! ldb_dn_validate(dn)) {
return LDB_ERR_OTHER;
}
diff --git a/source3/libads/kerberos.c b/source3/libads/kerberos.c
index d8325201b2f..5593364c397 100644
--- a/source3/libads/kerberos.c
+++ b/source3/libads/kerberos.c
@@ -1380,6 +1380,15 @@ bool create_local_private_krb5_conf_for_domain(const
char *realm,
char *enctypes = NULL;
const char *include_system_krb5 = "";
mode_t mask;
+ /*
+ * The default will be 15 seconds, it can be changed in the smb.conf:
+ * [global]
+ * krb5:request_timeout = 30
+ */
+ int timeout_sec = lp_parm_int(-1,
+ "krb5",
+ "request_timeout",
+ 15 /* default */);
if (!lp_create_krb5_conf()) {
return false;
@@ -1449,6 +1458,12 @@ bool create_local_private_krb5_conf_for_domain(const
char *realm,
file_contents =
talloc_asprintf(fname,
"[libdefaults]\n"
+#ifdef SAMBA4_USES_HEIMDAL
+ "\tkdc_timeout = %d\n"
+#else
+ "\trequest_timeout = %ds\n"
+ "\tudp_preference_limit = 0\n"
+#endif
"\tdefault_realm = %s\n"
"%s"
"\tdns_lookup_realm = false\n"
@@ -1458,6 +1473,7 @@ bool create_local_private_krb5_conf_for_domain(const char
*realm,
"\t%s = {\n"
"%s\t}\n"
"%s\n",
+ timeout_sec,
realm_upper,
enctypes,
realm_upper,
diff --git a/source3/locale/net/LINGUAS b/source3/locale/net/LINGUAS
index 7673daa944e..711b12d3c82 100644
--- a/source3/locale/net/LINGUAS
+++ b/source3/locale/net/LINGUAS
@@ -1 +1,2 @@
de
+ka
diff --git a/source3/locale/net/de.po b/source3/locale/net/ka.po
similarity index 55%
copy from source3/locale/net/de.po
copy to source3/locale/net/ka.po
index 1f460b26767..d2a6dce072a 100644
--- a/source3/locale/net/de.po
+++ b/source3/locale/net/ka.po
@@ -1,6 +1,5 @@
-# net message translation (german).
-# Copyright (C) 2009, 2010 Kai Blin <[email protected]>
-# Copyright (C) 2009, 2010 André Hentschel <[email protected]>
+# net message translation (Georgian).
+# Copyright (C) 2025, Ekaterine Papava <[email protected]>
# This file is distributed under the same license as the samba package.
#
msgid ""
@@ -8,24 +7,26 @@ msgstr ""
"Project-Id-Version: @PACKAGE@\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-01-19 14:40+0100\n"
-"PO-Revision-Date: 2010-01-14 18:55+0100\n"
-"Last-Translator: André Hentschel <[email protected]>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2025-09-25 09:02+0200\n"
+"Last-Translator: Ekaterine Papava <[email protected]>\n"
+"Language-Team: Georgian <(nothing)>\n"
+"Language: ka_GE\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 3.7\n"
#: ../../utils/net.c:103
msgid "Enter machine password: "
-msgstr "Bitte Maschinenpasswort eingeben: "
+msgstr "შეიყვანეთ მანქანის პაროლი: "
#: ../../utils/net.c:107
msgid "Unable to write the machine account password in the secrets database"
-msgstr ""
+msgstr "მანქანის ანგარიშის პაროლის ჩაწერის შეცდომა საიდუმლოების მონაცემთა
ბაზაში"
#: ../../utils/net.c:111
msgid "Modified trust account password in secrets database\n"
-msgstr ""
+msgstr "შეიცვალა ნდობის ანგარიშის პაროლი საიდუმლოების მონაცემთა ბაზაში\n"
#: ../../utils/net.c:115
msgid ""
@@ -36,13 +37,23 @@ msgstr ""
#: ../../utils/net.c:132
msgid "Failed to open secrets.tdb.\n"
-msgstr ""
-
-#: ../../utils/net.c:139 ../../utils/net.c:157 ../../utils/net_ads.c:1435
../../utils/net_ads.c:1487 ../../utils/net_conf.c:1156
../../utils/net_groupmap.c:195 ../../utils/net_groupmap.c:271
../../utils/net_groupmap.c:355 ../../utils/net_groupmap.c:411
-#: ../../utils/net_groupmap.c:494 ../../utils/net_groupmap.c:521
../../utils/net_help.c:36 ../../utils/net_rap.c:161 ../../utils/net_rap.c:302
../../utils/net_rap.c:467 ../../utils/net_rap.c:752 ../../utils/net_rap.c:893
../../utils/net_rap.c:1004
-#: ../../utils/net_rap.c:1195 ../../utils/net_rpc.c:2730
../../utils/net_rpc.c:2845 ../../utils/net_rpc.c:4961
../../utils/net_rpc.c:6953 ../../utils/net_rpc.c:7043
../../utils/net_rpc.c:7148 ../../utils/net_util.c:586
+msgstr "ვერ გავხსენი ფაილი secrets.tdb.\n"
+
+#: ../../utils/net.c:139 ../../utils/net.c:157 ../../utils/net_ads.c:1435
+#: ../../utils/net_ads.c:1487 ../../utils/net_conf.c:1156
+#: ../../utils/net_groupmap.c:195 ../../utils/net_groupmap.c:271
+#: ../../utils/net_groupmap.c:355 ../../utils/net_groupmap.c:411
+#: ../../utils/net_groupmap.c:494 ../../utils/net_groupmap.c:521
+#: ../../utils/net_help.c:36 ../../utils/net_rap.c:161
+#: ../../utils/net_rap.c:302 ../../utils/net_rap.c:467
+#: ../../utils/net_rap.c:752 ../../utils/net_rap.c:893
+#: ../../utils/net_rap.c:1004 ../../utils/net_rap.c:1195
+#: ../../utils/net_rpc.c:2730 ../../utils/net_rpc.c:2845
+#: ../../utils/net_rpc.c:4961 ../../utils/net_rpc.c:6953
+#: ../../utils/net_rpc.c:7043 ../../utils/net_rpc.c:7148
+#: ../../utils/net_util.c:586
msgid "Usage:\n"
-msgstr "Verwendung:\n"
+msgstr "გამოყენება:\n"
#: ../../utils/net.c:141
#, c-format
@@ -56,6 +67,8 @@ msgid ""
" net setauthuser delete\n"
" Delete the auth user setting.\n"
msgstr ""
+" net setauthuser delete\n"
+" მომხმარებლის ავთენტიკაციის პარამეტრის წაშლა.\n"
#: ../../utils/net.c:159
#, c-format
@@ -66,249 +79,323 @@ msgstr ""
#: ../../utils/net.c:169
msgid "the auth user"
-msgstr ""
+msgstr "ავტორიზაციის მომხმარებელი"
#: ../../utils/net.c:171
msgid "Failed to get the auth users password.\n"
-msgstr ""
+msgstr "ავთენტიკაციის მომხმარებლების პაროლის მიღება ჩავარდა.\n"
#: ../../utils/net.c:177
msgid "error storing auth user name\n"
-msgstr ""
+msgstr "ავთენტიკაციის მომხმარებლის სახელის შენახვის შეცდომა\n"
#: ../../utils/net.c:183
msgid "error storing auth user domain\n"
-msgstr ""
+msgstr "ავთენტიკაციის დომენის შენახვის შეცდომა\n"
#: ../../utils/net.c:189
msgid "error storing auth user password\n"
-msgstr ""
+msgstr "ავთენტიკაციის პაროლის შენახვის შეცდომა\n"
#: ../../utils/net.c:213
msgid "No authorised user configured\n"
-msgstr ""
+msgstr "ავტორიზებული მომხმარებელი მორგებული არაა\n"
#: ../../utils/net.c:255 ../../utils/net.c:336
#, c-format
msgid "Unable to open secrets.tdb. Can't fetch domain SID for name: %s\n"
-msgstr ""
+msgstr "ვერ გავხსენი ფაილი secrets.tdb. ვერ მივიღე დომენის SID სახელისთვის:
%s\n"
#: ../../utils/net.c:268 ../../utils/net.c:359
#, c-format
msgid "SID for domain %s is: %s\n"
-msgstr "SID der Domäne %s ist: %s\n"
+msgstr "SID დომენისთვის %s არის: %s\n"
# c-format
-#: ../../utils/net.c:280 ../../utils/net.c:301 ../../utils/net.c:320
../../utils/net.c:405 ../../utils/net_ads.c:134 ../../utils/net_ads.c:166
../../utils/net_ads.c:382 ../../utils/net_ads.c:709 ../../utils/net_ads.c:862
../../utils/net_ads.c:898
-#: ../../utils/net_ads.c:942 ../../utils/net_ads.c:1057
../../utils/net_ads.c:1560 ../../utils/net_ads.c:1600
../../utils/net_ads.c:1665 ../../utils/net_ads.c:1792
../../utils/net_ads.c:1896 ../../utils/net_ads.c:1982 ../../utils/net_ads.c:2225
-#: ../../utils/net_ads.c:2246 ../../utils/net_ads.c:2274
../../utils/net_ads.c:2293 ../../utils/net_ads.c:2362
../../utils/net_ads.c:2388 ../../utils/net_ads.c:2445
../../utils/net_ads_gpo.c:41 ../../utils/net_ads_gpo.c:230
../../utils/net_ads_gpo.c:304
-#: ../../utils/net_ads_gpo.c:456 ../../utils/net_ads_gpo.c:498
../../utils/net_ads_gpo.c:586 ../../utils/net_afs.c:38 ../../utils/net_afs.c:71
../../utils/net_cache.c:159 ../../utils/net_cache.c:198
../../utils/net_cache.c:228 ../../utils/net_cache.c:257
-#: ../../utils/net_cache.c:283 ../../utils/net_cache.c:306
../../utils/net_cache.c:321 ../../utils/net_conf.c:42 ../../utils/net_conf.c:50
../../utils/net_conf.c:63 ../../utils/net_conf.c:70 ../../utils/net_conf.c:78
../../utils/net_conf.c:87
-#: ../../utils/net_conf.c:104 ../../utils/net_conf.c:113
../../utils/net_conf.c:122 ../../utils/net_conf.c:131
../../utils/net_conf.c:140 ../../utils/net_conf.c:149
../../utils/net_conf.c:158 ../../utils/net_dom.c:27 ../../utils/net_dom.c:32
-#: ../../utils/net_dom.c:37 ../../utils/net_eventlog.c:47
../../utils/net_eventlog.c:104 ../../utils/net_eventlog.c:200
../../utils/net_groupmap.c:119 ../../utils/net_groupmap.c:557
../../utils/net_groupmap.c:677 ../../utils/net_groupmap.c:715
-#: ../../utils/net_groupmap.c:738 ../../utils/net_groupmap.c:762
../../utils/net_groupmap.c:822 ../../utils/net_idmap.c:65
../../utils/net_idmap.c:97 ../../utils/net_idmap.c:244
../../utils/net_idmap.c:344 ../../utils/net_lookup.c:327
-#: ../../utils/net_lookup.c:351 ../../utils/net_lookup.c:384
../../utils/net_rap.c:507 ../../utils/net_rap.c:537
../../utils/net_registry.c:134 ../../utils/net_registry.c:189
../../utils/net_registry.c:246 ../../utils/net_registry.c:291
-#: ../../utils/net_registry.c:341 ../../utils/net_registry.c:398
../../utils/net_registry.c:443 ../../utils/net_rpc.c:280
../../utils/net_rpc.c:413 ../../utils/net_rpc.c:443 ../../utils/net_rpc.c:561
../../utils/net_rpc.c:629 ../../utils/net_rpc.c:999
-#: ../../utils/net_rpc.c:1049 ../../utils/net_rpc.c:1131
../../utils/net_rpc.c:1186 ../../utils/net_rpc.c:1933
../../utils/net_rpc.c:2136 ../../utils/net_rpc.c:2221
../../utils/net_rpc.c:3072 ../../utils/net_rpc.c:3258 ../../utils/net_rpc.c:3593
-#: ../../utils/net_rpc.c:3720 ../../utils/net_rpc.c:3755
../../utils/net_rpc.c:4560 ../../utils/net_rpc.c:4686
../../utils/net_rpc.c:4750 ../../utils/net_rpc.c:4768
../../utils/net_rpc.c:5071 ../../utils/net_rpc.c:5220 ../../utils/net_rpc.c:5279
-#: ../../utils/net_rpc.c:5394 ../../utils/net_rpc.c:5436
../../utils/net_rpc.c:5554 ../../utils/net_rpc.c:5638
../../utils/net_rpc.c:5803 ../../utils/net_rpc.c:5937
../../utils/net_rpc.c:6096 ../../utils/net_rpc.c:6471 ../../utils/net_rpc.c:6520
-#: ../../utils/net_rpc.c:6558 ../../utils/net_rpc.c:6614
../../utils/net_rpc.c:6646 ../../utils/net_rpc.c:6678
../../utils/net_rpc.c:6710 ../../utils/net_rpc.c:6742
../../utils/net_rpc.c:6846 ../../utils/net_rpc.c:6873 ../../utils/net_rpc.c:6900
-#: ../../utils/net_rpc.c:6926 ../../utils/net_rpc.c:6980
../../utils/net_rpc_audit.c:370 ../../utils/net_rpc_audit.c:388
../../utils/net_rpc_audit.c:406 ../../utils/net_rpc_audit.c:424
../../utils/net_rpc_audit.c:442 ../../utils/net_rpc_registry.c:475
-#: ../../utils/net_rpc_registry.c:530 ../../utils/net_rpc_registry.c:646
../../utils/net_rpc_registry.c:674 ../../utils/net_rpc_registry.c:748
../../utils/net_rpc_registry.c:799 ../../utils/net_rpc_registry.c:831
../../utils/net_rpc_registry.c:905
-#: ../../utils/net_rpc_registry.c:1094 ../../utils/net_rpc_registry.c:1140
../../utils/net_rpc_registry.c:1213 ../../utils/net_rpc_rights.c:417
../../utils/net_rpc_rights.c:455 ../../utils/net_rpc_rights.c:526
../../utils/net_rpc_rights.c:583
-#: ../../utils/net_rpc_rights.c:601 ../../utils/net_rpc_rights.c:623
../../utils/net_rpc_samsync.c:258 ../../utils/net_rpc_samsync.c:341
../../utils/net_rpc_samsync.c:485 ../../utils/net_rpc_service.c:218
../../utils/net_rpc_service.c:327
-#: ../../utils/net_rpc_service.c:459 ../../utils/net_rpc_service.c:505
../../utils/net_rpc_service.c:551 ../../utils/net_rpc_service.c:597
../../utils/net_rpc_service.c:677 ../../utils/net_rpc_service.c:756
../../utils/net_rpc_service.c:827
-#: ../../utils/net_rpc_service.c:845 ../../utils/net_rpc_service.c:863
../../utils/net_rpc_service.c:881 ../../utils/net_rpc_service.c:899
../../utils/net_rpc_service.c:917 ../../utils/net_rpc_service.c:935
../../utils/net_rpc_service.c:953
-#: ../../utils/net_rpc_sh_acct.c:158 ../../utils/net_rpc_sh_acct.c:229
../../utils/net_rpc_shell.c:217 ../../utils/net_sam.c:40
../../utils/net_sam.c:146 ../../utils/net_sam.c:239 ../../utils/net_sam.c:303
../../utils/net_sam.c:468
-#: ../../utils/net_sam.c:535 ../../utils/net_sam.c:583
../../utils/net_sam.c:642 ../../utils/net_sam.c:699 ../../utils/net_sam.c:738
../../utils/net_sam.c:866 ../../utils/net_sam.c:930 ../../utils/net_sam.c:967
../../utils/net_sam.c:1000
-#: ../../utils/net_sam.c:1043 ../../utils/net_sam.c:1080
../../utils/net_sam.c:1124 ../../utils/net_sam.c:1178
../../utils/net_sam.c:1267 ../../utils/net_sam.c:1341
../../utils/net_sam.c:1416 ../../utils/net_sam.c:1551 ../../utils/net_sam.c:1593
-#: ../../utils/net_status.c:69 ../../utils/net_status.c:221
../../utils/net_time.c:139 ../../utils/net_time.c:165 ../../utils/net_time.c:227
+#: ../../utils/net.c:280 ../../utils/net.c:301 ../../utils/net.c:320
+#: ../../utils/net.c:405 ../../utils/net_ads.c:134 ../../utils/net_ads.c:166
+#: ../../utils/net_ads.c:382 ../../utils/net_ads.c:709
+#: ../../utils/net_ads.c:862 ../../utils/net_ads.c:898
+#: ../../utils/net_ads.c:942 ../../utils/net_ads.c:1057
+#: ../../utils/net_ads.c:1560 ../../utils/net_ads.c:1600
+#: ../../utils/net_ads.c:1665 ../../utils/net_ads.c:1792
+#: ../../utils/net_ads.c:1896 ../../utils/net_ads.c:1982
+#: ../../utils/net_ads.c:2225 ../../utils/net_ads.c:2246
+#: ../../utils/net_ads.c:2274 ../../utils/net_ads.c:2293
+#: ../../utils/net_ads.c:2362 ../../utils/net_ads.c:2388
+#: ../../utils/net_ads.c:2445 ../../utils/net_ads_gpo.c:41
+#: ../../utils/net_ads_gpo.c:230 ../../utils/net_ads_gpo.c:304
+#: ../../utils/net_ads_gpo.c:456 ../../utils/net_ads_gpo.c:498
+#: ../../utils/net_ads_gpo.c:586 ../../utils/net_afs.c:38
+#: ../../utils/net_afs.c:71 ../../utils/net_cache.c:159
+#: ../../utils/net_cache.c:198 ../../utils/net_cache.c:228
+#: ../../utils/net_cache.c:257 ../../utils/net_cache.c:283
+#: ../../utils/net_cache.c:306 ../../utils/net_cache.c:321
+#: ../../utils/net_conf.c:42 ../../utils/net_conf.c:50
+#: ../../utils/net_conf.c:63 ../../utils/net_conf.c:70
+#: ../../utils/net_conf.c:78 ../../utils/net_conf.c:87
+#: ../../utils/net_conf.c:104 ../../utils/net_conf.c:113
+#: ../../utils/net_conf.c:122 ../../utils/net_conf.c:131
+#: ../../utils/net_conf.c:140 ../../utils/net_conf.c:149
+#: ../../utils/net_conf.c:158 ../../utils/net_dom.c:27 ../../utils/net_dom.c:32
+#: ../../utils/net_dom.c:37 ../../utils/net_eventlog.c:47
+#: ../../utils/net_eventlog.c:104 ../../utils/net_eventlog.c:200
+#: ../../utils/net_groupmap.c:119 ../../utils/net_groupmap.c:557
+#: ../../utils/net_groupmap.c:677 ../../utils/net_groupmap.c:715
+#: ../../utils/net_groupmap.c:738 ../../utils/net_groupmap.c:762
+#: ../../utils/net_groupmap.c:822 ../../utils/net_idmap.c:65
+#: ../../utils/net_idmap.c:97 ../../utils/net_idmap.c:244
+#: ../../utils/net_idmap.c:344 ../../utils/net_lookup.c:327
+#: ../../utils/net_lookup.c:351 ../../utils/net_lookup.c:384
+#: ../../utils/net_rap.c:507 ../../utils/net_rap.c:537
+#: ../../utils/net_registry.c:134 ../../utils/net_registry.c:189
+#: ../../utils/net_registry.c:246 ../../utils/net_registry.c:291
+#: ../../utils/net_registry.c:341 ../../utils/net_registry.c:398
+#: ../../utils/net_registry.c:443 ../../utils/net_rpc.c:280
+#: ../../utils/net_rpc.c:413 ../../utils/net_rpc.c:443
+#: ../../utils/net_rpc.c:561 ../../utils/net_rpc.c:629
+#: ../../utils/net_rpc.c:999 ../../utils/net_rpc.c:1049
+#: ../../utils/net_rpc.c:1131 ../../utils/net_rpc.c:1186
+#: ../../utils/net_rpc.c:1933 ../../utils/net_rpc.c:2136
+#: ../../utils/net_rpc.c:2221 ../../utils/net_rpc.c:3072
+#: ../../utils/net_rpc.c:3258 ../../utils/net_rpc.c:3593
+#: ../../utils/net_rpc.c:3720 ../../utils/net_rpc.c:3755
+#: ../../utils/net_rpc.c:4560 ../../utils/net_rpc.c:4686
+#: ../../utils/net_rpc.c:4750 ../../utils/net_rpc.c:4768
+#: ../../utils/net_rpc.c:5071 ../../utils/net_rpc.c:5220
+#: ../../utils/net_rpc.c:5279 ../../utils/net_rpc.c:5394
+#: ../../utils/net_rpc.c:5436 ../../utils/net_rpc.c:5554
+#: ../../utils/net_rpc.c:5638 ../../utils/net_rpc.c:5803
+#: ../../utils/net_rpc.c:5937 ../../utils/net_rpc.c:6096
+#: ../../utils/net_rpc.c:6471 ../../utils/net_rpc.c:6520
+#: ../../utils/net_rpc.c:6558 ../../utils/net_rpc.c:6614
+#: ../../utils/net_rpc.c:6646 ../../utils/net_rpc.c:6678
+#: ../../utils/net_rpc.c:6710 ../../utils/net_rpc.c:6742
+#: ../../utils/net_rpc.c:6846 ../../utils/net_rpc.c:6873
+#: ../../utils/net_rpc.c:6900 ../../utils/net_rpc.c:6926
+#: ../../utils/net_rpc.c:6980 ../../utils/net_rpc_audit.c:370
+#: ../../utils/net_rpc_audit.c:388 ../../utils/net_rpc_audit.c:406
+#: ../../utils/net_rpc_audit.c:424 ../../utils/net_rpc_audit.c:442
+#: ../../utils/net_rpc_registry.c:475 ../../utils/net_rpc_registry.c:530
+#: ../../utils/net_rpc_registry.c:646 ../../utils/net_rpc_registry.c:674
+#: ../../utils/net_rpc_registry.c:748 ../../utils/net_rpc_registry.c:799
+#: ../../utils/net_rpc_registry.c:831 ../../utils/net_rpc_registry.c:905
+#: ../../utils/net_rpc_registry.c:1094 ../../utils/net_rpc_registry.c:1140
+#: ../../utils/net_rpc_registry.c:1213 ../../utils/net_rpc_rights.c:417
+#: ../../utils/net_rpc_rights.c:455 ../../utils/net_rpc_rights.c:526
+#: ../../utils/net_rpc_rights.c:583 ../../utils/net_rpc_rights.c:601
+#: ../../utils/net_rpc_rights.c:623 ../../utils/net_rpc_samsync.c:258
+#: ../../utils/net_rpc_samsync.c:341 ../../utils/net_rpc_samsync.c:485
+#: ../../utils/net_rpc_service.c:218 ../../utils/net_rpc_service.c:327
+#: ../../utils/net_rpc_service.c:459 ../../utils/net_rpc_service.c:505
+#: ../../utils/net_rpc_service.c:551 ../../utils/net_rpc_service.c:597
+#: ../../utils/net_rpc_service.c:677 ../../utils/net_rpc_service.c:756
+#: ../../utils/net_rpc_service.c:827 ../../utils/net_rpc_service.c:845
+#: ../../utils/net_rpc_service.c:863 ../../utils/net_rpc_service.c:881
+#: ../../utils/net_rpc_service.c:899 ../../utils/net_rpc_service.c:917
+#: ../../utils/net_rpc_service.c:935 ../../utils/net_rpc_service.c:953
+#: ../../utils/net_rpc_sh_acct.c:158 ../../utils/net_rpc_sh_acct.c:229
+#: ../../utils/net_rpc_shell.c:217 ../../utils/net_sam.c:40
+#: ../../utils/net_sam.c:146 ../../utils/net_sam.c:239
+#: ../../utils/net_sam.c:303 ../../utils/net_sam.c:468
+#: ../../utils/net_sam.c:535 ../../utils/net_sam.c:583
+#: ../../utils/net_sam.c:642 ../../utils/net_sam.c:699
+#: ../../utils/net_sam.c:738 ../../utils/net_sam.c:866
+#: ../../utils/net_sam.c:930 ../../utils/net_sam.c:967
+#: ../../utils/net_sam.c:1000 ../../utils/net_sam.c:1043
+#: ../../utils/net_sam.c:1080 ../../utils/net_sam.c:1124
+#: ../../utils/net_sam.c:1178 ../../utils/net_sam.c:1267
+#: ../../utils/net_sam.c:1341 ../../utils/net_sam.c:1416
+#: ../../utils/net_sam.c:1551 ../../utils/net_sam.c:1593
+#: ../../utils/net_status.c:69 ../../utils/net_status.c:221
+#: ../../utils/net_time.c:139 ../../utils/net_time.c:165
+#: ../../utils/net_time.c:227
#, c-format
msgid "Usage:"
-msgstr "Verwendung:"
+msgstr "გამოყენება:"
#: ../../utils/net.c:346
msgid "Could not fetch local SID\n"
-msgstr "Lokale SID nicht abrufbar\n"
+msgstr "ვერ მივიღე ლოკალური SID\n"
#: ../../utils/net.c:350
#, c-format
msgid "SID for local machine %s is: %s\n"
-msgstr "SID des lokalen Rechners %s ist: %s\n"
+msgstr "SID ლოკალური მანქანისთვის %s არის: %s\n"
#: ../../utils/net.c:354
msgid "Could not fetch domain SID\n"
-msgstr "SID der Domäne nicht abrufbar\n"
+msgstr "ვერ მივიღე დომენის SID\n"
#: ../../utils/net.c:371
#, c-format
msgid "get_maxrid: Could not search %s\n"
-msgstr "get_maxrid: Konnte %s nicht suchen\n"
+msgstr "get_maxrid: ვერ მოვძებნე %s\n"
#: ../../utils/net.c:410
msgid "can't get current maximum rid\n"
-msgstr ""
+msgstr "ვერ მივიღე მიმდინარე მაქსიმალური rid\n"
#: ../../utils/net.c:414
#, c-format
msgid "Currently used maximum rid: %d\n"
-msgstr ""
+msgstr "ამჟამად გამოყენებული მაქსიმალური rid: %d\n"
#: ../../utils/net.c:425
msgid "Run functions using RPC transport"
-msgstr "RPC Protokoll nutzen"
+msgstr "ფუნქციების გაშვება RPC ტრანსპორტით"
#: ../../utils/net.c:426
msgid " Use 'net help rpc' to get more extensive information about 'net rpc'
commands."
-msgstr ""
+msgstr " გამოიყენეთ 'net help rpc' 'net rpc' ბრძანებების შესახებ უფრო ვრცელი
ინფორმაციის მისაღებად."
#: ../../utils/net.c:433
msgid "Run functions using RAP transport"
-msgstr "RAP Protokoll nutzen"
+msgstr "ფუნქციების გაშვება RAP ტრანსპორტით"
#: ../../utils/net.c:434
msgid " Use 'net help rap' to get more extensive information about 'net rap'
commands."
-msgstr ""
+msgstr " გამოიყენეთ 'net help rap' 'net rap' ბრძანებების შესახებ უფრო ვრცელი
ინფორმაციის მისაღებად."
#: ../../utils/net.c:441
msgid "Run functions using ADS transport"
-msgstr "ADS Protokoll nutzen"
+msgstr "ფუნქციების გაშვება ADS ტრანსპორტით"
#: ../../utils/net.c:442
msgid " Use 'net help ads' to get more extensive information about 'net ads'
commands."
-msgstr ""
+msgstr " გამოიყენეთ 'net help ads' 'net ads' ბრძანებების შესახებ უფრო ვრცელი
ინფორმაციის მისაღებად."
#: ../../utils/net.c:451
msgid "Functions on remote opened files"
-msgstr "Freigegebene Dateien verwalten"
+msgstr "ფუნქციები დაშორებულ ღია ფაილებზე"
#: ../../utils/net.c:452
msgid " Use 'net help file' to get more information about 'net file'
commands."
-msgstr ""
+msgstr " გამოიყენეთ 'net help file' 'net file' ბრძანებების შესახებ უფრო
ვრცელი ინფორმაციის მისაღებად."
#: ../../utils/net.c:459
msgid "Functions on shares"
-msgstr "Freigaben verwalten"
+msgstr "ფუნქციები გაზიარებულებზე"
#: ../../utils/net.c:460
msgid " Use 'net help share' to get more information about 'net share'
commands."
-msgstr ""
+msgstr " გამოიყენეთ 'net help share' 'net share' ბრძანებების შესახებ უფრო
ვრცელი ინფორმაციის მისაღებად."
#: ../../utils/net.c:467
msgid "Manage sessions"
-msgstr "Sitzungen verwalten"
+msgstr "სესიების მართვა"
#: ../../utils/net.c:468
msgid " Use 'net help session' to get more information about 'net session'
commands."
-msgstr ""
+msgstr " გამოიყენეთ 'net help session' 'net session' ბრძანებების შესახებ უფრო
ვრცელი ინფორმაციის მისაღებად."
#: ../../utils/net.c:475 ../../utils/net_rap.c:1293
msgid "List servers in workgroup"
-msgstr "Server der Arbeitsgruppe auflisten"
+msgstr "სამუშაო ჯგუფში არსებული სერვერების ჩამონათვალი"
#: ../../utils/net.c:476
msgid " Use 'net help server' to get more information about 'net server'
commands."
-msgstr ""
+msgstr " გამოიყენეთ 'net help server' 'net server' ბრძანებების შესახებ უფრო
ვრცელი ინფორმაციის მისაღებად."
#: ../../utils/net.c:483
msgid "List domains/workgroups on network"
-msgstr "Domänen/Arbeitsgruppen im Netzwerk auflisten"
+msgstr "ქსელში არსებული დომენების/სამუშაო ჯგუფების ჩამონათვალი"
#: ../../utils/net.c:484
msgid " Use 'net help domain' to get more information about 'net domain'
commands."
-msgstr ""
+msgstr " გამოიყენეთ 'net help domain' 'net domain' ბრძანებების შესახებ უფრო
ვრცელი ინფორმაციის მისაღებად."
#: ../../utils/net.c:491
msgid "Modify printer queue"
-msgstr "Druckerwarteschlange ändern"
+msgstr "პრინტერის რიგის შეცვლა"
#: ../../utils/net.c:492
msgid " Use 'net help printq' to get more information about 'net printq'
commands."
-msgstr ""
+msgstr " გამოიყენეთ 'net help printq' 'net printq' ბრძანებების შესახებ უფრო
ვრცელი ინფორმაციის მისაღებად."
#: ../../utils/net.c:499
msgid "Manage users"
-msgstr "Benutzer verwalten"
+msgstr "მომხმარებლების მართვა"
#: ../../utils/net.c:500
msgid " Use 'net help user' to get more information about 'net user'
commands."
-msgstr ""
+msgstr " გამოიყენეთ 'net help user' 'net user' ბრძანებების შესახებ უფრო
ვრცელი ინფორმაციის მისაღებად."
#: ../../utils/net.c:507
msgid "Manage groups"
-msgstr "Gruppen verwalten"
+msgstr "ჯგუფების მართვა"
#: ../../utils/net.c:508
msgid " Use 'net help group' to get more information about 'net group'
commands."
-msgstr ""
+msgstr " გამოიყენეთ 'net help group' 'net group' ბრძანებების შესახებ უფრო
ვრცელი ინფორმაციის მისაღებად."
#: ../../utils/net.c:515
msgid "Manage group mappings"
-msgstr "Gruppenzuweisungen verwalten"
+msgstr "ჯგუფის ასახვების მართვა"
#: ../../utils/net.c:516
msgid " Use 'net help groupmap' to get more information about 'net groupmap'
commands."
-msgstr ""
+msgstr " გამოიყენეთ 'net help groupmap' 'net groupmap' ბრძანებების შესახებ
უფრო ვრცელი ინფორმაციის მისაღებად."
#: ../../utils/net.c:523
msgid "Functions on the SAM database"
-msgstr "SAM Datenbank nutzen"
+msgstr "ფუნქციები SAM მონაცემთა ბაზაზე"
#: ../../utils/net.c:524
msgid " Use 'net help sam' to get more information about 'net sam' commands."
-msgstr ""
--
Samba Shared Repository
