1d4ac88d67 · matheusbsbs/matheus-bagliano

@@ -8,7 +8,7 @@ msgid ""

8 msgstr ""

9 "Project-Id-Version: PACKAGE VERSION\n"

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

11 -"POT-Creation-Date: 2012-02-13 14:24+0800\n"

11 +"POT-Creation-Date: 2012-02-28 09:17+0800\n"

12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

14 "Language-Team: LANGUAGE <LL@li.org>\n"

@@ -73,14 +73,39 @@ msgstr ""

73 msgid " Unknown dirstat parameter '%.*s'\n"

74 msgstr ""

75

76 -#: diff.c:208

76 +#: diff.c:205

77 #, c-format

78 msgid ""

79 "Found errors in 'diff.dirstat' config variable:\n"

80 "%s"

81 msgstr ""

82

83 -#: diff.c:3308

83 +#: diff.c:1331

84 +msgid " 0 files changed\n"

85 +msgstr ""

86 +

87 +#: diff.c:1335

88 +#, c-format

89 +msgid " %d file changed"

90 +msgid_plural " %d files changed"

91 +msgstr[0] ""

92 +msgstr[1] ""

93 +

94 +#: diff.c:1352

95 +#, c-format

96 +msgid ", %d insertion(+)"

97 +msgid_plural ", %d insertions(+)"

98 +msgstr[0] ""

99 +msgstr[1] ""

100 +

101 +#: diff.c:1363

102 +#, c-format

103 +msgid ", %d deletion(-)"

104 +msgid_plural ", %d deletions(-)"

105 +msgstr[0] ""

106 +msgstr[1] ""

107 +

108 +#: diff.c:3364

109 #, c-format

110 msgid ""

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

@@ -99,21 +124,36 @@ msgstr ""

124 msgid "gpg failed to sign the data"

125 msgstr ""

126

102 -#: help.c:309

127 +#: grep.c:1285

128 +#, c-format

129 +msgid "'%s': unable to read %s"

130 +msgstr ""

131 +

132 +#: grep.c:1302

133 +#, c-format

134 +msgid "'%s': %s"

135 +msgstr ""

136 +

137 +#: grep.c:1313

138 +#, c-format

139 +msgid "'%s': short read %s"

140 +msgstr ""

141 +

142 +#: help.c:287

143 #, c-format

144 msgid ""

145 "'%s' appears to be a git command, but we were not\n"

146 "able to execute it. Maybe git-%s is broken?"

147 msgstr ""

148

109 -#: remote.c:1576

149 +#: remote.c:1607

150 #, c-format

151 msgid "Your branch is ahead of '%s' by %d commit.\n"

152 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"

153 msgstr[0] ""

154 msgstr[1] ""

155

116 -#: remote.c:1582

156 +#: remote.c:1613

157 #, c-format

158 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"

159 msgid_plural ""

@@ -121,7 +161,7 @@ msgid_plural ""

161 msgstr[0] ""

162 msgstr[1] ""

163

124 -#: remote.c:1590

164 +#: remote.c:1621

165 #, c-format

166 msgid ""

167 "Your branch and '%s' have diverged,\n"

@@ -850,7 +890,7 @@ msgstr ""

890 msgid "Failed to resolve HEAD as a valid ref."

891 msgstr ""

892

853 -#: builtin/branch.c:747 builtin/clone.c:570

893 +#: builtin/branch.c:747 builtin/clone.c:558

894 msgid "HEAD not found below refs/heads!"

895 msgstr ""

896

@@ -915,7 +955,7 @@ msgstr ""

955 msgid "path '%s' is unmerged"

956 msgstr ""

957

918 -#: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:595

958 +#: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583

959 #: builtin/merge.c:809

960 msgid "unable to write new index file"

961 msgstr ""

@@ -1017,72 +1057,72 @@ msgstr ""

1057 msgid "reference is not a tree: %s"

1058 msgstr ""

1059

1020 -#: builtin/checkout.c:961

1060 +#: builtin/checkout.c:972

1061 msgid "-B cannot be used with -b"

1062 msgstr ""

1063

1024 -#: builtin/checkout.c:970

1064 +#: builtin/checkout.c:981

1065 msgid "--patch is incompatible with all other options"

1066 msgstr ""

1067

1028 -#: builtin/checkout.c:973

1068 +#: builtin/checkout.c:984

