8d2cca9754 · matheusbsbs/matheus-bagliano

@@ -134,7 +134,7 @@ msgid ""

134 msgstr ""

135 "Project-Id-Version: Git\n"

136 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"

137 -"POT-Creation-Date: 2020-12-15 16:27+0800\n"

137 +"POT-Creation-Date: 2021-05-17 16:02+0800\n"

138 "PO-Revision-Date: 2020-10-14 11:43+0100\n"

139 "Last-Translator: Daniel Santos <hello@brighterdan.com>\n"

140 "Language-Team: Git L10N Português <https://github.com/git-l10n-pt-PT/>\n"

@@ -149,9 +149,9 @@ msgstr ""

149 msgid "Huh (%s)?"

150 msgstr "O quê (%s)?"

151

152 -#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3284

153 -#: sequencer.c:3735 sequencer.c:3890 builtin/rebase.c:1532

154 -#: builtin/rebase.c:1955

152 +#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493

153 +#: sequencer.c:3944 sequencer.c:4099 builtin/rebase.c:1528

154 +#: builtin/rebase.c:1953

155 msgid "could not read index"

156 msgstr "incapaz de ler index"

157

@@ -179,7 +179,7 @@ msgstr "Atualizar"

179 msgid "could not stage '%s'"

180 msgstr "incapaz de stage '%s'"

181

182 -#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3478

182 +#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3687

183 #, fuzzy

184 msgid "could not write index"

185 msgstr "incapaz de escrever index"

@@ -196,7 +196,7 @@ msgstr[1] "actualizou %d paths\n"

196 msgid "note: %s is untracked now.\n"

197 msgstr "nota: %s agora está por seguir.\n"

198

199 -#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:295

199 +#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298

200 #: builtin/reset.c:145

201 #, c-format

202 msgid "make_cache_entry failed for path '%s'"

@@ -346,12 +346,12 @@ msgstr "staged"

346 msgid "unstaged"

347 msgstr "unstaged"

348

349 -#: add-interactive.c:1144 apply.c:4989 apply.c:4992 builtin/am.c:2257

350 -#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124

351 -#: builtin/fetch.c:147 builtin/merge.c:284 builtin/pull.c:190

352 -#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818

353 -#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326

354 -#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572

349 +#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2308

350 +#: builtin/am.c:2311 builtin/bugreport.c:135 builtin/clone.c:128

351 +#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190

352 +#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819

353 +#: builtin/submodule--helper.c:1822 builtin/submodule--helper.c:2327

354 +#: builtin/submodule--helper.c:2330 builtin/submodule--helper.c:2573

355 #: git-add--interactive.perl:213

356 msgid "path"

357 msgstr "path"

@@ -788,8 +788,8 @@ msgstr "'git apply --cached' falhou"

788 msgid ""

789 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "

790 msgstr ""

791 -"Problema na submissão de pedaço editado. Editar de novo (responder "

792 -"\"n\" para \"não\" descarta!) [y/n]? "

791 +"Problema na submissão de pedaço editado. Editar de novo (responder \"n\" "

792 +"para \"não\" descarta!) [y/n]? "

793

794 #: add-patch.c:1289

795 #, fuzzy

@@ -897,7 +897,7 @@ msgstr "Lamento, incapaz de editar este pedaço"

897 msgid "'git apply' failed"

898 msgstr "'git apply' falhou"

899

900 -#: advice.c:143

900 +#: advice.c:145

901 #, c-format

902 msgid ""

903 "\n"

@@ -906,37 +906,37 @@ msgstr ""

906 "\n"

907 "Desative este mensagem com \"git config advice.%s false\""

908

909 -#: advice.c:159

909 +#: advice.c:161

910 #, fuzzy, c-format

911 msgid "%shint: %.*s%s\n"

912 msgstr "%sdica: %.*s%s\n"

913

914 -#: advice.c:250

914 +#: advice.c:252

915 msgid "Cherry-picking is not possible because you have unmerged files."

916 msgstr "Cherry-picking é impossível porque tem ficheiros em separado."

917

918 -#: advice.c:252

918 +#: advice.c:254

919 msgid "Committing is not possible because you have unmerged files."

920 msgstr "Cometer é impossível porque tem ficheiros em separado."

921

922 -#: advice.c:254

922 +#: advice.c:256

923 msgid "Merging is not possible because you have unmerged files."

924 msgstr "Juntar é impossível porque tem ficheiros em separado."

925

926 -#: advice.c:256

926 +#: advice.c:258

927 msgid "Pulling is not possible because you have unmerged files."

928 msgstr "Puxar é impossível porque tem ficheiros em separado."

929

930 -#: advice.c:258

930 +#: advice.c:260

931 msgid "Reverting is not possible because you have unmerged files."

932 msgstr "Reverter é impossível porque tem ficheiros em separado."

933

934 -#: advice.c:260

934 +#: advice.c:262

935 #, c-format

936 msgid "It is not possible to %s because you have unmerged files."

937 msgstr "É impossível fazer %s porque tem ficheiros em separado."

938

939 -#: advice.c:268

939 +#: advice.c:270

940 msgid ""

941 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"

942 "as appropriate to mark resolution and make a commit."

@@ -944,23 +944,36 @@ msgstr ""

944 "Corrija-os em worktree, e use 'git add/rm <ficheiro>' apropriadamente\n"

945 "para marcar resolução e fazer uma memória."

946

947 -#: advice.c:276

947 +#: advice.c:278

948 msgid "Exiting because of an unresolved conflict."

949 msgstr "Saindo devido a conflito por resolver."

950

951 -#: advice.c:281 builtin/merge.c:1369

951 +#: advice.c:283 builtin/merge.c:1374

952 msgid "You have not concluded your merge (MERGE_HEAD exists)."

953 msgstr "O teu juntar ficou por concluir (MERGE_HEAD presente)."

954

955 -#: advice.c:283

955 +#: advice.c:285

956 msgid "Please, commit your changes before merging."

957 msgstr "Por favor, memoriza as tuas modificações antes de juntar."

958

959 -#: advice.c:284

959 +#: advice.c:286

960 msgid "Exiting because of unfinished merge."

961 msgstr "Saindo devido a juntar inacabado."

962

963 -#: advice.c:290

963 +#: advice.c:296

964 +#, c-format

965 +msgid ""

966 +"The following pathspecs didn't match any eligible path, but they do match "

967 +"index\n"

968 +"entries outside the current sparse checkout:\n"

969 +msgstr ""

970 +

971 +#: advice.c:303

972 +msgid ""

973 +"Disable or modify the sparsity rules if you intend to update such entries."

974 +msgstr ""

975 +

976 +#: advice.c:310

977 #, fuzzy, c-format

978 msgid ""

979 "Note: switching to '%s'.\n"

@@ -1010,85 +1023,83 @@ msgstr "cmdline termina com \\"

1023 msgid "unclosed quote"

1024 msgstr "aspa aberta"

1025

1013 -#: apply.c:69

1026 +#: apply.c:70

1027 #, c-format

1028 msgid "unrecognized whitespace option '%s'"

1029 msgstr "opção de whitespace desconhecida '%s'"

1030

1018 -#: apply.c:85

1031 +#: apply.c:86

1032 #, c-format

1033 msgid "unrecognized whitespace ignore option '%s'"

1034 msgstr "opção de ignorar whitespace desconhecida '%s'"

1035

1023 -#: apply.c:135

1036 +#: apply.c:136

1037 msgid "--reject and --3way cannot be used together."

1038 msgstr "--reject e --3way só podem ser usados separadamente."

1039

1027 -#: apply.c:137

1028 -msgid "--cached and --3way cannot be used together."

1029 -msgstr "--cached e --3way só podem ser usados separadamente."

1030 -

1031 -#: apply.c:140

1040 +#: apply.c:139

1041 msgid "--3way outside a repository"

1042 msgstr "--3way fora de um repositório"

1043

1035 -#: apply.c:151

1044 +#: apply.c:150

1045 msgid "--index outside a repository"

1046 msgstr "--index fora de um repositório"

1047

1039 -#: apply.c:154

1048 +#: apply.c:153

1049 msgid "--cached outside a repository"

1050 msgstr "--cached fora de um repositório"

1051

1043 -#: apply.c:801

1052 +#: apply.c:800

1053 #, c-format

1054 msgid "Cannot prepare timestamp regexp %s"

1055 msgstr "Incapaz preparar timestamp de regexp %s"

1056

1048 -#: apply.c:810

1057 +#: apply.c:809

1058 #, c-format

1059 msgid "regexec returned %d for input: %s"

1060 msgstr "regexec devolveu %d para input: %s"

1061

1053 -#: apply.c:884

1062 +#: apply.c:883

1063 #, c-format

1064 msgid "unable to find filename in patch at line %d"

1065 msgstr "incapaz de encontrar o nome do ficheiro no patch da linha %d"

1066

1058 -#: apply.c:922

1067 +#: apply.c:921

1068 #, c-format

1069 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"

1061 -msgstr "git apply: git-diff incorreto - esperava /dev/null, tive %s na linha "

1062 -"%d"

1070 +msgstr ""

1071 +"git apply: git-diff incorreto - esperava /dev/null, tive %s na linha %d"

1072

1064 -#: apply.c:928

1073 +#: apply.c:927

1074 #, c-format

1075 msgid "git apply: bad git-diff - inconsistent new filename on line %d"

1067 -msgstr "git apply: git-diff incorreto - novo nome de ficheiro inconsistente "

1068 -"na linha %d"

1076 +msgstr ""

1077 +"git apply: git-diff incorreto - novo nome de ficheiro inconsistente na linha "

1078 +"%d"

1079

1070 -#: apply.c:929

1080 +#: apply.c:928

1081 #, c-format

1082 msgid "git apply: bad git-diff - inconsistent old filename on line %d"

1073 -msgstr "git apply: git-diff incorreto - antigo nome de ficheiro inconsistente "

1074 -"na linha %d"

1083 +msgstr ""

1084 +"git apply: git-diff incorreto - antigo nome de ficheiro inconsistente na "

1085 +"linha %d"

1086

1076 -#: apply.c:934

1087 +#: apply.c:933

1088 #, c-format

1089 msgid "git apply: bad git-diff - expected /dev/null on line %d"

1090 msgstr "git apply: git-diff incorreto - esperava /dev/null na linha %d"

1091

1081 -#: apply.c:963

1092 +#: apply.c:962

1093 #, fuzzy, c-format

1094 msgid "invalid mode on line %d: %s"

1095 msgstr "modo inválido na linha %d: %s"

1096

1086 -#: apply.c:1282

1097 +#: apply.c:1281

1098 #, c-format

1099 msgid "inconsistent header lines %d and %d"

1100 msgstr "linhas de cabeçalho %d e %d inconsistentes"

1101

1091 -#: apply.c:1372

1102 +#: apply.c:1371

1103 #, c-format

1104 msgid ""

1105 "git diff header lacks filename information when removing %d leading pathname "

@@ -1103,92 +1114,92 @@ msgstr[1] ""

1114 "cabeçalho do git diff falta informação de nome de ficheiro quando removendo "

1115 "%d componentes do pathname (linha %d)"

1116

1106 -#: apply.c:1385

1117 +#: apply.c:1384

1118 #, c-format

1119 msgid "git diff header lacks filename information (line %d)"

1120 msgstr "cabeçalho do git diff falta informação de nome de ficheiro (linha %d)"

1121

1111 -#: apply.c:1481

1122 +#: apply.c:1480

1123 #, c-format

1124 msgid "recount: unexpected line: %.*s"

1125 msgstr "recontagem: linha inesperada: %.*s"

1126

1116 -#: apply.c:1550

1127 +#: apply.c:1549

1128 #, c-format

1129 msgid "patch fragment without header at line %d: %.*s"

1130 msgstr "fragmento de patch sem cabeçalho na linha %d: %.*s"

1131

1121 -#: apply.c:1753

1132 +#: apply.c:1752

1133 msgid "new file depends on old contents"

1134 msgstr "novo ficheiro depende de conteúdos antigos"

1135

1125 -#: apply.c:1755

1136 +#: apply.c:1754

1137 msgid "deleted file still has contents"

1138 msgstr "ficheiro eliminado ainda tem conteúdos"

1139

1129 -#: apply.c:1789

1140 +#: apply.c:1788

1141 #, c-format

1142 msgid "corrupt patch at line %d"

1143 msgstr "patch roto na linha %d"

1144

1134 -#: apply.c:1826

1145 +#: apply.c:1825

1146 #, c-format

1147 msgid "new file %s depends on old contents"

1148 msgstr "novo ficheiro %s depende de conteúdos antigos"

1149

1139 -#: apply.c:1828

1150 +#: apply.c:1827

1151 #, c-format

1152 msgid "deleted file %s still has contents"

1153 msgstr "ficheiro apagado %s ainda tem conteúdos"

1154

1144 -#: apply.c:1831

1155 +#: apply.c:1830

1156 #, c-format

1157 msgid "** warning: file %s becomes empty but is not deleted"

1158 msgstr "** aviso: ficheiro %s fica vazio e mantêm-se"

1159

1149 -#: apply.c:1978

1160 +#: apply.c:1977

1161 #, c-format

1162 msgid "corrupt binary patch at line %d: %.*s"

1163 msgstr "patch binário roto na linha %d: %.*s"

1164

1154 -#: apply.c:2015

1165 +#: apply.c:2014

1166 #, c-format

1167 msgid "unrecognized binary patch at line %d"

1168 msgstr "patch binário irreconhecível na linha %d"

1169

1159 -#: apply.c:2177

1170 +#: apply.c:2176

1171 #, c-format

1172 msgid "patch with only garbage at line %d"

1173 msgstr "patch com apenas lixo na linha %d"

1174

1164 -#: apply.c:2263

1175 +#: apply.c:2262

1176 #, c-format

1177 msgid "unable to read symlink %s"

1178 msgstr "incapaz de ler ligação simbólica %s"

1179

1169 -#: apply.c:2267

1180 +#: apply.c:2266

1181 #, c-format

1182 msgid "unable to open or read %s"

1183 msgstr "incapaz de abrir ou ler %s"

1184

1174 -#: apply.c:2936

1185 +#: apply.c:2935

1186 #, c-format

1187 msgid "invalid start of line: '%c'"

1188 msgstr "início de linha inválido: '%c'"

1189

1179 -#: apply.c:3057

1190 +#: apply.c:3056

1191 #, c-format

1192 msgid "Hunk #%d succeeded at %d (offset %d line)."

1193 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."

1194 msgstr[0] "Pedaço #%d apareceu em %d (%d offset de linha)."

1195 msgstr[1] "Pedaço #%d apareceu em %d (%d offset de linhas)."

1196

1186 -#: apply.c:3069

1197 +#: apply.c:3068

1198 #, c-format

1199 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"

1200 msgstr "Contexto reduzido a (%ld/%ld) para submeter fragmento em %d"

1201

1191 -#: apply.c:3075

1202 +#: apply.c:3074

1203 #, c-format

1204 msgid ""

1205 "while searching for:\n"

@@ -1197,135 +1208,141 @@ msgstr ""

1208 "procurando por:\n"

1209 "%.*s"

1210

1200 -#: apply.c:3097

1211 +#: apply.c:3096

1212 #, c-format

1213 msgid "missing binary patch data for '%s'"

1214 msgstr "faltando patch binário para '%s'"

1215

1205 -#: apply.c:3105

1216 +#: apply.c:3104

1217 #, c-format

1218 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"

1208 -msgstr "incapaz submeter-inversamente patch binário sem pedaço "

1209 -"inverso a '%s'"

1219 +msgstr "incapaz submeter-inversamente patch binário sem pedaço inverso a '%s'"

1220

1211 -#: apply.c:3152

1221 +#: apply.c:3151

1222 #, c-format

1223 msgid "cannot apply binary patch to '%s' without full index line"

1224 msgstr "incapaz submeter patch binário a '%s' sem a linha completa de index"

1225

1216 -#: apply.c:3163

1226 +#: apply.c:3162

1227 #, c-format

1228 msgid ""

1229 "the patch applies to '%s' (%s), which does not match the current contents."

1230 msgstr ""

1231 "o patch submete-se a '%s' (%s), que corresponde a conteúdo actual nenhum."

1232

1223 -#: apply.c:3171

1233 +#: apply.c:3170

1234 #, c-format

1235 msgid "the patch applies to an empty '%s' but it is not empty"

1236 msgstr "o patch submete-se a um '%s' vazio mas tem conteúdo"

1237

1228 -#: apply.c:3189

1238 +#: apply.c:3188

1239 #, c-format

1240 msgid "the necessary postimage %s for '%s' cannot be read"

1241 msgstr "incapaz ler a postimage necessária %s para '%s'"

1242

1233 -#: apply.c:3202

1243 +#: apply.c:3201

1244 #, c-format

1245 msgid "binary patch does not apply to '%s'"

1246 msgstr "path binário submete-se a '%s' de maneira nenhuma"

1247

1238 -#: apply.c:3209

1248 +#: apply.c:3208

1249 #, c-format

1250 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"

1241 -msgstr "patch binário para '%s' cria resultado incorreto (esperei %s, "

1242 -"recebi %s)"

1251 +msgstr ""

1252 +"patch binário para '%s' cria resultado incorreto (esperei %s, recebi %s)"

1253

1244 -#: apply.c:3230

1254 +#: apply.c:3229

1255 #, c-format

1256 msgid "patch failed: %s:%ld"

1257 msgstr "patch falhou: %s:%ld"

1258

1249 -#: apply.c:3353

1259 +#: apply.c:3352

1260 #, c-format

1261 msgid "cannot checkout %s"

1262 msgstr "incapaz de checkout %s"

1263

1254 -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:73 setup.c:308

1264 +#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214

1265 +#: setup.c:308

1266 #, c-format

1267 msgid "failed to read %s"

1268 msgstr "falha a ler %s"

1269

1259 -#: apply.c:3413

1270 +#: apply.c:3412

1271 #, c-format

1272 msgid "reading from '%s' beyond a symbolic link"

1273 msgstr "lendo '%s' além de uma ligação simbólica"

1274

1264 -#: apply.c:3442 apply.c:3685

1275 +#: apply.c:3441 apply.c:3687

1276 #, c-format

1277 msgid "path %s has been renamed/deleted"

1278 msgstr "path %s mudou de nome ou foi eliminado"

1279

1269 -#: apply.c:3528 apply.c:3700

1280 +#: apply.c:3527 apply.c:3702

1281 #, c-format

1282 msgid "%s: does not exist in index"

1283 msgstr "%s: tem inexistência no index"

1284

1274 -#: apply.c:3537 apply.c:3708 apply.c:3953

1285 +#: apply.c:3536 apply.c:3710 apply.c:3954

1286 #, c-format

1287 msgid "%s: does not match index"

1288 msgstr "%s: no index há correspondência nenhuma"

1289

1279 -#: apply.c:3572

1280 -msgid "repository lacks the necessary blob to fall back on 3-way merge."

1290 +#: apply.c:3571

1291 +#, fuzzy

1292 +msgid "repository lacks the necessary blob to perform 3-way merge."

1293 msgstr "repositório falta o blob necessário para recorrer à tri-junção."

1294

1283 -#: apply.c:3575

1284 -#, c-format

1285 -msgid "Falling back to three-way merge...\n"

1295 +#: apply.c:3574

1296 +#, fuzzy, c-format

1297 +msgid "Performing three-way merge...\n"

1298 msgstr "A recorrer a integração com 3 pontos...\n"

1299

1288 -#: apply.c:3591 apply.c:3595

1300 +#: apply.c:3590 apply.c:3594

1301 #, c-format

1302 msgid "cannot read the current contents of '%s'"

1303 msgstr "incapaz ler conteúdo atual de '%s'"

1304

1293 -#: apply.c:3607

1294 -#, c-format

1295 -msgid "Failed to fall back on three-way merge...\n"

1305 +#: apply.c:3606

1306 +#, fuzzy, c-format

1307 +msgid "Failed to perform three-way merge...\n"

1308 msgstr "Falha a recorrer a integração com 3 pontos...\n"

1309

1298 -#: apply.c:3621

1310 +#: apply.c:3620

1311 #, c-format

1312 msgid "Applied patch to '%s' with conflicts.\n"

1313 msgstr "Patch aplicado a '%s' com conflitos.\n"

1314

1303 -#: apply.c:3626

1315 +#: apply.c:3625

1316 #, c-format

1317 msgid "Applied patch to '%s' cleanly.\n"

1318 msgstr "Patch aplicado a '%s' com sucesso.\n"

1319

1308 -#: apply.c:3652

1320 +#: apply.c:3642

1321 +#, fuzzy, c-format

1322 +msgid "Falling back to direct application...\n"

1323 +msgstr "A recorrer a integração com 3 pontos...\n"

1324 +

1325 +#: apply.c:3654

1326 msgid "removal patch leaves file contents"

1327 msgstr "patch de remoção deixa conteúdos no ficheiro"

1328

1312 -#: apply.c:3725

1329 +#: apply.c:3727

1330 #, c-format

1331 msgid "%s: wrong type"

1332 msgstr "%s: tipo errado"

1333

1317 -#: apply.c:3727

1334 +#: apply.c:3729

1335 #, c-format

1336 msgid "%s has type %o, expected %o"

1337 msgstr "%s é do tipo %o, esperado %o"

1338

1322 -#: apply.c:3892 apply.c:3894 read-cache.c:832 read-cache.c:858

1323 -#: read-cache.c:1313

1339 +#: apply.c:3894 apply.c:3896 read-cache.c:861 read-cache.c:890

1340 +#: read-cache.c:1351

1341 #, c-format

1342 msgid "invalid path '%s'"

1343 msgstr "caminho inválido '%s'"

1344

1328 -#: apply.c:3950

1345 +#: apply.c:3952

1346 #, c-format

1347 msgid "%s: already exists in index"

1348 msgstr "%s: já existe no índice"

@@ -1410,7 +1427,7 @@ msgstr "incapaz criar armazenamento de backup para ficheiro recém-criado %s"

1427 msgid "unable to add cache entry for %s"

1428 msgstr "incapaz adicionar entrada de cache para %s"

1429

1413 -#: apply.c:4376 builtin/bisect--helper.c:524

1430 +#: apply.c:4376 builtin/bisect--helper.c:523

1431 #, c-format

1432 msgid "failed to write to '%s'"

1433 msgstr "falha a escrever para '%s'"

@@ -1446,7 +1463,7 @@ msgstr[1] "A aplicar patch %%s com %d rejeições..."

1463 msgid "truncating .rej filename to %.*s.rej"

1464 msgstr "a truncar o nome do ficheiro .rej em %.*s.rej"

1465

1449 -#: apply.c:4578 builtin/fetch.c:927 builtin/fetch.c:1228

1466 +#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394

1467 #, c-format

1468 msgid "cannot open %s"

1469 msgstr "incapaz abrir %s"

@@ -1461,172 +1478,175 @@ msgstr "Excerto nº%d aplicado com sucesso."

1478 msgid "Rejected hunk #%d."

1479 msgstr "Excerto nº%d rejeitado."

1480

1464 -#: apply.c:4720

1481 +#: apply.c:4725

1482 #, c-format

1483 msgid "Skipped patch '%s'."

1484 msgstr "Patch '%s' ignorado."

1485

1469 -#: apply.c:4728

1486 +#: apply.c:4733

1487 msgid "unrecognized input"

1488 msgstr "input desconhecido"

1489

1473 -#: apply.c:4748

1490 +#: apply.c:4753

1491 msgid "unable to read index file"

1492 msgstr "incapaz ler ficheiro index"

1493

1477 -#: apply.c:4905

1494 +#: apply.c:4910

1495 #, c-format

1496 msgid "can't open patch '%s': %s"

1497 msgstr "incapaz abrir patch '%s': %s"

1498

1482 -#: apply.c:4932

