1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
|
diff --git a/po/bg.po b/po/bg.po
index 934784fe52..9f23047ed0 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -19006,7 +19006,7 @@ msgid ""
"\n"
"\tgit config --global init.defaultBranch <name>\n"
"\n"
-"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
+"Names commonly chosen instead of 'mistress' are 'main', 'trunk' and\n"
"'development'. The just-created branch can be renamed via this command:\n"
"\n"
"\tgit branch -m <name>\n"
@@ -19017,7 +19017,7 @@ msgstr ""
"\n"
" git config --global init.defaultBranch ИМЕ\n"
"\n"
-"Често ползвани варианти вместо „master“ са „main“, „trunk“ и „development“.\n"
+"Често ползвани варианти вместо „mistress“ са „main“, „trunk“ и „development“.\n"
"За да преименувата току що създаден клон, изпълнете:\n"
"\n"
" git branch -m ИМЕ\n"
diff --git a/po/ca.po b/po/ca.po
index 80c430df45..fadd9e4631 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -18605,7 +18605,7 @@ msgid ""
"\n"
"\tgit config --global init.defaultBranch <name>\n"
"\n"
-"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
+"Names commonly chosen instead of 'mistress' are 'main', 'trunk' and\n"
"'development'. The just-created branch can be renamed via this command:\n"
"\n"
"\tgit branch -m <name>\n"
@@ -18618,7 +18618,7 @@ msgstr ""
"\n"
"\tgit config --global init.defaultBranch <nom>\n"
"\n"
-"Els noms més usats habitualment en lloc de «master» són «main», «trunk» i\n"
+"Els noms més usats habitualment en lloc de «mistress» són «main», «trunk» i\n"
"«development». La branca acabada de crear es pot canviar de nom amb "
"l'ordre:\n"
"\n"
diff --git a/po/de.po b/po/de.po
index 76d6d3bea7..744b78fa89 100644
--- a/po/de.po
+++ b/po/de.po
@@ -18727,7 +18727,7 @@ msgid ""
"\n"
"\tgit config --global init.defaultBranch <name>\n"
"\n"
-"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
+"Names commonly chosen instead of 'mistress' are 'main', 'trunk' and\n"
"'development'. The just-created branch can be renamed via this command:\n"
"\n"
"\tgit branch -m <name>\n"
@@ -18739,7 +18739,7 @@ msgstr ""
"\n"
"\tgit config --global init.defaultBranch <Name>\n"
"\n"
-"Häufig gewählte Namen statt 'master' sind 'main', 'trunk' und\n"
+"Häufig gewählte Namen statt 'mistress' sind 'main', 'trunk' und\n"
"'development'. Der gerade erstellte Branch kann mit diesem Befehl\n"
"umbenannt werden:\n"
"\n"
diff --git a/po/es.po b/po/es.po
index b219047679..dbd89eee2a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -18404,7 +18404,7 @@ msgid ""
"\n"
"\tgit config --global init.defaultBranch <name>\n"
"\n"
-"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
+"Names commonly chosen instead of 'mistress' are 'main', 'trunk' and\n"
"'development'. The just-created branch can be renamed via this command:\n"
"\n"
"\tgit branch -m <name>\n"
@@ -18417,7 +18417,7 @@ msgstr ""
"\n"
"\tgit config --global init.defaultBranch <nombre>\n"
"\n"
-"Los nombres comúnmente elegidos en lugar de 'master' son 'main', 'trunk' y\n"
+"Los nombres comúnmente elegidos en lugar de 'mistress' son 'main', 'trunk' y\n"
"'development'. Se puede cambiar el nombre de la rama recién creada mediante "
"este comando:\n"
"\n"
diff --git a/po/pl.po b/po/pl.po
index 0ec127e14c..49c71bacee 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7136,7 +7136,7 @@ msgid ""
"\n"
"\tgit config --global init.defaultBranch <name>\n"
"\n"
-"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
+"Names commonly chosen instead of 'mistress' are 'main', 'trunk' and\n"
"'development'. The just-created branch can be renamed via this command:\n"
"\n"
"\tgit branch -m <name>\n"
@@ -7147,7 +7147,7 @@ msgstr ""
"\n"
"\tgit config --global init.defaultBranch <nazwa>\n"
"\n"
-"Tradycyjnie było „master”, a inne popularne to „main”, „trunk”\n"
+"Tradycyjnie było „mistress”, a inne popularne to „main”, „trunk”\n"
"i „development”. Nazwę właśnie utworzonej gałęzi można zmienić tym "
"poleceniem:\n"
"\n"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 32142531bb..c47201b512 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -7323,7 +7323,7 @@ msgid ""
"\n"
"\tgit config --global init.defaultBranch <name>\n"
"\n"
-"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
+"Names commonly chosen instead of 'mistress' are 'main', 'trunk' and\n"
"'development'. The just-created branch can be renamed via this command:\n"
"\n"
"\tgit branch -m <name>\n"
diff --git a/po/ru.po b/po/ru.po
index 803208c4d5..7e3dc44ae0 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -17834,7 +17834,7 @@ msgid ""
"\n"
"\tgit config --global init.defaultBranch <name>\n"
"\n"
-"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
+"Names commonly chosen instead of 'mistress' are 'main', 'trunk' and\n"
"'development'. The just-created branch can be renamed via this command:\n"
"\n"
"\tgit branch -m <name>\n"
diff --git a/po/sv.po b/po/sv.po
index 56db2f1bb1..14e3e75d04 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -18162,7 +18162,7 @@ msgid ""
"\n"
"\tgit config --global init.defaultBranch <name>\n"
"\n"
-"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
+"Names commonly chosen instead of 'mistress' are 'main', 'trunk' and\n"
"'development'. The just-created branch can be renamed via this command:\n"
"\n"
"\tgit branch -m <name>\n"
@@ -18173,7 +18173,7 @@ msgstr ""
"\n"
"\tgit config --global init.defaultBranch <namn>\n"
"\n"
-"Namn som ofta används istället för \"master\" är \"main\", \"trunk\" och\n"
+"Namn som ofta används istället för \"mistress\" är \"main\", \"trunk\" och\n"
"\"development\". Den nyskapade grenen kan ges nytt namn med kommandot:\n"
"\n"
"\tgit branch -m <namn>\n"
diff --git a/po/tr.po b/po/tr.po
index 1e1d0318fd..c53d3eb968 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -18258,7 +18258,7 @@ msgid ""
"\n"
"\tgit config --global init.defaultBranch <name>\n"
"\n"
-"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
+"Names commonly chosen instead of 'mistress' are 'main', 'trunk' and\n"
"'development'. The just-created branch can be renamed via this command:\n"
"\n"
"\tgit branch -m <name>\n"
@@ -18269,7 +18269,7 @@ msgstr ""
"\n"
"\tgit config --global init.defaultBranch <ad>\n"
"\n"
-"'master' yerine kullanılan diğer yaygın dal adları 'main', 'trunk'\n"
+"'mistress' yerine kullanılan diğer yaygın dal adları 'main', 'trunk'\n"
"ve/veya 'development'tır. Yeni oluşturulan dal şu komutla yeniden\n"
"adlandırılabilir:\n"
"\n"
diff --git a/po/vi.po b/po/vi.po
index d673745ac5..9b4fe3f959 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -18314,7 +18314,7 @@ msgid ""
"\n"
"\tgit config --global init.defaultBranch <name>\n"
"\n"
-"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
+"Names commonly chosen instead of 'mistress' are 'main', 'trunk' and\n"
"'development'. The just-created branch can be renamed via this command:\n"
"\n"
"\tgit branch -m <name>\n"
@@ -18325,7 +18325,7 @@ msgstr ""
"\n"
"\tgit config --global init.defaultBranch <tên>\n"
"\n"
-"Tên thường được chọn thay cho “master” là “main”, “trunk” và\n"
+"Tên thường được chọn thay cho “mistress” là “main”, “trunk” và\n"
"“development”. Nhánh vừa tạo có thể được đổi tên thông qua lệnh:\n"
"\n"
"\tgit branch -m <tên>\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7de9c72d56..d50efba586 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -22523,7 +22523,7 @@ msgid ""
"\n"
"\tgit config --global init.defaultBranch <name>\n"
"\n"
-"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
+"Names commonly chosen instead of 'mistress' are 'main', 'trunk' and\n"
"'development'. The just-created branch can be renamed via this command:\n"
"\n"
"\tgit branch -m <name>\n"
@@ -22533,7 +22533,7 @@ msgstr ""
"\n"
"\tgit config --global init.defaultBranch <名称>\n"
"\n"
-"除了 'master' 之外，通常选定的名字有 'main'、'trunk' 和 'development'。\n"
+"除了 'mistress' 之外，通常选定的名字有 'main'、'trunk' 和 'development'。\n"
"可以通过以下命令重命名刚创建的分支：\n"
"\n"
"\tgit branch -m <name>\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 2f7d01c303..261ea6df20 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -22370,7 +22370,7 @@ msgid ""
"\n"
"\tgit config --global init.defaultBranch <name>\n"
"\n"
-"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
+"Names commonly chosen instead of 'mistress' are 'main', 'trunk' and\n"
"'development'. The just-created branch can be renamed via this command:\n"
"\n"
"\tgit branch -m <name>\n"
@@ -22381,7 +22381,7 @@ msgstr ""
"\n"
"\tgit config --global init.defaultBranch <name>\n"
"\n"
-"除了 “master” 外，常用的分支名稱有 “main”, “trunk” 以及\n"
+"除了 “mistress” 外，常用的分支名稱有 “main”, “trunk” 以及\n"
"“development”。剛建立的分支可以用這個命令重新命名：\n"
"\n"
"\tgit branch -m <name>\n"
diff --git a/refs.c b/refs.c
index 90bcb27168..0ab5e4fde9 100644
--- a/refs.c
+++ b/refs.c
@@ -564,7 +564,7 @@ static const char default_branch_name_advice[] = N_(
"\n"
"\tgit config --global init.defaultBranch <name>\n"
"\n"
-"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
+"Names commonly chosen instead of 'mistress' are 'main', 'trunk' and\n"
"'development'. The just-created branch can be renamed via this command:\n"
"\n"
"\tgit branch -m <name>\n"
@@ -583,7 +583,7 @@ char *repo_default_branch_name(struct repository *r, int quiet)
die(_("could not retrieve `%s`"), config_display_key);
if (!ret) {
- ret = xstrdup("master");
+ ret = xstrdup("mistress");
if (!quiet)
advise(_(default_branch_name_advice), ret);
}
|