1069 msgid "--detach cannot be used with -b/-B/--orphan"

1070 msgstr ""

1071

1032 -#: builtin/checkout.c:975

1072 +#: builtin/checkout.c:986

1073 msgid "--detach cannot be used with -t"

1074 msgstr ""

1075

1036 -#: builtin/checkout.c:981

1076 +#: builtin/checkout.c:992

1077 msgid "--track needs a branch name"

1078 msgstr ""

1079

1040 -#: builtin/checkout.c:988

1080 +#: builtin/checkout.c:999

1081 msgid "Missing branch name; try -b"

1082 msgstr ""

1083

1044 -#: builtin/checkout.c:994

1084 +#: builtin/checkout.c:1005

1085 msgid "--orphan and -b|-B are mutually exclusive"

1086 msgstr ""

1087

1048 -#: builtin/checkout.c:996

1088 +#: builtin/checkout.c:1007

1089 msgid "--orphan cannot be used with -t"

1090 msgstr ""

1091

1052 -#: builtin/checkout.c:1006

1092 +#: builtin/checkout.c:1017

1093 msgid "git checkout: -f and -m are incompatible"

1094 msgstr ""

1095

1056 -#: builtin/checkout.c:1040

1096 +#: builtin/checkout.c:1051

1097 msgid "invalid path specification"

1098 msgstr ""

1099

1060 -#: builtin/checkout.c:1048

1100 +#: builtin/checkout.c:1059

1101 #, c-format

1102 msgid ""

1103 "git checkout: updating paths is incompatible with switching branches.\n"

1104 "Did you intend to checkout '%s' which can not be resolved as commit?"

1105 msgstr ""

1106

1067 -#: builtin/checkout.c:1050

1107 +#: builtin/checkout.c:1061

1108 msgid "git checkout: updating paths is incompatible with switching branches."

1109 msgstr ""

1110

1071 -#: builtin/checkout.c:1055

1111 +#: builtin/checkout.c:1066

1112 msgid "git checkout: --detach does not take a path argument"

1113 msgstr ""

1114

1075 -#: builtin/checkout.c:1058

1115 +#: builtin/checkout.c:1069

1116 msgid ""

1117 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"

1118 "checking out of the index."

1119 msgstr ""

1120

1081 -#: builtin/checkout.c:1077

1121 +#: builtin/checkout.c:1088

1122 msgid "Cannot switch branch to a non-commit."

1123 msgstr ""

1124

1085 -#: builtin/checkout.c:1080

1125 +#: builtin/checkout.c:1091

1126 msgid "--ours/--theirs is incompatible with switching branches."

1127 msgstr ""

1128

@@ -1126,128 +1166,128 @@ msgstr ""

1166 msgid "Not removing %s\n"

1167 msgstr ""

1168

1129 -#: builtin/clone.c:246

1169 +#: builtin/clone.c:243

1170 #, c-format

1171 msgid "reference repository '%s' is not a local directory."

1172 msgstr ""

1173

1134 -#: builtin/clone.c:313

1174 +#: builtin/clone.c:302

1175 #, c-format

1176 msgid "failed to open '%s'"

1177 msgstr ""

1178

1139 -#: builtin/clone.c:317

1179 +#: builtin/clone.c:306

1180 #, c-format

1181 msgid "failed to create directory '%s'"

1182 msgstr ""

1183

1144 -#: builtin/clone.c:319 builtin/diff.c:75

1184 +#: builtin/clone.c:308 builtin/diff.c:75

1185 #, c-format

1186 msgid "failed to stat '%s'"

1187 msgstr ""

1188

1149 -#: builtin/clone.c:321

1189 +#: builtin/clone.c:310

1190 #, c-format

1191 msgid "%s exists and is not a directory"

1192 msgstr ""

1193

1154 -#: builtin/clone.c:335

1194 +#: builtin/clone.c:324

1195 #, c-format

1196 msgid "failed to stat %s\n"

1197 msgstr ""

1198

1159 -#: builtin/clone.c:352

1199 +#: builtin/clone.c:341

1200 #, c-format

1201 msgid "failed to unlink '%s'"

1202 msgstr ""

1203

1164 -#: builtin/clone.c:357

1204 +#: builtin/clone.c:346

1205 #, c-format

1206 msgid "failed to create link '%s'"

1207 msgstr ""

1208

1169 -#: builtin/clone.c:361