1499 +#: apply.c:4937

1500 #, c-format

1501 msgid "squelched %d whitespace error"

1502 msgid_plural "squelched %d whitespace errors"

1503 msgstr[0] "%d erro de espaço em branco reprimido"

1504 msgstr[1] "%d erros de espaço em branco reprimidos"

1505

1489 -#: apply.c:4938 apply.c:4953

1506 +#: apply.c:4943 apply.c:4958

1507 #, c-format

1508 msgid "%d line adds whitespace errors."

1509 msgid_plural "%d lines add whitespace errors."

1510 msgstr[0] "%d linha adiciona erros de espaço em branco."

1511 msgstr[1] "%d linhas adicionam erros de espaço em branco."

1512

1496 -#: apply.c:4946

1513 +#: apply.c:4951

1514 #, c-format

1515 msgid "%d line applied after fixing whitespace errors."

1516 msgid_plural "%d lines applied after fixing whitespace errors."

1517 msgstr[0] "%d linha aplicada depois de corrigir erros de espaço em branco."

1518 msgstr[1] "%d linhas aplicadas depois de corrigir erros de espaço em branco."

1519

1503 -#: apply.c:4962 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406

1520 +#: apply.c:4967 builtin/add.c:679 builtin/mv.c:304 builtin/rm.c:423

1521 msgid "Unable to write new index file"

1522 msgstr "Incapaz de escrever novo ficheiro index"

1523

1507 -#: apply.c:4990

1524 +#: apply.c:4995

1525 msgid "don't apply changes matching the given path"

1509 -msgstr "submeter de maneira nenhuma alterações correspondentes a path fornecido"

1526 +msgstr ""

1527 +"submeter de maneira nenhuma alterações correspondentes a path fornecido"

1528

1511 -#: apply.c:4993

1529 +#: apply.c:4998

1530 msgid "apply changes matching the given path"

1531 msgstr "submeter alterações correspondentes a path fornecido"

1532

1515 -#: apply.c:4995 builtin/am.c:2266

1533 +#: apply.c:5000 builtin/am.c:2317

1534 msgid "num"

1535 msgstr "num"

1536

1519 -#: apply.c:4996

1537 +#: apply.c:5001

1538 msgid "remove <num> leading slashes from traditional diff paths"

1539 msgstr "remover <num> barras à esquerda dos caminhos de diff tradicional"

1540

1523 -#: apply.c:4999

1541 +#: apply.c:5004

1542 msgid "ignore additions made by the patch"

1543 msgstr "ignorar adições feitas pelo patch"

1544

1527 -#: apply.c:5001

1545 +#: apply.c:5006

1546 msgid "instead of applying the patch, output diffstat for the input"

1547 msgstr "invés aplicada patch, output diffstat para "

1548

1531 -#: apply.c:5005

1549 +#: apply.c:5010

1550 msgid "show number of added and deleted lines in decimal notation"

1551 msgstr "mostrar número de linhas adicionadas e removidas em notação decimal"

1552

1535 -#: apply.c:5007

1553 +#: apply.c:5012

1554 msgid "instead of applying the patch, output a summary for the input"

1555 msgstr "em vez de aplicar o patch, mostrar um resumo da entrada"

1556

1539 -#: apply.c:5009

1557 +#: apply.c:5014

1558 msgid "instead of applying the patch, see if the patch is applicable"

1559 msgstr "em vez de aplicar o patch, verificar se o patch pode ser aplicado"

1560

1543 -#: apply.c:5011

1561 +#: apply.c:5016

1562 msgid "make sure the patch is applicable to the current index"

1563 msgstr "garantir que o patch pode ser aplicado ao índice atual"

1564

1547 -#: apply.c:5013

1565 +#: apply.c:5018

1566 msgid "mark new files with `git add --intent-to-add`"

1567 msgstr ""

1568

1551 -#: apply.c:5015

1569 +#: apply.c:5020

1570 msgid "apply a patch without touching the working tree"

1571 msgstr "aplicar um patch sem tocar na árvore de trabalho"

1572

1555 -#: apply.c:5017

1573 +#: apply.c:5022

1574 msgid "accept a patch that touches outside the working area"

1575 msgstr "aceitar patches que alteram ficheiros fora da área de trabalho"

1576

1559 -#: apply.c:5020

1577 +#: apply.c:5025

1578 msgid "also apply the patch (use with --stat/--summary/--check)"

1579 msgstr "aplicar o patch também (use com --stat/--summary/--check)"

1580

1563 -#: apply.c:5022

1564 -msgid "attempt three-way merge if a patch does not apply"

1581 +#: apply.c:5027

1582 +#, fuzzy

1583 +msgid "attempt three-way merge, fall back on normal patch if that fails"

1584 msgstr "tentar tri-junção se um patch submete-se de maneira nenhuma"

1585

1567 -#: apply.c:5024

1586 +#: apply.c:5029

1587 msgid "build a temporary index based on embedded index information"

1588 msgstr ""

1589 "construir um índice temporário baseado na informação incorporada do índice"

1590

1572 -#: apply.c:5027 builtin/checkout-index.c:182 builtin/ls-files.c:525

1591 +#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617

1592 msgid "paths are separated with NUL character"

1593 msgstr "os caminhos estão separados por caracteres NUL"

1594

1576 -#: apply.c:5029

1595 +#: apply.c:5034

1596 msgid "ensure at least <n> lines of context match"

1597 msgstr "garantir que, pelo menos, <n> linhas de contexto coincidem"

1598

1580 -#: apply.c:5030 builtin/am.c:2245 builtin/interpret-trailers.c:98

1581 -#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102

1582 -#: builtin/pack-objects.c:3562 builtin/rebase.c:1346

1599 +#: apply.c:5035 builtin/am.c:2293 builtin/am.c:2296

1600 +#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100

1601 +#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3831

1602 +#: builtin/rebase.c:1347

1603 msgid "action"

1604 msgstr "ação"

1605

1586 -#: apply.c:5031

1606 +#: apply.c:5036

1607 msgid "detect new or modified lines that have whitespace errors"

1608 msgstr "detetar linhas novas ou modificadas que tenham espaços em branco"

1609

1590 -#: apply.c:5034 apply.c:5037

1610 +#: apply.c:5039 apply.c:5042

1611 msgid "ignore changes in whitespace when finding context"

1612 msgstr "ignorar alterações de espaço em branco ao procurar contexto"

1613

1594 -#: apply.c:5040

1614 +#: apply.c:5045

1615 msgid "apply the patch in reverse"

1616 msgstr "aplicar o patch em reverso"

1617

1598 -#: apply.c:5042

1618 +#: apply.c:5047

1619 msgid "don't expect at least one line of context"

1620 msgstr "conta com linha de contexto nenhuma"

1621

1602 -#: apply.c:5044

1622 +#: apply.c:5049

1623 msgid "leave the rejected hunks in corresponding *.rej files"

1624 msgstr "deixar os pedaços rejeitados nos respetivos ficheiros *.rej"

1625

1606 -#: apply.c:5046

1626 +#: apply.c:5051

1627 msgid "allow overlapping hunks"

1628 msgstr "permitir a sobreposição de pedaços"

1629

1610 -#: apply.c:5047 builtin/add.c:329 builtin/check-ignore.c:22

1611 -#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:775

1612 -#: builtin/log.c:2287 builtin/mv.c:123 builtin/read-tree.c:128

1630 +#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22

1631 +#: builtin/commit.c:1474 builtin/count-objects.c:98 builtin/fsck.c:755

1632 +#: builtin/log.c:2295 builtin/mv.c:123 builtin/read-tree.c:128

1633 msgid "be verbose"

1634 msgstr "ser verboso"

1635

1616 -#: apply.c:5049

1636 +#: apply.c:5054

1637 msgid "tolerate incorrectly detected missing new-line at the end of file"

1638 msgstr ""

1639 "tolerar deteções incorretas de falta de nova linha no final do ficheiro"

1640

1621 -#: apply.c:5052

1641 +#: apply.c:5057

1642 msgid "do not trust the line counts in the hunk headers"

1643 msgstr "desconfia da contagem de linhas nos headers de pedaços"

1644

1625 -#: apply.c:5054 builtin/am.c:2254

1645 +#: apply.c:5059 builtin/am.c:2305

1646 msgid "root"

1647 msgstr "raiz"

1648

1629 -#: apply.c:5055

1649 +#: apply.c:5060

1650 msgid "prepend <root> to all filenames"

1651 msgstr "preceder <root> a todos os nomes de ficheiro"

1652

@@ -1694,145 +1714,145 @@ msgstr ""

1714 msgid "git archive --remote <repo> [--exec <cmd>] --list"

1715 msgstr "git archive --remote <repo> [--exec <cmd>] --list"

1716

1697 -#: archive.c:192

1717 +#: archive.c:188

1718 #, fuzzy, c-format

1719 msgid "cannot read %s"

1720 msgstr "incapaz ler '%s'"

1721

1702 -#: archive.c:345 sequencer.c:459 sequencer.c:1736 sequencer.c:2886

1703 -#: sequencer.c:3327 sequencer.c:3436 builtin/am.c:249 builtin/commit.c:786

1704 -#: builtin/merge.c:1138

1722 +#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095

1723 +#: sequencer.c:3536 sequencer.c:3645 builtin/am.c:261 builtin/commit.c:833

1724 +#: builtin/merge.c:1143

1725 #, c-format

1726 msgid "could not read '%s'"

1727 msgstr "incapaz ler '%s'"

1728

1709 -#: archive.c:430 builtin/add.c:181 builtin/add.c:594 builtin/rm.c:315

1729 +#: archive.c:427 builtin/add.c:205 builtin/add.c:646 builtin/rm.c:328

1730 #, c-format

1731 msgid "pathspec '%s' did not match any files"

1732 msgstr "especificador de path '%s' correspondeu a ficheiro nenhum"

1733

1714 -#: archive.c:454

1734 +#: archive.c:451

1735 #, fuzzy, c-format

1736 msgid "no such ref: %.*s"

1737 msgstr "referência inexistente %s"

1738

1719 -#: archive.c:460

1739 +#: archive.c:457

1740 #, fuzzy, c-format

1741 msgid "not a valid object name: %s"

1742 msgstr "nome de objeto inválido: %s"

1743

1724 -#: archive.c:473

1744 +#: archive.c:470

1745 #, fuzzy, c-format

1746 msgid "not a tree object: %s"

1747 msgstr "é objeto árvore nenhum: %s"

1748

1729 -#: archive.c:485

1749 +#: archive.c:482

1750 #, fuzzy

1751 msgid "current working directory is untracked"

1752 msgstr "pasta de trabalho atual está por seguir"

1753

1734 -#: archive.c:526

1754 +#: archive.c:523

1755 #, fuzzy, c-format

1756 msgid "File not found: %s"

1757 msgstr "ficheiro por encontrar: %s"

1758

1739 -#: archive.c:528

1759 +#: archive.c:525

1760 #, fuzzy, c-format

1761 msgid "Not a regular file: %s"

1762 msgstr "É ficheiro normal nenhum: %s"

1763

1744 -#: archive.c:555

1764 +#: archive.c:552

1765 msgid "fmt"

1766 msgstr "fmt"

1767

1748 -#: archive.c:555

1768 +#: archive.c:552

1769 msgid "archive format"

1770 msgstr "formato do arquivo"

1771

1752 -#: archive.c:556 builtin/log.c:1765

1772 +#: archive.c:553 builtin/log.c:1772

1773 msgid "prefix"

1774 msgstr "prefixo"

1775

1756 -#: archive.c:557

1776 +#: archive.c:554

1777 msgid "prepend prefix to each pathname in the archive"

1778 msgstr "preceder o prefixo a cada nome de caminho dentro do arquivo"

1779

1760 -#: archive.c:558 archive.c:561 builtin/blame.c:886 builtin/blame.c:890

1761 -#: builtin/blame.c:891 builtin/commit-tree.c:117 builtin/config.c:135

1762 -#: builtin/fast-export.c:1208 builtin/fast-export.c:1210

1763 -#: builtin/fast-export.c:1214 builtin/grep.c:919 builtin/hash-object.c:105

1764 -#: builtin/ls-files.c:561 builtin/ls-files.c:564 builtin/notes.c:412

1765 -#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190

1780 +#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888

1781 +#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135

1782 +#: builtin/fast-export.c:1207 builtin/fast-export.c:1209

1783 +#: builtin/fast-export.c:1213 builtin/grep.c:922 builtin/hash-object.c:105

1784 +#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412

1785 +#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191

1786 msgid "file"

1787 msgstr "ficheiro"

1788

1769 -#: archive.c:559

1789 +#: archive.c:556

1790 #, fuzzy

1791 msgid "add untracked file to archive"

1792 msgstr "adiciona ficheiro por seguir a arquivo"

1793

1774 -#: archive.c:562 builtin/archive.c:90

1794 +#: archive.c:559 builtin/archive.c:90

1795 msgid "write the archive to this file"

1796 msgstr "escreve arquivo para este ficheiro"

1797

1778 -#: archive.c:564

1798 +#: archive.c:561

1799 msgid "read .gitattributes in working directory"

1800 msgstr "ler .gitattributes do diretório de trabalho"

1801

1782 -#: archive.c:565

1802 +#: archive.c:562

1803 msgid "report archived files on stderr"

1804 msgstr "listar ficheiros arquivados para stderr"

1805

1786 -#: archive.c:567

1806 +#: archive.c:564

1807 #, fuzzy

1808 msgid "set compression level"

1809 msgstr "nível de compactação do pacote"

1810

1791 -#: archive.c:570

1811 +#: archive.c:567

1812 msgid "list supported archive formats"

1813 msgstr "listar formatos de arquivo suportados"

1814

1795 -#: archive.c:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117

1796 -#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335

1815 +#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121

1816 +#: builtin/submodule--helper.c:1831 builtin/submodule--helper.c:2336

1817 msgid "repo"

1818 msgstr "repo"

1819

1800 -#: archive.c:573 builtin/archive.c:92

1820 +#: archive.c:570 builtin/archive.c:92

1821 msgid "retrieve the archive from remote repository <repo>"

1822 msgstr "obter o arquivo a partir do repositório remoto <repo>"

1823

1804 -#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714

1824 +#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:718

1825 #: builtin/notes.c:498

1826 msgid "command"

1827 msgstr "comando"

1828

1809 -#: archive.c:575 builtin/archive.c:94

1829 +#: archive.c:572 builtin/archive.c:94

1830 msgid "path to the remote git-upload-archive command"

1831 msgstr "caminho para o comando git-upload-archive no remoto"

1832

1813 -#: archive.c:582

1833 +#: archive.c:579

1834 msgid "Unexpected option --remote"

1835 msgstr "Opção inesperada --remote"

1836

1817 -#: archive.c:584

1837 +#: archive.c:581

1838 msgid "Option --exec can only be used together with --remote"

1839 msgstr "A opção --exec só pode ser usada em conjunto com --remote"

1840

1821 -#: archive.c:586

1841 +#: archive.c:583

1842 msgid "Unexpected option --output"

1843 msgstr "Opção inesperada --output"

1844

1825 -#: archive.c:588

1845 +#: archive.c:585

1846 #, fuzzy

1847 msgid "Options --add-file and --remote cannot be used together"

1848 msgstr "Opções --add-file e --remote podem nada ser usadas juntas"

1849

1830 -#: archive.c:610

1850 +#: archive.c:607

1851 #, c-format

1852 msgid "Unknown archive format '%s'"

1853 msgstr "Formato de arquivo desconhecido '%s'"

1854

1835 -#: archive.c:619

1855 +#: archive.c:616

1856 #, c-format

1857 msgid "Argument not supported for format '%s': -%d"

1858 msgstr "Argumento por ser suportado para formato '%s': -%d"

@@ -1842,12 +1862,12 @@ msgstr "Argumento por ser suportado para formato '%s': -%d"

1862 msgid "%.*s is not a valid attribute name"

1863 msgstr "%.*s é nome de atributo inválido"

1864

1845 -#: attr.c:359

1865 +#: attr.c:363

1866 #, fuzzy, c-format

1867 msgid "%s not allowed: %s:%d"

1868 msgstr "falha ao aplicar o patch: %s:%ld"

1869

1850 -#: attr.c:399

1870 +#: attr.c:403

1871 msgid ""

1872 "Negative patterns are ignored in git attributes\n"

1873 "Use '\\!' for literal leading exclamation."

@@ -1929,12 +1949,12 @@ msgstr "A bissetar: uma base de integração tem de ser testada\n"

1949 msgid "a %s revision is needed"

1950 msgstr "precisa-se de uma revisão %s"

1951

1932 -#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:255

1952 +#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298

1953 #, c-format

1954 msgid "could not create file '%s'"

1955 msgstr "incapaz criar ficheiro '%s'"

1956

1937 -#: bisect.c:987 builtin/merge.c:152

1957 +#: bisect.c:987 builtin/merge.c:153

1958 #, c-format

1959 msgid "could not read file '%s'"

1960 msgstr "incapaz ler ficheiro '%s'"

@@ -1949,10 +1969,10 @@ msgid "%s was both %s and %s\n"

1969 msgstr "%s era %s e %s em simultâneo\n"

1970

1971 #: bisect.c:1066

1952 -#, c-format

1972 +#, fuzzy, c-format

1973 msgid ""

1974 "No testable commit found.\n"

1955 -"Maybe you started with bad path parameters?\n"

1975 +"Maybe you started with bad path arguments?\n"

1976 msgstr ""

1977 "Nenhum commit testável encontrado.\n"

1978 "Talvez tenha começado com parâmetros de caminho incorretos?\n"

@@ -1974,39 +1994,39 @@ msgid_plural "Bisecting: %d revisions left to test after this %s\n"

1994 msgstr[0] "A bissetar: falta %d revisão para testar depois desta %s\n"

1995 msgstr[1] "A bissetar: faltam %d revisões para testar depois desta %s\n"

1996

1977 -#: blame.c:2777

1997 +#: blame.c:2776

1998 msgid "--contents and --reverse do not blend well."

1999 msgstr "--contents e --reverse são imiscíveis."

2000

1981 -#: blame.c:2791

2001 +#: blame.c:2790

2002 msgid "cannot use --contents with final commit object name"

2003 msgstr "usar --contents com nome de objeto commit final é impossível"

2004

1985 -#: blame.c:2812

2005 +#: blame.c:2811

2006 msgid "--reverse and --first-parent together require specified latest commit"

2007 msgstr ""

2008 "--reverse e --first-parent juntos requer que se especifique o último commit"

2009

1990 -#: blame.c:2821 bundle.c:213 ref-filter.c:2272 remote.c:2031 sequencer.c:2138

1991 -#: sequencer.c:4633 submodule.c:855 builtin/commit.c:1045 builtin/log.c:409

1992 -#: builtin/log.c:1023 builtin/log.c:1625 builtin/log.c:2046 builtin/log.c:2336

1993 -#: builtin/merge.c:423 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395

1994 -#: builtin/shortlog.c:267

2010 +#: blame.c:2820 bundle.c:213 ref-filter.c:2207 remote.c:2041 sequencer.c:2333

2011 +#: sequencer.c:4866 submodule.c:857 builtin/commit.c:1106 builtin/log.c:411

2012 +#: builtin/log.c:1018 builtin/log.c:1626 builtin/log.c:2054 builtin/log.c:2344

2013 +#: builtin/merge.c:428 builtin/pack-objects.c:3183 builtin/pack-objects.c:3646

2014 +#: builtin/pack-objects.c:3661 builtin/shortlog.c:255

2015 msgid "revision walk setup failed"

2016 msgstr "falha ao configurar percurso de revisões"

2017

1998 -#: blame.c:2839

2018 +#: blame.c:2838

2019 msgid ""

2020 "--reverse --first-parent together require range along first-parent chain"

2021 msgstr ""

2022 "--reverse --first-parent juntos requer intervalo ao longo do primeiro-pai"

2023

2004 -#: blame.c:2850

2024 +#: blame.c:2849

2025 #, c-format

2026 msgid "no such path %s in %s"

2027 msgstr "path %s inexistente em %s"

2028

2009 -#: blame.c:2861

2029 +#: blame.c:2860

2030 #, c-format

2031 msgid "cannot read blob %s for path %s"

2032 msgstr "incapaz ler blob %s para path %s"

@@ -2095,7 +2115,9 @@ msgstr "Incapaz de forçar a atualização do ramo atual."

2115 #: branch.c:233

2116 #, c-format

2117 msgid "Cannot setup tracking information; starting point '%s' is not a branch."

2098 -msgstr "Impossível configurar informação sobre seguir; o ponto inicial '%s' é ramo nenhum."

2118 +msgstr ""

2119 +"Impossível configurar informação sobre seguir; o ponto inicial '%s' é ramo "

2120 +"nenhum."

2121

2122 #: branch.c:235

2123 #, c-format

@@ -2137,12 +2159,12 @@ msgstr "Nome de objeto ambíguo: '%s'."

2159 msgid "Not a valid branch point: '%s'."

2160 msgstr "Ponto no ramo inválido: '%s'."

2161

2140 -#: branch.c:365

2162 +#: branch.c:366

2163 #, c-format

2164 msgid "'%s' is already checked out at '%s'"

2165 msgstr "'%s' foi já extraído em '%s'"

2166

2145 -#: branch.c:388

2167 +#: branch.c:389

2168 #, c-format

2169 msgid "HEAD of working tree %s is not updated"

2170 msgstr "HEAD da working tree %s está desatualizada"

@@ -2167,8 +2189,8 @@ msgstr "'%s' parece-se com ficheiro bundle v2 ou v3 nenhum"

2189 msgid "unrecognized header: %s%s (%d)"

2190 msgstr "cabeçalho irreconhecível: %s%s (%d)"

2191

2170 -#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2390 sequencer.c:3176

2171 -#: builtin/commit.c:814

2192 +#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385

2193 +#: builtin/commit.c:861

2194 #, c-format

2195 msgid "could not open '%s'"

2196 msgstr "incapaz abrir '%s'"

@@ -2213,314 +2235,319 @@ msgstr "Impossível gerar pack-objects"

2235 msgid "pack-objects died"

2236 msgstr "pack-objects terminaram inesperadamente"

2237

2216 -#: bundle.c:379

2217 -msgid "rev-list died"

2218 -msgstr "rev-list terminou inesperadamente"

2219 -

2220 -#: bundle.c:428

2238 +#: bundle.c:386

2239 #, c-format

2240 msgid "ref '%s' is excluded by the rev-list options"

2241 msgstr "a referência '%s' é excluída pelas opções de rev-list"

2242

2225 -#: bundle.c:498

2243 +#: bundle.c:490

2244 #, fuzzy, c-format

2245 msgid "unsupported bundle version %d"

2246 msgstr "fora de suporte versão bundle %d"

2247

2230 -#: bundle.c:500

2248 +#: bundle.c:492

2249 #, c-format

2250 msgid "cannot write bundle version %d with algorithm %s"

2251 msgstr ""

2252

2235 -#: bundle.c:522 builtin/log.c:209 builtin/log.c:1927 builtin/shortlog.c:408

2253 +#: bundle.c:510 builtin/log.c:210 builtin/log.c:1935 builtin/shortlog.c:396

2254 #, c-format

2255 msgid "unrecognized argument: %s"

2256 msgstr "argumento irreconhecível: %s"

2257

2240 -#: bundle.c:530

2258 +#: bundle.c:539

2259 msgid "Refusing to create empty bundle."

2260 msgstr "Criação de bundle vazio recusada."

2261

2244 -#: bundle.c:540

2262 +#: bundle.c:549

2263 #, c-format

2264 msgid "cannot create '%s'"

2265 msgstr "incapaz criar '%s'"

2266

2249 -#: bundle.c:565

2267 +#: bundle.c:574

2268 msgid "index-pack died"

2269 msgstr "index-pack terminou inesperadamente"

