Skip to content
Browse files

Merge branch 'master' of git://github.com/roundcube/roundcubemail

  • Loading branch information...
2 parents 734982f + 57ea837 commit ac71f6ac74f5719a2403702786f79bc0448db37c @jmatth jmatth committed Jan 2, 2013
Showing with 7,732 additions and 5,131 deletions.
  1. +20 −1 CHANGELOG
  2. +5 −3 INSTALL
  3. +2 −1 UPGRADING
  4. +1 −1 bin/installto.sh
  5. +3 −2 bin/makedoc.sh
  6. +1 −1 bin/moduserprefs.sh
  7. +2 −2 bin/update.sh
  8. +11 −4 config/main.inc.php.dist
  9. +7 −1 installer/check.php
  10. +3 −3 installer/rcube_install.php
  11. +40 −30 plugins/acl/localization/de_CH.inc
  12. +16 −0 plugins/acl/localization/en_US.inc
  13. +28 −0 plugins/acl/localization/id_ID.inc
  14. +34 −2 plugins/acl/localization/{nb_NB.inc → nb_NO.inc}
  15. +89 −0 plugins/acl/localization/nn_NO.inc
  16. +21 −0 plugins/acl/localization/sr_CS.inc
  17. +21 −0 plugins/archive/localization/br.inc
  18. +10 −6 plugins/archive/localization/de_CH.inc
  19. +16 −0 plugins/archive/localization/en_US.inc
  20. +21 −0 plugins/archive/localization/nb_NO.inc
  21. +21 −0 plugins/archive/localization/nn_NO.inc
  22. +1 −1 plugins/{zipdownload/localization/zh_CN.inc → help/localization/ber.inc}
  23. +20 −0 plugins/help/localization/br.inc
  24. +9 −5 plugins/help/localization/de_CH.inc
  25. +16 −0 plugins/help/localization/en_US.inc
  26. +20 −0 plugins/help/localization/id_ID.inc
  27. 0 plugins/help/localization/{nb_NB.inc → nb_NO.inc}
  28. +20 −0 plugins/help/localization/nn_NO.inc
  29. +2 −2 plugins/help/skins/larry/help.css
  30. +9 −5 plugins/hide_blockquote/localization/de_CH.inc
  31. +16 −0 plugins/hide_blockquote/localization/en_US.inc
  32. +19 −0 plugins/hide_blockquote/localization/id_ID.inc
  33. 0 plugins/hide_blockquote/localization/{nb_NB.inc → nb_NO.inc}
  34. +5 −6 plugins/{managesieve/localization/ia_IA.inc → hide_blockquote/localization/nn_NO.inc}
  35. +9 −0 plugins/http_authentication/config.inc.php.dist
  36. +10 −1 plugins/http_authentication/http_authentication.php
  37. +3 −0 plugins/managesieve/Changelog
  38. +1 −1 plugins/managesieve/lib/Roundcube/rcube_sieve.php
  39. +122 −0 plugins/managesieve/localization/az_AZ.inc
  40. +62 −37 plugins/managesieve/localization/de_CH.inc
  41. +2 −1 plugins/managesieve/localization/en_GB.inc
  42. +17 −0 plugins/managesieve/localization/en_US.inc
  43. +14 −14 plugins/managesieve/localization/nb_NO.inc
  44. +149 −0 plugins/managesieve/localization/nn_NO.inc
  45. +1 −1 plugins/managesieve/managesieve.php
  46. +2 −2 plugins/managesieve/package.xml
  47. +17 −0 plugins/markasjunk/localization/ber.inc
  48. +20 −0 plugins/markasjunk/localization/br.inc
  49. +9 −5 plugins/markasjunk/localization/de_CH.inc
  50. +16 −0 plugins/markasjunk/localization/en_US.inc
  51. 0 plugins/markasjunk/localization/{nb_NB.inc → nb_NO.inc}
  52. +20 −0 plugins/markasjunk/localization/nn_NO.inc
  53. +9 −6 plugins/new_user_dialog/localization/de_CH.inc
  54. +16 −0 plugins/new_user_dialog/localization/en_US.inc
  55. 0 plugins/new_user_dialog/localization/{nb_NB.inc → nb_NO.inc}
  56. +19 −0 plugins/new_user_dialog/localization/nn_NO.inc
  57. +2 −3 plugins/new_user_dialog/localization/sv_SE.inc
  58. +19 −0 plugins/newmail_notifier/localization/br.inc
  59. +9 −7 plugins/newmail_notifier/localization/de_CH.inc
  60. +16 −0 plugins/newmail_notifier/localization/en_US.inc
  61. +0 −22 plugins/newmail_notifier/localization/ia_IA.inc
  62. +6 −7 plugins/newmail_notifier/localization/{nb_NB.inc → nb_NO.inc}
  63. +26 −0 plugins/newmail_notifier/localization/nn_NO.inc
  64. +8 −3 plugins/newmail_notifier/localization/sr_CS.inc
  65. +67 −71 plugins/password/drivers/cpanel.php
  66. +9 −11 plugins/password/drivers/directadmin.php
  67. +3 −3 plugins/password/drivers/ldap.php
  68. +174 −174 plugins/password/drivers/ldap_simple.php
  69. +1 −1 plugins/password/drivers/pam.php
  70. +0 −1 plugins/password/drivers/smb.php
  71. +30 −30 plugins/password/drivers/sql.php
  72. +4 −4 plugins/password/drivers/virtualmin.php
  73. +1 −1 plugins/password/drivers/vpopmaild.php
  74. +17 −0 plugins/password/localization/ber.inc
  75. +30 −0 plugins/password/localization/br.inc
  76. +25 −19 plugins/password/localization/de_CH.inc
  77. +16 −0 plugins/password/localization/en_US.inc
  78. +20 −0 plugins/password/localization/id_ID.inc
  79. +4 −4 plugins/password/localization/{nb_NB.inc → nb_NO.inc}
  80. +31 −0 plugins/password/localization/nn_NO.inc
  81. +4 −4 plugins/password/localization/sv_SE.inc
  82. +1 −1 plugins/show_additional_headers/show_additional_headers.php
  83. +1 −1 plugins/squirrelmail_usercopy/squirrelmail_usercopy.php
  84. +10 −6 plugins/subscriptions_option/localization/de_CH.inc
  85. +16 −0 plugins/subscriptions_option/localization/en_US.inc
  86. 0 plugins/subscriptions_option/localization/{nb_NB.inc → nb_NO.inc}
  87. +17 −0 plugins/userinfo/localization/ber.inc
  88. +20 −0 plugins/userinfo/localization/br.inc
  89. +9 −6 plugins/userinfo/localization/de_CH.inc
  90. +16 −0 plugins/userinfo/localization/en_US.inc
  91. +0 −22 plugins/userinfo/localization/ia_IA.inc
  92. 0 plugins/userinfo/localization/{nb_NB.inc → nb_NO.inc}
  93. +21 −0 plugins/userinfo/localization/nn_NO.inc
  94. +2 −3 plugins/userinfo/localization/sv_SE.inc
  95. +9 −6 plugins/vcard_attachments/localization/de_CH.inc
  96. +16 −0 plugins/vcard_attachments/localization/en_US.inc
  97. 0 plugins/vcard_attachments/localization/{nb_NB.inc → nb_NO.inc}
  98. +19 −0 plugins/vcard_attachments/localization/nn_NO.inc
  99. +19 −0 plugins/zipdownload/localization/br.inc
  100. +16 −3 plugins/zipdownload/localization/de_CH.inc
  101. +16 −3 plugins/zipdownload/localization/en_US.inc
  102. 0 plugins/zipdownload/localization/{nb_NB.inc → nb_NO.inc}
  103. +19 −0 plugins/zipdownload/localization/nn_NO.inc
  104. +19 −0 plugins/zipdownload/localization/sr_CS.inc
  105. +14 −1 program/include/bc.php
  106. +19 −8 program/include/rcmail.php
  107. +4 −1 program/include/rcmail_output_html.php
  108. +151 −141 program/js/app.js
  109. +37 −20 program/lib/Mail/mime.php
  110. +2 −2 program/lib/Mail/mimeDecode.php
  111. +27 −8 program/lib/Mail/mimePart.php
  112. +102 −0 program/lib/Roundcube/README.md
  113. +16 −3 program/lib/Roundcube/bootstrap.php
  114. +10 −12 program/lib/Roundcube/html.php
  115. +3 −4 program/lib/Roundcube/rcube.php
  116. +4 −7 program/lib/Roundcube/rcube_addressbook.php
  117. +0 −3 program/lib/Roundcube/rcube_base_replacer.php
  118. +0 −3 program/lib/Roundcube/rcube_browser.php
  119. +0 −3 program/lib/Roundcube/rcube_cache.php
  120. +0 −3 program/lib/Roundcube/rcube_charset.php
  121. +0 −3 program/lib/Roundcube/rcube_config.php
  122. +0 −3 program/lib/Roundcube/rcube_contacts.php
  123. +0 −3 program/lib/Roundcube/rcube_content_filter.php
  124. +0 −2 program/lib/Roundcube/rcube_csv2vcard.php
  125. +37 −75 program/lib/Roundcube/rcube_db.php
  126. +0 −4 program/lib/Roundcube/rcube_db_mssql.php
  127. +0 −4 program/lib/Roundcube/rcube_db_mysql.php
  128. +0 −4 program/lib/Roundcube/rcube_db_pgsql.php
  129. +1 −10 program/lib/Roundcube/rcube_db_sqlite.php
  130. +0 −4 program/lib/Roundcube/rcube_db_sqlsrv.php
  131. +143 −0 program/lib/Roundcube/rcube_enriched.php
  132. +160 −224 program/lib/{html2text.php → Roundcube/rcube_html2text.php}
  133. +17 −14 program/lib/Roundcube/rcube_image.php
  134. +14 −13 program/lib/Roundcube/rcube_imap.php
  135. +0 −4 program/lib/Roundcube/rcube_imap_cache.php
  136. +28 −13 program/lib/Roundcube/rcube_imap_generic.php
  137. +1 −4 program/lib/Roundcube/rcube_ldap.php
  138. +44 −25 program/lib/Roundcube/rcube_message.php
  139. +18 −4 program/lib/Roundcube/rcube_message_header.php
  140. +0 −4 program/lib/Roundcube/rcube_message_part.php
  141. +2 −5 program/lib/Roundcube/rcube_mime.php
  142. +1 −3 program/lib/Roundcube/rcube_output.php
  143. +333 −316 program/lib/Roundcube/rcube_plugin.php
  144. +449 −444 program/lib/Roundcube/rcube_plugin_api.php
  145. +0 −4 program/lib/Roundcube/rcube_result_index.php
  146. +0 −4 program/lib/Roundcube/rcube_result_set.php
  147. +0 −4 program/lib/Roundcube/rcube_result_thread.php
  148. +593 −569 program/lib/Roundcube/rcube_session.php
  149. +374 −394 program/lib/Roundcube/rcube_smtp.php
  150. +1 −5 program/lib/Roundcube/rcube_spellchecker.php
  151. +3 −5 program/lib/Roundcube/rcube_storage.php
  152. +174 −153 program/lib/Roundcube/rcube_string_replacer.php
  153. +1 −5 program/lib/Roundcube/rcube_user.php
  154. +0 −3 program/lib/Roundcube/rcube_utils.php
  155. +758 −708 program/lib/Roundcube/rcube_vcard.php
  156. +451 −0 program/lib/Roundcube/rcube_washtml.php
  157. +0 −114 program/lib/enriched.inc
  158. +0 −330 program/lib/washtml.php
  159. +5 −1 program/localization/az_AZ/labels.inc
  160. +4 −0 program/localization/az_AZ/messages.inc
  161. +18 −0 program/localization/ber/labels.inc
  162. +32 −2 program/localization/bg_BG/labels.inc
  163. +51 −16 program/localization/br/labels.inc
  164. +8 −5 program/localization/br/messages.inc
  165. +8 −4 program/localization/bs_BA/labels.inc
  166. +4 −0 program/localization/bs_BA/messages.inc
  167. +10 −2 program/localization/ca_ES/labels.inc
  168. +5 −1 program/localization/ca_ES/messages.inc
  169. +6 −1 program/localization/cy_GB/labels.inc
  170. +4 −0 program/localization/cy_GB/messages.inc
  171. +260 −186 program/localization/de_CH/labels.inc
  172. +22 −14 program/localization/de_CH/messages.inc
  173. +16 −4 program/localization/de_DE/labels.inc
  174. +5 −1 program/localization/de_DE/messages.inc
  175. +19 −2 program/localization/en_GB/labels.inc
  176. +7 −2 program/localization/en_GB/messages.inc
  177. +2 −2 program/localization/en_US/csv2vcard.inc
  178. +9 −5 program/localization/en_US/labels.inc
  179. +4 −4 program/localization/en_US/messages.inc
  180. +2 −2 program/localization/eo/labels.inc
  181. +8 −1 program/localization/es_ES/labels.inc
  182. +2 −1 program/localization/es_ES/messages.inc
  183. +10 −7 program/localization/fa_IR/labels.inc
  184. +5 −2 program/localization/fa_IR/messages.inc
  185. +6 −2 program/localization/fr_FR/labels.inc
  186. +4 −1 program/localization/fr_FR/messages.inc
  187. +85 −0 program/localization/fy_NL/labels.inc
  188. +16 −0 program/localization/fy_NL/messages.inc
  189. +9 −1 program/localization/hu_HU/labels.inc
  190. +5 −0 program/localization/hu_HU/messages.inc
  191. +1 −0 program/localization/index.inc
  192. +5 −1 program/localization/ja_JP/labels.inc
  193. +4 −0 program/localization/ja_JP/messages.inc
  194. +2 −3 program/localization/ko_KR/labels.inc
  195. +12 −3 program/localization/nb_NO/labels.inc
  196. +13 −8 program/localization/nb_NO/messages.inc
  197. +7 −3 program/localization/nl_NL/labels.inc
  198. +5 −1 program/localization/nl_NL/messages.inc
  199. +93 −22 program/localization/nn_NO/labels.inc
  200. +138 −82 program/localization/nn_NO/messages.inc
  201. +7 −1 program/localization/pl_PL/labels.inc
  202. +2 −0 program/localization/pl_PL/messages.inc
  203. +5 −1 program/localization/pt_BR/labels.inc
  204. +5 −1 program/localization/pt_BR/messages.inc
  205. +6 −2 program/localization/pt_PT/labels.inc
  206. +4 −0 program/localization/pt_PT/messages.inc
  207. +9 −3 program/localization/ru_RU/labels.inc
  208. +5 −1 program/localization/ru_RU/messages.inc
  209. +38 −10 program/localization/sr_CS/messages.inc
  210. +5 −1 program/localization/sv_SE/labels.inc
  211. +5 −1 program/localization/sv_SE/messages.inc
  212. +27 −1 program/localization/th_TH/labels.inc
  213. +17 −3 program/localization/tr_TR/labels.inc
  214. +6 −1 program/localization/tr_TR/messages.inc
  215. +15 −16 program/localization/vi_VN/labels.inc
  216. +3 −1 program/localization/zh_TW/messages.inc
  217. +15 −13 program/steps/addressbook/func.inc
  218. +7 −6 program/steps/addressbook/groups.inc
  219. +10 −3 program/steps/mail/check_recent.inc
  220. +108 −177 program/steps/mail/compose.inc
  221. +1 −0 program/steps/mail/folders.inc
  222. +185 −90 program/steps/mail/func.inc
  223. +19 −26 program/steps/mail/get.inc
  224. +1 −0 program/steps/mail/list.inc
  225. +3 −4 program/steps/mail/move_del.inc
  226. +5 −3 program/steps/mail/search.inc
  227. +4 −5 program/steps/mail/sendmail.inc
  228. +1 −4 program/steps/mail/show.inc
  229. +1 −3 program/steps/utils/html2text.inc
  230. +8 −0 skins/classic/common.css
  231. +2 −2 skins/classic/includes/messagetoolbar.html
  232. +11 −0 skins/classic/mail.css
  233. +5 −5 skins/classic/templates/addressbook.html
  234. +37 −36 skins/classic/templates/mail.html
  235. +2 −0 skins/classic/templates/message.html
  236. +27 −1 skins/larry/ie7hacks.css
  237. BIN skins/larry/images/buttons.png
  238. +5 −3 skins/larry/includes/header.html
  239. +3 −1 skins/larry/includes/mailtoolbar.html
  240. +26 −5 skins/larry/mail.css
  241. +173 −1 skins/larry/styles.css
  242. +5 −5 skins/larry/templates/addressbook.html
  243. +31 −32 skins/larry/templates/mail.html
  244. +1 −2 skins/larry/templates/message.html
  245. +1 −1 skins/larry/templates/messagepart.html
  246. +1 −1 skins/larry/templates/messagepreview.html
  247. +20 −0 skins/larry/ui.js
  248. +8 −0 tests/Framework/Bootstrap.php
  249. +74 −0 tests/Framework/Enriched.php
  250. +3 −3 tests/{HtmlToText.php → Framework/Html2text.php}
  251. +6 −0 tests/Framework/StringReplacer.php
  252. +28 −0 tests/Framework/Washtml.php
  253. +15 −1 tests/MailFunc.php
  254. +3 −1 tests/phpunit.xml