1209 +#: builtin/clone.c:350

1210 #, c-format

1211 msgid "failed to copy file to '%s'"

1212 msgstr ""

1213

1174 -#: builtin/clone.c:384

1214 +#: builtin/clone.c:373

1215 #, c-format

1216 msgid "done.\n"

1217 msgstr ""

1218

1179 -#: builtin/clone.c:451

1219 +#: builtin/clone.c:440

1220 #, c-format

1221 msgid "Could not find remote branch %s to clone."

1222 msgstr ""

1223

1184 -#: builtin/clone.c:561

1224 +#: builtin/clone.c:549

1225 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"

1226 msgstr ""

1227

1188 -#: builtin/clone.c:651

1228 +#: builtin/clone.c:639

1229 msgid "Too many arguments."

1230 msgstr ""

1231

1192 -#: builtin/clone.c:655

1232 +#: builtin/clone.c:643

1233 msgid "You must specify a repository to clone."

1234 msgstr ""

1235

1196 -#: builtin/clone.c:666

1236 +#: builtin/clone.c:654

1237 #, c-format

1238 msgid "--bare and --origin %s options are incompatible."

1239 msgstr ""

1240

1201 -#: builtin/clone.c:680

1241 +#: builtin/clone.c:668

1242 #, c-format

1243 msgid "repository '%s' does not exist"

1244 msgstr ""

1245

1206 -#: builtin/clone.c:685

1246 +#: builtin/clone.c:673

1247 msgid "--depth is ignored in local clones; use file:// instead."

1248 msgstr ""

1249

1210 -#: builtin/clone.c:695

1250 +#: builtin/clone.c:683

1251 #, c-format

1252 msgid "destination path '%s' already exists and is not an empty directory."

1253 msgstr ""

1254

1215 -#: builtin/clone.c:705

1255 +#: builtin/clone.c:693

1256 #, c-format

1257 msgid "working tree '%s' already exists."

1258 msgstr ""

1259

1220 -#: builtin/clone.c:718 builtin/clone.c:732

1260 +#: builtin/clone.c:706 builtin/clone.c:720

1261 #, c-format

1262 msgid "could not create leading directories of '%s'"

1263 msgstr ""

1264

1225 -#: builtin/clone.c:721

1265 +#: builtin/clone.c:709

1266 #, c-format

1267 msgid "could not create work tree dir '%s'."

1268 msgstr ""

1269

1230 -#: builtin/clone.c:740

1270 +#: builtin/clone.c:728

1271 #, c-format

1272 msgid "Cloning into bare repository '%s'...\n"

1273 msgstr ""

1274

1235 -#: builtin/clone.c:742

1275 +#: builtin/clone.c:730

1276 #, c-format

1277 msgid "Cloning into '%s'...\n"

1278 msgstr ""

1279

1240 -#: builtin/clone.c:798

1280 +#: builtin/clone.c:786

1281 #, c-format

1282 msgid "Don't know how to clone %s"

1283 msgstr ""

1284

1245 -#: builtin/clone.c:847

1285 +#: builtin/clone.c:835

1286 #, c-format

1287 msgid "Remote branch %s not found in upstream %s"

1288 msgstr ""

1289

1250 -#: builtin/clone.c:854

1290 +#: builtin/clone.c:842

1291 msgid "You appear to have cloned an empty repository."

1292 msgstr ""

1293

@@ -1423,7 +1463,7 @@ msgstr ""

1463 msgid "Error building trees"

1464 msgstr ""

1465

1426 -#: builtin/commit.c:895 builtin/tag.c:324

1466 +#: builtin/commit.c:895 builtin/tag.c:357

1467 #, c-format

1468 msgid "Please supply the message using either -m or -F option.\n"

1469 msgstr ""

@@ -1483,7 +1523,7 @@ msgstr ""

1523 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."

1524 msgstr ""

1525

1486 -#: builtin/commit.c:1096 builtin/tag.c:500

1526 +#: builtin/commit.c:1096 builtin/tag.c:556

1527 #, c-format

1528 msgid "Invalid cleanup mode %s"

1529 msgstr ""

@@ -1845,77 +1885,62 @@ msgid ""

1885 "There are too many unreachable loose objects; run 'git prune' to remove them."

1886 msgstr ""

1887

1848 -#: builtin/grep.c:275

1888 +#: builtin/grep.c:216

