Files
webmin/status
KafamaG 78b728a531 Merge branch 'master' into dev/translation_tr
#2829 landed on master and touched 173 of the same keys this branch
rewrites, which is where the conflicts came from.

Resolved by rule rather than by hand: for any key #2829 already fixed
and merged, master's value wins (54 keys); everything else keeps this
branch's version. That keeps the diff against master limited to what is
genuinely new here, and avoids re-editing work that is already upstream.

It also avoids a regression. This branch was cut before #2829, so it
still carried the old double-encoded UTF-8 in nine mailboxes strings
(confirm_warnallf, left_autoreply, left_folders, left_forward,
left_pass, left_sig, mail_fromfilter, mail_selread, mail_subfilter).
Taking master's value for those keeps them fixed. A mojibake scan over
the whole tree after the merge reports 0 remaining lines.

master also added acl/forgot_sudouser, which is translated here, so
lang/tr is still complete at 31,523 of 31,523 keys.
2026-08-31 09:51:50 +03:00
..
2024-08-08 19:21:34 -07:00
2024-09-29 13:43:56 -07:00
2019-06-30 19:43:05 -07:00
2020-12-24 05:30:29 +01:00
2026-06-15 16:38:34 -05:00
2018-12-22 21:21:06 -08:00
2024-03-11 22:21:08 -07:00
2026-04-28 21:33:16 -07:00
2019-06-30 18:35:07 -07:00
2021-02-28 21:14:24 +03:00
2019-12-15 07:37:05 -08:00
2024-03-11 21:22:29 -07:00