View
21 CHANGELOG
@@ -1,10 +1,29 @@
CHANGELOG Roundcube Webmail
===========================
+- Add option to use envelope From address for MDN responses (#1488880)
+- Add possibility to search in message body only (#1488770)
+- Support "multipart/relative" as an alias for "multipart/related" type (#1488886)
+- Display PGP/MIME signature attachments as "Digital Signature" (#1488570)
+- Workaround UW-IMAP bug where hierarchy separator is added to the shared folder name (#1488879)
+- Fix version comparisons with -stable suffix (#1488876)
+- Add unsupported alternative parts to attachments list (#1488870)
+- Add Compose button on message view page (#1488747)
+- Display 'Sender' header in message preview
+- Plugin API: Added message_before_send hook
+- Fix contact copy/add-to-group operations on search result (#1488862)
+- Use matching identity in MDN response (#1488864)
+- Fix unwanted horizontal scrollbar in message preview header (#1488866)
+- Fix handling of signatures on draft edit (#1488798)
+- Fix so compacting of non-empty folder is possible also when messages list is empty (#1488858)
+- Allow forwarding of multiple emails (#1486854)
+- Fix big memory consumption of DB layer (#1488856)
+- Add workaround for IE<=8 bug where Content-Disposition:inline was ignored (#1488844)
+- Fix XSS vulnerability in vbscript: and data:text links handling (#1488850)
- Fix broken message/part bodies when FETCH response contains more untagged lines (#1488836)
- Fix empty email on identities list after identity update (#1488834)
- Add new identities_level: (4) one identity with possibility to edit only signature
-- Use Delivered-To header as a last resort for identity selection (#1488840)
+- Use Delivered-To and Envelope-To headers for identity selection (#1488840, #1488553)
- Fix XSS vulnerability using Flash files (#1488828)
- Fix absolute positioning in HTML messages (#1488819)
- Fix cache (in)validation after setting \Deleted flag
View
8 INSTALL
@@ -12,9 +12,11 @@ REQUIREMENTS
* The Apache, Lighttpd, Cherokee or Hiawatha web server
* .htaccess support allowing overrides for DirectoryIndex
* PHP Version 5.2.1 or greater including
- - PDO, PCRE, DOM, JSON, XML, Session, Sockets (required)
- - libiconv, zip (recommended)
- - mbstring, fileinfo, mcrypt (optional)
+ - PCRE, DOM, JSON, XML, Session, Sockets (required)
+ - PHP Data Objects (PDO) with driver for either MySQL, PostgreSQL or SQLite (required)
+ Note: MySQL database driver requires PHP 5.3 or newer.
+ - Libiconv, Zip (recommended)
+ - Fileinfo, Mcrypt, mbstring (optional)
* PEAR packages distributed with Roundcube or external:
- Mail_Mime 1.8.1 or newer
- Mail_mimeDecode 1.5.5 or newer
View
3 UPGRADING
@@ -20,7 +20,7 @@ target location and check and update the configuration and database schema.
After all is done, the temporary folder with the new Roundcube files can be
removed again.
-Please also see Post-Upgrade Activities section.
+WARNING: See Post-Upgrade Activities section below.
Updating manually
@@ -53,3 +53,4 @@ Post-Upgrade Activities
3. When upgrading from version older than 0.6-beta you should make sure
your folder settings contain namespace prefix. For example Courier users
should add INBOX. prefix to folder names in main configuration file.
+4. Check system requirements in INSTALL file.
View
2 bin/installto.sh
@@ -35,7 +35,7 @@ if (!preg_match('/define\(.RCMAIL_VERSION.,\s*.([0-9.]+[a-z-]*)/', $iniset, $m))
$oldversion = $m[1];
-if (version_compare($oldversion, RCMAIL_VERSION, '>='))
+if (version_compare(version_parse($oldversion), version_parse(RCMAIL_VERSION), '>='))
die("Installation at target location is up-to-date!\n");
echo "Upgrading from $oldversion. Do you want to continue? (y/N)\n";
View
5 bin/makedoc.sh
@@ -1,10 +1,11 @@
#!/bin/sh
-TITLE="Roundcube Classes"
+TITLE="Roundcube Webmail"
PACKAGES="Core"
INSTALL_PATH="`dirname $0`/.."
PATH_PROJECT=$INSTALL_PATH/program/include
+PATH_FRAMEWORK=$INSTALL_PATH/program/lib/Roundcube
PATH_DOCS=$INSTALL_PATH/doc/phpdoc
BIN_PHPDOC="`/usr/bin/which phpdoc`"
@@ -20,6 +21,6 @@ TEMPLATE=earthli
PRIVATE=off
# make documentation
-$BIN_PHPDOC -d $PATH_PROJECT -t $PATH_DOCS -ti "$TITLE" -dn $PACKAGES \
+$BIN_PHPDOC -d $PATH_PROJECT,$PATH_FRAMEWORK -t $PATH_DOCS -ti "$TITLE" -dn $PACKAGES \
-o $OUTPUTFORMAT:$CONVERTER:$TEMPLATE -pp $PRIVATE
View
2 bin/moduserprefs.sh
@@ -31,7 +31,7 @@ function print_usage()
// get arguments
-$args = rcube_utils:get_opt(array('u' => 'user', 'd' => 'delete'));
+$args = rcube_utils::get_opt(array('u' => 'user', 'd' => 'delete'));
if ($_SERVER['argv'][1] == 'help') {
print_usage();
View
4 bin/update.sh
@@ -34,7 +34,7 @@ if (!$opts['version']) {
$opts['version'] = $input;
}
-if ($opts['version'] && version_compare($opts['version'], RCMAIL_VERSION, '>'))
+if ($opts['version'] && version_compare(version_parse($opts['version']), version_parse(RCMAIL_VERSION), '>'))
die("Nothing to be done here. Bye!\n");
@@ -169,7 +169,7 @@ if ($RCI->configured) {
}
// index contacts for fulltext searching
- if (version_compare($opts['version'], '0.6', '<')) {
+ if (version_compare(version_parse($opts['version']), '0.6.0', '<')) {
system(INSTALL_PATH . 'bin/indexcontacts.sh');
}
View
15 config/main.inc.php.dist
@@ -63,8 +63,8 @@ $rcmail_config['smtp_debug'] = false;
// IMAP
// ----------------------------------
-// the mail host chosen to perform the log-in
-// leave blank to show a textbox at login, give a list of hosts
+// The mail host chosen to perform the log-in.
+// Leave blank to show a textbox at login, give a list of hosts
// to display a pulldown menu or set one host as string.
// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls://
// Supported replacement variables:
@@ -73,6 +73,8 @@ $rcmail_config['smtp_debug'] = false;
// %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part)
// %s - domain name after the '@' from e-mail address provided at login screen
// For example %n = mail.domain.tld, %t = domain.tld
+// WARNING: After hostname change update of mail_host column in users table is
+// required to match old user data records with the new host.
$rcmail_config['default_host'] = '';
// TCP port used for IMAP connections
@@ -351,6 +353,10 @@ $rcmail_config['line_length'] = 72;
// send plaintext messages as format=flowed
$rcmail_config['send_format_flowed'] = true;
+// According to RFC2298, return receipt envelope sender address must be empty.
+// If this option is true, Roundcube will use user's identity as envelope sender for MDN responses.
+$rcmail_config['mdn_use_from'] = false;
+
// Set identities access level:
// 0 - many identities with possibility to edit all params
// 1 - many identities with possibility to edit all params but not email address
@@ -368,9 +374,10 @@ $rcmail_config['client_mimetypes'] = null; # null == default
// Set to null if the default path should be used.
$rcmail_config['mime_magic'] = null;
-// Path to local mime.types mapping table.
+// Absolute path to a local mime.types mapping table file.
// This is used to derive mime-types from the filename extension or vice versa.
-// Such a file is usually part of the apache webserver.
+// Such a file is usually part of the apache webserver. If you don't find a file named mime.types on your system,
+// download it from http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types
$rcmail_config['mime_types'] = null;
// path to imagemagick identify binary
View
8 installer/check.php
@@ -130,7 +130,13 @@
$prefix = (PHP_SHLIB_SUFFIX === 'dll') ? 'php_' : '';
foreach ($RCI->supported_dbs as $database => $ext) {
if (extension_loaded($ext)) {
- $RCI->pass($database);
+ // MySQL driver requires PHP >= 5.3 (#1488875)
+ if ($ext == 'pdo_mysql' && version_compare(PHP_VERSION, '5.3.0', '<')) {
+ $RCI->fail($database, 'PHP >= 5.3 required');
+ }
+ else {
+ $RCI->pass($database);
+ }
}
else {
$_ext = $ext_dir . '/' . $prefix . $ext . '.' . PHP_SHLIB_SUFFIX;
View
6 installer/rcube_install.php
@@ -633,8 +633,8 @@ function init_db($DB)
*/
function update_db($DB, $version)
{
- $version = strtolower($version);
- $engine = isset($this->db_map[$DB->db_provider]) ? $this->db_map[$DB->db_provider] : $DB->db_provider;
+ $version = version_parse(strtolower($version));
+ $engine = isset($this->db_map[$DB->db_provider]) ? $this->db_map[$DB->db_provider] : $DB->db_provider;
// read schema file from /SQL/*
$fname = INSTALL_PATH . "SQL/$engine.update.sql";
@@ -643,7 +643,7 @@ function update_db($DB, $version)
foreach ($lines as $line) {
$is_comment = preg_match('/^--/', $line);
if (!$from && $is_comment && preg_match('/from version\s([0-9.]+[a-z-]*)/', $line, $m)) {
- $v = strtolower($m[1]);
+ $v = version_parse(strtolower($m[1]));
if ($v == $version || version_compare($version, $v, '<='))
$from = true;
}
View
70 plugins/acl/localization/de_CH.inc
@@ -2,18 +2,20 @@
/*
+-----------------------------------------------------------------------+
- | localization/de_CH/labels.inc |
+ | plugins/acl/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail ACL plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: Thomas |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
*/
-$labels = array();
$labels['sharing'] = 'Freigabe';
$labels['myrights'] = 'Zugriffsrechte';
$labels['username'] = 'Benutzer:';
@@ -23,44 +25,48 @@ $labels['actions'] = 'Zugriffsrechte Aktionen...';
$labels['anyone'] = 'Alle Benutzer (anyone)';
$labels['anonymous'] = 'Gäste (anonymous)';
$labels['identifier'] = 'Bezeichnung';
+
$labels['acll'] = 'Sichtbar';
-$labels['shortacll'] = 'Sichtbar';
$labels['aclr'] = 'Nachrichten lesen';
$labels['acls'] = 'Lesestatus ändern';
$labels['aclw'] = 'Flags schreiben';
$labels['acli'] = 'Nachrichten hinzufügen';
$labels['aclp'] = 'Senden an';
-$labels['shortaclp'] = 'Senden an';
$labels['aclc'] = 'Unterordner erstellen';
$labels['aclk'] = 'Unterordner erstellen';
$labels['acld'] = 'Nachrichten als gelöscht markieren';
$labels['aclt'] = 'Nachrichten als gelöscht markieren';
$labels['acle'] = 'Endgültig löschen';
-$labels['shortacle'] = 'Endgültig löschen';
$labels['aclx'] = 'Ordner löschen';
$labels['acla'] = 'Verwalten';
-$labels['shortacla'] = 'Verwalten';
+
$labels['aclfull'] = 'Vollzugriff';
$labels['aclother'] = 'Andere';
-$labels['shortaclother'] = 'Andere';
$labels['aclread'] = 'Lesen';
-$labels['shortaclr'] = 'Lesen';
-$labels['shortaclread'] = 'Lesen';
$labels['aclwrite'] = 'Schreiben';
-$labels['shortaclw'] = 'Schreiben';
-$labels['shortaclwrite'] = 'Schreiben';
$labels['acldelete'] = 'Löschen';
-$labels['shortacld'] = 'Löschen';
-$labels['shortaclt'] = 'Löschen';
-$labels['shortacldelete'] = 'Löschen';
+
+$labels['shortacll'] = 'Sichtbar';
+$labels['shortaclr'] = 'Lesen';
$labels['shortacls'] = 'Behalte';
+$labels['shortaclw'] = 'Schreiben';
$labels['shortacli'] = 'Hinzufügen';
+$labels['shortaclp'] = 'Senden an';
$labels['shortaclc'] = 'Erstellen';
$labels['shortaclk'] = 'Erstellen';
+$labels['shortacld'] = 'Löschen';
+$labels['shortaclt'] = 'Löschen';
+$labels['shortacle'] = 'Endgültig löschen';
$labels['shortaclx'] = 'Ordner löschen';
+$labels['shortacla'] = 'Verwalten';
+
+$labels['shortaclother'] = 'Andere';
+$labels['shortaclread'] = 'Lesen';
+$labels['shortaclwrite'] = 'Schreiben';
+$labels['shortacldelete'] = 'Löschen';
+
$labels['longacll'] = 'Der Ordner ist sichtbar und kann abonniert werden';
$labels['longaclr'] = 'Der Ordnerinhalt kann gelesen werden';
-$labels['longaclread'] = 'Der Ordnerinhalt kann gelesen werden';
$labels['longacls'] = 'Der Lesestatus von Nachrichten kann geändert werden';
$labels['longaclw'] = 'Alle Nachrichten-Flags und Schlüsselwörter ausser "Gelesen" und "Gelöscht" können geändert werden';
$labels['longacli'] = 'Nachrichten können in diesen Ordner kopiert oder verschoben werden';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'Der "gelöscht" Status von Nachrichten kann geändert wer
$labels['longacle'] = 'Als "gelöscht" markierte Nachrichten können entfernt werden';
$labels['longaclx'] = 'Der Ordner kann gelöscht oder umbenannt werden';
$labels['longacla'] = 'Die Zugriffsrechte des Ordners können geändert werden';
+
$labels['longaclfull'] = 'Vollzugriff inklusive Ordner-Verwaltung';
+$labels['longaclread'] = 'Der Ordnerinhalt kann gelesen werden';
$labels['longaclwrite'] = 'Nachrichten können markiert, an den Ordner gesendet und in den Ordner kopiert oder verschoben werden';
$labels['longacldelete'] = 'Nachrichten können gelöscht werden';
-$labels['deleting'] = 'Zugriffsrechte werden entzogen...';
-$labels['saving'] = 'Zugriffsrechte werden gespeichert...';
-$labels['updatesuccess'] = 'Zugriffsrechte erfolgreich geändert';
-$labels['deletesuccess'] = 'Zugriffsrechte erfolgreich entzogen';
-$labels['createsuccess'] = 'Zugriffsrechte erfolgreich hinzugefügt';
-$labels['updateerror'] = 'Zugriffsrechte konnten nicht geändert werden';
-$labels['deleteerror'] = 'Zugriffsrechte konnten nicht entzogen werden';
-$labels['createerror'] = 'Zugriffsrechte konnten nicht gewährt werden';
-$labels['deleteconfirm'] = 'Sind Sie sicher, dass Sie die Zugriffsrechte den ausgewählten Benutzern entziehen möchten?';
-$labels['norights'] = 'Es wurden keine Zugriffsrechte ausgewählt!';
-$labels['nouser'] = 'Es wurde kein Benutzer ausgewählt!';
+$messages['deleting'] = 'Zugriffsrechte werden entzogen...';
+$messages['saving'] = 'Zugriffsrechte werden gespeichert...';
+$messages['updatesuccess'] = 'Zugriffsrechte erfolgreich geändert';
+$messages['deletesuccess'] = 'Zugriffsrechte erfolgreich entzogen';
+$messages['createsuccess'] = 'Zugriffsrechte erfolgreich hinzugefügt';
+$messages['updateerror'] = 'Zugriffsrechte konnten nicht geändert werden';
+$messages['deleteerror'] = 'Zugriffsrechte konnten nicht entzogen werden';
+$messages['createerror'] = 'Zugriffsrechte konnten nicht gewährt werden';
+$messages['deleteconfirm'] = 'Sind Sie sicher, dass Sie die Zugriffsrechte den ausgewählten Benutzern entziehen möchten?';
+$messages['norights'] = 'Es wurden keine Zugriffsrechte ausgewählt!';
+$messages['nouser'] = 'Es wurde kein Benutzer ausgewählt!';
+
+?>
View
16 plugins/acl/localization/en_US.inc
@@ -1,5 +1,21 @@
<?php
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/acl/localization/<lang>.inc |
+ | |
+ | Localization file of the Roundcube Webmail ACL plugin |
+ | Copyright (C) 2012, The Roundcube Dev Team |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
+ | |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
+*/
+
$labels['sharing'] = 'Sharing';
$labels['myrights'] = 'Access Rights';
$labels['username'] = 'User:';
View
28 plugins/acl/localization/id_ID.inc
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/id_ID/labels.inc |
+ | |
+ | Language file of the Roundcube Webmail client |
+ | Copyright (C) 2012, The Roundcube Dev Team |
+ | Licensed under the GNU General Public License |
+ | |
+ +-----------------------------------------------------------------------+
+ | Author: Lazlo |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['sharing'] = 'Berbagi';
+$labels['myrights'] = 'Hak Akses';
+$labels['username'] = 'Pengguna:';
+$labels['identifier'] = 'Identifair';
+$labels['acll'] = 'Cari';
+$labels['shortacll'] = 'Cari';
+$labels['aclp'] = 'Tulisan';
+$labels['shortaclp'] = 'Tulisan';
+$labels['aclc'] = 'Buat subfolder';
+$labels['aclk'] = 'Buat subfolder';
+$labels['aclx'] = 'Hapus folder';
+
View
36 plugins/acl/localization/nb_NB.inc → plugins/acl/localization/nb_NO.inc
@@ -9,7 +9,7 @@
| Licensed under the GNU General Public License |
| |
+-----------------------------------------------------------------------+
- | Author: Martin Bore |
+ | Author: Fredrik Larsen <fredrik.h.larsen@gmail.com> |
+-----------------------------------------------------------------------+
*/
@@ -19,12 +19,15 @@ $labels['myrights'] = 'Tilgangsrettigheter';
$labels['username'] = 'Bruker:';
$labels['advanced'] = 'Avansert modus';
$labels['newuser'] = 'Legg til oppføring';
+$labels['actions'] = 'Valg for tilgangsrettigheter.';
$labels['anyone'] = 'Alle brukere (alle)';
-$labels['anonymous'] = 'Gjester (anononyme)';
+$labels['anonymous'] = 'Gjester (anonyme)';
$labels['identifier'] = 'Identifikator';
$labels['acll'] = 'Oppslag';
$labels['shortacll'] = 'Oppslag';
$labels['aclr'] = 'Les meldinger';
+$labels['acls'] = 'Behold lesestatus';
+$labels['aclw'] = 'Lagre flagg';
$labels['acli'] = 'Lim inn';
$labels['aclp'] = 'Post';
$labels['shortaclp'] = 'Post';
@@ -37,6 +40,9 @@ $labels['shortacle'] = 'Slett fullstendig';
$labels['aclx'] = 'Slett mappe';
$labels['acla'] = 'Administrer';
$labels['shortacla'] = 'Administrer';
+$labels['aclfull'] = 'Full kontroll';
+$labels['aclother'] = 'Annet';
+$labels['shortaclother'] = 'Annet';
$labels['aclread'] = 'Les';
$labels['shortaclr'] = 'Les';
$labels['shortaclread'] = 'Les';
@@ -51,7 +57,33 @@ $labels['shortacls'] = 'Behold';
$labels['shortacli'] = 'Sett inn';
$labels['shortaclc'] = 'Opprett';
$labels['shortaclk'] = 'Opprett';
+$labels['shortaclx'] = 'Slett mappe';
+$labels['longacll'] = 'Mappen er synlig og kan abonneres på';
+$labels['longaclr'] = 'Mappen kan åpnes for lesing';
+$labels['longaclread'] = 'Mappen kan åpnes for lesing';
+$labels['longacls'] = 'Meldingenes lesestatusflagg kan endres';
+$labels['longaclw'] = 'Meldingsflagg og -nøkkelord kan endres, bortsett fra status for lesing og sletting';
+$labels['longacli'] = 'Meldinger kan lagres eller kopieres til mappen';
+$labels['longaclp'] = 'Meldinger kan postes til denne mappen';
+$labels['longaclc'] = 'Mapper kan opprettes (eller navnes om) direkte under denne mappen';
+$labels['longaclk'] = 'Mapper kan opprettes (eller navnes om) direkte under denne mappen';
+$labels['longacld'] = 'Meldingenes flagg for sletting kan endres';
+$labels['longaclt'] = 'Meldingenes flagg for sletting kan endres';
+$labels['longacle'] = 'Meldingen kan slettes for godt';
+$labels['longaclx'] = 'Mappen kan slettes eller gis nytt navn';
+$labels['longacla'] = 'Mappens tilgangsrettigheter kan endres';
+$labels['longaclfull'] = 'Full kontroll, inkludert mappeadministrasjon';
+$labels['longaclwrite'] = 'Meldinger kan merkes, lagres i eller flyttes til mappen';
$labels['longacldelete'] = 'Meldingen kan slettes';
$labels['deleting'] = 'Sletter tilgangsrettigheter';
$labels['saving'] = 'Lagrer tilgangsrettigheter';
+$labels['updatesuccess'] = 'Tilgangsrettigheter ble endret';
+$labels['deletesuccess'] = 'Tilgangsrettigheter ble slettet';
+$labels['createsuccess'] = 'Tilgangsrettigheter ble lagt til';
+$labels['updateerror'] = 'Kunne ikke oppdatere tilgangsrettigheter';
+$labels['deleteerror'] = 'Kunne ikke fjerne tilgangsrettigheter';
+$labels['createerror'] = 'Kunne ikke legge til tilgangsrettigheter';
+$labels['deleteconfirm'] = 'Er du sikker på at du vil fjerne tilgangen til valgte brukere';
+$labels['norights'] = 'Ingen rettigheter er spesifisert!';
+$labels['nouser'] = 'Brukernavn er ikke spesifisert!';
View
89 plugins/acl/localization/nn_NO.inc
@@ -0,0 +1,89 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/nn_NN/labels.inc |
+ | |
+ | Language file of the Roundcube Webmail client |
+ | Copyright (C) 2012, The Roundcube Dev Team |
+ | Licensed under the GNU General Public License |
+ | |
+ +-----------------------------------------------------------------------+
+ | Author: Fredrik Larsen <fredrik.h.larsen@gmail.com> |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['sharing'] = 'Deling';
+$labels['myrights'] = 'Tilgangsrettar';
+$labels['username'] = 'Brukar:';
+$labels['advanced'] = 'Avansert modus';
+$labels['newuser'] = 'Legg til oppføring';
+$labels['actions'] = 'Val for tilgangsrettar...';
+$labels['anyone'] = 'Alle brukarar (alle)';
+$labels['anonymous'] = 'Gjester (anonyme)';
+$labels['identifier'] = 'Identifikator';
+$labels['acll'] = 'Oppslag';
+$labels['shortacll'] = 'Oppslag';
+$labels['aclr'] = 'Les meldingar';
+$labels['acls'] = 'Behald lesestatus';
+$labels['aclw'] = 'Skriveflagg';
+$labels['acli'] = 'Lim inn';
+$labels['aclp'] = 'Post';
+$labels['shortaclp'] = 'Post';
+$labels['aclc'] = 'Opprett undermapper';
+$labels['aclk'] = 'Opprett undermapper';
+$labels['acld'] = 'Slett meldingar';
+$labels['aclt'] = 'Slett meldingar';
+$labels['acle'] = 'Slett fullstendig';
+$labels['shortacle'] = 'Slett fullstendig';
+$labels['aclx'] = 'Slett mappe';
+$labels['acla'] = 'Administrér';
+$labels['shortacla'] = 'Administrér';
+$labels['aclfull'] = 'Full kontroll';
+$labels['aclother'] = 'Anna';
+$labels['shortaclother'] = 'Anna';
+$labels['aclread'] = 'Les';
+$labels['shortaclr'] = 'Les';
+$labels['shortaclread'] = 'Les';
+$labels['aclwrite'] = 'Skriv';
+$labels['shortaclw'] = 'Skriv';
+$labels['shortaclwrite'] = 'Skriv';
+$labels['acldelete'] = 'Slett';
+$labels['shortacld'] = 'Slett';
+$labels['shortaclt'] = 'Slett';
+$labels['shortacldelete'] = 'Slett';
+$labels['shortacls'] = 'Behald';
+$labels['shortacli'] = 'Sett inn';
+$labels['shortaclc'] = 'Opprett';
+$labels['shortaclk'] = 'Opprett';
+$labels['shortaclx'] = 'Slett mappe';
+$labels['longacll'] = 'Mappa er synleg og kan abonnerast på';
+$labels['longaclr'] = 'Mappa kan opnast for lesing';
+$labels['longaclread'] = 'Mappa kan opnast for lesing';
+$labels['longacls'] = 'Meldingane sine lesestatusflagg kan endrast';
+$labels['longaclw'] = 'Meldingsflagg og -nøkkelord kan endrast, bortsett frå status for lesing og sletting';
+$labels['longacli'] = 'Meldingar kan lagrast eller kopierast til mappa';
+$labels['longaclp'] = 'Meldingar kan postast til denne mappa';
+$labels['longaclc'] = 'Mapper kan opprettast (eller namnast om) direkte under denne mappa';
+$labels['longaclk'] = 'Mapper kan opprettast (eller namnast om) direkte under denne mappa';
+$labels['longacld'] = 'Meldingane sine flagg for sletting kan endrast';
+$labels['longaclt'] = 'Meldingane sine flagg for sletting kan endrast';
+$labels['longacle'] = 'Meldinga kan slettast for godt';
+$labels['longaclx'] = 'Mappa kan slettast eller få nytt namn';
+$labels['longacla'] = 'Mappa sine tilgangsrettar kan endrast';
+$labels['longaclfull'] = 'Full kontroll, inkludert mappeadministrasjon';
+$labels['longaclwrite'] = 'Meldingar kan merkast, lagrast i eller flyttast til mappa';
+$labels['longacldelete'] = 'Meldinga kan slettast';
+$labels['deleting'] = 'Slettar tilgangsrettar…';
+$labels['saving'] = 'Lagrar tilgangsrettar…';
+$labels['updatesuccess'] = 'Tilgangsrettiar vart endra';
+$labels['deletesuccess'] = 'Tilgangsretter vart sletta';
+$labels['createsuccess'] = 'Tilgangsrettar vart legne til';
+$labels['updateerror'] = 'Kunne ikkje oppdatere tilgangsrettar';
+$labels['deleteerror'] = 'Kunne ikkje fjerne tilgangsrettar';
+$labels['createerror'] = 'Kunne ikkje leggje til tilgangsrettar';
+$labels['deleteconfirm'] = 'Er du sikker på at du vil fjerne tilgangen til valde brukarar?';
+$labels['norights'] = 'Ingen rettar er spesifisert!';
+$labels['nouser'] = 'Brukarnamn er ikkje spesifisert!';
+
View
21 plugins/acl/localization/sr_CS.inc
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/sr_CS/labels.inc |
+ | |
+ | Language file of the Roundcube Webmail client |
+ | Copyright (C) 2012, The Roundcube Dev Team |
+ | Licensed under the GNU General Public License |
+ | |
+ +-----------------------------------------------------------------------+
+ | Author: Данило Шеган |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['sharing'] = 'Дељење';
+$labels['myrights'] = 'Права приступа';
+$labels['username'] = 'Корисник:';
+$labels['newuser'] = 'Додај унос';
+
View
21 plugins/archive/localization/br.inc
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/br/labels.inc |
+ | |
+ | Language file of the Roundcube Webmail client |
+ | Copyright (C) 2012, The Roundcube Dev Team |
+ | Licensed under the GNU General Public License |
+ | |
+ +-----------------------------------------------------------------------+
+ | Author: Denis |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['buttontext'] = 'Diell';
+$labels['archivefolder'] = 'Diell';
+$labels['buttontitle'] = 'Dielliñ ar gemenadenn-mañ';
+$labels['archived'] = 'Diellet gant berzh';
+
View
16 plugins/archive/localization/de_CH.inc
@@ -2,20 +2,24 @@
/*
+-----------------------------------------------------------------------+
- | localization/de_CH/labels.inc |
+ | plugins/archive/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Archive plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: Thomas |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
*/
$labels = array();
$labels['buttontext'] = 'Archiv';
-$labels['archivefolder'] = 'Archiv';
$labels['buttontitle'] = 'Nachricht archivieren';
$labels['archived'] = 'Nachricht erfolgreich archiviert';
+$labels['archivefolder'] = 'Archiv';
+?>
View
16 plugins/archive/localization/en_US.inc
@@ -1,5 +1,21 @@
<?php
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/archive/localization/<lang>.inc |
+ | |
+ | Localization file of the Roundcube Webmail Archive plugin |
+ | Copyright (C) 2012, The Roundcube Dev Team |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
+ | |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
+*/
+
$labels = array();
$labels['buttontext'] = 'Archive';
$labels['buttontitle'] = 'Archive this message';
View
21 plugins/archive/localization/nb_NO.inc
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/nb_NB/labels.inc |
+ | |
+ | Language file of the Roundcube Webmail client |
+ | Copyright (C) 2012, The Roundcube Dev Team |
+ | Licensed under the GNU General Public License |
+ | |
+ +-----------------------------------------------------------------------+
+ | Author: Tobias V. Langhoff <spug@thespug.net> |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['buttontext'] = 'Arkiv';
+$labels['archivefolder'] = 'Arkiv';
+$labels['buttontitle'] = 'Arkiver meldingen';
+$labels['archived'] = 'Arkivert';
+
View
21 plugins/archive/localization/nn_NO.inc
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/nn_NN/labels.inc |
+ | |
+ | Language file of the Roundcube Webmail client |
+ | Copyright (C) 2012, The Roundcube Dev Team |
+ | Licensed under the GNU General Public License |
+ | |
+ +-----------------------------------------------------------------------+
+ | Author: Fredrik Larsen <fredrik.h.larsen@gmail.com> |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['buttontext'] = 'Arkiver';
+$labels['archivefolder'] = 'Arkiver';
+$labels['buttontitle'] = 'Arkiver meldinga';
+$labels['archived'] = 'Arkivert';
+
View
2 plugins/zipdownload/localization/zh_CN.inc → plugins/help/localization/ber.inc
@@ -2,7 +2,7 @@
/*
+-----------------------------------------------------------------------+
- | localization/zh_CN/labels.inc |
+ | localization//labels.inc |
| |
| Language file of the Roundcube Webmail client |
| Copyright (C) 2012, The Roundcube Dev Team |
View
20 plugins/help/localization/br.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/br/labels.inc |
+ | |
+ | Language file of the Roundcube Webmail client |
+ | Copyright (C) 2012, The Roundcube Dev Team |
+ | Licensed under the GNU General Public License |
+ | |
+ +-----------------------------------------------------------------------+
+ | Author: Denis |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['help'] = 'Skoazell';
+$labels['about'] = 'Diwar-benn';
+$labels['license'] = 'Lañvaz';
+
View
14 plugins/help/localization/de_CH.inc
@@ -2,19 +2,23 @@
/*
+-----------------------------------------------------------------------+
- | localization/de_CH/labels.inc |
+ | plugins/help/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Help plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: Thomas |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
*/
$labels = array();
$labels['help'] = 'Hilfe';
$labels['about'] = 'Information';
$labels['license'] = 'Lizenz';
+?>
View
16 plugins/help/localization/en_US.inc
@@ -1,5 +1,21 @@
<?php
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/help/localization/<lang>.inc |
+ | |
+ | Localization file of the Roundcube Webmail Help plugin |
+ | Copyright (C) 2012, The Roundcube Dev Team |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
+ | |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
+*/
+
$labels = array();
$labels['help'] = 'Help';
$labels['about'] = 'About';
View
20 plugins/help/localization/id_ID.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/id_ID/labels.inc |
+ | |
+ | Language file of the Roundcube Webmail client |
+ | Copyright (C) 2012, The Roundcube Dev Team |
+ | Licensed under the GNU General Public License |
+ | |
+ +-----------------------------------------------------------------------+
+ | Author: Lazlo |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['help'] = 'Panduan';
+$labels['about'] = 'Tentang';
+$labels['license'] = 'Lisensi';
+
View
0 plugins/help/localization/nb_NB.inc → plugins/help/localization/nb_NO.inc
File renamed without changes.
View
20 plugins/help/localization/nn_NO.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/nn_NN/labels.inc |
+ | |
+ | Language file of the Roundcube Webmail client |
+ | Copyright (C) 2012, The Roundcube Dev Team |
+ | Licensed under the GNU General Public License |
+ | |
+ +-----------------------------------------------------------------------+
+ | Author: Åsmund Skjæveland <aasmunds@ulrik.uio.no> |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['help'] = 'Hjelp';
+$labels['about'] = 'Om';
+$labels['license'] = 'Lisens';
+
View
4 plugins/help/skins/larry/help.css
@@ -17,13 +17,13 @@
}
#taskbar a.button-help span.button-inner {
- background: url(help.png) 2px 0px no-repeat;
+ background: url(help.png) 0 0 no-repeat;
height: 19px;
}
#taskbar a.button-help:hover span.button-inner,
#taskbar a.button-help.button-selected span.button-inner {
- background: url(help.png) 2px -24px no-repeat;
+ background: url(help.png) 0 -24px no-repeat;
height: 19px;
}
View
14 plugins/hide_blockquote/localization/de_CH.inc
@@ -2,19 +2,23 @@
/*
+-----------------------------------------------------------------------+
- | localization/de_CH/labels.inc |
+ | plugins/hide_blockquote/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: Thomas |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
*/
$labels = array();
$labels['hide'] = 'ausblenden';
$labels['show'] = 'einblenden';
$labels['quotelimit'] = 'Zitate verbergen ab einer Zeilenlänge von';
+?>
View
16 plugins/hide_blockquote/localization/en_US.inc
@@ -1,5 +1,21 @@
<?php
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/hide_blockquote/localization/<lang>.inc |
+ | |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin |
+ | Copyright (C) 2012, The Roundcube Dev Team |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
+ | |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
+*/
+
$labels = array();
$labels['hide'] = 'Hide';
$labels['show'] = 'Show';
View
19 plugins/hide_blockquote/localization/id_ID.inc
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/id_ID/labels.inc |
+ | |
+ | Language file of the Roundcube Webmail client |
+ | Copyright (C) 2012, The Roundcube Dev Team |
+ | Licensed under the GNU General Public License |
+ | |
+ +-----------------------------------------------------------------------+
+ | Author: Lazlo |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['hide'] = 'Sembunyi';
+$labels['show'] = 'Tampak';
+
View
0 ...ns/hide_blockquote/localization/nb_NB.inc → ...ns/hide_blockquote/localization/nb_NO.inc
File renamed without changes.
View
11 plugins/managesieve/localization/ia_IA.inc → ...ns/hide_blockquote/localization/nn_NO.inc
@@ -2,20 +2,19 @@
/*
+-----------------------------------------------------------------------+
- | localization/ia_IA/labels.inc |
+ | localization/nn_NN/labels.inc |
| |
| Language file of the Roundcube Webmail client |
| Copyright (C) 2012, The Roundcube Dev Team |
| Licensed under the GNU General Public License |
| |
+-----------------------------------------------------------------------+
- | Author: Emilio Sepulveda <emilio@chilemoz.org> |
+ | Author: Åsmund Skjæveland <aasmunds@ulrik.uio.no> |
+-----------------------------------------------------------------------+
- @version $Id$
*/
$labels = array();
-$labels['filters'] = 'Filtros';
-$labels['filteradd'] = 'Adder filtro';
-$labels['filterdel'] = 'Deler filtro';
+$labels['hide'] = 'Gøym';
+$labels['show'] = 'Vis';
+$labels['quotelimit'] = 'Gøym sitat når talet på linjer er større enn';
View
9 plugins/http_authentication/config.inc.php.dist
@@ -0,0 +1,9 @@
+<?php
+
+// HTTP Basic Authentication Plugin options
+// ----------------------------------------
+// Default mail host to log-in using user/password from HTTP Authentication.
+// This is useful if the users are free to choose arbitrary mail hosts (or
+// from a list), but have one host they usually want to log into.
+// Unlike $rcmail_config['default_host'] this must be a string!
+$rcmail_config['http_authentication_host'] = '';
View
11 plugins/http_authentication/http_authentication.php
@@ -11,6 +11,8 @@
*
* See logout.html (in this directory) for an example how HTTP auth can be cleared.
*
+ * For other configuration options, see config.inc.php.dist!
+ *
* @version @package_version@
* @license GNU GPLv3+
* @author Thomas Bruederli
@@ -36,7 +38,7 @@ function startup($args)
$args['action'] = 'login';
}
// Set user password in session (see shutdown() method for more info)
- else if (!empty($_SESSION['user_id']) && empty($_SESION['password'])) {
+ else if (!empty($_SESSION['user_id']) && empty($_SESSION['password'])) {
$_SESSION['password'] = $rcmail->encrypt($_SERVER['PHP_AUTH_PW']);
}
}
@@ -46,6 +48,13 @@ function startup($args)
function authenticate($args)
{
+ // Load plugin's config file
+ $this->load_config();
+
+ $host = rcmail::get_instance()->config->get('http_authentication_host');
+ if (is_string($host) && trim($host) !== '')
+ $args['host'] = rcube_idn_to_ascii(rcube_parse_host($host));
+
// Allow entering other user data in login form,
// e.g. after log out (#1487953)
if (!empty($args['user'])) {
View
3 plugins/managesieve/Changelog
@@ -1,7 +1,10 @@
+* version 6.1 [2012-12-21]
+-----------------------------------------------------------
- Fixed filter activation/deactivation confirmation message (#1488765)
- Moved rcube_* classes to <plugin>/lib/Roundcube for compat. with Roundcube Framework autoloader
- Fixed filter selection after filter deletion (#1488832)
- Fixed compatibility with jQueryUI-1.9
+- Don't force 'stop' action on last rule in a script
* version 6.0 [2012-10-03]
-----------------------------------------------------------
View
2 plugins/managesieve/lib/Roundcube/rcube_sieve.php
@@ -325,7 +325,7 @@ private function _parse($txt)
continue 2;
}
}
- if (empty($script->content[$idx+1]) || $script->content[$idx+1]['type'] != 'if') {
+ if (!empty($script->content[$idx+1]) && $script->content[$idx+1]['type'] != 'if') {
$script->content[$idx]['actions'][] = array('type' => 'stop');
}
}
View
122 plugins/managesieve/localization/az_AZ.inc
@@ -24,4 +24,126 @@ $labels['moveup'] = 'Yuxarı apar';
$labels['movedown'] = 'Aşağı apar';
$labels['filterallof'] = 'göstərilən bütün qaydalara uyur';
$labels['filteranyof'] = 'verilmiş istənilən qaydaya uyur';
+$labels['filterany'] = 'bütün məktublar';
+$labels['filtercontains'] = 'daxildir';
+$labels['filternotcontains'] = 'daxil deyil';
+$labels['filteris'] = 'uyğundur';
+$labels['filterisnot'] = 'uyğun deyil';
+$labels['filterexists'] = 'mövcuddur';
+$labels['filternotexists'] = 'mövcud deyil';
+$labels['filtermatches'] = 'ifadə ilə üst-üstə düşür';
+$labels['filternotmatches'] = 'ifadə ilə üst-üstə düşmür';
+$labels['filterregex'] = 'daimi ifadənin nəticəsi ilə üst-üstə düşür';
+$labels['filternotregex'] = 'daimi ifadə ilə üst-üstə düşmür';
+$labels['filterunder'] = 'altında';
+$labels['filterover'] = 'yuxarıda';
+$labels['addrule'] = 'Qayda əlavə et';
+$labels['delrule'] = 'Qaydanı sil';
+$labels['messagemoveto'] = 'Məktubu köçür';
+$labels['messageredirect'] = 'Məktubu yolla';
+$labels['messagecopyto'] = 'Məktubu kopyala';
+$labels['messagesendcopy'] = 'Məktubun kopyasını göndər';
+$labels['messagereply'] = 'Məktubla cavab ver';
+$labels['messagedelete'] = 'Sil';
+$labels['messagediscard'] = 'Məktubla rədd et';
+$labels['messagesrules'] = 'Daxil olan məktub üçün:';
+$labels['messagesactions'] = '...növbəti hərəkəti yerinə yetir:';
+$labels['add'] = 'Əlavə et';
+$labels['del'] = 'Sil';
+$labels['sender'] = 'Göndərən';
+$labels['recipient'] = 'Qəbul edən';
+$labels['vacationaddresses'] = 'Əlavə ünvanlarım üçün siyahı (vergüllər ilə ayrılmış):';
+$labels['vacationdays'] = 'Məktub neçə müddətdən bir göndərilsin (gündə):';
+$labels['vacationreason'] = 'Məktubun mətni (səbəb yoxdur):';
+$labels['vacationsubject'] = 'Məktubun mövzusu:';
+$labels['rulestop'] = 'Yerinə yetirməyi dayandır';
+$labels['enable'] = 'Yandır/Söndür';
+$labels['filterset'] = 'Süzgəc dəsti';
+$labels['filtersets'] = 'Süzgəc dəstləri';
+$labels['filtersetadd'] = 'Süzgəc dəsti əlavə et';
+$labels['filtersetdel'] = 'İndiki sücgəc dəstini sil';
+$labels['filtersetact'] = 'İndiki sücgəc dəstini yandır';
+$labels['filtersetdeact'] = 'İndiki süzgəc dəstini söndür';
+$labels['filterdef'] = 'Süzgəcin təsviri';
+$labels['filtersetname'] = 'Süzgəc dəstinin adı';
+$labels['newfilterset'] = 'Yeni süzgəc dəsti';
+$labels['active'] = 'aktiv';
+$labels['none'] = 'heç biri';
+$labels['fromset'] = 'dəstdən';
+$labels['fromfile'] = 'fayldan';
+$labels['filterdisabled'] = 'Süzgəci söndür';
+$labels['countisgreaterthan'] = 'sayı buradan daha çoxdur';
+$labels['countisgreaterthanequal'] = 'say çox və ya bərabərdir';
+$labels['countislessthan'] = 'say buradan azdır';
+$labels['countislessthanequal'] = 'say azdır və ya bərabərdir';
+$labels['countequals'] = 'say bərabərdir';
+$labels['countnotequals'] = 'say bərabər deyil';
+$labels['valueisgreaterthan'] = 'dəyər buradan daha böyükdür';
+$labels['valueisgreaterthanequal'] = 'dəyər çoxdur və ya bərabərdir';
+$labels['valueislessthan'] = 'dəyər buradan azdır';
+$labels['valueislessthanequal'] = 'dəyər azdır və ya bərabərdir';
+$labels['valueequals'] = 'dəyər bərabərdir';
+$labels['valuenotequals'] = 'dəyər bərabər deyil';
+$labels['setflags'] = 'Məktublara flaq quraşdır';
+$labels['addflags'] = 'Məktuba flaq əlavə et';
+$labels['removeflags'] = 'Məktubdan flaqları sil';
+$labels['flagread'] = 'Oxu';
+$labels['flagdeleted'] = 'Silindi';
+$labels['flaganswered'] = 'Cavab verilmiş';
+$labels['flagflagged'] = 'İşarəlilər';
+$labels['flagdraft'] = 'Qaralama';
+$labels['filtercreate'] = 'Süzgəc yarat';
+$labels['usedata'] = 'Süzgəcdə bu məlumatları istifadə et:';
+$labels['nextstep'] = 'Sonrakı';
+$labels['...'] = '...';
+$labels['advancedopts'] = 'Əlavə ayarlar';
+$labels['body'] = 'Məzmun';
+$labels['address'] = 'ünvan';
+$labels['envelope'] = 'zərf';
+$labels['modifier'] = 'modifikator:';
+$labels['text'] = 'mətn';
+$labels['undecoded'] = 'emal olunmamış (xammal)';
+$labels['contenttype'] = 'məzmun növü';
+$labels['modtype'] = 'növ:';
+$labels['allparts'] = 'hamısı';
+$labels['domain'] = 'domen';
+$labels['localpart'] = 'lokal hissə';
+$labels['user'] = 'istifadəçi';
+$labels['detail'] = 'təfsilat';
+$labels['comparator'] = 'komparator:';
+$labels['default'] = 'ön qurğulu';
+$labels['octet'] = 'ciddi (oktet)';
+$labels['asciicasemap'] = 'qeydiyyat üzrə müstəqil (ascii-casemap)';
+$labels['asciinumeric'] = 'ədədi (ascii-numeric)';
+$labels['filterunknownerror'] = 'Serverin naməlum xətası.';
+$labels['filterconnerror'] = 'Serverə qoşulmaq alınmır';
+$labels['filterdeleteerror'] = 'Süzgəci silmək mümkün deyil. Server xətası.';
+$labels['filterdeleted'] = 'Süzgəc uğurla silindi.';
+$labels['filtersaved'] = 'Süzgəc uğurla saxlanıldı.';
+$labels['filtersaveerror'] = 'Süzgəci saxlamaq mümkün deyil. Server xətası.';
+$labels['filterdeleteconfirm'] = 'Siz həqiqətən süzgəci silmək istəyirsiniz?';
+$labels['ruledeleteconfirm'] = 'Bu qaydanı silməkdə əminsiniz?';
+$labels['actiondeleteconfirm'] = 'Bu hərəkəti silməkdə əminsiniz?';
+$labels['forbiddenchars'] = 'Sahədə qadağan edilən işarələr.';
+$labels['cannotbeempty'] = 'Sahə boş ola bilməz.';
+$labels['ruleexist'] = 'Bu adla süzgəc artıq mövcuddur.';
+$labels['setactivateerror'] = 'Seçilmiş süzgəc dəstini yandırmaq mümkün deyil. Server xətası.';
+$labels['setdeactivateerror'] = 'Seçilmiş süzgəc dəstini söndürmək mümkün deyil. Server xətası.';
+$labels['setdeleteerror'] = 'Seçilmiş süzgəc dəstini silmək mümkün deyil. Server xətası.';
+$labels['setactivated'] = 'Süzgəc dəsti yandırıldı.';
+$labels['setdeactivated'] = 'Süzgəc dəsti söndürüldü.';
+$labels['setdeleted'] = 'Süzgəc dəsti silindi.';
+$labels['setdeleteconfirm'] = 'Bu süzgəc dəstini silməkdə əminsiniz?';
+$labels['setcreateerror'] = 'Süzgəc dəstini yaratmaq mümkün deyil. Server xərası.';
+$labels['setcreated'] = 'Süzgəc dəsti uğurla yaradıldı.';
+$labels['activateerror'] = 'Seçilmiş süzgəc(lər)i yandırmaq mümkün deyil. Server xətası.';
+$labels['deactivateerror'] = 'Seçilmiş süzgəc(lər)i söndürmək mümkün deyil. Server xətası.';
+$labels['activated'] = 'Süzgəc(lər) uğurla söndürüldü.';
+$labels['deactivated'] = 'Süzgəc(lər) uğurla yandırıldı.';
+$labels['moved'] = 'Süzgəc uğurla köçürüldü.';
+$labels['moveerror'] = 'Süzgəci köçürmək mümkün deyil. Server xətası.';
+$labels['nametoolong'] = 'Süzgəc dəstini yaratmaq mümkün deyil. Ad çox uzundur.';
+$labels['namereserved'] = 'Rezerv edilmiş ad.';
+$labels['setexist'] = 'Dəst artıq mövcuddur.';
+$labels['nodata'] = 'Heç olmasa bir mövqe tutmaq lazımdır!';
View
99 plugins/managesieve/localization/de_CH.inc
@@ -2,18 +2,21 @@
/*
+-----------------------------------------------------------------------+
- | localization/de_CH/labels.inc |
+ | plugins/managesieve/localization/<lang>.inc |
| |
- | Language file of the Roundcube Webmail client |
+ | Localization file of the Roundcube Webmail Managesieve plugin |
| Copyright (C) 2012, The Roundcube Dev Team |
- | Licensed under the GNU General Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
+-----------------------------------------------------------------------+
- | Author: Thomas |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
*/
-$labels = array();
+
$labels['filters'] = 'Filter';
$labels['managefilters'] = 'Verwalte eingehende Nachrichtenfilter';
$labels['filtername'] = 'Filtername';
@@ -92,6 +95,25 @@ $labels['flagdeleted'] = 'Gelöscht';
$labels['flaganswered'] = 'Beantwortet';
$labels['flagflagged'] = 'Markiert';
$labels['flagdraft'] = 'Entwurf';
+$labels['setvariable'] = 'Setze Variable';
+$labels['setvarname'] = 'Variablenname:';
+$labels['setvarvalue'] = 'Variablenwert:';
+$labels['setvarmodifiers'] = 'Umwandler:';
+$labels['varlower'] = 'Kleinschreibung';
+$labels['varupper'] = 'Grossschreibung';
+$labels['varlowerfirst'] = 'Erster Buchstabe klein';
+$labels['varupperfirst'] = 'Erster Buchstabe gross';
+$labels['varquotewildcard'] = 'Sonderzeichen auszeichnen';
+$labels['varlength'] = 'Länge';
+$labels['notify'] = 'Mitteilung senden';
+$labels['notifyaddress'] = 'Empfängeradresse:';
+$labels['notifybody'] = 'Mitteilungstext:';
+$labels['notifysubject'] = 'Mitteilungsbetreff:';
+$labels['notifyfrom'] = 'Absender:';
+$labels['notifyimportance'] = 'Wichtigkeit:';
+$labels['notifyimportancelow'] = 'tief';
+$labels['notifyimportancenormal'] = 'normal';
+$labels['notifyimportancehigh'] = 'hoch';
$labels['filtercreate'] = 'Filter erstellen';
$labels['usedata'] = 'Die folgenden Daten im Filter benutzen:';
$labels['nextstep'] = 'Nächster Schritt';
@@ -115,35 +137,38 @@ $labels['default'] = 'Vorgabewert';
$labels['octet'] = 'strikt (Oktet)';
$labels['asciicasemap'] = 'Gross-/Kleinschreibung ignorieren';
$labels['asciinumeric'] = 'numerisch (ascii-numeric)';
-$labels['filterunknownerror'] = 'Unbekannter Serverfehler';
-$labels['filterconnerror'] = 'Kann nicht zum Sieve-Server verbinden';
-$labels['filterdeleteerror'] = 'Fehler beim des löschen Filters. Serverfehler';
-$labels['filterdeleted'] = 'Filter erfolgreich gelöscht';
-$labels['filtersaved'] = 'Filter gespeichert';
-$labels['filtersaveerror'] = 'Serverfehler, konnte den Filter nicht speichern.';
-$labels['filterdeleteconfirm'] = 'Möchten Sie den Filter löschen ?';
-$labels['ruledeleteconfirm'] = 'Sicher, dass Sie die Regel löschen wollen?';
-$labels['actiondeleteconfirm'] = 'Sicher, dass Sie die ausgewaehlte Aktion löschen wollen?';
-$labels['forbiddenchars'] = 'Unerlaubte Zeichen im Feld';
-$labels['cannotbeempty'] = 'Feld darf nicht leer sein';
-$labels['ruleexist'] = 'Ein Filter mit dem angegebenen Namen existiert bereits.';
-$labels['setactivateerror'] = 'Filtersatz kann nicht aktiviert werden. Serverfehler.';
-$labels['setdeactivateerror'] = 'Filtersatz kann nicht deaktiviert werden. Serverfehler.';
-$labels['setdeleteerror'] = 'Filtersatz kann nicht gelöscht werden. Serverfehler.';
-$labels['setactivated'] = 'Filtersatz erfolgreich aktiviert.';
-$labels['setdeactivated'] = 'Filtersatz erfolgreich deaktiviert.';
-$labels['setdeleted'] = 'Filtersatz erfolgreich gelöscht.';
-$labels['setdeleteconfirm'] = 'Sind Sie sicher, dass Sie den ausgewählten Filtersatz löschen möchten?';
-$labels['setcreateerror'] = 'Filtersatz kann nicht erstellt werden. Serverfehler.';
-$labels['setcreated'] = 'Filter erfolgreich erstellt.';
-$labels['activateerror'] = 'Filter kann nicht aktiviert werden. Serverfehler.';
-$labels['deactivateerror'] = 'Filter kann nicht deaktiviert werden. Serverfehler.';
-$labels['activated'] = 'Filter erfolgreich deaktiviert.';
-$labels['deactivated'] = 'Filter erfolgreich aktiviert.';
-$labels['moved'] = 'Filter erfolgreich verschoben.';
-$labels['moveerror'] = 'Filter kann nicht verschoben werden. Serverfehler.';
-$labels['nametoolong'] = 'Filtersatz kann nicht erstellt werden. Name zu lang.';
-$labels['namereserved'] = 'Reservierter Name.';
-$labels['setexist'] = 'Filtersatz existiert bereits.';
-$labels['nodata'] = 'Mindestens eine Position muss ausgewählt werden!';
+$messages = array();
+$messages['filterunknownerror'] = 'Unbekannter Serverfehler';
+$messages['filterconnerror'] = 'Kann nicht zum Sieve-Server verbinden';
+$messages['filterdeleteerror'] = 'Fehler beim des löschen Filters. Serverfehler';
+$messages['filterdeleted'] = 'Filter erfolgreich gelöscht';
+$messages['filtersaved'] = 'Filter gespeichert';
+$messages['filtersaveerror'] = 'Serverfehler, konnte den Filter nicht speichern.';
+$messages['filterdeleteconfirm'] = 'Möchten Sie den Filter löschen ?';
+$messages['ruledeleteconfirm'] = 'Sicher, dass Sie die Regel löschen wollen?';
+$messages['actiondeleteconfirm'] = 'Sicher, dass Sie die ausgewaehlte Aktion löschen wollen?';
+$messages['forbiddenchars'] = 'Unerlaubte Zeichen im Feld';
+$messages['cannotbeempty'] = 'Feld darf nicht leer sein';
+$messages['ruleexist'] = 'Ein Filter mit dem angegebenen Namen existiert bereits.';
+$messages['setactivateerror'] = 'Filtersatz kann nicht aktiviert werden. Serverfehler.';
+$messages['setdeactivateerror'] = 'Filtersatz kann nicht deaktiviert werden. Serverfehler.';
+$messages['setdeleteerror'] = 'Filtersatz kann nicht gelöscht werden. Serverfehler.';
+$messages['setactivated'] = 'Filtersatz erfolgreich aktiviert.';
+$messages['setdeactivated'] = 'Filtersatz erfolgreich deaktiviert.';
+$messages['setdeleted'] = 'Filtersatz erfolgreich gelöscht.';
+$messages['setdeleteconfirm'] = 'Sind Sie sicher, dass Sie den ausgewählten Filtersatz löschen möchten?';
+$messages['setcreateerror'] = 'Filtersatz kann nicht erstellt werden. Serverfehler.';
+$messages['setcreated'] = 'Filter erfolgreich erstellt.';
+$messages['activateerror'] = 'Filter kann nicht aktiviert werden. Serverfehler.';
+$messages['deactivateerror'] = 'Filter kann nicht deaktiviert werden. Serverfehler.';
+$messages['deactivated'] = 'Filter erfolgreich aktiviert.';
+$messages['activated'] = 'Filter erfolgreich deaktiviert.';
+$messages['moved'] = 'Filter erfolgreich verschoben.';
+$messages['moveerror'] = 'Filter kann nicht verschoben werden. Serverfehler.';
+$messages['nametoolong'] = 'Filtersatz kann nicht erstellt werden. Name zu lang.';
+$messages['namereserved'] = 'Reservierter Name.';
+$messages['setexist'] = 'Filtersatz existiert bereits.';
+$messages['nodata'] = 'Mindestens eine Position muss ausgewählt werden!';
+
+?>
View
3 plugins/managesieve/localization/en_GB.inc
@@ -9,7 +9,7 @@
| Licensed under the GNU General Public License |
| |
+-----------------------------------------------------------------------+
- | Author: Sebastian Schweizer |
+ | Author: Vibhav Pant <vibhavp@gmail.com> |
+-----------------------------------------------------------------------+
*/