Clarify PR merge action labels (#1608)
* fix: disambiguate merge PR action labels (squash/merge/rebase) * Clarify PR merge method labels * Address merge label review feedback --------- Co-authored-by: Matt Cowger <matt@cowger.us>
This commit is contained in:
co-authored by
Matt Cowger
parent
e73b1c4724
commit
f9660c7e89
@@ -610,16 +610,16 @@ export const fr: TranslationResources = {
|
||||
success: "Archivé",
|
||||
},
|
||||
mergePr: {
|
||||
squash: "Fusionner",
|
||||
merge: "Fusionner",
|
||||
rebase: "Fusionner",
|
||||
pending: "Fusion dePR...",
|
||||
success: "PRfusionné",
|
||||
squash: "Fusionner PR (squash)",
|
||||
merge: "Fusionner PR (merge)",
|
||||
rebase: "Fusionner PR (rebase)",
|
||||
pending: "Fusion de PR...",
|
||||
success: "PR fusionné",
|
||||
},
|
||||
autoMerge: {
|
||||
enableSquash: "Fusion automatique",
|
||||
enableMerge: "Fusion automatique",
|
||||
enableRebase: "Fusion automatique",
|
||||
enableSquash: "Fusion automatique (squash)",
|
||||
enableMerge: "Fusion automatique (merge)",
|
||||
enableRebase: "Fusion automatique (rebase)",
|
||||
enabled: "Fusion automatique activée",
|
||||
enabling: "Activation de la fusion automatique...",
|
||||
disabling: "Désactivation de la fusion automatique...",
|
||||
|
||||
Reference in New Issue
Block a user