2270

2271 +#: chunk-format.c:113

2272 +msgid "terminating chunk id appears earlier than expected"

2273 +msgstr ""

2274 +

2275 +#: chunk-format.c:122

2276 +#, c-format

2277 +msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"

2278 +msgstr ""

2279 +

2280 +#: chunk-format.c:129

2281 +#, c-format

2282 +msgid "duplicate chunk ID %<PRIx32> found"

2283 +msgstr ""

2284 +

2285 +#: chunk-format.c:143

2286 +#, c-format

2287 +msgid "final chunk has non-zero id %<PRIx32>"

2288 +msgstr ""

2289 +

2290 #: color.c:329

2291 #, c-format

2292 msgid "invalid color value: %.*s"

2293 msgstr "valor de cor inválido: %.*s"

2294

2258 -#: commit-graph.c:188 midx.c:47

2295 +#: commit-graph.c:204 midx.c:47

2296 #, fuzzy

2297 msgid "invalid hash version"

2298 msgstr "especificação de caminho inválida"

2299

2263 -#: commit-graph.c:246

2300 +#: commit-graph.c:262

2301 msgid "commit-graph file is too small"

2302 msgstr ""

2303

2267 -#: commit-graph.c:311

2304 +#: commit-graph.c:355

2305 #, fuzzy, c-format

2306 msgid "commit-graph signature %X does not match signature %X"

2307 msgstr "assinatura commit-graph %X corresponde a assinatura %X nenhuma"

2308

2272 -#: commit-graph.c:318

2309 +#: commit-graph.c:362

2310 #, fuzzy, c-format

2311 msgid "commit-graph version %X does not match version %X"

2312 msgstr "commit-graph versão %X corresponde a versão %X nenhuma"

2313

2277 -#: commit-graph.c:325

2314 +#: commit-graph.c:369

2315 #, c-format

2316 msgid "commit-graph hash version %X does not match version %X"

2317 msgstr ""

2318

2282 -#: commit-graph.c:342

2319 +#: commit-graph.c:386

2320 #, c-format

2321 msgid "commit-graph file is too small to hold %u chunks"

2322 msgstr ""

2323

2287 -#: commit-graph.c:361

2288 -#, c-format

2289 -msgid "commit-graph improper chunk offset %08x%08x"

2290 -msgstr ""

2291 -

2292 -#: commit-graph.c:433

2293 -#, c-format

2294 -msgid "commit-graph chunk id %08x appears multiple times"

2295 -msgstr ""

2296 -

2297 -#: commit-graph.c:499

2324 +#: commit-graph.c:482

2325 msgid "commit-graph has no base graphs chunk"

2326 msgstr ""

2327

2301 -#: commit-graph.c:509

2328 +#: commit-graph.c:492

2329 msgid "commit-graph chain does not match"

2330 msgstr ""

2331

2305 -#: commit-graph.c:557

2332 +#: commit-graph.c:540

2333 #, c-format

2334 msgid "invalid commit-graph chain: line '%s' not a hash"

2335 msgstr ""

2336

2310 -#: commit-graph.c:581

2337 +#: commit-graph.c:564

2338 #, fuzzy

2339 msgid "unable to find all commit-graph files"

2340 msgstr "incapaz de encontrar todos ficheiros commit-graph"

2341

2315 -#: commit-graph.c:721 commit-graph.c:785

2342 +#: commit-graph.c:745 commit-graph.c:782

2343 msgid "invalid commit position. commit-graph is likely corrupt"

2344 msgstr ""

2345

2319 -#: commit-graph.c:742

2346 +#: commit-graph.c:766

2347 #, fuzzy, c-format

2348 msgid "could not find commit %s"

2349 msgstr "incapaz encontrar commit %s"

2350

2324 -#: commit-graph.c:1042 builtin/am.c:1292

2351 +#: commit-graph.c:799

2352 +msgid "commit-graph requires overflow generation data but has none"

2353 +msgstr ""

2354 +

2355 +#: commit-graph.c:1075 builtin/am.c:1340

2356 #, c-format

2357 msgid "unable to parse commit %s"

2358 msgstr "incapaz analisar commit %s"

2359

2329 -#: commit-graph.c:1265 builtin/pack-objects.c:2864

2360 +#: commit-graph.c:1337 builtin/pack-objects.c:2897

2361 #, fuzzy, c-format

2362 msgid "unable to get type of object %s"

2363 msgstr "incapaz obter tipo de objeto %s"

2364

2334 -#: commit-graph.c:1301

2365 +#: commit-graph.c:1368

2366 msgid "Loading known commits in commit graph"

2367 msgstr ""

2368

2338 -#: commit-graph.c:1318

2369 +#: commit-graph.c:1385

2370 msgid "Expanding reachable commits in commit graph"

2371 msgstr ""

2372

2342 -#: commit-graph.c:1338

2373 +#: commit-graph.c:1405

2374 msgid "Clearing commit marks in commit graph"

2375 msgstr ""

2376

2346 -#: commit-graph.c:1357

2377 +#: commit-graph.c:1424

2378 +#, fuzzy

2379 +msgid "Computing commit graph topological levels"

2380 +msgstr "mostrar commits em ordem topológica"

2381 +

2382 +#: commit-graph.c:1477

2383 msgid "Computing commit graph generation numbers"

2384 msgstr ""

2385

2350 -#: commit-graph.c:1424

2386 +#: commit-graph.c:1558

2387 msgid "Computing commit changed paths Bloom filters"

2388 msgstr ""

2389

2354 -#: commit-graph.c:1501

2390 +#: commit-graph.c:1635

2391 #, fuzzy

2392 msgid "Collecting referenced commits"

2393 msgstr "Recolhendo commits referênciados"

2394

2359 -#: commit-graph.c:1526

2395 +#: commit-graph.c:1660

2396 #, c-format

2397 msgid "Finding commits for commit graph in %d pack"

2398 msgid_plural "Finding commits for commit graph in %d packs"

2399 msgstr[0] ""

2400 msgstr[1] ""

2401

2366 -#: commit-graph.c:1539

2402 +#: commit-graph.c:1673

2403 #, fuzzy, c-format

2404 msgid "error adding pack %s"

2405 msgstr "Erro ao rematar %s."

2406

2371 -#: commit-graph.c:1543

2407 +#: commit-graph.c:1677

2408 #, c-format

2409 msgid "error opening index for %s"

2410 msgstr ""

2411

2376 -#: commit-graph.c:1582

2412 +#: commit-graph.c:1714

2413 msgid "Finding commits for commit graph among packed objects"

2414 msgstr ""

2415

2380 -#: commit-graph.c:1597

2381 -msgid "Counting distinct commits in commit graph"

2382 -msgstr ""

2383 -

2384 -#: commit-graph.c:1629

2416 +#: commit-graph.c:1732

2417 msgid "Finding extra edges in commit graph"

2418 msgstr ""

2419

2388 -#: commit-graph.c:1678

2420 +#: commit-graph.c:1781

2421 msgid "failed to write correct number of base graph ids"

2422 msgstr ""

2423

2392 -#: commit-graph.c:1720 midx.c:819

2424 +#: commit-graph.c:1812 midx.c:906

2425 #, fuzzy, c-format

2426 msgid "unable to create leading directories of %s"

2427 msgstr "incapaz criar as pastas superiores a %s"

2428

2397 -#: commit-graph.c:1733

2429 +#: commit-graph.c:1825

2430 #, fuzzy

2431 msgid "unable to create temporary graph layer"

2432 msgstr "incapaz criar camada de grafo temporária"

2433

2402 -#: commit-graph.c:1738

2434 +#: commit-graph.c:1830

2435 #, fuzzy, c-format

2436 msgid "unable to adjust shared permissions for '%s'"

2437 msgstr "incapaz de ajustar permissão partilhada para '%s'"

2438

2407 -#: commit-graph.c:1808

2439 +#: commit-graph.c:1887

2440 #, c-format

2441 msgid "Writing out commit graph in %d pass"

2442 msgid_plural "Writing out commit graph in %d passes"

2443 msgstr[0] ""

2444 msgstr[1] ""

2445

2414 -#: commit-graph.c:1853

2446 +#: commit-graph.c:1923

2447 #, fuzzy

2448 msgid "unable to open commit-graph chain file"

2449 msgstr "incapaz abrir ficheiro commit-graph chain"

2450

2419 -#: commit-graph.c:1869

2451 +#: commit-graph.c:1939

2452 #, fuzzy

2453 msgid "failed to rename base commit-graph file"

2454 msgstr "Falha ao criar os ficheiros de saída"

2455

2424 -#: commit-graph.c:1889

2456 +#: commit-graph.c:1959

2457 #, fuzzy

2458 msgid "failed to rename temporary commit-graph file"

2459 msgstr "falha a renomear ficheiro commit-graph temporário"

2460

2429 -#: commit-graph.c:2015

2461 +#: commit-graph.c:2092

2462 #, fuzzy

2463 msgid "Scanning merged commits"

2464 msgstr "A adicionar %s integrado"

2465

2434 -#: commit-graph.c:2059

2466 +#: commit-graph.c:2136

2467 msgid "Merging commit-graph"

2468 msgstr ""

2469

2438 -#: commit-graph.c:2165

2470 +#: commit-graph.c:2244

2471 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"

2472 msgstr ""

2473

2442 -#: commit-graph.c:2274

2443 -#, c-format

2444 -msgid "the commit graph format cannot write %d commits"

2445 -msgstr ""

2446 -

2447 -#: commit-graph.c:2285

2474 +#: commit-graph.c:2351

2475 #, fuzzy

2476 msgid "too many commits to write graph"

2477 msgstr "demasiados commits para escrever grafo"

2478

2452 -#: commit-graph.c:2378

2479 +#: commit-graph.c:2450

2480 msgid "the commit-graph file has incorrect checksum and is likely corrupt"

2481 msgstr ""

2482

2456 -#: commit-graph.c:2388

2483 +#: commit-graph.c:2460

2484 #, c-format

2485 msgid "commit-graph has incorrect OID order: %s then %s"

2486 msgstr ""

2487

2461 -#: commit-graph.c:2398 commit-graph.c:2413

2488 +#: commit-graph.c:2470 commit-graph.c:2485

2489 #, c-format

2490 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"

2491 msgstr ""

2492

2466 -#: commit-graph.c:2405

2493 +#: commit-graph.c:2477

2494 #, fuzzy, c-format

2495 msgid "failed to parse commit %s from commit-graph"

2496 msgstr "incapaz analisar commit %s de commit-graph"

2497

2471 -#: commit-graph.c:2423

2498 +#: commit-graph.c:2495

2499 msgid "Verifying commits in commit graph"

2500 msgstr ""

2501

2475 -#: commit-graph.c:2438

2502 +#: commit-graph.c:2510

2503 #, c-format

2504 msgid "failed to parse commit %s from object database for commit-graph"

2505 msgstr ""

2506

2480 -#: commit-graph.c:2445

2507 +#: commit-graph.c:2517

2508 #, c-format

2509 msgid "root tree OID for commit %s in commit-graph is %s != %s"

2510 msgstr ""

2511

2485 -#: commit-graph.c:2455

2512 +#: commit-graph.c:2527

2513 #, c-format

2514 msgid "commit-graph parent list for commit %s is too long"

2515 msgstr ""

2516

2490 -#: commit-graph.c:2464

2517 +#: commit-graph.c:2536

2518 #, c-format

2519 msgid "commit-graph parent for %s is %s != %s"

2520 msgstr ""

2521

2495 -#: commit-graph.c:2478

2522 +#: commit-graph.c:2550

2523 #, c-format

2524 msgid "commit-graph parent list for commit %s terminates early"

2525 msgstr ""

2526

2500 -#: commit-graph.c:2483

2527 +#: commit-graph.c:2555

2528 #, c-format

2529 msgid ""

2530 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"

2531 msgstr ""

2532

2506 -#: commit-graph.c:2487

2533 +#: commit-graph.c:2559

2534 #, c-format

2535 msgid ""

2536 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"

2537 msgstr ""

2538

2512 -#: commit-graph.c:2503

2539 +#: commit-graph.c:2576

2540 #, c-format

2514 -msgid "commit-graph generation for commit %s is %u != %u"

2541 +msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"

2542 msgstr ""

2543

2517 -#: commit-graph.c:2509

2544 +#: commit-graph.c:2582

2545 #, c-format

2546 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"

2547 msgstr ""

2548

2522 -#: commit.c:52 sequencer.c:2879 builtin/am.c:359 builtin/am.c:403

2523 -#: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457

2549 +#: commit.c:52 sequencer.c:3088 builtin/am.c:371 builtin/am.c:416

2550 +#: builtin/am.c:421 builtin/am.c:1419 builtin/am.c:2066 builtin/replace.c:457

2551 #, c-format

2552 msgid "could not parse %s"

2553 msgstr "incapaz analisar %s"

@@ -2542,27 +2569,27 @@ msgid ""

2569 "\"git config advice.graftFileDeprecated false\""

2570 msgstr ""

2571

2545 -#: commit.c:1172

2572 +#: commit.c:1237

2573 #, c-format

2574 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."

2575 msgstr "Commit %s tem assinatura GPG desconfiada, alegadamente por %s."

2576

2550 -#: commit.c:1176

2577 +#: commit.c:1241

2578 #, c-format

2579 msgid "Commit %s has a bad GPG signature allegedly by %s."

2580 msgstr "Commit %s tem assinatura GPG incorreta, alegadamente por %s."

2581

2555 -#: commit.c:1179

2582 +#: commit.c:1244

2583 #, c-format

2584 msgid "Commit %s does not have a GPG signature."

2585 msgstr "Commit %s tem assinatura GPG nenhuma."

2586

2560 -#: commit.c:1182

2587 +#: commit.c:1247

2588 #, c-format

2589 msgid "Commit %s has a good GPG signature by %s\n"

2590 msgstr "Commit %s tem assinatura correta, por %s\n"

2591

2565 -#: commit.c:1436

2592 +#: commit.c:1501

2593 msgid ""

2594 "Warning: commit message did not conform to UTF-8.\n"

2595 "You may want to amend it after fixing the message, or set the config\n"

@@ -2577,7 +2604,7 @@ msgstr ""

2604 msgid "memory exhausted"

2605 msgstr "memória esgotada"

2606

2580 -#: config.c:125

2607 +#: config.c:126

2608 #, c-format

2609 msgid ""

2610 "exceeded maximum include depth (%d) while including\n"

@@ -2587,297 +2614,342 @@ msgid ""

2614 "This might be due to circular includes."

2615 msgstr ""

2616

2590 -#: config.c:141

2617 +#: config.c:142

2618 #, fuzzy, c-format

2619 msgid "could not expand include path '%s'"

2620 msgstr "incapaz de expandir include path '%s'"

2621

2595 -#: config.c:152

2622 +#: config.c:153

2623 #, fuzzy

2624 msgid "relative config includes must come from files"

2625 msgstr ""

2626 "configuração relativa com inclusão condicional deve provir de ficheiros"

2627

2601 -#: config.c:198

2628 +#: config.c:199

2629 msgid "relative config include conditionals must come from files"

2630 msgstr ""

2631 "configuração relativa com inclusão condicional deve provir de ficheiros"

2632

2606 -#: config.c:378

2633 +#: config.c:396

2634 +#, fuzzy, c-format

2635 +msgid "invalid config format: %s"

2636 +msgstr "formato de ref inválido: %s"

2637 +

2638 +#: config.c:400

2639 +#, c-format

2640 +msgid "missing environment variable name for configuration '%.*s'"

2641 +msgstr ""

2642 +

2643 +#: config.c:405

2644 +#, c-format

2645 +msgid "missing environment variable '%s' for configuration '%.*s'"

2646 +msgstr ""

2647 +

2648 +#: config.c:442

2649 #, fuzzy, c-format

2650 msgid "key does not contain a section: %s"

2651 msgstr "chave contém secção nenhuma: %s"

2652

2611 -#: config.c:384

2653 +#: config.c:448

2654 #, c-format

2655 msgid "key does not contain variable name: %s"

2656 msgstr ""

2657

2616 -#: config.c:408 sequencer.c:2580

2658 +#: config.c:472 sequencer.c:2785

2659 #, c-format

2660 msgid "invalid key: %s"

2661 msgstr "chave inválida: %s"

2662

2621 -#: config.c:414

2663 +#: config.c:478

2664 #, fuzzy, c-format

2665 msgid "invalid key (newline): %s"

2666 msgstr "linha de identidade inválida: %s"

2667

2626 -#: config.c:450 config.c:462

2668 +#: config.c:511

2669 +#, fuzzy

2670 +msgid "empty config key"

2671 +msgstr "usar ficheiro de configuração do repositório"

2672 +

2673 +#: config.c:529 config.c:541

2674 #, fuzzy, c-format

2675 msgid "bogus config parameter: %s"

2676 msgstr "parâmetros insuficientes"

2677

2631 -#: config.c:497

2678 +#: config.c:555 config.c:572 config.c:579 config.c:588

2679 #, fuzzy, c-format

2680 msgid "bogus format in %s"

2681 msgstr "cadeia malformada %s"

2682

2636 -#: config.c:836

2683 +#: config.c:622

2684 +#, fuzzy, c-format

2685 +msgid "bogus count in %s"

2686 +msgstr "cadeia malformada %s"

2687 +

2688 +#: config.c:626

2689 +#, fuzzy, c-format

2690 +msgid "too many entries in %s"

2691 +msgstr "Demasiados argumentos."

2692 +

2693 +#: config.c:636

2694 +#, fuzzy, c-format

2695 +msgid "missing config key %s"

2696 +msgstr "ficheiro config inválido %s"

2697 +

2698 +#: config.c:644

2699 +#, fuzzy, c-format

2700 +msgid "missing config value %s"

2701 +msgstr "valor inválido de %s"

2702 +

2703 +#: config.c:995

2704 #, c-format

2705 msgid "bad config line %d in blob %s"

2706 msgstr "linha de configuração %d incorreta no blob %s"

2707

2641 -#: config.c:840

2708 +#: config.c:999

2709 #, c-format

2710 msgid "bad config line %d in file %s"

2711 msgstr "linha de configuração %d incorreta no ficheiro %s"

2712

2646 -#: config.c:844

2713 +#: config.c:1003

2714 #, c-format

2715 msgid "bad config line %d in standard input"

2716 msgstr "linha de configuração %d incorreta na entrada padrão"

2717

2651 -#: config.c:848

2718 +#: config.c:1007

2719 #, c-format

2720 msgid "bad config line %d in submodule-blob %s"

2721 msgstr "linha de configuração %d incorreta no submódulo-blob %s"

2722

2656 -#: config.c:852

2723 +#: config.c:1011

2724 #, c-format

2725 msgid "bad config line %d in command line %s"

2726 msgstr "linha de configuração %d incorreta na linha de comandos %s"

2727

2661 -#: config.c:856

2728 +#: config.c:1015

2729 #, c-format

2730 msgid "bad config line %d in %s"

2731 msgstr "linha de configuração %d incorreta em %s"

2732

2666 -#: config.c:993

2733 +#: config.c:1152

2734 msgid "out of range"

2735 msgstr "fora de intervalo"

2736

2670 -#: config.c:993

2737 +#: config.c:1152

2738 msgid "invalid unit"

2739 msgstr "unidade inválida"

2740

2674 -#: config.c:994

2741 +#: config.c:1153

2742 #, c-format

2743 msgid "bad numeric config value '%s' for '%s': %s"

2744 msgstr "valor numérico '%s' da configuração '%s' incorreto: %s"

2745

2679 -#: config.c:1013

2746 +#: config.c:1163

2747 #, c-format

2748 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"

2749 msgstr "valor numérico '%s' da configuração '%s' incorreto no blob %s: %s"

2750

2684 -#: config.c:1016

2751 +#: config.c:1166

2752 #, c-format

2753 msgid "bad numeric config value '%s' for '%s' in file %s: %s"

2754 msgstr "valor numérico '%s' da configuração '%s' incorreto no ficheiro %s: %s"

2755

2689 -#: config.c:1019

2756 +#: config.c:1169

2757 #, c-format

2758 msgid "bad numeric config value '%s' for '%s' in standard input: %s"

2759 msgstr ""

2760 "valor numérico '%s' da configuração '%s' incorreto na entrada padrão: %s"

2761

2695 -#: config.c:1022

2762 +#: config.c:1172

2763 #, c-format

2764 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"

2765 msgstr ""

2766 "valor numérico '%s' da configuração '%s' incorreto no submódulo-blob %s: %s"

2767

2701 -#: config.c:1025

2768 +#: config.c:1175

2769 #, c-format

2770 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"

2771 msgstr ""

2772 "valor numérico '%s' da configuração '%s' incorreto na linha de comandos %s: "

2773 "%s"

2774

2708 -#: config.c:1028

2775 +#: config.c:1178

2776 #, c-format

2777 msgid "bad numeric config value '%s' for '%s' in %s: %s"

2778 msgstr "valor numérico '%s' da configuração '%s' incorreto em %s: %s"

2779

2713 -#: config.c:1123

2780 +#: config.c:1257

2781 +#, fuzzy, c-format

2782 +msgid "bad boolean config value '%s' for '%s'"

2783 +msgstr "valor numérico '%s' da configuração '%s' incorreto: %s"

2784 +

2785 +#: config.c:1275

2786 #, c-format

2787 msgid "failed to expand user dir in: '%s'"

2788 msgstr "falha ao expandir diretório de utilizador em: '%s'"

2789

2718 -#: config.c:1132

2790 +#: config.c:1284

2791 #, c-format

2792 msgid "'%s' for '%s' is not a valid timestamp"

2793 msgstr "'%s' em '%s' é carimbo de data/hora inválido"

2794

2723 -#: config.c:1223

2795 +#: config.c:1377

2796 #, c-format

2797 msgid "abbrev length out of range: %d"

2798 msgstr ""

2799

2728 -#: config.c:1237 config.c:1248

2800 +#: config.c:1391 config.c:1402

2801 #, c-format

2802 msgid "bad zlib compression level %d"

2803 msgstr "nível de compressão zlib %d incorreto"

2804

2733 -#: config.c:1340

2805 +#: config.c:1494

2806 msgid "core.commentChar should only be one character"

2807 msgstr ""

2808

2737 -#: config.c:1373

2809 +#: config.c:1527

2810 #, c-format

2811 msgid "invalid mode for object creation: %s"

2812 msgstr "modo inválido para criação de objeto: %s"

2813

2742 -#: config.c:1445

2814 +#: config.c:1599

2815 #, fuzzy, c-format

2816 msgid "malformed value for %s"

2817 msgstr "valor desformado para %s"

2818

2747 -#: config.c:1471

2819 +#: config.c:1625

2820 #, fuzzy, c-format

2821 msgid "malformed value for %s: %s"

2822 msgstr "valor inválido de %s: %s"

2823

2752 -#: config.c:1472

2824 +#: config.c:1626

2825 msgid "must be one of nothing, matching, simple, upstream or current"

2826 msgstr ""

2827

2756 -#: config.c:1533 builtin/pack-objects.c:3649

2828 +#: config.c:1687 builtin/pack-objects.c:3924

2829 #, c-format

2830 msgid "bad pack compression level %d"

2831 msgstr "nível de compactação do pacote %d incorreto"

2832

2761 -#: config.c:1655

2833 +#: config.c:1809

2834 #, fuzzy, c-format

2835 msgid "unable to load config blob object '%s'"

2836 msgstr "incapaz carregar objeto blob config '%s'"

2837

2766 -#: config.c:1658

2838 +#: config.c:1812

2839 #, fuzzy, c-format

2840 msgid "reference '%s' does not point to a blob"

2841 msgstr "referência '%s' aponta para blob nenhum"

2842

2771 -#: config.c:1675

2843 +#: config.c:1829

2844 #, fuzzy, c-format

