diff --git a/admin/qtx_admin_settings.php b/admin/qtx_admin_settings.php
index 0f0fb812..51be1360 100644
--- a/admin/qtx_admin_settings.php
+++ b/admin/qtx_admin_settings.php
@@ -557,6 +557,10 @@ private function add_advanced_section() {
             <tr>
                 <th scope="row"><?php _e( 'Date / Time Conversion', 'qtranslate' ) ?></th>
                 <td>
+                    <label>
+                        <input type="radio" name="use_strftime"
+                               value="<?php echo QTX_DATE_WP; ?>" <?php checked( $q_config['use_strftime'], QTX_DATE_WP ) ?>/> <?php _e( 'Use WordPress options and translation. Ignore language date / time formats.', 'qtranslate' ) ?>
+                    </label><br/>
                     <label>
                         <input type="radio" name="use_strftime"
                                value="<?php echo QTX_DATE; ?>" <?php checked( $q_config['use_strftime'], QTX_DATE ) ?>/> <?php _e( 'Use emulated date function.', 'qtranslate' ) ?>
diff --git a/qtranslate_date_time.php b/qtranslate_date_time.php
index b8ef391d..da3fe6c5 100644
--- a/qtranslate_date_time.php
+++ b/qtranslate_date_time.php
@@ -316,6 +316,7 @@ function qtranxf_convert_to_strftime_format_using_config( $format, $default_form
             return ( ! empty( $format ) ? qtranxf_convert_date_format_to_strftime_format( $format ) : stripslashes( $default_format ) );
         case QTX_STRFTIME_OVERRIDE:
             return stripslashes( $default_format );
+        case QTX_DATE_WP:
         default:
             return '';
     }
diff --git a/qtranslate_hooks.php b/qtranslate_hooks.php
index 74e0f19d..d87900c2 100644
--- a/qtranslate_hooks.php
+++ b/qtranslate_hooks.php
@@ -123,6 +123,8 @@ function qtranxf_ngettext( $translated_text ) {
  * @return void
  */
 function qtranxf_add_main_filters() {
+    global $q_config;
+
     // Hooks defined differently in admin and frontend
     add_filter( 'wp_trim_words', 'qtranxf_trim_words', 0, 4 );
 
@@ -138,12 +140,14 @@ function qtranxf_add_main_filters() {
     add_filter( 'the_excerpt', 'qtranxf_useCurrentLanguageIfNotFoundShowAvailable', 0 );
     add_filter( 'the_excerpt_rss', 'qtranxf_useCurrentLanguageIfNotFoundShowAvailable', 0 );
 
-    add_filter( 'get_comment_date', 'qtranxf_dateFromCommentForCurrentLanguage', 0, 3 );
-    add_filter( 'get_comment_time', 'qtranxf_timeFromCommentForCurrentLanguage', 0, 5 );
-    add_filter( 'get_post_modified_time', 'qtranxf_timeModifiedFromPostForCurrentLanguage', 0, 3 );
-    add_filter( 'get_the_time', 'qtranxf_timeFromPostForCurrentLanguage', 0, 3 );
-    add_filter( 'get_the_date', 'qtranxf_dateFromPostForCurrentLanguage', 0, 3 );
-    add_filter( 'get_the_modified_date', 'qtranxf_dateModifiedFromPostForCurrentLanguage', 0, 2 );
+    if ( $q_config['use_strftime'] != QTX_DATE_WP ) {
+        add_filter( 'get_comment_date', 'qtranxf_dateFromCommentForCurrentLanguage', 0, 3 );
+        add_filter( 'get_comment_time', 'qtranxf_timeFromCommentForCurrentLanguage', 0, 5 );
+        add_filter( 'get_post_modified_time', 'qtranxf_timeModifiedFromPostForCurrentLanguage', 0, 3 );
+        add_filter( 'get_the_time', 'qtranxf_timeFromPostForCurrentLanguage', 0, 3 );
+        add_filter( 'get_the_date', 'qtranxf_dateFromPostForCurrentLanguage', 0, 3 );
+        add_filter( 'get_the_modified_date', 'qtranxf_dateModifiedFromPostForCurrentLanguage', 0, 2 );
+    }
 
     add_filter( 'locale', 'qtranxf_localeForCurrentLanguage', 99 );
     add_filter( 'core_version_check_locale', 'qtranxf_versionLocale' );
diff --git a/qtranslate_options.php b/qtranslate_options.php
index 22fb6898..93eee64f 100644
--- a/qtranslate_options.php
+++ b/qtranslate_options.php
@@ -28,7 +28,7 @@
 /**
  * Date/time conversion, see "use_strftime" option.
  */
-const QTX_DATE_WP           = 0;  // obsolete, value reserved
+const QTX_DATE_WP           = 0;  // Use WordPress options and translation, disable all date / time hooks.
 const QTX_STRFTIME_OVERRIDE = 1;  // TODO: deprecate strftime format
 const QTX_DATE_OVERRIDE     = 2;  // deprecated
 const QTX_DATE              = 3;  // default format at first activation - not consistent with default date/time values