1889 #, c-format

1890 msgid "grep: failed to create thread: %s"

1891 msgstr ""

1892

1853 -#: builtin/grep.c:390

1854 -#, c-format

1855 -msgid "'%s': unable to read %s"

1856 -msgstr ""

1857 -

1858 -#: builtin/grep.c:441

1859 -#, c-format

1860 -msgid "'%s': %s"

1861 -msgstr ""

1862 -

1863 -#: builtin/grep.c:452

1864 -#, c-format

1865 -msgid "'%s': short read %s"

1866 -msgstr ""

1867 -

1868 -#: builtin/grep.c:514

1893 +#: builtin/grep.c:402

1894 #, c-format

1895 msgid "Failed to chdir: %s"

1896 msgstr ""

1897

1873 -#: builtin/grep.c:590 builtin/grep.c:624

1898 +#: builtin/grep.c:478 builtin/grep.c:512

1899 #, c-format

1900 msgid "unable to read tree (%s)"

1901 msgstr ""

1902

1878 -#: builtin/grep.c:638

1903 +#: builtin/grep.c:526

1904 #, c-format

1905 msgid "unable to grep from object of type %s"

1906 msgstr ""

1907

1883 -#: builtin/grep.c:696

1908 +#: builtin/grep.c:584

1909 #, c-format

1910 msgid "switch `%c' expects a numerical value"

1911 msgstr ""

1912

1888 -#: builtin/grep.c:713

1913 +#: builtin/grep.c:601

1914 #, c-format

1915 msgid "cannot open '%s'"

1916 msgstr ""

1917

1893 -#: builtin/grep.c:1001

1918 +#: builtin/grep.c:889

1919 msgid "no pattern given."

1920 msgstr ""

1921

1897 -#: builtin/grep.c:1015

1922 +#: builtin/grep.c:903

1923 #, c-format

1924 msgid "bad object %s"

1925 msgstr ""

1926

1902 -#: builtin/grep.c:1058

1927 +#: builtin/grep.c:944

1928 msgid "--open-files-in-pager only works on the worktree"

1929 msgstr ""

1930

1906 -#: builtin/grep.c:1081

1931 +#: builtin/grep.c:967

1932 msgid "--cached or --untracked cannot be used with --no-index."

1933 msgstr ""

1934

1910 -#: builtin/grep.c:1086

1935 +#: builtin/grep.c:972

1936 msgid "--no-index or --untracked cannot be used with revs."

1937 msgstr ""

1938

1914 -#: builtin/grep.c:1089

1939 +#: builtin/grep.c:975

1940 msgid "--[no-]exclude-standard cannot be used for tracked contents."

1941 msgstr ""

1942

1918 -#: builtin/grep.c:1097

1943 +#: builtin/grep.c:983

1944 msgid "both --cached and trees are given."

1945 msgstr ""

1946

@@ -2370,51 +2395,51 @@ msgstr ""

2395 msgid "%s - not something we can merge"

2396 msgstr ""

2397

2373 -#: builtin/merge.c:1382

2398 +#: builtin/merge.c:1383

2399 #, c-format

2400 msgid "Updating %s..%s\n"

2401 msgstr ""

2402

2378 -#: builtin/merge.c:1420

2403 +#: builtin/merge.c:1421

2404 #, c-format

2405 msgid "Trying really trivial in-index merge...\n"

2406 msgstr ""

2407

2383 -#: builtin/merge.c:1427

2408 +#: builtin/merge.c:1428

2409 #, c-format

2410 msgid "Nope.\n"

2411 msgstr ""

2412

2388 -#: builtin/merge.c:1459

2413 +#: builtin/merge.c:1460

2414 msgid "Not possible to fast-forward, aborting."

2415 msgstr ""

2416

2392 -#: builtin/merge.c:1482 builtin/merge.c:1559

2417 +#: builtin/merge.c:1483 builtin/merge.c:1560

2418 #, c-format

2419 msgid "Rewinding the tree to pristine...\n"

2420 msgstr ""

2421

2397 -#: builtin/merge.c:1486

2422 +#: builtin/merge.c:1487

2423 #, c-format

2424 msgid "Trying merge strategy %s...\n"

2425 msgstr ""

2426

2402 -#: builtin/merge.c:1550

2427 +#: builtin/merge.c:1551

2428 #, c-format

2429 msgid "No merge strategy handled the merge.\n"