2845 msgid "unable to resolve config blob '%s'"

2846 msgstr "incapaz resolver blog config '%s'"

2847

2776 -#: config.c:1705

2848 +#: config.c:1873

2849 #, fuzzy, c-format

2850 msgid "failed to parse %s"

2851 msgstr "falha a analisar %s"

2852

2781 -#: config.c:1759

2853 +#: config.c:1929

2854 msgid "unable to parse command-line config"

2855 msgstr "incapaz analisar config de linha de comandos"

2856

2785 -#: config.c:2122

2857 +#: config.c:2293

2858 msgid "unknown error occurred while reading the configuration files"

2859 msgstr ""

2860 "ocorreu um erro desconhecido durante a leitura dos ficheiros de configuração"

2861

2790 -#: config.c:2296

2862 +#: config.c:2467

2863 #, c-format

2864 msgid "Invalid %s: '%s'"

2865 msgstr "Inválido %s: '%s'"

2866

2795 -#: config.c:2341

2867 +#: config.c:2512

2868 #, c-format

2869 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"

2870 msgstr "o valor '%d' de splitIndex.maxPercentChange deve estar entre 0 e 100"

2871

2800 -#: config.c:2387

2872 +#: config.c:2558

2873 #, c-format

2874 msgid "unable to parse '%s' from command-line config"

2875 msgstr "incapaz analisar '%s' da configuração de linha de comandos"

2876

2805 -#: config.c:2389

2877 +#: config.c:2560

2878 #, c-format

2879 msgid "bad config variable '%s' in file '%s' at line %d"

2880 msgstr "variável de configuração '%s' incorreta no ficheiro '%s' na linha %d"

2881

2810 -#: config.c:2473

2882 +#: config.c:2644

2883 #, fuzzy, c-format

2884 msgid "invalid section name '%s'"

2885 msgstr "conteúdo inválido: '%s'"

2886

2815 -#: config.c:2505

2887 +#: config.c:2676

2888 #, c-format

2889 msgid "%s has multiple values"

2890 msgstr "%s tem múltiplos valores"

2891

2820 -#: config.c:2534

2892 +#: config.c:2705

2893 #, fuzzy, c-format

2894 msgid "failed to write new configuration file %s"

2895 msgstr "falha a escrever novo ficheiro configuração %s"

2896

2825 -#: config.c:2786 config.c:3112

2897 +#: config.c:2957 config.c:3283

2898 #, fuzzy, c-format

2899 msgid "could not lock config file %s"

2900 msgstr "incapaz trancar ficheiro config %s"

2901

2830 -#: config.c:2797

2902 +#: config.c:2968

2903 #, fuzzy, c-format

2904 msgid "opening %s"

2905 msgstr "abrindo %s"

2906

2835 -#: config.c:2834 builtin/config.c:361

2907 +#: config.c:3005 builtin/config.c:361

2908 #, fuzzy, c-format

2909 msgid "invalid pattern: %s"

2910 msgstr "padrão inválido: %s"

2911

2840 -#: config.c:2859

2912 +#: config.c:3030

2913 #, fuzzy, c-format

2914 msgid "invalid config file %s"

2915 msgstr "ficheiro config inválido %s"

2916

2845 -#: config.c:2872 config.c:3125

2917 +#: config.c:3043 config.c:3296

2918 #, c-format

2919 msgid "fstat on %s failed"

2920 msgstr "falha de fstat de %s"

2921

2850 -#: config.c:2883

2922 +#: config.c:3054

2923 #, fuzzy, c-format

2924 msgid "unable to mmap '%s'"

2925 msgstr "incapaz mmap '%s'"

2926

2855 -#: config.c:2892 config.c:3130

2927 +#: config.c:3063 config.c:3301

2928 #, fuzzy, c-format

2929 msgid "chmod on %s failed"

2930 msgstr "falha de fstat de %s"

2931

2860 -#: config.c:2977 config.c:3227

2932 +#: config.c:3148 config.c:3398

2933 #, fuzzy, c-format

2934 msgid "could not write config file %s"

2935 msgstr "incapaz escrever ficheiro config %s"

2936

2865 -#: config.c:3011

2937 +#: config.c:3182

2938 #, c-format

2939 msgid "could not set '%s' to '%s'"

2940 msgstr "incapaz definir '%s' como '%s'"

2941

2870 -#: config.c:3013 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863

2942 +#: config.c:3184 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863

2943 #, c-format

2944 msgid "could not unset '%s'"

2945 msgstr "incapaz desdefinir '%s'"

2946

2875 -#: config.c:3103

2947 +#: config.c:3274

2948 #, fuzzy, c-format

2949 msgid "invalid section name: %s"

2950 msgstr "opção inválida: %s"

2951

2880 -#: config.c:3270

2952 +#: config.c:3441

2953 #, fuzzy, c-format

2954 msgid "missing value for '%s'"

2955 msgstr "valor inválido de %s"

@@ -2941,52 +3013,52 @@ msgstr "caminho inválido '%s'"

3013 msgid "protocol error: unexpected '%s'"

3014 msgstr "erro de protocolo: cabeçalho de pacote incorreto"

3015

2944 -#: connect.c:473

3016 +#: connect.c:497

3017 #, c-format

3018 msgid "unknown object format '%s' specified by server"

3019 msgstr "objeto desconhecido '%s' pelo formato em servidor."

3020

2949 -#: connect.c:500

3021 +#: connect.c:526

3022 #, fuzzy, c-format

3023 msgid "invalid ls-refs response: %s"

3024 msgstr "referência inválida: %s"

3025

2954 -#: connect.c:504

3026 +#: connect.c:530

3027 msgid "expected flush after ref listing"

3028 msgstr ""

3029

2958 -#: connect.c:507

3030 +#: connect.c:533

3031 msgid "expected response end packet after ref listing"

3032 msgstr ""

3033

2962 -#: connect.c:640

3034 +#: connect.c:666

3035 #, fuzzy, c-format

3036 msgid "protocol '%s' is not supported"

3037 msgstr "protocolo '%s' é insustentado"

3038

2967 -#: connect.c:691

3039 +#: connect.c:717

3040 msgid "unable to set SO_KEEPALIVE on socket"

3041 msgstr ""

3042

2971 -#: connect.c:731 connect.c:794

3043 +#: connect.c:757 connect.c:820

3044 #, fuzzy, c-format

3045 msgid "Looking up %s ... "

3046 msgstr "A verificar o patch %s..."

3047

2976 -#: connect.c:735

3048 +#: connect.c:761

3049 #, fuzzy, c-format

3050 msgid "unable to look up %s (port %s) (%s)"

3051 msgstr "incapaz procurar %s (porta %s) (%s)"

3052

3053 #. TRANSLATORS: this is the end of "Looking up %s ... "

2982 -#: connect.c:739 connect.c:810

3054 +#: connect.c:765 connect.c:836

3055 #, c-format

3056 msgid ""

3057 "done.\n"

3058 "Connecting to %s (port %s) ... "

3059 msgstr ""

3060

2989 -#: connect.c:761 connect.c:838

3061 +#: connect.c:787 connect.c:864

3062 #, fuzzy, c-format

3063 msgid ""

3064 "unable to connect to %s:\n"

@@ -2996,64 +3068,68 @@ msgstr ""

3068 "%s"

3069

3070 #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "

2999 -#: connect.c:767 connect.c:844

3071 +#: connect.c:793 connect.c:870

3072 #, fuzzy

3073 msgid "done."

3074 msgstr "concluído."

3075

3004 -#: connect.c:798

3076 +#: connect.c:824

3077 #, fuzzy, c-format

3078 msgid "unable to look up %s (%s)"

3079 msgstr "incapaz procurar %s (%s)"

3080

3009 -#: connect.c:804

3081 +#: connect.c:830

3082 #, fuzzy, c-format

3083 msgid "unknown port %s"

3084 msgstr "opção desconhecido %s"

3085

3014 -#: connect.c:941 connect.c:1271

3086 +#: connect.c:967 connect.c:1299

3087 #, c-format

3088 msgid "strange hostname '%s' blocked"

3089 msgstr ""

3090

3019 -#: connect.c:943

3091 +#: connect.c:969

3092 #, c-format

3093 msgid "strange port '%s' blocked"

3094 msgstr ""

3095

3024 -#: connect.c:953

3096 +#: connect.c:979

3097 #, fuzzy, c-format

3098 msgid "cannot start proxy %s"

3099 msgstr "incapaz começar proxy %s"

3100

3029 -#: connect.c:1024

3101 +#: connect.c:1050

3102 msgid "no path specified; see 'git help pull' for valid url syntax"

3103 msgstr ""

3104

3033 -#: connect.c:1219

3105 +#: connect.c:1190

3106 +msgid "newline is forbidden in git:// hosts and repo paths"

3107 +msgstr ""

3108 +

3109 +#: connect.c:1247

3110 msgid "ssh variant 'simple' does not support -4"

3111 msgstr ""

3112

3037 -#: connect.c:1231

3113 +#: connect.c:1259

3114 msgid "ssh variant 'simple' does not support -6"

3115 msgstr ""

3116

3041 -#: connect.c:1248

3117 +#: connect.c:1276

3118 #, fuzzy

3119 msgid "ssh variant 'simple' does not support setting port"

3120 msgstr "ssh variant 'simple' insustenta definir porta"

3121

3046 -#: connect.c:1360

3122 +#: connect.c:1388

3123 #, c-format

3124 msgid "strange pathname '%s' blocked"

3125 msgstr ""

3126

3051 -#: connect.c:1408

3127 +#: connect.c:1436

3128 #, fuzzy

3129 msgid "unable to fork"

3130 msgstr "incapaz de aforquilhar"

3131

3056 -#: connected.c:108 builtin/fsck.c:209 builtin/prune.c:45

3132 +#: connected.c:108 builtin/fsck.c:188 builtin/prune.c:45

3133 msgid "Checking connectivity"

3134 msgstr "A verificar conectividade"

3135

@@ -3069,17 +3145,17 @@ msgstr "falha ao escrever para rev-list"

3145 msgid "failed to close rev-list's stdin"

3146 msgstr "falha ao fechar entrada padrão de rev-list"

3147

3072 -#: convert.c:194

3148 +#: convert.c:183

3149 #, c-format

3150 msgid "illegal crlf_action %d"

3151 msgstr ""

3152

3077 -#: convert.c:207

3153 +#: convert.c:196

3154 #, fuzzy, c-format

3155 msgid "CRLF would be replaced by LF in %s"

3156 msgstr "CRLF será substituído por LF em %s."

3157

3082 -#: convert.c:209

3158 +#: convert.c:198

3159 #, fuzzy, c-format

3160 msgid ""

3161 "CRLF will be replaced by LF in %s.\n"

@@ -3088,12 +3164,12 @@ msgstr ""

3164 "CRLF será substituído por LF em %s.\n"

3165 "O final de linha original será mantido no ficheiro da sua árvore de trabalho."

3166

3091 -#: convert.c:217

3167 +#: convert.c:206

3168 #, c-format

3169 msgid "LF would be replaced by CRLF in %s"

3170 msgstr "LF será substituído por CRLF em %s."

3171

3096 -#: convert.c:219

3172 +#: convert.c:208

3173 #, fuzzy, c-format

3174 msgid ""

3175 "LF will be replaced by CRLF in %s.\n"

@@ -3102,91 +3178,91 @@ msgstr ""

3178 "LF será substituído por CRLF em %s.\n"

3179 "O final de linha original será mantido no ficheiro da sua árvore de trabalho."

3180

3105 -#: convert.c:284

3181 +#: convert.c:273

3182 #, c-format

3183 msgid "BOM is prohibited in '%s' if encoded as %s"

3184 msgstr ""

3185

3110 -#: convert.c:291

3186 +#: convert.c:280

3187 #, c-format

3188 msgid ""

3189 "The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "

3190 "working-tree-encoding."

3191 msgstr ""

3192

3117 -#: convert.c:304

3193 +#: convert.c:293

3194 #, c-format

3195 msgid "BOM is required in '%s' if encoded as %s"

3196 msgstr ""

3197

3122 -#: convert.c:306

3198 +#: convert.c:295

3199 #, c-format

3200 msgid ""

3201 "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"

3202 "%sLE (depending on the byte order) as working-tree-encoding."

3203 msgstr ""

3204

3129 -#: convert.c:419 convert.c:490

3205 +#: convert.c:408 convert.c:479

3206 #, fuzzy, c-format

3207 msgid "failed to encode '%s' from %s to %s"

3208 msgstr "falha ao copiar notas de '%s' para '%s'"

3209

3134 -#: convert.c:462

3210 +#: convert.c:451

3211 #, c-format

3212 msgid "encoding '%s' from %s to %s and back is not the same"

3213 msgstr ""

3214

3139 -#: convert.c:665

3215 +#: convert.c:654

3216 #, fuzzy, c-format

3217 msgid "cannot fork to run external filter '%s'"

3218 msgstr "incapaz aforquilhar para correr filtro externo '%s'"

3219

3144 -#: convert.c:685

3220 +#: convert.c:674

3221 #, fuzzy, c-format

3222 msgid "cannot feed the input to external filter '%s'"

3223 msgstr "incapaz introduzir input para filtro externo '%s'"

3224

3149 -#: convert.c:692

3225 +#: convert.c:681

3226 #, fuzzy, c-format

3227 msgid "external filter '%s' failed %d"

3228 msgstr "filtro externo '%s' falhou %d"

3229

3154 -#: convert.c:727 convert.c:730

3230 +#: convert.c:716 convert.c:719

3231 #, c-format

3232 msgid "read from external filter '%s' failed"

3233 msgstr ""

3234

3159 -#: convert.c:733 convert.c:788

3235 +#: convert.c:722 convert.c:777

3236 #, fuzzy, c-format

3237 msgid "external filter '%s' failed"

3238 msgstr "falha ao mudar o nome de '%s'"

3239

3164 -#: convert.c:837

3240 +#: convert.c:826

3241 #, fuzzy

3242 msgid "unexpected filter type"

3243 msgstr "fim de ficheiro inesperado"

3244

3169 -#: convert.c:848

3245 +#: convert.c:837

3246 msgid "path name too long for external filter"

3247 msgstr ""

3248

3173 -#: convert.c:940

3249 +#: convert.c:934

3250 #, c-format

3251 msgid ""

3252 "external filter '%s' is not available anymore although not all paths have "

3253 "been filtered"

3254 msgstr ""

3255

3180 -#: convert.c:1240

3256 +#: convert.c:1234

3257 msgid "true/false are no valid working-tree-encodings"

3258 msgstr ""

3259

3184 -#: convert.c:1428 convert.c:1462

3260 +#: convert.c:1414 convert.c:1447

3261 #, fuzzy, c-format

3262 msgid "%s: clean filter '%s' failed"

3263 msgstr "falha ao criar '%s'"

3264

3189 -#: convert.c:1508

3265 +#: convert.c:1490

3266 #, fuzzy, c-format

3267 msgid "%s: smudge filter %s failed"

3268 msgstr "falha ao atualizar os ficheiros"

@@ -3311,24 +3387,29 @@ msgstr ""

3387 msgid "Marked %d islands, done.\n"

3388 msgstr ""

3389

3314 -#: diff-lib.c:534

3390 +#: diff-merges.c:80

3391 +#, fuzzy, c-format

3392 +msgid "unknown value for --diff-merges: %s"

3393 +msgstr "valor desconhecido '%s' da chave '%s'"

3394 +

3395 +#: diff-lib.c:538

3396 msgid "--merge-base does not work with ranges"

3397 msgstr ""

3398

3318 -#: diff-lib.c:536

3399 +#: diff-lib.c:540

3400 msgid "--merge-base only works with commits"

3401 msgstr ""

3402

3322 -#: diff-lib.c:553

3403 +#: diff-lib.c:557

3404 #, fuzzy

3405 msgid "unable to get HEAD"

3406 msgstr "incapaz obter HEAD"

3407

3327 -#: diff-lib.c:560

3408 +#: diff-lib.c:564

3409 msgid "no merge base found"

3410 msgstr ""

3411

3331 -#: diff-lib.c:562

3412 +#: diff-lib.c:566

3413 msgid "multiple merge bases found"

3414 msgstr ""

3415

@@ -3386,36 +3467,36 @@ msgstr ""

3467 "Erros encontrados na variável de configuração 'diff.dirstat':\n"

3468 "%s"

3469

3389 -#: diff.c:4276

3470 +#: diff.c:4278

3471 #, c-format

3472 msgid "external diff died, stopping at %s"

3473 msgstr "o diff externo terminou inesperadamente, interrompido em %s"

3474

3394 -#: diff.c:4625

3475 +#: diff.c:4630

3476 msgid "--name-only, --name-status, --check and -s are mutually exclusive"

3477 msgstr "--name-only, --name-status, --check e -s são mutuamente exclusivos"

3478

3398 -#: diff.c:4628

3479 +#: diff.c:4633

3480 #, fuzzy

3481 msgid "-G, -S and --find-object are mutually exclusive"

3482 msgstr "-b, -B e --detach são mutuamente exclusivos"

3483

3403 -#: diff.c:4706

3484 +#: diff.c:4712

3485 msgid "--follow requires exactly one pathspec"

3486 msgstr "--follow requer exatamente um único especificador de caminho"

3487

3407 -#: diff.c:4754

3488 +#: diff.c:4760

3489 #, fuzzy, c-format

3490 msgid "invalid --stat value: %s"

3491 msgstr "valor de cor inválido: %.*s"

3492

3412 -#: diff.c:4759 diff.c:4764 diff.c:4769 diff.c:4774 diff.c:5302

3493 +#: diff.c:4765 diff.c:4770 diff.c:4775 diff.c:4780 diff.c:5308

3494 #: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180

3495 #, fuzzy, c-format

3496 msgid "%s expects a numerical value"

3497 msgstr "a opção '%c' espera um valor numérico"

3498

3418 -#: diff.c:4791

3499 +#: diff.c:4797

3500 #, c-format

3501 msgid ""

3502 "Failed to parse --dirstat/-X option parameter:\n"

@@ -3424,539 +3505,555 @@ msgstr ""

3505 "Falha ao analisar parâmetro da opção --dirstat/-X:\n"

3506 "%s"

3507

3427 -#: diff.c:4876

3508 +#: diff.c:4882

3509 #, c-format

3510 msgid "unknown change class '%c' in --diff-filter=%s"

3511 msgstr ""

3512

3432 -#: diff.c:4900

3513 +#: diff.c:4906

3514 #, c-format

3515 msgid "unknown value after ws-error-highlight=%.*s"

3516 msgstr ""

3517

3437 -#: diff.c:4914

3518 +#: diff.c:4920

3519 #, fuzzy, c-format

3520 msgid "unable to resolve '%s'"

3521 msgstr "incapaz resolver '%s'"

3522

3442 -#: diff.c:4964 diff.c:4970

3523 +#: diff.c:4970 diff.c:4976

3524 #, c-format

3525 msgid "%s expects <n>/<m> form"

3526 msgstr ""

3527

3447 -#: diff.c:4982

3528 +#: diff.c:4988

3529 #, c-format

3530 msgid "%s expects a character, got '%s'"

3531 msgstr ""

3532

3452 -#: diff.c:5003

3533 +#: diff.c:5009

3534 #, fuzzy, c-format

3535 msgid "bad --color-moved argument: %s"

3536 msgstr "argumento incorreto --color-moved: %s"

3537

3457 -#: diff.c:5022

3538 +#: diff.c:5028

3539 #, fuzzy, c-format

3540 msgid "invalid mode '%s' in --color-moved-ws"

3541 msgstr "objeto inválido '%s' fornecido."

3542

3462 -#: diff.c:5062

3543 +#: diff.c:5068

3544 msgid ""

3545 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "

3546 "\"histogram\""

3547 msgstr ""

3548

3468 -#: diff.c:5098 diff.c:5118

3549 +#: diff.c:5104 diff.c:5124

3550 #, fuzzy, c-format

3551 msgid "invalid argument to %s"

3552 msgstr "valor inválido de %s"

3553

3473 -#: diff.c:5222

3554 +#: diff.c:5228

3555 #, fuzzy, c-format

3556 msgid "invalid regex given to -I: '%s'"

3557 msgstr "valor inválido de %s"

3558

3478 -#: diff.c:5271

3559 +#: diff.c:5277

3560 #, fuzzy, c-format

3561 msgid "failed to parse --submodule option parameter: '%s'"

3562 msgstr "Falha ao analisar parâmetro da opção --submodule: '%s'"

3563

3483 -#: diff.c:5327

3564 +#: diff.c:5333

3565 #, c-format

3566 msgid "bad --word-diff argument: %s"

3567 msgstr ""

3568

3488 -#: diff.c:5350

3569 +#: diff.c:5369

3570 msgid "Diff output format options"

3571 msgstr ""

3572

3492 -#: diff.c:5352 diff.c:5358

3573 +#: diff.c:5371 diff.c:5377

3574 #, fuzzy

3575 msgid "generate patch"

3576 msgstr "incorporar o patch"

3577

3497 -#: diff.c:5355 builtin/log.c:178

3578 +#: diff.c:5374 builtin/log.c:179

3579 msgid "suppress diff output"

3580 msgstr "suprimir saída do diff"

3581

3501 -#: diff.c:5360 diff.c:5474 diff.c:5481

3582 +#: diff.c:5379 diff.c:5493 diff.c:5500

3583 msgid "<n>"

3584 msgstr ""

3585

3505 -#: diff.c:5361 diff.c:5364

3586 +#: diff.c:5380 diff.c:5383

3587 #, fuzzy

3588 msgid "generate diffs with <n> lines context"

3589 msgstr "garantir que, pelo menos, <n> linhas de contexto coincidem"

3590

3510 -#: diff.c:5366

3591 +#: diff.c:5385

3592 msgid "generate the diff in raw format"

3593 msgstr ""

3594

3514 -#: diff.c:5369

3595 +#: diff.c:5388

3596 #, fuzzy

3597 msgid "synonym for '-p --raw'"

3598 msgstr "(sinónimo de --stat)"

3599

3519 -#: diff.c:5373

3600 +#: diff.c:5392

3601 #, fuzzy

3602 msgid "synonym for '-p --stat'"

3603 msgstr "(sinónimo de --stat)"

3604

3524 -#: diff.c:5377

3605 +#: diff.c:5396

3606 #, fuzzy

3607 msgid "machine friendly --stat"

3608 msgstr "saída inteligível por máquina"

3609

3529 -#: diff.c:5380

3610 +#: diff.c:5399

3611 msgid "output only the last line of --stat"

3612 msgstr ""

3613

3533 -#: diff.c:5382 diff.c:5390

3614 +#: diff.c:5401 diff.c:5409

3615 msgid "<param1,param2>..."

3616 msgstr ""

3617

3537 -#: diff.c:5383

3618 +#: diff.c:5402

3619 msgid ""

3620 "output the distribution of relative amount of changes for each sub-directory"

3621 msgstr ""

3622

3542 -#: diff.c:5387

3623 +#: diff.c:5406

3624 #, fuzzy

3625 msgid "synonym for --dirstat=cumulative"

3626 msgstr "sinónimo de --files-with-matches"

3627

3547 -#: diff.c:5391

3628 +#: diff.c:5410

3629 msgid "synonym for --dirstat=files,param1,param2..."

3630 msgstr ""

3631

3551 -#: diff.c:5395

3632 +#: diff.c:5414

3633 msgid "warn if changes introduce conflict markers or whitespace errors"

3634 msgstr ""

3635

3555 -#: diff.c:5398

3636 +#: diff.c:5417

3637 msgid "condensed summary such as creations, renames and mode changes"

3638 msgstr ""

3639

3559 -#: diff.c:5401

3640 +#: diff.c:5420

3641 #, fuzzy

3642 msgid "show only names of changed files"

3643 msgstr "mostrar apenas nomes de ficheiro em vez de linhas correspondidas"

