Commit Graph

115 Commits (ce7b0d5ff518455fc8e679593033801e623a786d)

Author SHA1 Message Date
Christian Boltz ce7b0d5ff5 *.lang
- removed remaining <br /> in
  - $PALANG['pPassword_password_text_error']
  - $PALANG['pAdminCreate_admin_password_text_error']
  - $PALANG['pAdminEdit_admin_password_text_error']
  - $PALANG['pCreate_alias_catchall_text']
  - $PALANG['pCreate_mailbox_password_text_error']
  - (and some other texts not listed here, but only in one or two languages)
- differences to Dale's patch:
  - use a space as replacement for <br /> (instead of nothing)
  - added a note that the translation needs to be be beautified to most languages
    (except en and de, which are already ok)
  - do not change "MB" -> "in MB" in $PALANG['pAdminCreate_domain_maxquota_text']
    and PALANG['pAdminEdit_domain_maxquota_text']

This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1119 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz a0aa16f6b7 *.lang:
- some $PALANG texts contained field description and error message in
  one $PALANG text. Removed the field descriptions so that the text only
  contains the error message.
- affected texts:
  - $PALANG['pCreate_alias_goto_text_error']
  - $PALANG['pCreate_mailbox_password_text_error']
  - $PALANG['pAdminCreate_admin_username_text_error1']
  - $PALANG['pAdminCreate_admin_username_text_error2']
