Index: modules/locale/locale.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/locale/locale.install,v
retrieving revision 1.61
diff -u -p -r1.61 locale.install
--- modules/locale/locale.install	7 Jul 2010 05:44:03 -0000	1.61
+++ modules/locale/locale.install	12 Jul 2010 05:48:24 -0000
@@ -145,6 +145,7 @@ function locale_uninstall() {
   variable_del('locale_js_directory');
   variable_del('javascript_parsed');
   variable_del('locale_field_language_fallback');
+  variable_del('locale_cache_length');
 
   foreach (language_types() as $type) {
     variable_del("language_negotiation_$type");
Index: modules/locale/locale.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/locale/locale.module,v
retrieving revision 1.293
diff -u -p -r1.293 locale.module
--- modules/locale/locale.module	12 May 2010 08:26:14 -0000	1.293
+++ modules/locale/locale.module	12 Jul 2010 05:48:24 -0000
@@ -480,7 +480,7 @@ function locale_field_language_alter(&$d
  * @param $entity
  *   The entity to be displayed.
  * @param $langcode
- *   The language code $entity has to be displayed in. 
+ *   The language code $entity has to be displayed in.
  */
 function locale_field_language_fallback(&$display_language, $entity, $langcode) {
   // Lazily init fallback candidates to avoid unnecessary calls.
@@ -650,7 +650,7 @@ function locale($string = NULL, $context
         // Refresh database stored cache of translations for given language.
         // We only store short strings used in current version, to improve
         // performance and consume less memory.
-        $result = db_query("SELECT s.source, s.context, t.translation, t.language FROM {locales_source} s LEFT JOIN {locales_target} t ON s.lid = t.lid AND t.language = :language WHERE s.textgroup = 'default' AND s.version = :version AND LENGTH(s.source) < 75", array(':language' => $langcode, ':version' => VERSION));
+        $result = db_query("SELECT s.source, s.context, t.translation, t.language FROM {locales_source} s LEFT JOIN {locales_target} t ON s.lid = t.lid AND t.language = :language WHERE s.textgroup = 'default' AND s.version = :version AND LENGTH(s.source) < :length", array(':language' => $langcode, ':version' => VERSION, ':length' => variable_get('locale_cache_length', 75)));
         foreach ($result as $data) {
           $locale_t[$langcode][$data->context][$data->source] = (empty($data->translation) ? TRUE : $data->translation);
         }