3644

3564 -#: diff.c:5404

3645 +#: diff.c:5423

3646 #, fuzzy

3647 msgid "show only names and status of changed files"

3648 msgstr "mostrar apenas nomes de ficheiro em vez de linhas correspondidas"

3649

3569 -#: diff.c:5406

3650 +#: diff.c:5425

3651 msgid "<width>[,<name-width>[,<count>]]"

3652 msgstr ""

3653

3573 -#: diff.c:5407

3654 +#: diff.c:5426

3655 #, fuzzy

3656 msgid "generate diffstat"

3657 msgstr "diff status inesperado %c"

3658

3578 -#: diff.c:5409 diff.c:5412 diff.c:5415

3659 +#: diff.c:5428 diff.c:5431 diff.c:5434

3660 msgid "<width>"

3661 msgstr ""

3662

3582 -#: diff.c:5410

3663 +#: diff.c:5429

3664 msgid "generate diffstat with a given width"

3665 msgstr ""

3666

3586 -#: diff.c:5413

3667 +#: diff.c:5432

3668 msgid "generate diffstat with a given name width"

3669 msgstr ""

3670

3590 -#: diff.c:5416

3671 +#: diff.c:5435

3672 msgid "generate diffstat with a given graph width"

3673 msgstr ""

3674

3594 -#: diff.c:5418

3675 +#: diff.c:5437

3676 msgid "<count>"

3677 msgstr ""

3678

3598 -#: diff.c:5419

3679 +#: diff.c:5438

3680 msgid "generate diffstat with limited lines"

3681 msgstr ""

3682

3602 -#: diff.c:5422

3683 +#: diff.c:5441

3684 msgid "generate compact summary in diffstat"

3685 msgstr ""

3686

3606 -#: diff.c:5425

3687 +#: diff.c:5444

3688 msgid "output a binary diff that can be applied"

3689 msgstr ""

3690

3610 -#: diff.c:5428

3691 +#: diff.c:5447

3692 msgid "show full pre- and post-image object names on the \"index\" lines"

3693 msgstr ""

3694

3614 -#: diff.c:5430

3695 +#: diff.c:5449

3696 #, fuzzy

3697 msgid "show colored diff"

3698 msgstr "mostrar ficheiros ignorados"

3699

3619 -#: diff.c:5431

3700 +#: diff.c:5450

3701 msgid "<kind>"

3702 msgstr ""

3703

3623 -#: diff.c:5432

3704 +#: diff.c:5451

3705 msgid ""

3706 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "

3707 "diff"

3708 msgstr ""

3709

3629 -#: diff.c:5435

3710 +#: diff.c:5454

3711 msgid ""

3712 "do not munge pathnames and use NULs as output field terminators in --raw or "

3713 "--numstat"

3714 msgstr ""

3715

3635 -#: diff.c:5438 diff.c:5441 diff.c:5444 diff.c:5553

3716 +#: diff.c:5457 diff.c:5460 diff.c:5463 diff.c:5572

3717 #, fuzzy

3718 msgid "<prefix>"

3719 msgstr "<prefixo>/"

3720

3640 -#: diff.c:5439

3721 +#: diff.c:5458

3722 msgid "show the given source prefix instead of \"a/\""

3723 msgstr ""

3724

3644 -#: diff.c:5442

3725 +#: diff.c:5461

3726 msgid "show the given destination prefix instead of \"b/\""

3727 msgstr ""

3728

3648 -#: diff.c:5445

3729 +#: diff.c:5464

3730 #, fuzzy

3731 msgid "prepend an additional prefix to every line of output"

3732 msgstr "preceder o nomebase do projeto pai na saída"

3733

3653 -#: diff.c:5448

3734 +#: diff.c:5467

3735 msgid "do not show any source or destination prefix"

3736 msgstr ""

3737

3657 -#: diff.c:5451

3738 +#: diff.c:5470

3739 #, fuzzy

3740 msgid "show context between diff hunks up to the specified number of lines"

3741 msgstr "criar um clone raso, truncado ao número especificado de revisões"

3742

3662 -#: diff.c:5455 diff.c:5460 diff.c:5465

3743 +#: diff.c:5474 diff.c:5479 diff.c:5484

3744 msgid "<char>"

3745 msgstr ""

3746

3666 -#: diff.c:5456

3747 +#: diff.c:5475

3748 msgid "specify the character to indicate a new line instead of '+'"

3749 msgstr ""

3750

3670 -#: diff.c:5461

3751 +#: diff.c:5480

3752 msgid "specify the character to indicate an old line instead of '-'"

3753 msgstr ""

3754

3674 -#: diff.c:5466

3755 +#: diff.c:5485

3756 msgid "specify the character to indicate a context instead of ' '"

3757 msgstr ""

3758

3678 -#: diff.c:5469

3759 +#: diff.c:5488

3760 #, fuzzy

3761 msgid "Diff rename options"

3762 msgstr "Opções genéricas"

3763

3683 -#: diff.c:5470

3764 +#: diff.c:5489

3765 #, fuzzy

3766 msgid "<n>[/<m>]"

3767 msgstr "<n>[,<base>]"

3768

3688 -#: diff.c:5471

3769 +#: diff.c:5490

3770 msgid "break complete rewrite changes into pairs of delete and create"

3771 msgstr ""

3772

3692 -#: diff.c:5475

3773 +#: diff.c:5494

3774 #, fuzzy

3775 msgid "detect renames"

3776 msgstr "nome do remoto"

3777

3697 -#: diff.c:5479

3778 +#: diff.c:5498

3779 msgid "omit the preimage for deletes"

3780 msgstr ""

3781

3701 -#: diff.c:5482

3782 +#: diff.c:5501

3783 msgid "detect copies"

3784 msgstr ""

3785

3705 -#: diff.c:5486

3786 +#: diff.c:5505

3787 msgid "use unmodified files as source to find copies"

3788 msgstr ""

3789

3709 -#: diff.c:5488

3790 +#: diff.c:5507

3791 #, fuzzy

3792 msgid "disable rename detection"

3793 msgstr "Deteção de mudança de nome inexata em curso"

3794

3714 -#: diff.c:5491

3795 +#: diff.c:5510

3796 msgid "use empty blobs as rename source"

3797 msgstr ""

3798

3718 -#: diff.c:5493

3799 +#: diff.c:5512

3800 msgid "continue listing the history of a file beyond renames"

3801 msgstr ""

3802

3722 -#: diff.c:5496

3803 +#: diff.c:5515

3804 msgid ""

3805 "prevent rename/copy detection if the number of rename/copy targets exceeds "

3806 "given limit"

3807 msgstr ""

3808

3728 -#: diff.c:5498

3809 +#: diff.c:5517

3810 #, fuzzy

3811 msgid "Diff algorithm options"

3812 msgstr "opção inválida: %s"

3813

3733 -#: diff.c:5500

3814 +#: diff.c:5519

3815 msgid "produce the smallest possible diff"

3816 msgstr ""

3817

3737 -#: diff.c:5503

3818 +#: diff.c:5522

3819 #, fuzzy

3820 msgid "ignore whitespace when comparing lines"

3821 msgstr "ignorar alterações de espaço em branco ao procurar contexto"

3822

3742 -#: diff.c:5506

3823 +#: diff.c:5525

3824 #, fuzzy

3825 msgid "ignore changes in amount of whitespace"

3826 msgstr "ignorar alterações de espaço em branco ao procurar contexto"

3827

3747 -#: diff.c:5509

3828 +#: diff.c:5528

3829 #, fuzzy

3830 msgid "ignore changes in whitespace at EOL"

3831 msgstr "ignorar alterações de espaço em branco ao procurar contexto"

3832

3752 -#: diff.c:5512

3833 +#: diff.c:5531

3834 msgid "ignore carrier-return at the end of line"

3835 msgstr ""

3836

3756 -#: diff.c:5515

3837 +#: diff.c:5534

3838 msgid "ignore changes whose lines are all blank"

3839 msgstr ""

3840

3760 -#: diff.c:5517 diff.c:5539 diff.c:5542 diff.c:5587

3841 +#: diff.c:5536 diff.c:5558 diff.c:5561 diff.c:5606

3842 msgid "<regex>"

3843 msgstr ""

3844

3764 -#: diff.c:5518

3845 +#: diff.c:5537

3846 #, fuzzy

3847 msgid "ignore changes whose all lines match <regex>"

3848 msgstr "ignorar alterações de espaço em branco ao procurar contexto"

3849

3769 -#: diff.c:5521

3850 +#: diff.c:5540

3851 msgid "heuristic to shift diff hunk boundaries for easy reading"

3852 msgstr ""

3853

3773 -#: diff.c:5524

3854 +#: diff.c:5543

3855 msgid "generate diff using the \"patience diff\" algorithm"

3856 msgstr ""

3857

3777 -#: diff.c:5528

3858 +#: diff.c:5547

3859 msgid "generate diff using the \"histogram diff\" algorithm"

3860 msgstr ""

3861

3781 -#: diff.c:5530

3862 +#: diff.c:5549

3863 msgid "<algorithm>"

3864 msgstr ""

3865

3785 -#: diff.c:5531

3866 +#: diff.c:5550

3867 msgid "choose a diff algorithm"

3868 msgstr ""

3869

3789 -#: diff.c:5533

3870 +#: diff.c:5552

3871 #, fuzzy

3872 msgid "<text>"

3873 msgstr "texto"

3874

3794 -#: diff.c:5534

3875 +#: diff.c:5553

3876 msgid "generate diff using the \"anchored diff\" algorithm"

3877 msgstr ""

3878

3798 -#: diff.c:5536 diff.c:5545 diff.c:5548

3879 +#: diff.c:5555 diff.c:5564 diff.c:5567

3880 #, fuzzy

3881 msgid "<mode>"

3882 msgstr "modo"

3883

3803 -#: diff.c:5537

3884 +#: diff.c:5556

3885 msgid "show word diff, using <mode> to delimit changed words"

3886 msgstr ""

3887

3807 -#: diff.c:5540

3888 +#: diff.c:5559

3889 msgid "use <regex> to decide what a word is"

3890 msgstr ""

3891

3811 -#: diff.c:5543

3892 +#: diff.c:5562

3893 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"

3894 msgstr ""

3895

3815 -#: diff.c:5546

3896 +#: diff.c:5565

3897 msgid "moved lines of code are colored differently"

3898 msgstr ""

3899

3819 -#: diff.c:5549

3900 +#: diff.c:5568

3901 msgid "how white spaces are ignored in --color-moved"

3902 msgstr ""

3903

3823 -#: diff.c:5552

3904 +#: diff.c:5571

3905 #, fuzzy

3906 msgid "Other diff options"

3907 msgstr "Opções genéricas"

3908

3828 -#: diff.c:5554

3909 +#: diff.c:5573

3910 msgid "when run from subdir, exclude changes outside and show relative paths"

3911 msgstr ""

3912

3832 -#: diff.c:5558

3913 +#: diff.c:5577

3914 #, fuzzy

3915 msgid "treat all files as text"

3916 msgstr "processar ficheiros binários como texto"

3917

3837 -#: diff.c:5560

3918 +#: diff.c:5579

3919 msgid "swap two inputs, reverse the diff"

3920 msgstr ""

3921

3841 -#: diff.c:5562

3922 +#: diff.c:5581

3923 msgid "exit with 1 if there were differences, 0 otherwise"

3924 msgstr ""

3925

3845 -#: diff.c:5564

3926 +#: diff.c:5583

3927 msgid "disable all output of the program"

3928 msgstr ""

3929

3849 -#: diff.c:5566

3930 +#: diff.c:5585

3931 msgid "allow an external diff helper to be executed"

3932 msgstr ""

3933

3853 -#: diff.c:5568

3934 +#: diff.c:5587

3935 msgid "run external text conversion filters when comparing binary files"

3936 msgstr ""

3937

3857 -#: diff.c:5570

3938 +#: diff.c:5589

3939 #, fuzzy

3940 msgid "<when>"

3941 msgstr "quando"

3942

3862 -#: diff.c:5571

3943 +#: diff.c:5590

3944 #, fuzzy

3945 msgid "ignore changes to submodules in the diff generation"

3946 msgstr ""

3947 "ignorar alterações em submódulos, quando é opcional: all, dirty, untracked. "

3948 "(Predefinição: all)"

3949

3869 -#: diff.c:5574

3950 +#: diff.c:5593

3951 #, fuzzy

3952 msgid "<format>"

3953 msgstr "formato"

3954

3874 -#: diff.c:5575

3955 +#: diff.c:5594

3956 msgid "specify how differences in submodules are shown"

3957 msgstr ""

3958

3878 -#: diff.c:5579

3959 +#: diff.c:5598

3960 #, fuzzy

3961 msgid "hide 'git add -N' entries from the index"

3962 msgstr "usar .gitattributes apenas a partir do índice"

3963

3883 -#: diff.c:5582

3964 +#: diff.c:5601

3965 msgid "treat 'git add -N' entries as real in the index"

3966 msgstr ""

3967

3887 -#: diff.c:5584

3968 +#: diff.c:5603

3969 #, fuzzy

3970 msgid "<string>"

3971 msgstr "cadeia"

3972

3892 -#: diff.c:5585

3973 +#: diff.c:5604

3974 msgid ""

3975 "look for differences that change the number of occurrences of the specified "

3976 "string"

3977 msgstr ""

3978

3898 -#: diff.c:5588

3979 +#: diff.c:5607

3980 msgid ""

3981 "look for differences that change the number of occurrences of the specified "

3982 "regex"

3983 msgstr ""

3984

3904 -#: diff.c:5591

3985 +#: diff.c:5610

3986 #, fuzzy

3987 msgid "show all changes in the changeset with -S or -G"

3988 msgstr "mostrar ficheiros com correspondências no paginador"

3989

3909 -#: diff.c:5594

3990 +#: diff.c:5613

3991 #, fuzzy

3992 msgid "treat <string> in -S as extended POSIX regular expression"

3993 msgstr "usar expressões regulares estendidas do POSIX"

3994

3914 -#: diff.c:5597

3995 +#: diff.c:5616

3996 #, fuzzy

3997 msgid "control the order in which files appear in the output"

3998 msgstr "mostrar outros ficheiros na saída"

3999

3919 -#: diff.c:5598

4000 +#: diff.c:5617 diff.c:5620

4001 +#, fuzzy

4002 +msgid "<path>"

4003 +msgstr "path"

4004 +

4005 +#: diff.c:5618

4006 +#, fuzzy

4007 +msgid "show the change in the specified path first"

4008 +msgstr ""

4009 +"escrever o ficheiro de índice do pacote na versão de formato especificada"

4010 +

4011 +#: diff.c:5621

4012 +#, fuzzy

4013 +msgid "skip the output to the specified path"

4014 +msgstr "Repor a HEAD atual no estado especificado"

4015 +

4016 +#: diff.c:5623

4017 #, fuzzy

4018 msgid "<object-id>"

4019 msgstr "objeto"

4020

3924 -#: diff.c:5599

4021 +#: diff.c:5624

4022 msgid ""

4023 "look for differences that change the number of occurrences of the specified "

4024 "object"

4025 msgstr ""

4026

3930 -#: diff.c:5601

4027 +#: diff.c:5626

4028 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"

4029 msgstr ""

4030

3934 -#: diff.c:5602

4031 +#: diff.c:5627

4032 msgid "select files by diff type"

4033 msgstr ""

4034

3938 -#: diff.c:5604

4035 +#: diff.c:5629

4036 #, fuzzy

4037 msgid "<file>"

4038 msgstr "ficheiro"

4039

3943 -#: diff.c:5605

4040 +#: diff.c:5630

4041 #, fuzzy

4042 msgid "Output to a specific file"

4043 msgstr "submeter somente os ficheiros especificados"

4044

3948 -#: diff.c:6262

4045 +#: diff.c:6287

4046 msgid "inexact rename detection was skipped due to too many files."

4047 msgstr ""

4048 "a deteção mudança de nome inexata foi omitida devido a demasiados ficheiros."

4049

3953 -#: diff.c:6265

4050 +#: diff.c:6290

4051 msgid "only found copies from modified paths due to too many files."

4052 msgstr ""

4053 "só foram encontradas cópias de caminhos modificados devido a demasiados "

4054 "ficheiros."

4055

3959 -#: diff.c:6268

4056 +#: diff.c:6293

4057 #, c-format

4058 msgid ""

4059 "you may want to set your %s variable to at least %d and retry the command."

@@ -3968,15 +4065,20 @@ msgstr ""

4065 msgid "failed to read orderfile '%s'"

4066 msgstr "falha ao ler o ficheiro de comando '%s'"

4067

3971 -#: diffcore-rename.c:592

4068 +#: diffcore-rename.c:1418

4069 msgid "Performing inexact rename detection"

4070 msgstr "Deteção de mudança de nome inexata em curso"

4071

4072 +#: diffcore-rotate.c:29

4073 +#, fuzzy, c-format

4074 +msgid "No such path '%s' in the diff"

4075 +msgstr "path %s inexistente em %s"

4076 +

4077 #: dir.c:578

4078 #, fuzzy, c-format

4079 msgid "pathspec '%s' did not match any file(s) known to git"

3978 -msgstr "especificador de path '%s' correspondeu a ficheiro nenhum "

3979 -"conhecido pelo git"

4080 +msgstr ""

4081 +"especificador de path '%s' correspondeu a ficheiro nenhum conhecido pelo git"

4082

4083 #: dir.c:718 dir.c:747 dir.c:760

4084 #, fuzzy, c-format

@@ -3997,36 +4099,36 @@ msgstr ""

4099 msgid "disabling cone pattern matching"

4100 msgstr ""

4101

4000 -#: dir.c:1198

4102 +#: dir.c:1206

4103 #, fuzzy, c-format

4104 msgid "cannot use %s as an exclude file"

4105 msgstr "incapaz usar %s como ficheiro de exclusão"

4106

4005 -#: dir.c:2305

4107 +#: dir.c:2314

4108 #, fuzzy, c-format

4109 msgid "could not open directory '%s'"

4110 msgstr "incapaz abrir pasta '%s'"

4111

4010 -#: dir.c:2605

4112 +#: dir.c:2614

4113 msgid "failed to get kernel name and information"

4114 msgstr "falha ao obter nome e informação do kernel"

4115

4014 -#: dir.c:2729

4116 +#: dir.c:2738

4117 #, fuzzy

4118 msgid "untracked cache is disabled on this system or location"

4119 msgstr "cache untracked está desativada neste sistema ou localização."

4120

4019 -#: dir.c:3520

4121 +#: dir.c:3543

4122 #, fuzzy, c-format

4123 msgid "index file corrupt in repo %s"

4124 msgstr "ficheiro de índice corrompido"

4125

4024 -#: dir.c:3565 dir.c:3570

4126 +#: dir.c:3590 dir.c:3595

4127 #, c-format

4128 msgid "could not create directories for %s"

4129 msgstr "incapaz criar pasta para %s"

4130

4029 -#: dir.c:3599

4131 +#: dir.c:3624

4132 #, c-format

4133 msgid "could not migrate git directory from '%s' to '%s'"

4134 msgstr "incapaz migrar pasta git de '%s' para '%s'"

@@ -4036,22 +4138,22 @@ msgstr "incapaz migrar pasta git de '%s' para '%s'"

4138 msgid "hint: Waiting for your editor to close the file...%c"

4139 msgstr ""

4140

4039 -#: entry.c:177

4141 +#: entry.c:179

4142 #, fuzzy

4143 msgid "Filtering content"

4144 msgstr "imprimir conteúdo da tag"

4145

4044 -#: entry.c:478

4146 +#: entry.c:500

4147 #, c-format

4148 msgid "could not stat file '%s'"

4149 msgstr "incapaz obter estatutário de ficheiro '%s'"

4150

4049 -#: environment.c:150

4151 +#: environment.c:152

4152 #, c-format

4153 msgid "bad git namespace path \"%s\""

4154 msgstr ""

4155

4054 -#: environment.c:337

4156 +#: environment.c:335

4157 #, fuzzy, c-format

4158 msgid "could not set GIT_DIR to '%s'"

4159 msgstr "incapaz definir GIT_DIR para '%s'"

@@ -4061,267 +4163,281 @@ msgstr "incapaz definir GIT_DIR para '%s'"

4163 msgid "too many args to run %s"

4164 msgstr "Demasiados argumentos."

4165

4064 -#: fetch-pack.c:177

4166 +#: fetch-pack.c:182

4167 msgid "git fetch-pack: expected shallow list"

4168 msgstr "git fetch-pack: esperava-se lista rasa"

4169

4068 -#: fetch-pack.c:180

4170 +#: fetch-pack.c:185

4171 #, fuzzy

4172 msgid "git fetch-pack: expected a flush packet after shallow list"

4173 msgstr "git fetch-pack: esperava-se lista rasa"

4174

4073 -#: fetch-pack.c:191

4175 +#: fetch-pack.c:196

4176 #, fuzzy

4177 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"

4178 msgstr "git fetch-pack: esperava-se ACK/NAK, obteve-se '%s'"

4179

4078 -#: fetch-pack.c:211

4180 +#: fetch-pack.c:216

4181 #, c-format

4182 msgid "git fetch-pack: expected ACK/NAK, got '%s'"

4183 msgstr "git fetch-pack: esperava-se ACK/NAK, obteve-se '%s'"

4184

4083 -#: fetch-pack.c:222

4185 +#: fetch-pack.c:227

4186 #, fuzzy

4187 msgid "unable to write to remote"

4188 msgstr "incapaz escrever para remoto"

4189

4088 -#: fetch-pack.c:283

4190 +#: fetch-pack.c:288

4191 msgid "--stateless-rpc requires multi_ack_detailed"

4192 msgstr "--stateless-rpc requer multi_ack_detailed"

4193

4092 -#: fetch-pack.c:378 fetch-pack.c:1406

4194 +#: fetch-pack.c:383 fetch-pack.c:1423

4195 #, c-format

4196 msgid "invalid shallow line: %s"

4197 msgstr "linha rasa inválida: %s"

4198

4097 -#: fetch-pack.c:384 fetch-pack.c:1412

4199 +#: fetch-pack.c:389 fetch-pack.c:1429

4200 #, c-format

4201 msgid "invalid unshallow line: %s"

4202 msgstr "linha por aprofundar inválida: %s"

4203

4102 -#: fetch-pack.c:386 fetch-pack.c:1414

4204 +#: fetch-pack.c:391 fetch-pack.c:1431

4205 #, c-format

4206 msgid "object not found: %s"

4207 msgstr "objeto perdido: %s"

4208

4107 -#: fetch-pack.c:389 fetch-pack.c:1417

4209 +#: fetch-pack.c:394 fetch-pack.c:1434

4210 #, c-format

4211 msgid "error in object: %s"

4212 msgstr "erro no objeto: %s"

4213

4112 -#: fetch-pack.c:391 fetch-pack.c:1419

4214 +#: fetch-pack.c:396 fetch-pack.c:1436

4215 #, c-format

4216 msgid "no shallow found: %s"

4217 msgstr "shallow por encontrar: %s"

4218

4117 -#: fetch-pack.c:394 fetch-pack.c:1423

4219 +#: fetch-pack.c:399 fetch-pack.c:1440

4220 #, c-format

4221 msgid "expected shallow/unshallow, got %s"

4222 msgstr "esperava-se raso/aprofundar, obteve-se %s"

4223

4122 -#: fetch-pack.c:434

4224 +#: fetch-pack.c:439

4225 #, c-format

4226 msgid "got %s %d %s"

4227 msgstr "obteve-se %s %d %s"

4228

4127 -#: fetch-pack.c:451

4229 +#: fetch-pack.c:456

4230 #, c-format

4231 msgid "invalid commit %s"

4232 msgstr "commit inválido %s"

4233

4132 -#: fetch-pack.c:482

