Index: includes/locale.inc
===================================================================
--- includes/locale.inc	(revisione 8630)
+++ includes/locale.inc	(copia locale)
@@ -632,7 +632,9 @@
  */
 function _locale_import_po($file, $langcode, $mode, $group = NULL) {
   // Try to allocate enough time to parse and import the data.
-  drupal_set_time_limit(240);
+  if (ini_get('max_execution_time') < 240) {
+    drupal_set_time_limit(240);
+  }
 
   // Check if we have the language already in the database.
   if (!db_query("SELECT COUNT(language) FROM {languages} WHERE language = :language", array(':language' => $langcode))->fetchField()) {
Index: sites/all/modules/devel/l10n_update/l10n_update.locale.inc
===================================================================
--- sites/all/modules/devel/l10n_update/l10n_update.locale.inc	(revisione 8630)
+++ sites/all/modules/devel/l10n_update/l10n_update.locale.inc	(copia locale)
@@ -24,7 +24,9 @@
  */
 function _l10n_update_locale_import_po($file, $langcode, $mode, $group = NULL) {
   // Try to allocate enough time to parse and import the data.
-  drupal_set_time_limit(240);
+  if (ini_get('max_execution_time') < 240) {
+    drupal_set_time_limit(240);
+  }
 
   // Check if we have the language already in the database.
   if (!db_query("SELECT COUNT(language) FROM {languages} WHERE language = :language", array(':language' => $langcode))->fetchField()) {