From 94e94e0a8566f23d16658a04c55b0bbfdd6689aa Mon Sep 17 00:00:00 2001
From: "godzilla80@gmx.net" <>
Date: Sun, 14 Feb 2010 01:22:57 +0000
Subject: Merge Branches & Trunk /trunk:r2680,2692,2707-2736
 /branches/3.1:r2682-2686,2694-2702,2705,2738-2762

---
 framework/Exceptions/messages/messages-id.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'framework/Exceptions/messages/messages-id.txt')

diff --git a/framework/Exceptions/messages/messages-id.txt b/framework/Exceptions/messages/messages-id.txt
index fb57a5ba..61699ddd 100644
--- a/framework/Exceptions/messages/messages-id.txt
+++ b/framework/Exceptions/messages/messages-id.txt
@@ -71,6 +71,7 @@ httpsession_autostart_unchangeable	= THttpSession.AutoStart tidak bisa diubah se
 httpsession_gcprobability_unchangeable	= THttpSession.GCProbability tidak bisa diubah setelah sesi dimulai.
 httpsession_gcprobability_invalid	= THttpSession.GCProbability harus integer antara 0 dan 100.
 httpsession_transid_unchangeable	= THttpSession.UseTransparentSessionID tidak bisa diubah setelah sesi dimulai.
+httpsession_transid_cookieonly			= THttpSession.UseTransparentSessionID cannot be set when THttpSession.CookieMode is set to Only.
 httpsession_maxlifetime_unchangeable	= THttpSession.Timeout tidak bisa diubah setelah sesi dimulai.
 
 assetmanager_basepath_invalid		= TAssetManager.BasePath '{0}' tidak benar. Pastikan ia dalam bentuk namespace dan mengarah ke direktori yang bisa ditulis oleh proses server Web.
-- 
cgit v1.2.3