fix(git): clean up in-progress merge/rebase banner

Use the real status-warning tokens (--status-warning-bg did not exist, so
the card rendered without a fill), drop the decorative icons, and fold the
conflict count into the title as a single full-message key per locale.
The operation description now wraps instead of truncating, and both the
conflict and ready-to-continue states share the same action layout.

packages/ui/src/lib/i18n/messages/ja.ts

@@ -830,12 +830,15 @@ export const dict: Record<I18nKey, string> = {
   'gitView.operation.abort': '中止',
   'gitView.operation.continue': '続行',
   'gitView.operation.inProgressTitle': '{operation}進行中',
+  'gitView.operation.inProgressTitleManyConflicts': '{operation} 進行中: 競合 {count} 件',
+  'gitView.operation.inProgressTitleOneConflict': '{operation} 進行中: 競合 {count} 件',
   'gitView.operation.merge': 'マージ',
   'gitView.operation.mergeInProgressWithHead': '{head}をマージ中',
   'gitView.operation.mergingMessage': 'マージ中: {message}',
   'gitView.operation.rebase': 'リベース',
   'gitView.operation.rebaseInProgress': 'リベース進行中',
   'gitView.operation.rebasingOnto': '{headName}を{onto}にリベース中',
+  'gitView.operation.readyToContinueHint': 'すべての競合が解決されました。続行して操作を完了してください。',
   'gitView.operation.resolveConflictsHint': '競合を解決してから操作を続行してください。',
   'gitView.operation.resolveWithAi': 'AIで解決',
   'gitView.stash.confirmButton': '{operation}',