4234 +#: fetch-pack.c:487

4235 msgid "giving up"

4236 msgstr "a desistir"

4237

4136 -#: fetch-pack.c:495 progress.c:339

4238 +#: fetch-pack.c:500 progress.c:339

4239 msgid "done"

4240 msgstr "concluído"

4241

4140 -#: fetch-pack.c:507

4242 +#: fetch-pack.c:512

4243 #, c-format

4244 msgid "got %s (%d) %s"

4245 msgstr "obteve-se %s (%d) %s"

4246

4145 -#: fetch-pack.c:543

4247 +#: fetch-pack.c:548

4248 #, c-format

4249 msgid "Marking %s as complete"

4250 msgstr "Marcado %s como completo"

4251

4150 -#: fetch-pack.c:758

4252 +#: fetch-pack.c:763

4253 #, c-format

4254 msgid "already have %s (%s)"

4255 msgstr "já se tem %s (%s)"

4256

4155 -#: fetch-pack.c:827

4257 +#: fetch-pack.c:849

4258 msgid "fetch-pack: unable to fork off sideband demultiplexer"

4259 msgstr "fetch-pack: incapaz de aforquilhar demultiplexer sideband"

4260

4159 -#: fetch-pack.c:835

4261 +#: fetch-pack.c:857

4262 msgid "protocol error: bad pack header"

4263 msgstr "erro de protocolo: cabeçalho de pacote incorreto"

4264

4163 -#: fetch-pack.c:919

4265 +#: fetch-pack.c:951

4266 #, c-format

4267 msgid "fetch-pack: unable to fork off %s"

4268 msgstr "fetch-pack: incapaz de aforquilhar %s"

4269

4168 -#: fetch-pack.c:937

4270 +#: fetch-pack.c:957

4271 +msgid "fetch-pack: invalid index-pack output"

4272 +msgstr ""

4273 +

4274 +#: fetch-pack.c:974

4275 #, c-format

4276 msgid "%s failed"

4277 msgstr "%s falhou"

4278

4173 -#: fetch-pack.c:939

4279 +#: fetch-pack.c:976

4280 msgid "error in sideband demultiplexer"

4281 msgstr "erro em demultiplexer sideband"

4282

4177 -#: fetch-pack.c:982

4283 +#: fetch-pack.c:1019

4284 #, c-format

4285 msgid "Server version is %.*s"

4286 msgstr "A versão do servidor é %.*s"

4287

4182 -#: fetch-pack.c:990 fetch-pack.c:996 fetch-pack.c:999 fetch-pack.c:1005

4183 -#: fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 fetch-pack.c:1021

4184 -#: fetch-pack.c:1025 fetch-pack.c:1029 fetch-pack.c:1033 fetch-pack.c:1037

4185 -#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1054 fetch-pack.c:1059

4288 +#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042

4289 +#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058

4290 +#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074

4291 +#: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096

4292 #, fuzzy, c-format

4293 msgid "Server supports %s"

4294 msgstr "O servidor suporta side-band"

4295

4190 -#: fetch-pack.c:992

4296 +#: fetch-pack.c:1029

4297 msgid "Server does not support shallow clients"

4298 msgstr "Servidor insustenta clientes shallow"

4299

4194 -#: fetch-pack.c:1052

4300 +#: fetch-pack.c:1089

4301 msgid "Server does not support --shallow-since"

4302 msgstr "Servidor insustenta --shallow-since"

4303

4198 -#: fetch-pack.c:1057

4304 +#: fetch-pack.c:1094

4305 msgid "Server does not support --shallow-exclude"

4306 msgstr "Servidor insustenta --shallow-exclude"

4307

4202 -#: fetch-pack.c:1061

4308 +#: fetch-pack.c:1098

4309 msgid "Server does not support --deepen"

4310 msgstr "Servidor insustenta --deepen"

4311

4206 -#: fetch-pack.c:1063

4312 +#: fetch-pack.c:1100

4313 #, fuzzy

4314 msgid "Server does not support this repository's object format"

4315 msgstr "Servidor insustenta formato de objeto deste repositório"

4316

4211 -#: fetch-pack.c:1076

4317 +#: fetch-pack.c:1113

4318 msgid "no common commits"

4319 msgstr "commits comuns nenhuns"

4320

4215 -#: fetch-pack.c:1088 fetch-pack.c:1628

4321 +#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238

4322 +#, fuzzy

4323 +msgid "source repository is shallow, reject to clone."

4324 +msgstr "o repositório de origem é raso, --local ignorado"

4325 +

4326 +#: fetch-pack.c:1128 fetch-pack.c:1651

4327 msgid "git fetch-pack: fetch failed."

4328 msgstr "git fetch-pack: falha ao obter."

4329

4219 -#: fetch-pack.c:1214

4330 +#: fetch-pack.c:1242

4331 #, c-format

4332 msgid "mismatched algorithms: client %s; server %s"

4333 msgstr ""

4334

4224 -#: fetch-pack.c:1218

4335 +#: fetch-pack.c:1246

4336 #, fuzzy, c-format

4337 msgid "the server does not support algorithm '%s'"

4338 msgstr "o servidor insustenta algoritmo '%s'"

4339

4229 -#: fetch-pack.c:1238

4340 +#: fetch-pack.c:1279

4341 #, fuzzy

4342 msgid "Server does not support shallow requests"

4343 msgstr "Servidor insustenta pedidos shallow"

4344

4234 -#: fetch-pack.c:1245

4345 +#: fetch-pack.c:1286

4346 #, fuzzy

4347 msgid "Server supports filter"

4348 msgstr "Servidor sustenta filtro"

4349

4239 -#: fetch-pack.c:1284

4350 +#: fetch-pack.c:1329 fetch-pack.c:2034

4351 #, fuzzy

4352 msgid "unable to write request to remote"

4353 msgstr "incapaz escrever pedidos para remoto"

4354

4244 -#: fetch-pack.c:1302

4355 +#: fetch-pack.c:1347

4356 #, c-format

4357 msgid "error reading section header '%s'"

4358 msgstr ""

4359

4249 -#: fetch-pack.c:1308

4360 +#: fetch-pack.c:1353

4361 #, fuzzy, c-format

4362 msgid "expected '%s', received '%s'"

4363 msgstr "blob para %s '%s' esperado"

4364

4254 -#: fetch-pack.c:1369

4365 +#: fetch-pack.c:1387

4366 #, c-format

4367 msgid "unexpected acknowledgment line: '%s'"

4368 msgstr ""

4369

4259 -#: fetch-pack.c:1374

4370 +#: fetch-pack.c:1392

4371 #, c-format

4372 msgid "error processing acks: %d"

4373 msgstr ""

4374

4264 -#: fetch-pack.c:1384

4375 +#: fetch-pack.c:1402

4376 msgid "expected packfile to be sent after 'ready'"

4377 msgstr ""

4378

4268 -#: fetch-pack.c:1386

4379 +#: fetch-pack.c:1404

4380 msgid "expected no other sections to be sent after no 'ready'"

4381 msgstr ""

4382

4272 -#: fetch-pack.c:1428

4383 +#: fetch-pack.c:1445

4384 #, c-format

4385 msgid "error processing shallow info: %d"

4386 msgstr ""

4387

4277 -#: fetch-pack.c:1475

4388 +#: fetch-pack.c:1494

4389 #, fuzzy, c-format

4390 msgid "expected wanted-ref, got '%s'"

4391 msgstr "esperava-se raso/aprofundar, obteve-se %s"

4392

4282 -#: fetch-pack.c:1480

4393 +#: fetch-pack.c:1499

4394 #, fuzzy, c-format

4395 msgid "unexpected wanted-ref: '%s'"

4396 msgstr "fim de ficheiro inesperado"

4397

4287 -#: fetch-pack.c:1485

4398 +#: fetch-pack.c:1504

4399 #, c-format

4400 msgid "error processing wanted refs: %d"

4401 msgstr ""

4402

4292 -#: fetch-pack.c:1515

4403 +#: fetch-pack.c:1534

4404 #, fuzzy

4405 msgid "git fetch-pack: expected response end packet"

4406 msgstr "git fetch-pack: esperava-se lista rasa"

4407

4297 -#: fetch-pack.c:1897

4408 +#: fetch-pack.c:1930

4409 msgid "no matching remote head"

4410 msgstr "corresponde a remote head nenhuma"

4411

4301 -#: fetch-pack.c:1920 builtin/clone.c:693

4412 +#: fetch-pack.c:1953 builtin/clone.c:697

4413 msgid "remote did not send all necessary objects"

4414 msgstr "remoto faltou enviar todos objetos necessários"

4415

4305 -#: fetch-pack.c:1947

4416 +#: fetch-pack.c:2056

4417 +#, fuzzy

4418 +msgid "unexpected 'ready' from remote"

4419 +msgstr "fim de ficheiro inesperado"

4420 +

4421 +#: fetch-pack.c:2079

4422 #, c-format

4423 msgid "no such remote ref %s"

4424 msgstr "referência remota %s inexistente"

4425

4310 -#: fetch-pack.c:1950

4426 +#: fetch-pack.c:2082

4427 #, c-format

4428 msgid "Server does not allow request for unadvertised object %s"

4429 msgstr "Servidor proíbe pedido de objeto por anunciar %s"

4430

4315 -#: gpg-interface.c:272

4431 +#: gpg-interface.c:273

4432 msgid "could not create temporary file"

4433 msgstr "incapaz criar ficheiro temporário"

4434

4319 -#: gpg-interface.c:275

4435 +#: gpg-interface.c:276

4436 #, c-format

4437 msgid "failed writing detached signature to '%s'"

4438 msgstr "falha ao escrever assinatura destacada em '%s'"

4439

4324 -#: gpg-interface.c:457

4440 +#: gpg-interface.c:470

4441 msgid "gpg failed to sign the data"

4442 msgstr "gpg falhou assinar os dados"

4443

@@ -4330,24 +4446,24 @@ msgstr "gpg falhou assinar os dados"

4446 msgid "ignore invalid color '%.*s' in log.graphColors"

4447 msgstr "ignorar cor inválida '%.*s' em log.graphColors"

4448

4333 -#: grep.c:640

4449 +#: grep.c:531

4450 msgid ""

4451 "given pattern contains NULL byte (via -f <file>). This is only supported "

4452 "with -P under PCRE v2"

4453 msgstr ""

4454

4339 -#: grep.c:2100

4455 +#: grep.c:1893

4456 #, c-format

4457 msgid "'%s': unable to read %s"

4458 msgstr "'%s': incapaz ler %s"

4459

4344 -#: grep.c:2117 setup.c:176 builtin/clone.c:412 builtin/diff.c:89

4345 -#: builtin/rm.c:135

4460 +#: grep.c:1910 setup.c:176 builtin/clone.c:416 builtin/diff.c:90

4461 +#: builtin/rm.c:136

4462 #, c-format

4463 msgid "failed to stat '%s'"

4464 msgstr "falha ao invocar stat de '%s'"

4465

4350 -#: grep.c:2128

4466 +#: grep.c:1921

4467 #, c-format

4468 msgid "'%s': short read"

4469 msgstr "'%s': leitura truncada"

@@ -4417,7 +4533,7 @@ msgstr "comandos do git disponíveis noutras localizações em $PATH"

4533 msgid "These are common Git commands used in various situations:"

4534 msgstr "Estes são comandos do Git comuns usados em diversas situações:"

4535

4420 -#: help.c:365 git.c:99

4536 +#: help.c:365 git.c:100

4537 #, fuzzy, c-format

4538 msgid "unsupported command listing type '%s'"

4539 msgstr "insustento para listagem tipo comandos '%s'"

@@ -4569,47 +4685,52 @@ msgstr "nome de identação vazio (para <%s>) proíbido"

4685 msgid "name consists only of disallowed characters: %s"

4686 msgstr "nome consiste apenas de caracteres proíbidos: %s"

4687

4572 -#: ident.c:454 builtin/commit.c:634

4688 +#: ident.c:454 builtin/commit.c:647

4689 #, c-format

4690 msgid "invalid date format: %s"

4691 msgstr "formato de data inválido: %s"

4692

4577 -#: list-objects-filter-options.c:81

4693 +#: list-objects-filter-options.c:83

4694 msgid "expected 'tree:<depth>'"

4695 msgstr ""

4696

4581 -#: list-objects-filter-options.c:96

4697 +#: list-objects-filter-options.c:98

4698 msgid "sparse:path filters support has been dropped"

4699 msgstr ""

4700

4585 -#: list-objects-filter-options.c:109

4701 +#: list-objects-filter-options.c:105

4702 +#, fuzzy, c-format

4703 +msgid "'%s' for 'object:type=<type>' isnot a valid object type"

4704 +msgstr "'%s' em '%s' é carimbo de data/hora inválido"

4705 +

4706 +#: list-objects-filter-options.c:124

4707 #, fuzzy, c-format

4708 msgid "invalid filter-spec '%s'"

4709 msgstr "ficheiro inválido: '%s'"

4710

4590 -#: list-objects-filter-options.c:125

4711 +#: list-objects-filter-options.c:140

4712 #, c-format

4713 msgid "must escape char in sub-filter-spec: '%c'"

4714 msgstr ""

4715

4595 -#: list-objects-filter-options.c:167

4716 +#: list-objects-filter-options.c:182

4717 msgid "expected something after combine:"

4718 msgstr ""

4719

4599 -#: list-objects-filter-options.c:249

4720 +#: list-objects-filter-options.c:264

4721 msgid "multiple filter-specs cannot be combined"

4722 msgstr ""

4723

4603 -#: list-objects-filter-options.c:361

4724 +#: list-objects-filter-options.c:376

4725 msgid "unable to upgrade repository format to support partial clone"

4726 msgstr ""

4727

4607 -#: list-objects-filter.c:492

4728 +#: list-objects-filter.c:532

4729 #, fuzzy, c-format

4730 msgid "unable to access sparse blob in '%s'"

4731 msgstr "incapaz acessar blob sparse em '%s'"

4732

4612 -#: list-objects-filter.c:495

4733 +#: list-objects-filter.c:535

4734 #, fuzzy, c-format

4735 msgid "unable to parse sparse filter data in %s"

4736 msgstr "incapaz analisar dados de filtro sparse em %s"

@@ -4624,7 +4745,7 @@ msgstr ""

4745 msgid "entry '%s' in tree %s has blob mode, but is not a blob"

4746 msgstr ""

4747

4627 -#: list-objects.c:375

4748 +#: list-objects.c:395

4749 #, fuzzy, c-format

4750 msgid "unable to load root tree for commit %s"

4751 msgstr "incapaz carregar raiz de árvore para commit %s"

@@ -4653,159 +4774,348 @@ msgstr ""

4774 msgid "Unable to create '%s.lock': %s"

4775 msgstr "Incapaz de criar '%s.lock': %s"

4776

4656 -#: ls-refs.c:109

4777 +#: ls-refs.c:37

4778 +#, fuzzy, c-format

4779 +msgid "invalid value '%s' for lsrefs.unborn"

4780 +msgstr "valor inválido de %s"

4781 +

4782 +#: ls-refs.c:167

4783 msgid "expected flush after ls-refs arguments"

4784 msgstr ""

4785

4660 -#: merge-ort-wrappers.c:13 merge-recursive.c:3672

4661 -#, fuzzy, c-format

4662 -msgid ""

4663 -"Your local changes to the following files would be overwritten by merge:\n"

4664 -" %s"

4786 +#: mailinfo.c:1050

4787 +msgid "quoted CRLF detected"

4788 msgstr ""

4666 -"As suas alterações locais nos seguintes ficheiros seriam substituídas ao "

4667 -"integrar:\n"

4668 -"%%s"

4789

4670 -#: merge-ort-wrappers.c:33 merge-recursive.c:3436

4790 +#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46

4791 #, fuzzy, c-format

4672 -msgid "Already up to date!"

4673 -msgstr "Já está atualizado!"

4674 -

4675 -#: merge-recursive.c:356

4676 -msgid "(bad commit)\n"

4677 -msgstr "(commit incorreto)\n"

4792 +msgid "bad action '%s' for '%s'"

4793 +msgstr "incapaz copiar '%s' para '%s'"

4794

4679 -#: merge-recursive.c:379

4795 +#: merge-ort.c:1116 merge-recursive.c:1205

4796 #, fuzzy, c-format

4681 -msgid "add_cacheinfo failed for path '%s'; merge aborting."

4682 -msgstr "addinfo_cache falhou no caminho '%s'"

4797 +msgid "Failed to merge submodule %s (not checked out)"

4798 +msgstr "Falha ao registar o submódulo '$sm_path'"

4799

4684 -#: merge-recursive.c:388

4800 +#: merge-ort.c:1125 merge-recursive.c:1212

4801 #, fuzzy, c-format

4686 -msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."

4687 -msgstr "addinfo_cache falhou no caminho '%s'"

4688 -

4689 -#: merge-recursive.c:874

4690 -#, c-format

4691 -msgid "failed to create path '%s'%s"

4692 -msgstr "falha ao criar o caminho '%s'%s"

4802 +msgid "Failed to merge submodule %s (commits not present)"

4803 +msgstr "Falha ao registar o submódulo '$sm_path'"

4804

4694 -#: merge-recursive.c:885

4805 +#: merge-ort.c:1134 merge-recursive.c:1219

4806 #, c-format

4696 -msgid "Removing %s to make room for subdirectory\n"

4697 -msgstr "A remover %s para criar espaço para o subdiretório\n"

4807 +msgid "Failed to merge submodule %s (commits don't follow merge-base)"

4808 +msgstr ""

4809

4699 -#: merge-recursive.c:899 merge-recursive.c:918

4700 -msgid ": perhaps a D/F conflict?"

4701 -msgstr ": talvez um conflito D/F?"

4810 +#: merge-ort.c:1144 merge-ort.c:1151

4811 +#, fuzzy, c-format

4812 +msgid "Note: Fast-forwarding submodule %s to %s"

4813 +msgstr "Avanço-rápido para $sha1"

4814

4703 -#: merge-recursive.c:908

4704 -#, c-format

4705 -msgid "refusing to lose untracked file at '%s'"

4706 -msgstr "recusando perder ficheiro untracked em '%s'"

4815 +#: merge-ort.c:1172

4816 +#, fuzzy, c-format

4817 +msgid "Failed to merge submodule %s"

4818 +msgstr "falha a percorrer recursivamente dentro de submódulo '%s'"

4819

4708 -#: merge-recursive.c:949 builtin/cat-file.c:41

4709 -#, c-format

4710 -msgid "cannot read object %s '%s'"

4711 -msgstr "incapaz ler objeto %s '%s'"

4820 +#: merge-ort.c:1179

4821 +#, fuzzy, c-format

4822 +msgid ""

4823 +"Failed to merge submodule %s, but a possible merge resolution exists:\n"

4824 +"%s\n"

4825 +msgstr "Falha ao registar o submódulo '$sm_path'"

4826

4713 -#: merge-recursive.c:954

4827 +#: merge-ort.c:1183 merge-recursive.c:1273

4828 +#, c-format

4829 +msgid ""

4830 +"If this is correct simply add it to the index for example\n"

4831 +"by using:\n"

4832 +"\n"

4833 +" git update-index --cacheinfo 160000 %s \"%s\"\n"

4834 +"\n"

4835 +"which will accept this suggestion.\n"

4836 +msgstr ""

4837 +

4838 +#: merge-ort.c:1196

4839 +#, fuzzy, c-format

4840 +msgid ""

4841 +"Failed to merge submodule %s, but multiple possible merges exist:\n"

4842 +"%s"

4843 +msgstr "Falha ao registar o submódulo '$sm_path'"

4844 +

4845 +#: merge-ort.c:1415 merge-recursive.c:1362

4846 +msgid "Failed to execute internal merge"

4847 +msgstr "Falha ao executar integração interna"

4848 +

4849 +#: merge-ort.c:1420 merge-recursive.c:1367

4850 +#, c-format

4851 +msgid "Unable to add %s to database"

4852 +msgstr "Incapaz de adicionar %s à base de dados"

4853 +

4854 +#: merge-ort.c:1427 merge-recursive.c:1400

4855 +#, c-format

4856 +msgid "Auto-merging %s"

4857 +msgstr "A integrar automaticamente %s"

4858 +

4859 +#: merge-ort.c:1566 merge-recursive.c:2122

4860 +#, c-format

4861 +msgid ""

4862 +"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "

4863 +"implicit directory rename(s) putting the following path(s) there: %s."

4864 +msgstr ""

4865 +

4866 +#: merge-ort.c:1576 merge-recursive.c:2132

4867 +#, c-format

4868 +msgid ""

4869 +"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "

4870 +"implicit directory renames tried to put these paths there: %s"

4871 +msgstr ""

4872 +

4873 +#: merge-ort.c:1634

4874 +#, c-format

4875 +msgid ""

4876 +"CONFLICT (directory rename split): Unclear where to rename %s to; it was "

4877 +"renamed to multiple other directories, with no destination getting a "

4878 +"majority of the files."

4879 +msgstr ""

4880 +

4881 +#: merge-ort.c:1788 merge-recursive.c:2468

4882 +#, c-format

4883 +msgid ""

4884 +"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "

4885 +"renamed."

4886 +msgstr ""

4887 +

4888 +#: merge-ort.c:1932 merge-recursive.c:3244

4889 +#, c-format

4890 +msgid ""

4891 +"Path updated: %s added in %s inside a directory that was renamed in %s; "

4892 +"moving it to %s."

4893 +msgstr ""

4894 +

4895 +#: merge-ort.c:1939 merge-recursive.c:3251

4896 +#, c-format

4897 +msgid ""

4898 +"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "

4899 +"%s; moving it to %s."

4900 +msgstr ""

4901 +

4902 +#: merge-ort.c:1952 merge-recursive.c:3247

4903 +#, c-format

4904 +msgid ""

4905 +"CONFLICT (file location): %s added in %s inside a directory that was renamed "

4906 +"in %s, suggesting it should perhaps be moved to %s."

4907 +msgstr ""

4908 +

4909 +#: merge-ort.c:1960 merge-recursive.c:3254

4910 +#, c-format

4911 +msgid ""

4912 +"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "

4913 +"was renamed in %s, suggesting it should perhaps be moved to %s."

4914 +msgstr ""

4915 +

4916 +#: merge-ort.c:2103

4917 +#, fuzzy, c-format

4918 +msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."

4919 +msgstr ""

4920 +"CONFLITO (mudar nome/mudar nome): Mudar de nome %s->%s em %s. Mudar o nome "

4921 +"%s->%s em %s"

4922 +

4923 +#: merge-ort.c:2198

4924 +#, c-format

4925 +msgid ""

4926 +"CONFLICT (rename involved in collision): rename of %s -> %s has content "

4927 +"conflicts AND collides with another path; this may result in nested conflict "

4928 +"markers."

4929 +msgstr ""

4930 +

4931 +#: merge-ort.c:2217 merge-ort.c:2241

4932 +#, fuzzy, c-format

4933 +msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."

4934 +msgstr ""

4935 +"CONFLITO (mudar nome/adicionar): Mudar o nome %s->%s em %s. %s adicionado em "

4936 +"%s"

4937 +

4938 +#: merge-ort.c:2550 merge-recursive.c:3002

4939 +#, c-format

4940 +msgid "cannot read object %s"

4941 +msgstr "incapaz ler objeto %s"

4942 +

4943 +#: merge-ort.c:2553 merge-recursive.c:3005

4944 +#, c-format

4945 +msgid "object %s is not a blob"

4946 +msgstr "objeto %s é blob nenhum"

4947 +

4948 +#: merge-ort.c:2981

4949 +#, c-format

4950 +msgid ""

4951 +"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "

4952 +"%s instead."

4953 +msgstr ""

4954 +

4955 +#: merge-ort.c:3055

4956 +#, c-format