2430 msgstr ""

2431

2407 -#: builtin/merge.c:1552

2432 +#: builtin/merge.c:1553

2433 #, c-format

2434 msgid "Merge with strategy %s failed.\n"

2435 msgstr ""

2436

2412 -#: builtin/merge.c:1561

2437 +#: builtin/merge.c:1562

2438 #, c-format

2439 msgid "Using the %s to prepare resolving by hand.\n"

2440 msgstr ""

2441

2417 -#: builtin/merge.c:1572

2442 +#: builtin/merge.c:1573

2443 #, c-format

2444 msgid "Automatic merge went well; stopped before committing as requested\n"

2445 msgstr ""

@@ -2500,7 +2525,7 @@ msgstr ""

2525 msgid "failed to finish 'show' for object '%s'"

2526 msgstr ""

2527

2503 -#: builtin/notes.c:175 builtin/tag.c:310

2528 +#: builtin/notes.c:175 builtin/tag.c:343

2529 #, c-format

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

2531 msgstr ""

@@ -2523,12 +2548,12 @@ msgstr ""

2548 msgid "The note contents has been left in %s"

2549 msgstr ""

2550

2526 -#: builtin/notes.c:251 builtin/tag.c:465

2551 +#: builtin/notes.c:251 builtin/tag.c:521

2552 #, c-format

2553 msgid "cannot read '%s'"

2554 msgstr ""

2555

2531 -#: builtin/notes.c:253 builtin/tag.c:468

2556 +#: builtin/notes.c:253 builtin/tag.c:524

2557 #, c-format

2558 msgid "could not open or read '%s'"

2559 msgstr ""

@@ -2536,7 +2561,7 @@ msgstr ""

2561 #: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447

2562 #: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644

2563 #: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766

2539 -#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:481

2564 +#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:537

2565 #, c-format

2566 msgid "Failed to resolve '%s' as a valid ref."

2567 msgstr ""

@@ -2633,6 +2658,26 @@ msgstr ""

2658 msgid "Unknown subcommand: %s"

2659 msgstr ""

2660

2661 +#: builtin/pack-objects.c:2310

2662 +#, c-format

2663 +msgid "unsupported index version %s"

2664 +msgstr ""

2665 +

2666 +#: builtin/pack-objects.c:2314

2667 +#, c-format

2668 +msgid "bad index version '%s'"

2669 +msgstr ""

2670 +

2671 +#: builtin/pack-objects.c:2322

2672 +#, c-format

2673 +msgid "option %s does not accept negative form"

2674 +msgstr ""

2675 +

2676 +#: builtin/pack-objects.c:2326

2677 +#, c-format

2678 +msgid "unable to parse value '%s' for option %s"

2679 +msgstr ""

2680 +

2681 #: builtin/push.c:44

2682 msgid "tag shorthand without <tag>"

2683 msgstr ""

@@ -2726,11 +2771,11 @@ msgstr ""

2771 msgid "--all and --mirror are incompatible"

2772 msgstr ""

2773

2729 -#: builtin/push.c:272

2774 +#: builtin/push.c:274

2775 msgid "--delete is incompatible with --all, --mirror and --tags"

2776 msgstr ""

2777

2733 -#: builtin/push.c:274

2778 +#: builtin/push.c:276

2779 msgid "--delete doesn't make sense without any refs"

2780 msgstr ""

2781

@@ -2866,27 +2911,32 @@ msgstr ""

2911 msgid "Missing author: %s"

2912 msgstr ""

2913

2869 -#: builtin/tag.c:172

2914 +#: builtin/tag.c:58

2915 +#, c-format

2916 +msgid "malformed object at '%s'"

2917 +msgstr ""

2918 +

2919 +#: builtin/tag.c:205

2920 #, c-format

2921 msgid "tag name too long: %.*s..."

2922 msgstr ""

2923

2874 -#: builtin/tag.c:177

2924 +#: builtin/tag.c:210

2925 #, c-format

2926 msgid "tag '%s' not found."

2927 msgstr ""

2928

2879 -#: builtin/tag.c:192

2929 +#: builtin/tag.c:225

2930 #, c-format

2931 msgid "Deleted tag '%s' (was %s)\n"

2932 msgstr ""

2933

2884 -#: builtin/tag.c:204

2934 +#: builtin/tag.c:237

2935 #, c-format