- difference to Dale's patch:
  - removed the field description in all *.lang files instead of only
    removing the <br />. I just did this manually.
    (changes in en.lang were part of Dale's patch)
  - added a "# check" in some languages where I'm not sure if I removed
    the correct part (if the first half of the text differed from the
    field description in another $PALANG text)

This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1118 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz 1476d3e420 *.lang:
- added $PALANG['pUsersLogin_language']
- difference to Dale's patch:
  - NOT added $PALANG['pCreate_alias_help'] to avoid text duplication.
    We can use the existing $PALANG['pEdit_alias_help'] instead.

en.lang:
- fixed typo in $PALANG['pCreate_mailbox_quota_text_error']
- fixed typo in $PALANG['pBroadcast_error_empty'] - this also affects
  not yet translated texts in some *.lang

This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1117 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz 4671b7c081 *.lang:
- removed all <span> tags
- removed several <br> tags
- marked the following stings as obsolete:
  - pDelete_postdelete_error
  - pDelete_domain_alias_error
  - pEdit_alias_address_error
  - pEdit_alias_domain_error
  - pEdit_mailbox_username_error
  - pPassword_admin_text_error

Note: This commit does not contain all *.lang changes from Dale's patch.
There are some interesting[tm] changes left to check/fix.

This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1116 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz 2b1f3e4102 login.tpl, users_login.tpl:
- changed <h4> to <th>
- mark labels with <label>
- added a label to the language selector
- removed tMessage

languages/*:
- added PALANG[pLogin_language]

changes compared to Dale's patch:
- users_login.tpl:
  - do not add the <div class="field_container"> ... </div> wraps
  - use PALANG[pLogin_language] instead of PALANG[pUsersLogin_language]
    to avoid a superfluous string/translation
- login.tpl:
  - removed wrong colspan for language selector and login button
- de.lang: added german translation for PALANG[pLogin_language]

This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1089 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz e7d230da28 dropspan:
This is a quick&dirty script to remove HTML from the language files.

It will be deleted from SVN again once this job is done.

    grep '<' en.lang
will print a TODO list ;-)


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1072 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz 0f49fb81b7 - text change to "Logged _in_ as %s" (the 'in' was missing)
pointed out by supa_user in #postfixadmin
- added a german translation


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1062 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz 408c257659 *.lang:
- new texts 'show' and 'all' for list-virtual (see r1054)
- marked 'pOverview_alias_domain_target' as obsolete (no longer needed since r1052)

de.lang:
- added some translations

language-update.sh:
- made --obsolete working


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1055 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz 091d15e58f *.lang: Preparations for domain level quotas
- added $PALANG['pAdminList_domain_quota'] and
  $PALANG['pAdminEdit_domain_quota']
- mark $PALANG['pAdminList_domain_maxquota'] as obsolete

en.lang:
- added TODO for text change to pAdminCreate_domain_maxquota and
  pAdminEdit_domain_maxquota

These changed are based on the patch from W. Rossmann (W. Rossmann@SF),
https://sourceforge.net/tracker/index.php?func=detail&aid=2974928&group_id=191583&atid=937966


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1041 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz 3e2b6c506f language-update.sh:
- new parameter --obsolete to mark a text as obsolete


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1040 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz a6cc2a2947 Changed delete.php to use flash_error(), removed some HTML from languages/*
delete.php: 
- replace various $tMessage=... with flash_error()
- always redirect to the relevant page, even if an error happened
- fix error check in delete admin
- removed HTML formatting (<b>, <span>) from some error messages
- replaced check for pgsql + BEGIN/COMMIT/ROLLBACK with db_begin(),
  db_commit() and db_rollback()
- the smarty message.tpl is most probably superfluous

languages/*.lang:
- removed HTML (<span>) from messages used by delete.php

fetchmail.php, scripts/snippets/baseclass.php
- remove superfluous </span>


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1036 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz cf1fde5194 languages/*:
several text changes to be more clear (see the en.lang diff for details)

This commit implements most changes from Chris H. (dharmachris@SF) posted at
https://sourceforge.net/tracker/?func=detail&aid=3186094&group_id=191583&atid=937964


Related template changes:

templates/admin_edit-admin.tpl:
- use PALANG.save instead of PALANG.pAdminEdit_admin_button

templates/users_edit-alias.tpl, templates/edit-alias.tpl:
- split PALANG.pEdit_alias_welcome - second half is now PALANG.pEdit_alias_help
  (this avoids the <br /> in the text)
- use PALANG.save instead of PALANG.pEdit_alias_button

templates/edit-mailbox.tpl:
- use PALANG.save instead of $PALANG.pEdit_mailbox_button

templates/admin_edit-domain.tpl:
- use PALANG.save instead of $PALANG.pAdminEdit_domain_button


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1031 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz fdfcedb621 de.lang:
- remove half/invalid utf-8 char in $PALANG['pCreate_dbLog_createalias']


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1014 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz 53ecb4cb50 ru.lang:
- translation update by Pavel Usischev (pusischev @SF)
  https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3178905&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@954 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz fb6ee0ea9a sk.lang:
- big translation update by Ondrej Zary (rnbw @sf) - thanks!
  https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3162501&group_id=191583

*.lang:
- added pViewlog_action_create_domain, pViewlog_action_delete_domain and
  pViewlog_action_edit_domain (was only in en.lang)


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@942 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz c1d5b7da0e nb.lang:
- translation update by Odd Henriksen (oddhenriksen @SF)
  https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3121434&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@889 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Christian Boltz 4c912f1da8 list-virtual.php:
- hand over $search to smarty templates

templates/list-virtual_alias.tpl, templates/list-virtual_alias_domain.tpl:
- add search result highlighting

templates/list-virtual_mailbox.tpl:
- add search result highlighting
- move output of "Mailbox" / "Forward only" outside the foreach loop
  (was displayed once per mailbox alias target)

css/default.css:
- add style for ".searchresult"



git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@868 a1433add-5e2c-0410-b055-b7f2511e0802
14 years ago
Sebastian 9ddf15439f - fix some display errors after rev. 788, found and patch supplied by Jan-Kruis, thx.
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@791 a1433add-5e2c-0410-b055-b7f2511e0802
15 years ago
Christian Boltz f456d8f9c3 ru.lang
- updated by  Pavel Usischev (pusischev @SF)
  https://sourceforge.net/tracker/?func=detail&atid=937966&aid=2900334&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@773 a1433add-5e2c-0410-b055-b7f2511e0802
15 years ago
Christian Boltz 76dc501a52 *.lang:
- added missing strings

language-update.sh:
- made --forcepatch more robust


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@772 a1433add-5e2c-0410-b055-b7f2511e0802
15 years ago
Christian Boltz ad5a4fff9f language updates:
- es.lang by virtualminds @SF
  https://sourceforge.net/tracker/?func=detail&atid=937966&aid=2894512&group_id=191583
- fr.lang by fschmutz @SF
  https://sourceforge.net/tracker/?func=detail&atid=937964&aid=2898500&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@771 a1433add-5e2c-0410-b055-b7f2511e0802
15 years ago
Sebastian b1287d97e2 - big merge of Postfixadmin smarty into trunk
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@757 a1433add-5e2c-0410-b055-b7f2511e0802
15 years ago
Christian Boltz 7ea19f84ef de.lang:
- fix wrong translation


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@750 a1433add-5e2c-0410-b055-b7f2511e0802
15 years ago
Christian Boltz f3f2fc3d6a nb.lang
- language update from Odd Henriksen (oddhenriksen@SF)
  https://sourceforge.net/tracker/?func=detail&atid=937966&aid=2773238&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@636 a1433add-5e2c-0410-b055-b7f2511e0802
16 years ago
David Goodwin 8f75a86a21 ru.lang: update from pusischev - see https://sourceforge.net/tracker/index.php?func=detail&aid=2697838&group_id=191583&atid=937966 - thank you
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@597 a1433add-5e2c-0410-b055-b7f2511e0802
16 years ago
David Goodwin 0ad9c1159d patch from Fabiobon - fix a few Italian translations - see https://sourceforge.net/tracker/?func=detail&atid=937966&aid=2696920&group_id=191583
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@596 a1433add-5e2c-0410-b055-b7f2511e0802
16 years ago
Christian Boltz 0c97fb861a nl.lang:
- language update by Johan Hendriks ( sylhouette )
  https://sourceforge.net/tracker2/?func=detail&atid=937966&aid=2556927&group_id=191583

it.lang:
- fix some typos, patch by Fabio Bonelli ( fabiobon )
  https://sourceforge.net/tracker2/?func=detail&atid=937966&aid=2556431&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@559 a1433add-5e2c-0410-b055-b7f2511e0802
16 years ago
Christian Boltz 2411cd7765 login.php
- put '<span class="error_msg">' and '</span>' into login.php, not in *.lang

languages/*.lang:
- removed pLogin_username_incorrect and pLogin_password_incorrect texts
- added pLogin_failed to all translations (without the wrapping <span>)
- removed the <span> from pLogin_failed in en.lang and fi.lang

translation-update.sh:
- added "--remove string" option to remove texts from language files



git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@550 a1433add-5e2c-0410-b055-b7f2511e0802
16 years ago
Christian Boltz d24ffeeb80 de.lang:
- translated several texts


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@549 a1433add-5e2c-0410-b055-b7f2511e0802
16 years ago
David Goodwin ef768fe142 nb.lang: patch from Odd Henriksen - oddhenriksen - see https://sourceforge.net/tracker/index.php?func=detail&aid=2532202&group_id=191583&atid=937966 - thanks
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@546 a1433add-5e2c-0410-b055-b7f2511e0802
16 years ago
Christian Boltz e6c9a75793 nl.lang:
- fixed typo (reported by Michiel van Baak on ML)


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@545 a1433add-5e2c-0410-b055-b7f2511e0802
16 years ago
David Goodwin d900e909f0 nl.lang: thanks Johan Hendriks - sylhouette - see https://sourceforge.net/tracker/?func=detail&atid=937966&aid=2530792&group_id=191583
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@544 a1433add-5e2c-0410-b055-b7f2511e0802
16 years ago
David Goodwin 234f638b09 updated fi.lang from Jorma Tuomainen <jorma.tuomainen@walkingwoods.com>
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@526 a1433add-5e2c-0410-b055-b7f2511e0802
16 years ago
David Goodwin dbff1d5210 en.lang: see ticket 2359801 - make login messages more generic
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@515 a1433add-5e2c-0410-b055-b7f2511e0802
16 years ago
David Goodwin b57a04aeaf updated pt-br translation from Luis - see email to dev list
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@492 a1433add-5e2c-0410-b055-b7f2511e0802
16 years ago
David Goodwin 482518548c see bug 2338300 - patch merged
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@488 a1433add-5e2c-0410-b055-b7f2511e0802
16 years ago
Christian Boltz 6a5cd59785 fetchmail.php:
- allow superadmin to create fetchmail entry for any mailbox, not only for himself
  https://sourceforge.net/tracker/index.php?func=detail&aid=2147740&group_id=191583&atid=937964

upgrade.php, fetchmail.php, fetchmail.pl:
- rename fetchmail ssl field to usessl - "ssl" is a reserved word in MySQL and 
  therefore causes various problems (we would need to quote the field name 
  everywhere)
  https://sourceforge.net/tracker/index.php?func=detail&aid=2265333&group_id=191583&atid=937964

languages/*.lang:
- renamed strings for fetchmail (use)ssl field



git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@479 a1433add-5e2c-0410-b055-b7f2511e0802
16 years ago
Christian Boltz 21d89517f2 ru.lang:
- translation update by Pavel Usischev - pusischev
  https://sourceforge.net/tracker/?func=detail&atid=937966&aid=2064862&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@450 a1433add-5e2c-0410-b055-b7f2511e0802
16 years ago
Christian Boltz 77b3627667 Applying the patch from Stefan Breitegger (tuxstef @SF), see
https://sourceforge.net/tracker/index.php?func=detail&aid=1995478&group_id=191583&atid=937966
+ some small changes

fetchmail.php
- add checkbox to allow setting the fetchmail "ssl" option

fetchmail.pl:
- honor ssl option if set

upgrade.php:
- add ssl column to fetchmail table

*.lang:
- added field name and description for fetchmail ssl option


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@439 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz 3cc02ab1c7 nl.lang:
- language update by Johan Hendriks (sylhouette @SF)
  https://sourceforge.net/tracker/?func=detail&atid=937966&aid=2038725&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@437 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz 3e5549bfad functions.inc.php:
- move DNS checks from check_email() to check_domain()
- add clear error message on non-resolvable domains (using flash_error() -
  this is probably not the best solution, but better than nothing)
- made error messages translatable

create-domain.php:
- avoid duplicated call to check_domain (to avoid duplicated error message)
- domains are now DNS-checked on creation - see the changes in check_domain()
  in functions.inc.php

languages/*:
- added error messages for the above changes


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@429 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz 41d5ee4ecb create-alias-domain.php:
- filter available alias and target domains (and print an error message
  if none is available)
- print success message via flash_info, not inside the form and do a
  redirect afterwards. We would have to update the list of domains
  available for aliasing otherwise.
- added vim: settings
 
templates/create-alias-domain.php:
- hide form if no domains are available for aliasing
- move logic of skipping non-available domains to /create-alias-domain.php
- added vim: settings

templates/list-virtual.php:
- show "create alias domain" link (only) if it makes sence (not perfect
  yet, but better than before)
- don't create empty <div> etc. if domain has no mailboxes
- intentionally skipped most whitespace fixes (added a comment instead),
  they would make the patch unreadable

languages/*:
- additional error message for alias domains: 'All domains are already 
  aliased.'


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@422 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz 094eb0b243 nb.lang
- translation update by Odd Henriksen (oddhenriksen @SF)


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@417 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz f5bef69d3e pl.lang
- updated by Lukasz Wasikowski <lukasz AT wasikowski.net>
  https://sourceforge.net/forum/message.php?msg_id=5100276


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@403 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz d0a9b507a7 bg.lang:
- fixed encoding and some added translations by Georgi Naplatanov (goshoo @SF)
  https://sourceforge.net/tracker/?func=detail&atid=937964&aid=2018539&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@402 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz 14db3cf10b tw.lang
- added some missing strings (mostly related to alias domains)
- removed a superfluous newline at the end


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@395 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz 90eeacf274 tw.lang:
- freshly translated by by John Chen (johnpupu @SF), based on cn.lang
  https://sourceforge.net/tracker/?func=detail&atid=937966&aid=1986622&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@394 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz f9301eb6c5 ru.lang:
- translation update by Pavel Usischev - pusischev
  https://sourceforge.net/tracker/?func=detail&atid=937966&aid=2003105&group_id=191583

nb.lang:
- enabled SVN keyword expansion


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@393 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz 8bf1146dd2 nl.lang:
- updated by Johan Hendriks (sylhouette)
  https://sourceforge.net/tracker/?func=detail&atid=937966&aid=1974742&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@376 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago
Christian Boltz c67c3cba00 *.lang:
- included all texts for domain aliases to the *.lang files

language-update.sh:
- new parameter --forcepatch
  Similar to --patch, but applies the patch line by line. Useful if 
  --patch fails because of empty lines etc., but much slower.



git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@365 a1433add-5e2c-0410-b055-b7f2511e0802
17 years ago