4957 +msgid ""

4958 +"CONFLICT (distinct types): %s had different types on each side; renamed both "

4959 +"of them so each can be recorded somewhere."

4960 +msgstr ""

4961 +

4962 +#: merge-ort.c:3062

4963 +#, c-format

4964 +msgid ""

4965 +"CONFLICT (distinct types): %s had different types on each side; renamed one "

4966 +"of them so each can be recorded somewhere."

4967 +msgstr ""

4968 +

4969 +#: merge-ort.c:3162 merge-recursive.c:3081

4970 +msgid "content"

4971 +msgstr "conteúdo"

4972 +

4973 +#: merge-ort.c:3164 merge-recursive.c:3085

4974 +msgid "add/add"

4975 +msgstr "adicionar/adicionar"

4976 +

4977 +#: merge-ort.c:3166 merge-recursive.c:3130

4978 +msgid "submodule"

4979 +msgstr "submódulo"

4980 +

4981 +#: merge-ort.c:3168 merge-recursive.c:3131

4982 +#, c-format

4983 +msgid "CONFLICT (%s): Merge conflict in %s"

4984 +msgstr "CONFLITO (%s): conflito de integração em %s"

4985 +

4986 +#: merge-ort.c:3198

4987 +#, fuzzy, c-format

4988 +msgid ""

4989 +"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "

4990 +"of %s left in tree."

4991 +msgstr ""

4992 +"CONFLITO (%s/eliminar): %s eliminado em %s e %s em %s. Versão de %s de %s "

4993 +"deixada na árvore."

4994 +

4995 +#: merge-ort.c:3433

4996 +#, c-format

4997 +msgid ""

4998 +"Note: %s not up to date and in way of checking out conflicted version; old "

4999 +"copy renamed to %s"

5000 +msgstr ""

5001 +

5002 +#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge

5003 +#. base, and 2-3) the trees for the two trees we're merging.

5004 +#.

5005 +#: merge-ort.c:3730

5006 +#, fuzzy, c-format

5007 +msgid "collecting merge info failed for trees %s, %s, %s"

5008 +msgstr "falha ao abrir '%s': %s"

5009 +

5010 +#: merge-ort-wrappers.c:13 merge-recursive.c:3699

5011 +#, fuzzy, c-format

5012 +msgid ""

5013 +"Your local changes to the following files would be overwritten by merge:\n"

5014 +" %s"

5015 +msgstr ""

5016 +"As suas alterações locais nos seguintes ficheiros seriam substituídas ao "

5017 +"integrar:\n"

5018 +"%%s"

5019 +

5020 +#: merge-ort-wrappers.c:33 merge-recursive.c:3465 builtin/merge.c:402

5021 +#, fuzzy

5022 +msgid "Already up to date."

5023 +msgstr "Já está atualizado."

5024 +

5025 +#: merge-recursive.c:356

5026 +msgid "(bad commit)\n"

5027 +msgstr "(commit incorreto)\n"

5028 +

5029 +#: merge-recursive.c:379

5030 +#, fuzzy, c-format

5031 +msgid "add_cacheinfo failed for path '%s'; merge aborting."

5032 +msgstr "addinfo_cache falhou no caminho '%s'"

5033 +

5034 +#: merge-recursive.c:388

5035 +#, fuzzy, c-format

5036 +msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."

5037 +msgstr "addinfo_cache falhou no caminho '%s'"

5038 +

5039 +#: merge-recursive.c:876

5040 +#, c-format

5041 +msgid "failed to create path '%s'%s"

5042 +msgstr "falha ao criar o caminho '%s'%s"

5043 +

5044 +#: merge-recursive.c:887

5045 +#, c-format

5046 +msgid "Removing %s to make room for subdirectory\n"

5047 +msgstr "A remover %s para criar espaço para o subdiretório\n"

5048 +

5049 +#: merge-recursive.c:901 merge-recursive.c:920

5050 +msgid ": perhaps a D/F conflict?"

5051 +msgstr ": talvez um conflito D/F?"

5052 +

5053 +#: merge-recursive.c:910

5054 +#, c-format

5055 +msgid "refusing to lose untracked file at '%s'"

5056 +msgstr "recusando perder ficheiro untracked em '%s'"

5057 +

5058 +#: merge-recursive.c:951 builtin/cat-file.c:41

5059 +#, c-format

5060 +msgid "cannot read object %s '%s'"

5061 +msgstr "incapaz ler objeto %s '%s'"

5062 +

5063 +#: merge-recursive.c:956

5064 #, c-format

5065 msgid "blob expected for %s '%s'"

5066 msgstr "blob para %s '%s' esperado"

5067

4718 -#: merge-recursive.c:979

5068 +#: merge-recursive.c:981

5069 #, c-format

5070 msgid "failed to open '%s': %s"

5071 msgstr "falha ao abrir '%s': %s"

5072

4723 -#: merge-recursive.c:990

5073 +#: merge-recursive.c:992

5074 #, c-format

5075 msgid "failed to symlink '%s': %s"

5076 msgstr "falha ao criar a ligação simbólica '%s': %s"

5077

4728 -#: merge-recursive.c:995

5078 +#: merge-recursive.c:997

5079 #, c-format

5080 msgid "do not know what to do with %06o %s '%s'"

5081 msgstr "desconheço que fazer com %06o %s '%s'"

5082

4733 -#: merge-recursive.c:1191

4734 -#, fuzzy, c-format

4735 -msgid "Failed to merge submodule %s (not checked out)"

4736 -msgstr "Falha ao registar o submódulo '$sm_path'"

4737 -

4738 -#: merge-recursive.c:1198

4739 -#, fuzzy, c-format

4740 -msgid "Failed to merge submodule %s (commits not present)"

4741 -msgstr "Falha ao registar o submódulo '$sm_path'"

4742 -

4743 -#: merge-recursive.c:1205

4744 -#, c-format

4745 -msgid "Failed to merge submodule %s (commits don't follow merge-base)"

4746 -msgstr ""

4747 -

4748 -#: merge-recursive.c:1213 merge-recursive.c:1225

5083 +#: merge-recursive.c:1227 merge-recursive.c:1239

5084 #, c-format

5085 msgid "Fast-forwarding submodule %s to the following commit:"

5086 msgstr ""

5087

4753 -#: merge-recursive.c:1216 merge-recursive.c:1228

5088 +#: merge-recursive.c:1230 merge-recursive.c:1242

5089 #, fuzzy, c-format

5090 msgid "Fast-forwarding submodule %s"

5091 msgstr "Avanço-rápido para $sha1"

5092

4758 -#: merge-recursive.c:1251

5093 +#: merge-recursive.c:1265

5094 #, c-format

5095 msgid "Failed to merge submodule %s (merge following commits not found)"

5096 msgstr ""

5097

4763 -#: merge-recursive.c:1255

5098 +#: merge-recursive.c:1269

5099 #, fuzzy, c-format

5100 msgid "Failed to merge submodule %s (not fast-forward)"

5101 msgstr "Falha ao registar o submódulo '$sm_path'"

5102

4768 -#: merge-recursive.c:1256

5103 +#: merge-recursive.c:1270

5104 msgid "Found a possible merge resolution for the submodule:\n"

5105 msgstr ""

5106

4772 -#: merge-recursive.c:1259

4773 -#, c-format

4774 -msgid ""

4775 -"If this is correct simply add it to the index for example\n"

4776 -"by using:\n"

4777 -"\n"

4778 -" git update-index --cacheinfo 160000 %s \"%s\"\n"

4779 -"\n"

4780 -"which will accept this suggestion.\n"

4781 -msgstr ""

4782 -

4783 -#: merge-recursive.c:1268

5107 +#: merge-recursive.c:1282

5108 #, c-format

5109 msgid "Failed to merge submodule %s (multiple merges found)"

5110 msgstr ""

5111

4788 -#: merge-recursive.c:1341

4789 -msgid "Failed to execute internal merge"

4790 -msgstr "Falha ao executar integração interna"

4791 -

4792 -#: merge-recursive.c:1346

4793 -#, c-format

4794 -msgid "Unable to add %s to database"

4795 -msgstr "Incapaz de adicionar %s à base de dados"

4796 -

4797 -#: merge-recursive.c:1378

4798 -#, c-format

4799 -msgid "Auto-merging %s"

4800 -msgstr "A integrar automaticamente %s"

4801 -

4802 -#: merge-recursive.c:1402

5112 +#: merge-recursive.c:1424

5113 #, fuzzy, c-format

5114 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."

4805 -msgstr "Erro: Recusando perder ficheiro untracked de '%s'; escrevendo "

4806 -"invés para %s"

5115 +msgstr ""

5116 +"Erro: Recusando perder ficheiro untracked de '%s'; escrevendo invés para %s"

5117

4808 -#: merge-recursive.c:1474

5118 +#: merge-recursive.c:1496

5119 #, c-format

5120 msgid ""

5121 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

@@ -4814,7 +5124,7 @@ msgstr ""

5124 "CONFLITO (%s/eliminar): %s eliminado em %s e %s em %s. Versão de %s de %s "

5125 "deixada na árvore."

5126

4817 -#: merge-recursive.c:1479

5127 +#: merge-recursive.c:1501

5128 #, c-format

5129 msgid ""

5130 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -4823,7 +5133,7 @@ msgstr ""

5133 "CONFLITO (%s/eliminar): %s eliminado em %s e %s para %s em %s. Versão de %s "

5134 "de %s deixada na árvore."

5135

4826 -#: merge-recursive.c:1486

5136 +#: merge-recursive.c:1508

5137 #, c-format

5138 msgid ""

5139 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

@@ -4832,7 +5142,7 @@ msgstr ""

5142 "CONFLITO (%s/eliminar): %s eliminado em %s e %s em %s. Versão de %s de %s "

5143 "deixada na árvore em %s."

5144

4835 -#: merge-recursive.c:1491

5145 +#: merge-recursive.c:1513

5146 #, c-format

5147 msgid ""

5148 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -4841,44 +5151,43 @@ msgstr ""

5151 "CONFLITO (%s/eliminar): %s eliminado em %s e %s para %s em %s. Versão de %s "

5152 "de %s deixada na árvore em %s."

5153

4844 -#: merge-recursive.c:1526

5154 +#: merge-recursive.c:1548

5155 msgid "rename"

5156 msgstr "mudar nome"

5157

4848 -#: merge-recursive.c:1526

5158 +#: merge-recursive.c:1548

5159 msgid "renamed"

5160 msgstr "nome mudado"

5161

4852 -#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129

5162 +#: merge-recursive.c:1599 merge-recursive.c:2505 merge-recursive.c:3158

5163 #, fuzzy, c-format

5164 msgid "Refusing to lose dirty file at %s"

5165 msgstr "Recusando perder ficheiro sujo de %s"

5166

4857 -#: merge-recursive.c:1587

5167 +#: merge-recursive.c:1609

5168 #, fuzzy, c-format

5169 msgid "Refusing to lose untracked file at %s, even though it's in the way."

4860 -msgstr "Recusando perder ficheiro untracked de %s, apesar de este estar "

4861 -"no caminho."

5170 +msgstr ""

5171 +"Recusando perder ficheiro untracked de %s, apesar de este estar no caminho."

5172

4863 -#: merge-recursive.c:1645

5173 +#: merge-recursive.c:1667

5174 #, fuzzy, c-format

5175 msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"

5176 msgstr ""

5177 "CONFLITO (mudar nome/adicionar): Mudar o nome %s->%s em %s. %s adicionado em "

5178 "%s"

5179

4870 -#: merge-recursive.c:1676

5180 +#: merge-recursive.c:1698

5181 #, c-format

5182 msgid "%s is a directory in %s adding as %s instead"

5183 msgstr "%s é um diretório em %s adicionando %s no seu lugar"

5184

4875 -#: merge-recursive.c:1681

5185 +#: merge-recursive.c:1703

5186 #, fuzzy, c-format

5187 msgid "Refusing to lose untracked file at %s; adding as %s instead"

4878 -msgstr "Recusando perder ficheiro untracked de %s; adicionado-o como %s "

4879 -"invés"

5188 +msgstr "Recusando perder ficheiro untracked de %s; adicionado-o como %s invés"

5189

4881 -#: merge-recursive.c:1708

5190 +#: merge-recursive.c:1730

5191 #, c-format

5192 msgid ""

5193 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"

@@ -4887,18 +5196,18 @@ msgstr ""

5196 "CONFLITO (mudar nome/mudar nome): Mudar o nome \"%s\"->\"%s\" no ramo \"%s\" "

5197 "mudar o nome \"%s\"->\"%s\" em \"%s\"%s"

5198

4890 -#: merge-recursive.c:1713

5199 +#: merge-recursive.c:1735

5200 msgid " (left unresolved)"

5201 msgstr " (por resolver)"

5202

4894 -#: merge-recursive.c:1805

5203 +#: merge-recursive.c:1827

5204 #, c-format

5205 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"

5206 msgstr ""

5207 "CONFLITO (mudar nome/mudar nome): Mudar de nome %s->%s em %s. Mudar o nome "

5208 "%s->%s em %s"

5209

4901 -#: merge-recursive.c:2068

5210 +#: merge-recursive.c:2090

5211 #, c-format

5212 msgid ""

5213 "CONFLICT (directory rename split): Unclear where to place %s because "

@@ -4906,21 +5215,7 @@ msgid ""

5215 "getting a majority of the files."

5216 msgstr ""

5217

4909 -#: merge-recursive.c:2100

4910 -#, c-format

4911 -msgid ""

4912 -"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "

4913 -"implicit directory rename(s) putting the following path(s) there: %s."

4914 -msgstr ""

4915 -

4916 -#: merge-recursive.c:2110

4917 -#, c-format

4918 -msgid ""

4919 -"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "

4920 -"implicit directory renames tried to put these paths there: %s"

4921 -msgstr ""

4922 -

4923 -#: merge-recursive.c:2202

5218 +#: merge-recursive.c:2224

5219 #, fuzzy, c-format

5220 msgid ""

5221 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"

@@ -4929,141 +5224,80 @@ msgstr ""

5224 "CONFLITO (mudar nome/mudar nome): Mudar de nome %s->%s em %s. Mudar o nome "

5225 "%s->%s em %s"

5226

4932 -#: merge-recursive.c:2447

4933 -#, c-format

4934 -msgid ""

4935 -"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "

4936 -"renamed."

4937 -msgstr ""

4938 -

4939 -#: merge-recursive.c:2973

4940 -#, c-format

4941 -msgid "cannot read object %s"

4942 -msgstr "incapaz ler objeto %s"

4943 -

4944 -#: merge-recursive.c:2976

4945 -#, c-format

4946 -msgid "object %s is not a blob"

4947 -msgstr "objeto %s é blob nenhum"

4948 -

4949 -#: merge-recursive.c:3040

5227 +#: merge-recursive.c:3069

5228 msgid "modify"

5229 msgstr "modificar"

5230

4953 -#: merge-recursive.c:3040

5231 +#: merge-recursive.c:3069

5232 msgid "modified"

5233 msgstr "modificado"

5234

4957 -#: merge-recursive.c:3052

4958 -msgid "content"

4959 -msgstr "conteúdo"

4960 -

4961 -#: merge-recursive.c:3056

4962 -msgid "add/add"

4963 -msgstr "adicionar/adicionar"

4964 -

4965 -#: merge-recursive.c:3079

5235 +#: merge-recursive.c:3108

5236 #, c-format

5237 msgid "Skipped %s (merged same as existing)"

5238 msgstr "%s ignorado (integrado é igual ao existente)"

5239

4970 -#: merge-recursive.c:3101

4971 -msgid "submodule"

4972 -msgstr "submódulo"

4973 -

4974 -#: merge-recursive.c:3102

4975 -#, c-format

4976 -msgid "CONFLICT (%s): Merge conflict in %s"

4977 -msgstr "CONFLITO (%s): conflito de integração em %s"

4978 -

4979 -#: merge-recursive.c:3132

5240 +#: merge-recursive.c:3161

5241 #, c-format

5242 msgid "Adding as %s instead"

5243 msgstr "A adicionar como %s, em alternativa."

5244

4984 -#: merge-recursive.c:3215

4985 -#, c-format

4986 -msgid ""

4987 -"Path updated: %s added in %s inside a directory that was renamed in %s; "

4988 -"moving it to %s."

4989 -msgstr ""

4990 -

4991 -#: merge-recursive.c:3218

4992 -#, c-format

4993 -msgid ""

4994 -"CONFLICT (file location): %s added in %s inside a directory that was renamed "

4995 -"in %s, suggesting it should perhaps be moved to %s."

4996 -msgstr ""

4997 -

4998 -#: merge-recursive.c:3222

4999 -#, c-format

5000 -msgid ""

5001 -"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "

5002 -"%s; moving it to %s."

5003 -msgstr ""

5004 -

5005 -#: merge-recursive.c:3225

5006 -#, c-format

5007 -msgid ""

5008 -"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "

5009 -"was renamed in %s, suggesting it should perhaps be moved to %s."

5010 -msgstr ""

5011 -

5012 -#: merge-recursive.c:3339

5245 +#: merge-recursive.c:3368

5246 #, c-format

5247 msgid "Removing %s"

5248 msgstr "A remover %s"

5249

5017 -#: merge-recursive.c:3362

5250 +#: merge-recursive.c:3391

5251 msgid "file/directory"

5252 msgstr "ficheiro/diretório"

5253

5021 -#: merge-recursive.c:3367

5254 +#: merge-recursive.c:3396

5255 msgid "directory/file"

5256 msgstr "diretório/ficheiro"

5257

5025 -#: merge-recursive.c:3374

5258 +#: merge-recursive.c:3403

5259 #, c-format

5260 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"

5261 msgstr ""

5262 "CONFLITO (%s): Há um diretório designado %s em %s. A adicionar %s como %s"

5263

5031 -#: merge-recursive.c:3383

5264 +#: merge-recursive.c:3412

5265 #, c-format

5266 msgid "Adding %s"

5267 msgstr "A adicionar %s"

5268

5036 -#: merge-recursive.c:3392

5269 +#: merge-recursive.c:3421

5270 #, fuzzy, c-format

5271 msgid "CONFLICT (add/add): Merge conflict in %s"

5272 msgstr "CONFLITO (%s): conflito de integração em %s"

5273

5041 -#: merge-recursive.c:3445

5274 +#: merge-recursive.c:3474

5275 #, c-format

5276 msgid "merging of trees %s and %s failed"

5277 msgstr "falha ao integrar as árvores %s e %s"

5278

5046 -#: merge-recursive.c:3550

5279 +#: merge-recursive.c:3568

5280 msgid "Merging:"

5281 msgstr "A integrar:"

5282

5050 -#: merge-recursive.c:3563

5283 +#: merge-recursive.c:3581

5284 #, c-format

5285 msgid "found %u common ancestor:"

5286 msgid_plural "found %u common ancestors:"

5287 msgstr[0] "%u antecessor comum encontrado:"

5288 msgstr[1] "%u antecessores comuns encontrados:"

5289

5057 -#: merge-recursive.c:3613

5290 +#: merge-recursive.c:3631

5291 msgid "merge returned no commit"

5292 msgstr "junção retornou commit nenhum"

5293

5061 -#: merge-recursive.c:3769

5294 +#: merge-recursive.c:3796

5295 #, c-format

5296 msgid "Could not parse object '%s'"

5297 msgstr "Incapaz de analisar objeto '%s'"

5298

5066 -#: merge-recursive.c:3787 builtin/merge.c:711 builtin/merge.c:895

5299 +#: merge-recursive.c:3814 builtin/merge.c:716 builtin/merge.c:900

5300 +#: builtin/stash.c:473

5301 msgid "Unable to write index."

5302 msgstr "Incapaz de escrever no index."

5303

@@ -5071,190 +5305,203 @@ msgstr "Incapaz de escrever no index."

5305 msgid "failed to read the cache"

5306 msgstr "falha ao ler a cache"

5307

5074 -#: merge.c:109 rerere.c:720 builtin/am.c:1883 builtin/am.c:1917

5075 -#: builtin/checkout.c:573 builtin/checkout.c:829 builtin/clone.c:817

5076 -#: builtin/stash.c:265

5308 +#: merge.c:109 rerere.c:704 builtin/am.c:1931 builtin/am.c:1965

5309 +#: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821

5310 +#: builtin/stash.c:267

5311 msgid "unable to write new index file"

5312 msgstr "incapaz escrever novo ficheiro index"

5313

5080 -#: midx.c:80

5314 +#: midx.c:74

5315 +#, fuzzy

5316 +msgid "multi-pack-index OID fanout is of the wrong size"

5317 +msgstr "versão %d de multi-pack-index é irreconhecível"

5318 +

5319 +#: midx.c:105

5320 #, c-format

5321 msgid "multi-pack-index file %s is too small"

5322 msgstr ""

5323

5085 -#: midx.c:96

5324 +#: midx.c:121

5325 #, c-format

5326 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"

5327 msgstr ""

5328

5090 -#: midx.c:101

5329 +#: midx.c:126

5330 #, c-format

5331 msgid "multi-pack-index version %d not recognized"

5332 msgstr "versão %d de multi-pack-index é irreconhecível"

5333

5095 -#: midx.c:106

5334 +#: midx.c:131

5335 #, c-format

5336 msgid "multi-pack-index hash version %u does not match version %u"

5337 msgstr ""

5338

5100 -#: midx.c:123

5101 -msgid "invalid chunk offset (too large)"

5102 -msgstr ""

5103 -

5104 -#: midx.c:147

5105 -msgid "terminating multi-pack-index chunk id appears earlier than expected"

5106 -msgstr ""

5107 -

5108 -#: midx.c:160

5339 +#: midx.c:148

5340 msgid "multi-pack-index missing required pack-name chunk"

5341 msgstr ""

5342

5112 -#: midx.c:162

5343 +#: midx.c:150

5344 msgid "multi-pack-index missing required OID fanout chunk"

5345 msgstr ""

5346

5116 -#: midx.c:164

5347 +#: midx.c:152

5348 msgid "multi-pack-index missing required OID lookup chunk"

5349 msgstr ""

5350

5120 -#: midx.c:166

5351 +#: midx.c:154

5352 msgid "multi-pack-index missing required object offsets chunk"

5353 msgstr ""

5354

5124 -#: midx.c:180

5355 +#: midx.c:170

5356 #, c-format

5357 msgid "multi-pack-index pack names out of order: '%s' before '%s'"

5358 msgstr ""

5359

5129 -#: midx.c:223

5360 +#: midx.c:214

5361 #, c-format

5362 msgid "bad pack-int-id: %u (%u total packs)"

5363 msgstr ""

5364

5134 -#: midx.c:273

5365 +#: midx.c:264

5366 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"

5367 msgstr ""

5368

5138 -#: midx.c:480

5369 +#: midx.c:490

5370 #, fuzzy, c-format

5371 msgid "failed to add packfile '%s'"

5372 msgstr "falha ao ler o ficheiro de comando '%s'"

5373

5143 -#: midx.c:486

5374 +#: midx.c:496

5375 #, fuzzy, c-format

5376 msgid "failed to open pack-index '%s'"

5377 msgstr "falha ao abrir '%s'"

5378

5148 -#: midx.c:546

5379 +#: midx.c:564

5380 #, fuzzy, c-format

5381 msgid "failed to locate object %d in packfile"

5382 msgstr "Falha ao criar os ficheiros de saída"

5383

5153 -#: midx.c:846

5384 +#: midx.c:880 builtin/index-pack.c:1535

5385 +#, fuzzy

5386 +msgid "cannot store reverse index file"

5387 +msgstr "incapaz guardar ficheiro index"

5388 +

5389 +#: midx.c:933

5390 msgid "Adding packfiles to multi-pack-index"

5391 msgstr ""

5392

5157 -#: midx.c:879

5393 +#: midx.c:979

5394 #, c-format

