diff --git a/components/admin/editors/team-editor.tsx b/components/admin/editors/team-editor.tsx
index 809f854..c02ed77 100644
--- a/components/admin/editors/team-editor.tsx
+++ b/components/admin/editors/team-editor.tsx
@@ -206,7 +206,7 @@ export function TeamImportPreviewCard({
     <Card className={cn(checked && "ring-2 ring-primary")}>
       <CardHeader>
         <CardTitle>{team.title}</CardTitle>
-        <CardDescription>โรเทชั่น {seconds} วิ{sourceLabel ? ` - ${sourceLabel}` : ""}</CardDescription>
+        <CardDescription>Rotation {seconds} วิ{sourceLabel ? ` - ${sourceLabel}` : ""}</CardDescription>
         <CardAction>
           <Field orientation="horizontal">
             <Checkbox id={checkboxId} checked={checked} disabled={disabled} onCheckedChange={(value) => onCheckedChange(value === true)} />
@@ -941,7 +941,7 @@ export function TeamEditor({
                                   className="flex-none"
                                   htmlFor={`team-rotation-${team.clientId}`}
                                 >
-                                  Rotation
+                                  โรเทชั่น
                                 </FieldLabel>
                                 <Input
                                   id={`team-rotation-${team.clientId}`}
diff --git a/components/admin/editors/weapon-editor.test.tsx b/components/admin/editors/weapon-editor.test.tsx
index dbf5ad7..9b844ed 100644
--- a/components/admin/editors/weapon-editor.test.tsx
+++ b/components/admin/editors/weapon-editor.test.tsx
@@ -71,7 +71,7 @@ describe("weapon damage editing", () => {
     ["0.00", "-"],
     ["120.00", "120%"],
     ["120.125", "120.13%"],
-    ["", ""],
+    ["", "-"],
   ])("displays %s as %s while preserving its raw draft value", async (raw, display) => {
     const input = await render(raw);
     expect(input.value).toBe(display);
diff --git a/components/admin/editors/weapon-editor.tsx b/components/admin/editors/weapon-editor.tsx
index 72f6e10..14f2111 100644
--- a/components/admin/editors/weapon-editor.tsx
+++ b/components/admin/editors/weapon-editor.tsx
@@ -30,9 +30,11 @@ import { type EditorBase, hasIssuePrefix, parseEditorDraft, ConditionControls, r
 function WeaponDamageInput({ value, onFocus, onBlur, ...props }: ComponentProps<typeof Input> & { value: string }) {
   const [focused, setFocused] = useState(false);
   const numeric = Number(value);
-  const displayValue = !value.trim() || !Number.isFinite(numeric)
-    ? value
-    : weaponComparisonPercent(value) ?? "";
+  const displayValue = !value.trim()
+    ? "-"
+    : !Number.isFinite(numeric)
+      ? value
+      : weaponComparisonPercent(value) ?? "-";
 
   return <Input
     {...props}
diff --git a/components/public/team-search.tsx b/components/public/team-search.tsx
index af50a40..f4fb724 100644
--- a/components/public/team-search.tsx
+++ b/components/public/team-search.tsx
@@ -280,7 +280,7 @@ function TeamCard({
     <Card>
       <CardHeader>
         <CardTitle>{team.title}</CardTitle>
-        <CardDescription>โรเทชั่น {seconds} วิ</CardDescription>
+        <CardDescription>โรเทชั่น {seconds} วินาที</CardDescription>
         {action ? <CardAction>{action}</CardAction> : null}
       </CardHeader>
       <CardContent className="flex flex-col gap-4">
@@ -389,7 +389,7 @@ function TeamCard({
         <Separator />
         <div className="flex items-end justify-between">
           <div>
-            <p className="text-sm text-muted-foreground">{exporting ? "ดาเมจรวม" : "ดาเมจรวมต่อโรเทชั่น"}</p>
+            <p className="text-sm text-muted-foreground">ดาเมจรวม</p>
             <p className="font-semibold">{total.toLocaleString()}</p>
           </div>
           <div className="text-right">