diff --git a/README.md b/README.md
index 4303169a5..a7a987776 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ cog.out(text)
   <a href="https://github.com/Aider-AI/aider/stargazers"><img alt="GitHub Stars" title="Total number of GitHub stars the Aider project has received"
 src="https://img.shields.io/github/stars/Aider-AI/aider?style=flat-square&logo=github&color=f1c40f&labelColor=555555"/></a>
   <a href="https://pypi.org/project/aider-chat/"><img alt="PyPI Downloads" title="Total number of installations via pip from PyPI"
-src="https://img.shields.io/badge/📦%20Installs-2.4M-2ecc71?style=flat-square&labelColor=555555"/></a>
+src="https://img.shields.io/badge/📦%20Installs-2.5M-2ecc71?style=flat-square&labelColor=555555"/></a>
   <img alt="Tokens per week" title="Number of tokens processed weekly by Aider users"
 src="https://img.shields.io/badge/📈%20Tokens%2Fweek-15B-3498db?style=flat-square&labelColor=555555"/>
   <a href="https://openrouter.ai/#options-menu"><img alt="OpenRouter Ranking" title="Aider's ranking among applications on the OpenRouter platform"
diff --git a/aider/website/assets/sample-analytics.jsonl b/aider/website/assets/sample-analytics.jsonl
index 5609c090e..11feb7b34 100644
--- a/aider/website/assets/sample-analytics.jsonl
+++ b/aider/website/assets/sample-analytics.jsonl
@@ -1,22 +1,3 @@
-{"event": "exit", "properties": {"reason": "Unknown edit format"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1746905654}
-{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1746905654}
-{"event": "model warning", "properties": {"main_model": "None", "weak_model": "None", "editor_model": "None"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1746905654}
-{"event": "no-repo", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1746905654}
-{"event": "auto_commits", "properties": {"enabled": true}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1746905654}
-{"event": "exit", "properties": {"reason": "Unknown edit format"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1746905654}
-{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1746905654}
-{"event": "model warning", "properties": {"main_model": "None", "weak_model": "None", "editor_model": "None"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1746905655}
-{"event": "no-repo", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1746905655}
-{"event": "auto_commits", "properties": {"enabled": true}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1746905655}
-{"event": "exit", "properties": {"reason": "Unknown edit format"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1746905655}
-{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1746905655}
-{"event": "model warning", "properties": {"main_model": "None", "weak_model": "None", "editor_model": "None"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1746905655}
-{"event": "no-repo", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1746905655}
-{"event": "auto_commits", "properties": {"enabled": true}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1746905655}
-{"event": "exit", "properties": {"reason": "Unknown edit format"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1746905655}
-{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1746905655}
-{"event": "model warning", "properties": {"main_model": "None", "weak_model": "None", "editor_model": "None"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1746905656}
-{"event": "no-repo", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1746905656}
 {"event": "auto_commits", "properties": {"enabled": true}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1746905656}
 {"event": "exit", "properties": {"reason": "Unknown edit format"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1746905656}
 {"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1746905656}
@@ -998,3 +979,22 @@
 {"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1748647628}
 {"event": "gui session", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1748647631}
 {"event": "exit", "properties": {"reason": "GUI session ended"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1748647631}
+{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1748650234}
+{"event": "repo", "properties": {"num_files": 627}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1748650234}
+{"event": "auto_commits", "properties": {"enabled": true}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1748650234}
+{"event": "cli session", "properties": {"main_model": "anthropic/claude-sonnet-4-20250514", "weak_model": "gemini/gemini-2.5-flash-preview-04-17", "editor_model": "anthropic/claude-sonnet-4-20250514", "edit_format": "diff"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1748650234}
+{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1748650268}
+{"event": "message_send", "properties": {"main_model": "anthropic/claude-sonnet-4-20250514", "weak_model": "gemini/gemini-2.5-flash-preview-04-17", "editor_model": "anthropic/claude-sonnet-4-20250514", "edit_format": "diff", "prompt_tokens": 17163, "completion_tokens": 429, "total_tokens": 17592, "cost": 0.057924, "total_cost": 0.057924}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1748650279}
+{"event": "exit", "properties": {"reason": "Completed main CLI coder.run"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1748650303}
+{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1749217976}
+{"event": "repo", "properties": {"num_files": 627}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1749217977}
+{"event": "auto_commits", "properties": {"enabled": true}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1749217977}
+{"event": "cli session", "properties": {"main_model": "anthropic/claude-sonnet-4-20250514", "weak_model": "gemini/gemini-2.5-flash-preview-04-17", "editor_model": "anthropic/claude-sonnet-4-20250514", "edit_format": "diff"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1749217977}
+{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1749218020}
+{"event": "message_send", "properties": {"main_model": "anthropic/claude-sonnet-4-20250514", "weak_model": "gemini/gemini-2.5-flash-preview-04-17", "editor_model": "anthropic/claude-sonnet-4-20250514", "edit_format": "diff", "prompt_tokens": 23215, "completion_tokens": 778, "total_tokens": 23993, "cost": 0.081315, "total_cost": 0.081315}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1749218035}
+{"event": "command_add", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1749218044}
+{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1749218051}
+{"event": "message_send", "properties": {"main_model": "anthropic/claude-sonnet-4-20250514", "weak_model": "gemini/gemini-2.5-flash-preview-04-17", "editor_model": "anthropic/claude-sonnet-4-20250514", "edit_format": "diff", "prompt_tokens": 33961, "completion_tokens": 154, "total_tokens": 34115, "cost": 0.10419300000000001, "total_cost": 0.185508}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1749218057}
+{"event": "command_add", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1749227216}
+{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1749227231}
+{"event": "message_send", "properties": {"main_model": "anthropic/claude-sonnet-4-20250514", "weak_model": "gemini/gemini-2.5-flash-preview-04-17", "editor_model": "anthropic/claude-sonnet-4-20250514", "edit_format": "diff", "prompt_tokens": 39764, "completion_tokens": 2126, "total_tokens": 41890, "cost": 0.151182, "total_cost": 0.33669000000000004}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1749227272}
diff --git a/aider/website/assets/sample.env b/aider/website/assets/sample.env
index 6d2a032cd..21f69f608 100644
--- a/aider/website/assets/sample.env
+++ b/aider/website/assets/sample.env
@@ -357,6 +357,9 @@
 ## Specify the language to use in the chat (default: None, uses system settings)
 #AIDER_CHAT_LANGUAGE=
 
+## Specify the language to use in the commit message (default: None, user language)
+#AIDER_COMMIT_LANGUAGE=
+
 ## Always say yes to every confirmation
 #AIDER_YES_ALWAYS=
 
diff --git a/aider/website/docs/config/adv-model-settings.md b/aider/website/docs/config/adv-model-settings.md
index 6af6e182b..4269fb3b3 100644
--- a/aider/website/docs/config/adv-model-settings.md
+++ b/aider/website/docs/config/adv-model-settings.md
@@ -924,6 +924,12 @@ cog.out("```\n")
   use_repo_map: true
   overeager: true
 
+- name: gemini/gemini-2.5-pro-preview-06-05
+  edit_format: diff-fenced
+  weak_model_name: gemini/gemini-2.5-flash-preview-04-17
+  use_repo_map: true
+  overeager: true
+
 - name: gemini/gemini-exp-1114
   edit_format: diff
   use_repo_map: true
@@ -1494,6 +1500,12 @@ cog.out("```\n")
   use_repo_map: true
   overeager: true
 
+- name: openrouter/google/gemini-2.5-pro-preview-06-05
+  edit_format: diff-fenced
+  weak_model_name: openrouter/google/gemini-2.0-flash-001
+  use_repo_map: true
+  overeager: true
+
 - name: openrouter/google/gemma-3-27b-it
   use_system_prompt: false
 
@@ -1854,6 +1866,13 @@ cog.out("```\n")
   overeager: true
   editor_model_name: vertex_ai-language-models/gemini-2.5-flash-preview-04-17
 
+- name: vertex_ai/gemini-2.5-pro-preview-06-05
+  edit_format: diff-fenced
+  weak_model_name: vertex_ai-language-models/gemini-2.5-flash-preview-04-17
+  use_repo_map: true
+  overeager: true
+  editor_model_name: vertex_ai-language-models/gemini-2.5-flash-preview-04-17
+
 - name: vertex_ai/gemini-pro-experimental
   edit_format: diff-fenced
   use_repo_map: true
diff --git a/aider/website/docs/config/dotenv.md b/aider/website/docs/config/dotenv.md
index 82ad974de..88453b5f4 100644
--- a/aider/website/docs/config/dotenv.md
+++ b/aider/website/docs/config/dotenv.md
@@ -397,6 +397,9 @@ cog.outl("```")
 ## Specify the language to use in the chat (default: None, uses system settings)
 #AIDER_CHAT_LANGUAGE=
 
+## Specify the language to use in the commit message (default: None, user language)
+#AIDER_COMMIT_LANGUAGE=
+
 ## Always say yes to every confirmation
 #AIDER_YES_ALWAYS=
 
diff --git a/aider/website/docs/config/model-aliases.md b/aider/website/docs/config/model-aliases.md
index 0a9a32d55..37b62fc21 100644
--- a/aider/website/docs/config/model-aliases.md
+++ b/aider/website/docs/config/model-aliases.md
@@ -80,8 +80,8 @@ for alias, model in sorted(MODEL_ALIASES.items()):
 - `4o`: gpt-4o
 - `deepseek`: deepseek/deepseek-chat
 - `flash`: gemini/gemini-2.5-flash-preview-04-17
-- `gemini`: gemini/gemini-2.5-pro-preview-05-06
-- `gemini-2.5-pro`: gemini/gemini-2.5-pro-preview-05-06
+- `gemini`: gemini/gemini-2.5-pro-preview-06-05
+- `gemini-2.5-pro`: gemini/gemini-2.5-pro-preview-06-05
 - `gemini-exp`: gemini/gemini-2.5-pro-exp-03-25
 - `grok3`: xai/grok-3-beta
 - `haiku`: claude-3-5-haiku-20241022
diff --git a/aider/website/docs/config/options.md b/aider/website/docs/config/options.md
index fb36b0f21..88acb3deb 100644
--- a/aider/website/docs/config/options.md
+++ b/aider/website/docs/config/options.md
@@ -74,9 +74,9 @@ usage: aider [-h] [--model] [--openai-api-key] [--anthropic-api-key]
              [--apply-clipboard-edits] [--exit] [--show-repo-map]
              [--show-prompts] [--voice-format] [--voice-language]
              [--voice-input-device] [--disable-playwright] [--file]
-             [--read] [--vim] [--chat-language] [--commit-language] [--yes-always] [-v]
-             [--load] [--encoding] [--line-endings] [-c]
-             [--env-file]
+             [--read] [--vim] [--chat-language] [--commit-language]
+             [--yes-always] [-v] [--load] [--encoding]
+             [--line-endings] [-c] [--env-file]
              [--suggest-shell-commands | --no-suggest-shell-commands]
              [--fancy-input | --no-fancy-input]
              [--multiline | --no-multiline]
diff --git a/aider/website/docs/faq.md b/aider/website/docs/faq.md
index 6a185a00a..ac7464cb4 100644
--- a/aider/website/docs/faq.md
+++ b/aider/website/docs/faq.md
@@ -264,12 +264,12 @@ tr:hover { background-color: #f5f5f5; }
 </style>
 <table>
 <tr><th>Model Name</th><th class='right'>Total Tokens</th><th class='right'>Percent</th></tr>
-<tr><td>o3</td><td class='right'>542,669</td><td class='right'>45.1%</td></tr>
-<tr><td>gemini/gemini-2.5-pro-exp-03-25</td><td class='right'>479,518</td><td class='right'>39.9%</td></tr>
-<tr><td>anthropic/claude-sonnet-4-20250514</td><td class='right'>131,972</td><td class='right'>11.0%</td></tr>
-<tr><td>gemini/gemini-2.5-pro-preview-05-06</td><td class='right'>40,256</td><td class='right'>3.3%</td></tr>
+<tr><td>o3</td><td class='right'>542,669</td><td class='right'>41.1%</td></tr>
+<tr><td>gemini/gemini-2.5-pro-exp-03-25</td><td class='right'>479,518</td><td class='right'>36.3%</td></tr>
+<tr><td>anthropic/claude-sonnet-4-20250514</td><td class='right'>249,562</td><td class='right'>18.9%</td></tr>
+<tr><td>gemini/gemini-2.5-pro-preview-05-06</td><td class='right'>40,256</td><td class='right'>3.0%</td></tr>
 <tr><td>gemini/gemini-2.5-flash-preview-05-20</td><td class='right'>7,638</td><td class='right'>0.6%</td></tr>
-<tr><td>gemini/REDACTED</td><td class='right'>643</td><td class='right'>0.1%</td></tr>
+<tr><td>gemini/REDACTED</td><td class='right'>643</td><td class='right'>0.0%</td></tr>
 </table>
 
 {: .note :}
diff --git a/aider/website/docs/llms/other.md b/aider/website/docs/llms/other.md
index be1ccdbce..6f0ccf886 100644
--- a/aider/website/docs/llms/other.md
+++ b/aider/website/docs/llms/other.md
@@ -72,6 +72,7 @@ cog.out(''.join(lines))
 - DATABRICKS_API_KEY
 - DEEPINFRA_API_KEY
 - DEEPSEEK_API_KEY
+- FEATHERLESS_AI_API_KEY
 - FIREWORKS_AI_API_KEY
 - FIREWORKS_API_KEY
 - FIREWORKSAI_API_KEY
@@ -81,7 +82,9 @@ cog.out(''.join(lines))
 - INFINITY_API_KEY
 - MARITALK_API_KEY
 - MISTRAL_API_KEY
+- NEBIUS_API_KEY
 - NLP_CLOUD_API_KEY
+- NOVITA_API_KEY
 - NVIDIA_NIM_API_KEY
 - OLLAMA_API_KEY
 - OPENAI_API_KEY
diff --git a/aider/website/docs/more/infinite-output.md b/aider/website/docs/more/infinite-output.md
index 09af92844..99920eeab 100644
--- a/aider/website/docs/more/infinite-output.md
+++ b/aider/website/docs/more/infinite-output.md
@@ -72,6 +72,8 @@ cog.out(model_list)
 - claude-3-opus-20240229
 - claude-3-opus-latest
 - claude-3-sonnet-20240229
+- claude-4-opus-20250514
+- claude-4-sonnet-20250514
 - claude-opus-4-20250514
 - claude-sonnet-4-20250514
 - codestral/codestral-2405
diff --git a/aider/website/index.html b/aider/website/index.html
index e030edf90..be5dfaca8 100644
--- a/aider/website/index.html
+++ b/aider/website/index.html
@@ -73,7 +73,7 @@ cog.out(text)
 </a>
 <a href="https://pypi.org/project/aider-chat/" class="github-badge badge-installs" title="Total number of installations via pip from PyPI">
     <span class="badge-label">📦 Installs</span>
-    <span class="badge-value">2.4M</span>
+    <span class="badge-value">2.5M</span>
 </a>
 <div class="github-badge badge-tokens" title="Number of tokens processed weekly by Aider users">
     <span class="badge-label">📈 Tokens/week</span>