2936 msgid "could not verify the tag '%s'"

2937 msgstr ""

2938

2889 -#: builtin/tag.c:214

2939 +#: builtin/tag.c:247

2940 msgid ""

2941 "\n"

2942 "#\n"

@@ -2895,7 +2945,7 @@ msgid ""

2945 "#\n"

2946 msgstr ""

2947

2898 -#: builtin/tag.c:221

2948 +#: builtin/tag.c:254

2949 msgid ""

2950 "\n"

2951 "#\n"

@@ -2905,68 +2955,81 @@ msgid ""

2955 "#\n"

2956 msgstr ""

2957

2908 -#: builtin/tag.c:261

2958 +#: builtin/tag.c:294

2959 msgid "unable to sign the tag"

2960 msgstr ""

2961

2912 -#: builtin/tag.c:263

2962 +#: builtin/tag.c:296

2963 msgid "unable to write tag file"

2964 msgstr ""

2965

2916 -#: builtin/tag.c:288

2966 +#: builtin/tag.c:321

2967 msgid "bad object type."

2968 msgstr ""

2969

2920 -#: builtin/tag.c:301

2970 +#: builtin/tag.c:334

2971 msgid "tag header too big."

2972 msgstr ""

2973

2924 -#: builtin/tag.c:333

2974 +#: builtin/tag.c:366

2975 msgid "no tag message?"

2976 msgstr ""

2977

2928 -#: builtin/tag.c:339

2978 +#: builtin/tag.c:372

2979 #, c-format

2980 msgid "The tag message has been left in %s\n"

2981 msgstr ""

2982

2933 -#: builtin/tag.c:448

2983 +#: builtin/tag.c:421

2984 +msgid "switch 'points-at' requires an object"

2985 +msgstr ""

2986 +

2987 +#: builtin/tag.c:423

2988 +#, c-format

2989 +msgid "malformed object name '%s'"

2990 +msgstr ""

2991 +

2992 +#: builtin/tag.c:502

2993 msgid "-n option is only allowed with -l."

2994 msgstr ""

2995

2937 -#: builtin/tag.c:450

2996 +#: builtin/tag.c:504

2997 msgid "--contains option is only allowed with -l."

2998 msgstr ""

2999

2941 -#: builtin/tag.c:458

3000 +#: builtin/tag.c:506

3001 +msgid "--points-at option is only allowed with -l."

3002 +msgstr ""

3003 +

3004 +#: builtin/tag.c:514

3005 msgid "only one -F or -m option is allowed."

3006 msgstr ""

3007

2945 -#: builtin/tag.c:478

3008 +#: builtin/tag.c:534

3009 msgid "too many params"

3010 msgstr ""

3011

2949 -#: builtin/tag.c:484

3012 +#: builtin/tag.c:540

3013 #, c-format

3014 msgid "'%s' is not a valid tag name."

3015 msgstr ""

3016

2954 -#: builtin/tag.c:489

3017 +#: builtin/tag.c:545

3018 #, c-format

3019 msgid "tag '%s' already exists"

3020 msgstr ""

3021

2959 -#: builtin/tag.c:507

3022 +#: builtin/tag.c:563

3023 #, c-format

3024 msgid "%s: cannot lock the ref"

3025 msgstr ""

3026

2964 -#: builtin/tag.c:509

3027 +#: builtin/tag.c:565

3028 #, c-format

3029 msgid "%s: cannot update the ref"

3030 msgstr ""

3031

2969 -#: builtin/tag.c:511

3032 +#: builtin/tag.c:567

3033 #, c-format

3034 msgid "Updated tag '%s' (was %s)\n"

3035 msgstr ""

@@ -3153,15 +3216,15 @@ msgstr ""

3216 msgid "Pull is not possible because you have unmerged files."

3217 msgstr ""

3218

3156 -#: git-pull.sh:193

3219 +#: git-pull.sh:197

3220 msgid "updating an unborn branch with changes added to the index"

3221 msgstr ""

3222

3160 -#: git-pull.sh:249

3223 +#: git-pull.sh:253

3224 msgid "Cannot merge multiple branches into empty head"

3225 msgstr ""

3226

3164 -#: git-pull.sh:253

3227 +#: git-pull.sh:257

3228 msgid "Cannot rebase onto multiple branches"

3229 msgstr ""

3230

l10n: Update git.pot (12 new messages)