diff --git a/CHANGELOG.md b/CHANGELOG.md
index f7a2786..95f4b88 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+## Domingo,  2 De Noviembre De 2025, 13:36:22
+
+- Usuario: **Jonathan Teran Carballo**
+- Email: **jonathan.nerat@gmail.com**
+- Rama: **docs/change-changelog-format**
+
+- **docs**:  agrego setteo de locale, muevo usuario y mail a contenido de seccion de CHANGELOG.md (143c704)
+	- git-flow (M)
+
+---
+
 ## Jonathan Teran Carballo (jonathan.nerat@gmail.com) - 02/11/2025 13:19
 
 **refactor/remove-unused-git-functions**
diff --git a/git-flow b/git-flow
index 085c9d8..ccb314e 100755
--- a/git-flow
+++ b/git-flow
@@ -1,10 +1,10 @@
 #!/usr/bin/env python3
 
 import os
-from subprocess import CalledProcessError
 import sys
 import datetime
 import requests
+import locale
 
 import lib.git as git
 from lib.git import Git
@@ -15,6 +15,8 @@ REPOSITORY_TOKEN_PATH=".repository-token"
 
 
 def main():
+    locale.setlocale(locale.LC_ALL, 'es_AR.UTF-8')
+
     args = sys.argv
 
     if len(args) < 2:
@@ -480,12 +482,15 @@ def update_changelog(branch: str, target: str):
 def generate_changelog_entry(branch: str, target: str):
     name = Git("config", "user.name").firstline()
     email = Git("config", "user.email").firstline()
-    timestamp = datetime.datetime.now().strftime("%d/%m/%Y %H:%M")
+    timestamp = datetime.datetime.now().strftime("%A, %e de %B de %Y, %T").title()
 
     entry_lines = [
-            f"## {name} ({email}) - {timestamp}",
-            "",
-            f"**{branch}**",
+        f"## {timestamp}",
+        "",
+        f"- Usuario: **{name}**",
+        f"- Email: **{email}**",
+        f"- Rama: **{branch}**",
+        ""
     ]
 
     commits = Git("log", target + "..", first_parent=True, format="%h", merges=False).lines()