5395 msgid "did not see pack-file %s to drop"

5396 msgstr ""

5397

5162 -#: midx.c:931

5398 +#: midx.c:1024

5399 +#, fuzzy, c-format

5400 +msgid "unknown preferred pack: '%s'"

5401 +msgstr "Subcomando desconhecido: %s"

5402 +

5403 +#: midx.c:1029

5404 +#, fuzzy, c-format

5405 +msgid "preferred pack '%s' is expired"

5406 +msgstr "o repositório de referência '%s' está enxertado"

5407 +

5408 +#: midx.c:1045

5409 #, fuzzy

5410 msgid "no pack files to index."

5411 msgstr "pack files nenhuns para index."

5412

5167 -#: midx.c:982

5168 -msgid "Writing chunks to multi-pack-index"

5169 -msgstr ""

5413 +#: midx.c:1125 builtin/clean.c:37

5414 +#, c-format

5415 +msgid "failed to remove %s"

5416 +msgstr "falha ao remover %s"

5417

5171 -#: midx.c:1060

5418 +#: midx.c:1156

5419 #, fuzzy, c-format

5420 msgid "failed to clear multi-pack-index at %s"

5421 msgstr "falha ao limpar o índice"

5422

5176 -#: midx.c:1116

5423 +#: midx.c:1214

5424 msgid "multi-pack-index file exists, but failed to parse"

5425 msgstr ""

5426

5180 -#: midx.c:1124

5427 +#: midx.c:1222

5428 msgid "Looking for referenced packfiles"

5429 msgstr ""

5430

5184 -#: midx.c:1139

5431 +#: midx.c:1237

5432 #, c-format

5433 msgid ""

5434 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

5435 msgstr ""

5436

5190 -#: midx.c:1144

5437 +#: midx.c:1242

5438 msgid "the midx contains no oid"

5439 msgstr ""

5440

5194 -#: midx.c:1153

5441 +#: midx.c:1251

5442 msgid "Verifying OID order in multi-pack-index"

5443 msgstr ""

5444

5198 -#: midx.c:1162

5445 +#: midx.c:1260

5446 #, c-format

5447 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"

5448 msgstr ""

5449

5203 -#: midx.c:1182

5450 +#: midx.c:1280

5451 #, fuzzy

5452 msgid "Sorting objects by packfile"

5453 msgstr "A escrever objetos"

5454

5208 -#: midx.c:1189

5455 +#: midx.c:1287

5456 #, fuzzy

5457 msgid "Verifying object offsets"

5458 msgstr "A escrever objetos"

5459

5213 -#: midx.c:1205

5460 +#: midx.c:1303

5461 #, fuzzy, c-format

5462 msgid "failed to load pack entry for oid[%d] = %s"

5463 msgstr "falhou carregar entrada pack para oid[%d] = %s"

5464

5218 -#: midx.c:1211

5465 +#: midx.c:1309

5466 #, fuzzy, c-format

5467 msgid "failed to load pack-index for packfile %s"

5468 msgstr "falha ao ler o ficheiro de comando '%s'"

5469

5223 -#: midx.c:1220

5470 +#: midx.c:1318

5471 #, c-format

5472 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"

5473 msgstr ""

5474

5228 -#: midx.c:1245

5475 +#: midx.c:1343

5476 #, fuzzy

5477 msgid "Counting referenced objects"

5478 msgstr "Contando objetos referenciados"

5479

5233 -#: midx.c:1255

5480 +#: midx.c:1353

5481 msgid "Finding and deleting unreferenced packfiles"

5482 msgstr ""

5483

5237 -#: midx.c:1446

5484 +#: midx.c:1544

5485 #, fuzzy

5486 msgid "could not start pack-objects"

5487 msgstr "incapaz de começar pack-objects"

5488

5242 -#: midx.c:1466

5489 +#: midx.c:1564

5490 #, fuzzy

5491 msgid "could not finish pack-objects"

5492 msgstr "incapaz de terminar pack-objects"

5493

5247 -#: name-hash.c:537

5494 +#: name-hash.c:542

5495 #, fuzzy, c-format

5496 msgid "unable to create lazy_dir thread: %s"

5497 msgstr "incapaz criar thread lazy_dir: %s"

5498

5252 -#: name-hash.c:559

5499 +#: name-hash.c:564

5500 #, fuzzy, c-format

5501 msgid "unable to create lazy_name thread: %s"

5502 msgstr "incapaz criar thread lazy_name: %s"

5503

5257 -#: name-hash.c:565

5504 +#: name-hash.c:570

5505 #, fuzzy, c-format

5506 msgid "unable to join lazy_name thread: %s"

5507 msgstr "incapaz juntar a thread lazy_name: %s"

@@ -5268,7 +5515,8 @@ msgid ""

5515 msgstr ""

5516 "Ficou por concluír a anterior junção de notas (%s existe).\n"

5517 "Por favor, usa 'git notes merge --commit' ou 'git notes merge --abort' para "

5271 -"commitar/abortar a junção anterior antes de começares uma nova junção de notas."

5518 +"commitar/abortar a junção anterior antes de começares uma nova junção de "

5519 +"notas."

5520

5521 #: notes-merge.c:284

5522 #, c-format

@@ -5277,7 +5525,8 @@ msgstr "Ficou por concluír a tua junção de notas (%s existe)."

5525

5526 #: notes-utils.c:46

5527 msgid "Cannot commit uninitialized/unreferenced notes tree"

5280 -msgstr "Impossível commit notas de árvore que estejam por iniciar/por referênciar"

5528 +msgstr ""

5529 +"Impossível commit notas de árvore que estejam por iniciar/por referênciar"

5530

5531 #: notes-utils.c:105

5532 #, c-format

@@ -5298,2988 +5547,3110 @@ msgstr "Reescrita de notas em %s (fora de refs/notes/) recusada"

5547 msgid "Bad %s value: '%s'"

5548 msgstr "Valor incorreto de %s: '%s'"

5549

5301 -#: object.c:53

5302 -#, fuzzy, c-format

5303 -msgid "invalid object type \"%s\""

5304 -msgstr "objeto blob inválido %s"

5550 +#: object-file.c:526

5551 +#, c-format

5552 +msgid "object directory %s does not exist; check .git/objects/info/alternates"

5553 +msgstr ""

5554

5306 -#: object.c:173

5555 +#: object-file.c:577

5556 #, fuzzy, c-format

5308 -msgid "object %s is a %s, not a %s"

5309 -msgstr "objeto %s é %s, é %s nenhum(a)"

5557 +msgid "unable to normalize alternate object path: %s"

5558 +msgstr "incapaz normalizar path de objeto alternativo: %s"

5559 +

5560 +#: object-file.c:649

5561 +#, c-format

5562 +msgid "%s: ignoring alternate object stores, nesting too deep"

5563 +msgstr ""

5564

5311 -#: object.c:233

5565 +#: object-file.c:656

5566 #, fuzzy, c-format

5313 -msgid "object %s has unknown type id %d"

5314 -msgstr "objeto de tipo desconhecido"

5567 +msgid "unable to normalize object directory: %s"

5568 +msgstr "incapaz normalizar pasta de objeto: %s"

5569 +

5570 +#: object-file.c:699

5571 +#, fuzzy

5572 +msgid "unable to fdopen alternates lockfile"

5573 +msgstr "incapaz de fdopen lockfile alternativo"

5574 +

5575 +#: object-file.c:717

5576 +#, fuzzy

5577 +msgid "unable to read alternates file"

5578 +msgstr "incapaz ler ficheiro alternativo"

5579 +

5580 +#: object-file.c:724

5581 +#, fuzzy

5582 +msgid "unable to move new alternates file into place"

5583 +msgstr "incapaz mover novo ficheiro alternativo para o sítio"

5584

5316 -#: object.c:246

5585 +#: object-file.c:759

5586 #, c-format

5318 -msgid "unable to parse object: %s"

5319 -msgstr "incapaz analisar objeto: %s"

5587 +msgid "path '%s' does not exist"

5588 +msgstr "caminho '%s' é inexistente"

5589

5321 -#: object.c:266 object.c:278

5590 +#: object-file.c:780

5591 #, c-format

5323 -msgid "hash mismatch %s"

5592 +msgid "reference repository '%s' as a linked checkout is not supported yet."

5593 msgstr ""

5594 +"repositório referência '%s' como uma checkout ligada ainda é insustentado."

5595

5326 -#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2216

5327 -#, fuzzy, c-format

5328 -msgid "unable to get size of %s"

5329 -msgstr "incapaz obter tamanho de %s"

5596 +#: object-file.c:786

5597 +#, c-format

5598 +msgid "reference repository '%s' is not a local repository."

5599 +msgstr "repositório referência '%s' é repositório local nenhum."

5600

5331 -#: packfile.c:615

5332 -msgid "offset before end of packfile (broken .idx?)"

5333 -msgstr "offset antes do fim do ficheiro de pacote (.idx danificado?)"

5601 +#: object-file.c:792

5602 +#, c-format

5603 +msgid "reference repository '%s' is shallow"

5604 +msgstr "o repositório de referência '%s' é raso"

5605

5335 -#: packfile.c:1907

5606 +#: object-file.c:800

5607 #, c-format

5337 -msgid "offset before start of pack index for %s (corrupt index?)"

5338 -msgstr "offset antes do início do índice do pacote %s (índice corrompido?)"

5608 +msgid "reference repository '%s' is grafted"

5609 +msgstr "o repositório de referência '%s' está enxertado"

5610

5340 -#: packfile.c:1911

5611 +#: object-file.c:860

5612 #, c-format

5342 -msgid "offset beyond end of pack index for %s (truncated index?)"

5343 -msgstr "offset depois do fim do índice do pacote %s (índice truncado?)"

5613 +msgid "invalid line while parsing alternate refs: %s"

5614 +msgstr ""

5615

5345 -#: parse-options-cb.c:20 parse-options-cb.c:24

5616 +#: object-file.c:1010

5617 +#, c-format

5618 +msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"

5619 +msgstr ""

5620 +

5621 +#: object-file.c:1031

5622 +#, fuzzy

5623 +msgid "mmap failed"

5624 +msgstr "%s falhou"

5625 +

5626 +#: object-file.c:1195

5627 #, fuzzy, c-format

5347 -msgid "option `%s' expects a numerical value"

5348 -msgstr "a opção '%c' espera um valor numérico"

5628 +msgid "object file %s is empty"

5629 +msgstr "objeto local %s corrompido"

5630

5350 -#: parse-options-cb.c:41

5631 +#: object-file.c:1330 object-file.c:2524

5632 #, fuzzy, c-format

5352 -msgid "malformed expiration date '%s'"

5353 -msgstr "folha de opções malformada: '%s'"

5633 +msgid "corrupt loose object '%s'"

5634 +msgstr "objeto solto '%s' corrupto"

5635

5355 -#: parse-options-cb.c:54

5636 +#: object-file.c:1332 object-file.c:2528

5637 +#, fuzzy, c-format

5638 +msgid "garbage at end of loose object '%s'"

5639 +msgstr "lixo no fim de objeto solto '%s'"

5640 +

5641 +#: object-file.c:1374

5642 +#, fuzzy

5643 +msgid "invalid object type"

5644 +msgstr "tipo de objeto incorreto."

5645 +

5646 +#: object-file.c:1458

5647 #, c-format

5357 -msgid "option `%s' expects \"always\", \"auto\", or \"never\""

5648 +msgid "unable to unpack %s header with --allow-unknown-type"

5649 msgstr ""

5650

5360 -#: parse-options-cb.c:132 parse-options-cb.c:149

5651 +#: object-file.c:1461

5652 +#, fuzzy, c-format

5653 +msgid "unable to unpack %s header"

5654 +msgstr "incapaz desempacotar cabeçalho %s"

5655 +

5656 +#: object-file.c:1467

5657 #, c-format

5362 -msgid "malformed object name '%s'"

5363 -msgstr "nome do objeto malformado '%s'"

5658 +msgid "unable to parse %s header with --allow-unknown-type"

5659 +msgstr ""

5660

5365 -#: parse-options.c:38

5661 +#: object-file.c:1470

5662 #, fuzzy, c-format

5367 -msgid "%s requires a value"

5368 -msgstr "a opção '%s' requer um valor"

5663 +msgid "unable to parse %s header"

5664 +msgstr "incapaz processar cabeçalho %s"

5665

5370 -#: parse-options.c:73

5666 +#: object-file.c:1697

5667 #, fuzzy, c-format

5372 -msgid "%s is incompatible with %s"

5373 -msgstr "--long é incompatível com --abbrev=0"

5668 +msgid "failed to read object %s"

5669 +msgstr "falha ao ler o objeto '%s'."

5670

5375 -#: parse-options.c:78

5671 +#: object-file.c:1701

5672 #, fuzzy, c-format

5377 -msgid "%s : incompatible with something else"

5378 -msgstr "--dirty é incompatível com commits ou semelhantes"

5673 +msgid "replacement %s not found for %s"

5674 +msgstr "%s substituto, por encontrar para %s"

5675

5380 -#: parse-options.c:92 parse-options.c:96 parse-options.c:317

5676 +#: object-file.c:1705

5677 #, fuzzy, c-format

5382 -msgid "%s takes no value"

5383 -msgstr "%s tem múltiplos valores"

5678 +msgid "loose object %s (stored in %s) is corrupt"

5679 +msgstr "objeto local %s corrompido"

5680

5385 -#: parse-options.c:94

5681 +#: object-file.c:1709

5682 #, fuzzy, c-format

5387 -msgid "%s isn't available"

5388 -msgstr "%s está indisponível"

5683 +msgid "packed object %s (stored in %s) is corrupt"

5684 +msgstr "objeto local %s corrompido"

5685

5390 -#: parse-options.c:217

5391 -#, c-format

5392 -msgid "%s expects a non-negative integer value with an optional k/m/g suffix"

5393 -msgstr ""

5686 +#: object-file.c:1814

5687 +#, fuzzy, c-format

5688 +msgid "unable to write file %s"

5689 +msgstr "incapaz escrever ficheiro %s"

5690

5395 -#: parse-options.c:386

5691 +#: object-file.c:1821

5692 +#, fuzzy, c-format

5693 +msgid "unable to set permission to '%s'"

5694 +msgstr "incapaz definir permissão para '%s'"

5695 +

5696 +#: object-file.c:1828

5697 +#, fuzzy

5698 +msgid "file write error"

5699 +msgstr "falha ao escrever para rev-list"

5700 +

5701 +#: object-file.c:1848

5702 +#, fuzzy

5703 +msgid "error when closing loose object file"

5704 +msgstr "erro ao fechar ficheiro de pacote"

5705 +

5706 +#: object-file.c:1913

5707 #, c-format

5397 -msgid "ambiguous option: %s (could be --%s%s or --%s%s)"

5708 +msgid "insufficient permission for adding an object to repository database %s"

5709 msgstr ""

5710

5400 -#: parse-options.c:420 parse-options.c:428

5711 +#: object-file.c:1915

5712 +#, fuzzy

5713 +msgid "unable to create temporary file"

5714 +msgstr "incapaz criar ficheiro temporário"

5715 +

5716 +#: object-file.c:1939

5717 +#, fuzzy

5718 +msgid "unable to write loose object file"

5719 +msgstr "incapaz escrever ficheiro objeto solto"

5720 +

5721 +#: object-file.c:1945

5722 +#, fuzzy, c-format

5723 +msgid "unable to deflate new object %s (%d)"

5724 +msgstr "incapaz esvaziar objeto novo %s (%d)"

5725 +

5726 +#: object-file.c:1949

5727 +#, fuzzy, c-format

5728 +msgid "deflateEnd on object %s failed (%d)"

5729 +msgstr "falha de fstat de %s"

5730 +

5731 +#: object-file.c:1953

5732 #, c-format

5402 -msgid "did you mean `--%s` (with two dashes)?"

5733 +msgid "confused by unstable object source data for %s"

5734 msgstr ""

5735

5405 -#: parse-options.c:666 parse-options.c:971

5736 +#: object-file.c:1963 builtin/pack-objects.c:1097

5737 +#, fuzzy, c-format

5738 +msgid "failed utime() on %s"

5739 +msgstr "falha ao abrir '%s'"

5740 +

5741 +#: object-file.c:2040

5742 +#, fuzzy, c-format

5743 +msgid "cannot read object for %s"

5744 +msgstr "incapaz ler objeto para %s"

5745 +

5746 +#: object-file.c:2091

5747 +#, fuzzy

5748 +msgid "corrupt commit"

5749 +msgstr "substituir autor do commit"

5750 +

5751 +#: object-file.c:2099

5752 +#, fuzzy

5753 +msgid "corrupt tag"

5754 +msgstr "mostrar tags"

5755 +

5756 +#: object-file.c:2199

5757 #, c-format

5407 -msgid "alias of --%s"

5758 +msgid "read error while indexing %s"

5759 msgstr ""

5760

5410 -#: parse-options.c:862

5761 +#: object-file.c:2202

5762 #, fuzzy, c-format

5412 -msgid "unknown option `%s'"

5413 -msgstr "opção desconhecido %s"

5763 +msgid "short read while indexing %s"

5764 +msgstr "leitura curta enquanto indexando %s"

5765

5415 -#: parse-options.c:864

5766 +#: object-file.c:2275 object-file.c:2285

5767 #, fuzzy, c-format

5417 -msgid "unknown switch `%c'"

5418 -msgstr "opção desconhecido %s"

5768 +msgid "%s: failed to insert into database"

5769 +msgstr "%s: falhou inserir na base de dados"

5770

5420 -#: parse-options.c:866

5771 +#: object-file.c:2291

5772 #, fuzzy, c-format

5422 -msgid "unknown non-ascii option in string: `%s'"

5423 -msgstr "Definidição --confirm desconhecida: '%s'"

5773 +msgid "%s: unsupported file type"

5774 +msgstr "%s: tipo ficheiro insustentado"

5775

5425 -#: parse-options.c:890

5426 -msgid "..."

5427 -msgstr "..."

5776 +#: object-file.c:2315

5777 +#, fuzzy, c-format

5778 +msgid "%s is not a valid object"

5779 +msgstr "%s é objeto inválido"

5780

5429 -#: parse-options.c:909

5781 +#: object-file.c:2317

5782 #, c-format

5431 -msgid "usage: %s"

5432 -msgstr "utilização: %s"

5783 +msgid "%s is not a valid '%s' object"

5784 +msgstr "%s é um objeto inválido '%s'"

5785

5434 -#. TRANSLATORS: the colon here should align with the

5435 -#. one in "usage: %s" translation.

5436 -#.

5437 -#: parse-options.c:915

5786 +#: object-file.c:2344 builtin/index-pack.c:192

5787 #, c-format

5439 -msgid " or: %s"

5440 -msgstr " ou: %s"

5788 +msgid "unable to open %s"

5789 +msgstr "incapaz abrir %s"

5790

5442 -#: parse-options.c:918

5791 +#: object-file.c:2535 object-file.c:2588

5792 #, c-format

5444 -msgid " %s"

5445 -msgstr " %s"

5446 -

5447 -#: parse-options.c:957

5448 -msgid "-NUM"

5449 -msgstr "-NUM"

5793 +msgid "hash mismatch for %s (expected %s)"

5794 +msgstr ""

5795

5451 -#: path.c:915

5452 -#, c-format

5453 -msgid "Could not make %s writable by group"

5454 -msgstr "Incapaz de fazer %s escrevível ao grupo"

5796 +#: object-file.c:2559

5797 +#, fuzzy, c-format

5798 +msgid "unable to mmap %s"

5799 +msgstr "incapaz mmap %s"

5800

5456 -#: pathspec.c:130

5457 -msgid "Escape character '\\' not allowed as last character in attr value"

5458 -msgstr "Carácter de escape '\\' é proíbido como último carácter no valor attr"

5801 +#: object-file.c:2564

5802 +#, fuzzy, c-format

5803 +msgid "unable to unpack header of %s"

5804 +msgstr "incapaz desempacotar cabeçalho de %s"

5805

5460 -#: pathspec.c:148

5461 -msgid "Only one 'attr:' specification is allowed."

5462 -msgstr "Só se pode especificar um 'attr:'."

5806 +#: object-file.c:2570

5807 +#, fuzzy, c-format

5808 +msgid "unable to parse header of %s"

5809 +msgstr "incapaz processar cabeçalho de %s"

5810

5464 -#: pathspec.c:151

5465 -msgid "attr spec must not be empty"

5466 -msgstr "attr spec tem de ter algum conteúdo"

5811 +#: object-file.c:2581

5812 +#, fuzzy, c-format

5813 +msgid "unable to unpack contents of %s"

5814 +msgstr "incapaz desempacotar conteúdo de %s"

5815

5468 -#: pathspec.c:194

5469 -#, c-format

5470 -msgid "invalid attribute name %s"

5471 -msgstr "nome de atributo inválido %s"

5816 +#: object-name.c:486

5817 +#, fuzzy, c-format

5818 +msgid "short object ID %s is ambiguous"

5819 +msgstr "SHA1 curto %s é ambíguo"

5820

5473 -#: pathspec.c:259

5474 -msgid "global 'glob' and 'noglob' pathspec settings are incompatible"

5475 -msgstr ""

5476 -"as definições globais 'glob' e 'noglob' de especificador de caminho "

5477 -"(pathspec) são incompatíveis"

5821 +#: object-name.c:497

5822 +msgid "The candidates are:"

5823 +msgstr "Os candidatos são:"

5824

5479 -#: pathspec.c:266

5825 +#: object-name.c:796

5826 +#, fuzzy

5827 msgid ""

5481 -"global 'literal' pathspec setting is incompatible with all other global "

5482 -"pathspec settings"

5828 +"Git normally never creates a ref that ends with 40 hex characters\n"

5829 +"because it will be ignored when you just specify 40-hex. These refs\n"

5830 +"may be created by mistake. For example,\n"

5831 +"\n"

5832 +" git switch -c $br $(git rev-parse ...)\n"

5833 +"\n"

5834 +"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"

5835 +"examine these refs and maybe delete them. Turn this message off by\n"

5836 +"running \"git config advice.objectNameWarning false\""

5837 msgstr ""

5484 -"a definição global de especificador de caminho 'literal' é incompatível com "

5485 -"todas as outras definições globais de especificador de caminho (pathspec)"

5486 -

5487 -#: pathspec.c:306

5488 -msgid "invalid parameter for pathspec magic 'prefix'"

5489 -msgstr "parâmetro inválido na mágica 'prefix' do especificador de caminho"

5838 +"Normalmente o Git nunca cria refs que terminem em 40 caracteres\n"

5839 +"hexadecimais, porque será ignorada quando apenas se indica 40-hex.\n"

5840 +"Poderam-se criar estas refs por engano. Como no exemplo,\n"

5841 +"\n"

5842 +" git switch -c $br $(git rev-parse ...)\n"

5843 +"\n"

5844 +"onde \"$br\" fica vazio e uma ref de 40-hex é criada. Por favor\n"

5845 +"examine estas refs e talvez apague-as. Desative esta mensagem\n"

5846 +"executando \"git config advice.objectNameWarning false\""

5847

5491 -#: pathspec.c:327

5848 +#: object-name.c:916

5849 #, c-format

5493 -msgid "Invalid pathspec magic '%.*s' in '%s'"

5494 -msgstr "Mágica do especificador de caminho '%.*s' inválida em '%s'"

5850 +msgid "log for '%.*s' only goes back to %s"

5851 +msgstr ""

5852

5496 -#: pathspec.c:332

5853 +#: object-name.c:924

5854 #, c-format

5498 -msgid "Missing ')' at the end of pathspec magic in '%s'"

5499 -msgstr "Falta um ')' no final da mágica do especificador de caminho em '%s'"

5855 +msgid "log for '%.*s' only has %d entries"

l10n: pt_PT: add Portuguese translations part 5