From da4c38bf3439e1eca6776a9d33439150383d1115 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 24 Nov 2023 14:38:48 +0100 Subject: [PATCH] Update pot files (#583) Co-authored-by: JupyterLab Language Packs Bot --- .../jupyterlab_git/locale/jupyterlab_git.pot | 1004 +++++++++-------- 1 file changed, 555 insertions(+), 449 deletions(-) diff --git a/extensions/jupyterlab_git/locale/jupyterlab_git.pot b/extensions/jupyterlab_git/locale/jupyterlab_git.pot index f7db9c2822..dcbdcf0ada 100644 --- a/extensions/jupyterlab_git/locale/jupyterlab_git.pot +++ b/extensions/jupyterlab_git/locale/jupyterlab_git.pot @@ -101,6 +101,16 @@ msgctxt "settings" msgid "Show diff on double click" msgstr "" +#: /schema/plugin.json:/properties/hideHiddenFileWarning/description +msgctxt "settings" +msgid "If true, the warning popup when opening the .gitignore file without hidden files will not be displayed." +msgstr "" + +#: /schema/plugin.json:/properties/hideHiddenFileWarning/title +msgctxt "settings" +msgid "Hide hidden file warning" +msgstr "" + #: /schema/plugin.json:/properties/historyCount/description msgctxt "settings" msgid "Number of (most recent) commits shown in the history log" @@ -166,329 +176,449 @@ msgctxt "schema" msgid "Git" msgstr "" -#: src/cloneCommand.ts:35 src/cloneCommand.ts:37 src/commandsAndMenu.tsx:286 src/commandsAndMenu.tsx:288 src/commandsAndMenu.tsx:289 src/commandsAndMenu.tsx:290 src/commandsAndMenu.tsx:293 src/components/GitPanel.tsx:454 src/components/GitPanel.tsx:470 src/components/GitPanel.tsx:475 src/components/GitPanel.tsx:483 src/components/GitPanel.tsx:497 src/components/GitPanel.tsx:505 src/components/GitPanel.tsx:604 src/components/GitPanel.tsx:605 src/components/GitPanel.tsx:688 src/components/GitPanel.tsx:707 src/components/GitPanel.tsx:708 +#: src/cloneCommand.ts:35 src/cloneCommand.ts:37 src/cloneCommand.tsx:48 src/commandsAndMenu.tsx:286 src/commandsAndMenu.tsx:288 src/commandsAndMenu.tsx:289 src/commandsAndMenu.tsx:290 src/commandsAndMenu.tsx:293 src/components/GitPanel.tsx:454 src/components/GitPanel.tsx:470 src/components/GitPanel.tsx:475 src/components/GitPanel.tsx:483 src/components/GitPanel.tsx:497 src/components/GitPanel.tsx:505 src/components/GitPanel.tsx:604 src/components/GitPanel.tsx:605 src/components/GitPanel.tsx:688 src/components/GitPanel.tsx:701 src/components/GitPanel.tsx:707 src/components/GitPanel.tsx:708 msgid "Clone a Repository" msgstr "" -#: src/cloneCommand.ts:36 src/cloneCommand.ts:38 src/commandsAndMenu.tsx:287 src/commandsAndMenu.tsx:289 src/commandsAndMenu.tsx:290 src/commandsAndMenu.tsx:291 src/commandsAndMenu.tsx:294 +#: src/cloneCommand.ts:36 src/cloneCommand.ts:38 src/cloneCommand.tsx:49 src/commandsAndMenu.tsx:287 src/commandsAndMenu.tsx:289 src/commandsAndMenu.tsx:290 src/commandsAndMenu.tsx:291 src/commandsAndMenu.tsx:294 msgid "Clone a repository from a URL" msgstr "" -#: src/cloneCommand.ts:40 src/cloneCommand.ts:42 src/commandsAndMenu.tsx:291 src/commandsAndMenu.tsx:293 src/commandsAndMenu.tsx:294 src/commandsAndMenu.tsx:295 src/commandsAndMenu.tsx:298 +#: src/cloneCommand.ts:40 src/cloneCommand.ts:42 src/cloneCommand.tsx:53 src/commandsAndMenu.tsx:291 src/commandsAndMenu.tsx:293 src/commandsAndMenu.tsx:294 src/commandsAndMenu.tsx:295 src/commandsAndMenu.tsx:298 msgid "Clone a repo" msgstr "" -#: src/cloneCommand.ts:44 src/cloneCommand.ts:46 src/commandsAndMenu.tsx:1001 src/commandsAndMenu.tsx:1002 src/commandsAndMenu.tsx:1044 src/commandsAndMenu.tsx:1045 src/commandsAndMenu.tsx:1070 src/commandsAndMenu.tsx:1086 src/commandsAndMenu.tsx:1108 src/commandsAndMenu.tsx:1112 src/commandsAndMenu.tsx:1113 src/commandsAndMenu.tsx:1129 src/commandsAndMenu.tsx:1141 src/commandsAndMenu.tsx:1151 src/commandsAndMenu.tsx:1155 src/commandsAndMenu.tsx:1184 src/commandsAndMenu.tsx:1370 src/commandsAndMenu.tsx:1375 src/commandsAndMenu.tsx:1413 src/commandsAndMenu.tsx:1418 src/commandsAndMenu.tsx:182 src/commandsAndMenu.tsx:184 src/commandsAndMenu.tsx:185 src/commandsAndMenu.tsx:186 src/commandsAndMenu.tsx:189 src/commandsAndMenu.tsx:191 src/commandsAndMenu.tsx:192 src/commandsAndMenu.tsx:193 src/commandsAndMenu.tsx:194 src/commandsAndMenu.tsx:200 src/commandsAndMenu.tsx:204 src/commandsAndMenu.tsx:210 src/commandsAndMenu.tsx:211 src/commandsAndMenu.tsx:216 src/commandsAndMenu.tsx:295 src/commandsAndMenu.tsx:297 src/commandsAndMenu.tsx:298 src/commandsAndMenu.tsx:299 src/commandsAndMenu.tsx:302 src/commandsAndMenu.tsx:317 src/commandsAndMenu.tsx:323 src/commandsAndMenu.tsx:327 src/commandsAndMenu.tsx:333 src/commandsAndMenu.tsx:334 src/commandsAndMenu.tsx:339 src/commandsAndMenu.tsx:432 src/commandsAndMenu.tsx:433 src/commandsAndMenu.tsx:449 src/commandsAndMenu.tsx:471 src/commandsAndMenu.tsx:475 src/commandsAndMenu.tsx:481 src/commandsAndMenu.tsx:482 src/commandsAndMenu.tsx:487 src/commandsAndMenu.tsx:743 src/commandsAndMenu.tsx:745 src/commandsAndMenu.tsx:751 src/commandsAndMenu.tsx:756 src/commandsAndMenu.tsx:776 src/commandsAndMenu.tsx:777 src/commandsAndMenu.tsx:786 src/commandsAndMenu.tsx:788 src/commandsAndMenu.tsx:794 src/commandsAndMenu.tsx:799 src/commandsAndMenu.tsx:819 src/commandsAndMenu.tsx:820 src/commandsAndMenu.tsx:878 src/commandsAndMenu.tsx:921 src/commandsAndMenu.tsx:942 src/commandsAndMenu.tsx:985 src/components/BranchMenu.tsx:344 src/components/BranchMenu.tsx:367 src/components/BranchMenu.tsx:374 src/components/BranchPicker.tsx:196 src/components/FileList.tsx:182 src/components/FileList.tsx:191 src/components/FileList.tsx:193 src/components/FileList.tsx:196 src/components/FileList.tsx:207 src/components/FileList.tsx:216 src/components/FileList.tsx:218 src/components/FileList.tsx:257 src/components/FileList.tsx:267 src/components/MergeBranchDialog.tsx:173 src/components/NewBranchDialog.tsx:202 src/components/NewBranchDialog.tsx:209 src/components/NewTagDialog.tsx:468 src/components/NewTagDialog.tsx:485 src/widgets/discardAllChanges.ts:25 +#: src/cloneCommand.ts:44 src/cloneCommand.ts:46 src/cloneCommand.tsx:57 src/commandsAndMenu.tsx:1001 src/commandsAndMenu.tsx:1002 src/commandsAndMenu.tsx:1044 src/commandsAndMenu.tsx:1045 src/commandsAndMenu.tsx:1070 src/commandsAndMenu.tsx:1086 src/commandsAndMenu.tsx:1108 src/commandsAndMenu.tsx:1112 src/commandsAndMenu.tsx:1113 src/commandsAndMenu.tsx:1129 src/commandsAndMenu.tsx:1141 src/commandsAndMenu.tsx:1151 src/commandsAndMenu.tsx:1155 src/commandsAndMenu.tsx:1184 src/commandsAndMenu.tsx:1370 src/commandsAndMenu.tsx:1375 src/commandsAndMenu.tsx:1413 src/commandsAndMenu.tsx:1418 src/commandsAndMenu.tsx:1558 src/commandsAndMenu.tsx:1601 src/commandsAndMenu.tsx:182 src/commandsAndMenu.tsx:184 src/commandsAndMenu.tsx:185 src/commandsAndMenu.tsx:186 src/commandsAndMenu.tsx:189 src/commandsAndMenu.tsx:191 src/commandsAndMenu.tsx:192 src/commandsAndMenu.tsx:193 src/commandsAndMenu.tsx:194 src/commandsAndMenu.tsx:200 src/commandsAndMenu.tsx:204 src/commandsAndMenu.tsx:210 src/commandsAndMenu.tsx:211 src/commandsAndMenu.tsx:216 src/commandsAndMenu.tsx:225 src/commandsAndMenu.tsx:295 src/commandsAndMenu.tsx:297 src/commandsAndMenu.tsx:298 src/commandsAndMenu.tsx:299 src/commandsAndMenu.tsx:302 src/commandsAndMenu.tsx:317 src/commandsAndMenu.tsx:323 src/commandsAndMenu.tsx:327 src/commandsAndMenu.tsx:333 src/commandsAndMenu.tsx:334 src/commandsAndMenu.tsx:339 src/commandsAndMenu.tsx:415 src/commandsAndMenu.tsx:432 src/commandsAndMenu.tsx:433 src/commandsAndMenu.tsx:449 src/commandsAndMenu.tsx:467 src/commandsAndMenu.tsx:471 src/commandsAndMenu.tsx:475 src/commandsAndMenu.tsx:481 src/commandsAndMenu.tsx:482 src/commandsAndMenu.tsx:487 src/commandsAndMenu.tsx:624 src/commandsAndMenu.tsx:743 src/commandsAndMenu.tsx:745 src/commandsAndMenu.tsx:751 src/commandsAndMenu.tsx:756 src/commandsAndMenu.tsx:776 src/commandsAndMenu.tsx:777 src/commandsAndMenu.tsx:786 src/commandsAndMenu.tsx:788 src/commandsAndMenu.tsx:794 src/commandsAndMenu.tsx:799 src/commandsAndMenu.tsx:819 src/commandsAndMenu.tsx:820 src/commandsAndMenu.tsx:878 src/commandsAndMenu.tsx:921 src/commandsAndMenu.tsx:942 src/commandsAndMenu.tsx:985 src/components/BranchMenu.tsx:344 src/components/BranchMenu.tsx:367 src/components/BranchMenu.tsx:372 src/components/BranchMenu.tsx:374 src/components/BranchPicker.tsx:196 src/components/BranchPicker.tsx:198 src/components/FileList.tsx:182 src/components/FileList.tsx:191 src/components/FileList.tsx:193 src/components/FileList.tsx:196 src/components/FileList.tsx:207 src/components/FileList.tsx:216 src/components/FileList.tsx:218 src/components/FileList.tsx:257 src/components/FileList.tsx:267 src/components/FileList.tsx:268 src/components/MergeBranchDialog.tsx:173 src/components/NewBranchDialog.tsx:197 src/components/NewBranchDialog.tsx:202 src/components/NewBranchDialog.tsx:209 src/components/NewTagDialog.tsx:468 src/components/NewTagDialog.tsx:479 src/components/NewTagDialog.tsx:485 src/widgets/discardAllChanges.ts:25 msgid "Cancel" msgstr "" -#: src/cloneCommand.ts:45 src/cloneCommand.ts:47 +#: src/cloneCommand.ts:45 src/cloneCommand.ts:47 src/cloneCommand.tsx:58 msgid "Clone" msgstr "" -#: src/cloneCommand.ts:52 src/cloneCommand.ts:54 +#: src/cloneCommand.ts:52 src/cloneCommand.ts:54 src/cloneCommand.tsx:63 msgid "Cloning…" msgstr "" -#: src/cloneCommand.ts:62 src/cloneCommand.ts:66 src/cloneCommand.ts:67 src/cloneCommand.ts:69 src/commandsAndMenu.tsx:313 src/commandsAndMenu.tsx:315 src/commandsAndMenu.tsx:316 src/commandsAndMenu.tsx:317 src/commandsAndMenu.tsx:320 +#: src/cloneCommand.ts:62 src/cloneCommand.ts:66 src/cloneCommand.ts:67 src/cloneCommand.ts:69 src/cloneCommand.tsx:82 src/commandsAndMenu.tsx:313 src/commandsAndMenu.tsx:315 src/commandsAndMenu.tsx:316 src/commandsAndMenu.tsx:317 src/commandsAndMenu.tsx:320 msgid "Successfully cloned" msgstr "" -#: src/cloneCommand.ts:73 src/cloneCommand.ts:77 src/cloneCommand.ts:78 src/cloneCommand.ts:80 src/commandsAndMenu.tsx:324 src/commandsAndMenu.tsx:326 src/commandsAndMenu.tsx:327 src/commandsAndMenu.tsx:328 src/commandsAndMenu.tsx:331 +#: src/cloneCommand.ts:73 src/cloneCommand.ts:77 src/cloneCommand.ts:78 src/cloneCommand.ts:80 src/cloneCommand.tsx:94 src/commandsAndMenu.tsx:324 src/commandsAndMenu.tsx:326 src/commandsAndMenu.tsx:327 src/commandsAndMenu.tsx:328 src/commandsAndMenu.tsx:331 msgid "Failed to clone" msgstr "" -#: src/commandsAndMenu.tsx:1002 src/commandsAndMenu.tsx:1003 src/commandsAndMenu.tsx:1049 src/commandsAndMenu.tsx:1065 src/commandsAndMenu.tsx:1071 src/commandsAndMenu.tsx:1087 src/commandsAndMenu.tsx:1091 src/commandsAndMenu.tsx:1109 src/commandsAndMenu.tsx:1113 src/commandsAndMenu.tsx:1120 src/commandsAndMenu.tsx:1142 src/commandsAndMenu.tsx:1349 src/commandsAndMenu.tsx:1354 src/commandsAndMenu.tsx:1371 src/commandsAndMenu.tsx:1376 src/commandsAndMenu.tsx:722 src/commandsAndMenu.tsx:724 src/commandsAndMenu.tsx:730 src/commandsAndMenu.tsx:735 src/commandsAndMenu.tsx:744 src/commandsAndMenu.tsx:746 src/commandsAndMenu.tsx:752 src/commandsAndMenu.tsx:755 src/commandsAndMenu.tsx:756 src/commandsAndMenu.tsx:757 src/commandsAndMenu.tsx:777 src/commandsAndMenu.tsx:778 src/commandsAndMenu.tsx:857 src/commandsAndMenu.tsx:879 src/commandsAndMenu.tsx:921 src/commandsAndMenu.tsx:943 src/commandsAndMenu.tsx:980 src/commandsAndMenu.tsx:981 src/components/BranchMenu.tsx:345 src/components/BranchMenu.tsx:368 src/components/BranchMenu.tsx:375 +#: src/cloneCommand.tsx:122 src/widgets/gitClone.tsx:38 +msgid "Git Clone" +msgstr "" + +#: src/commandsAndMenu.tsx:1002 src/commandsAndMenu.tsx:1003 src/commandsAndMenu.tsx:1049 src/commandsAndMenu.tsx:1065 src/commandsAndMenu.tsx:1071 src/commandsAndMenu.tsx:1087 src/commandsAndMenu.tsx:1091 src/commandsAndMenu.tsx:1109 src/commandsAndMenu.tsx:1113 src/commandsAndMenu.tsx:1120 src/commandsAndMenu.tsx:1142 src/commandsAndMenu.tsx:1349 src/commandsAndMenu.tsx:1354 src/commandsAndMenu.tsx:1371 src/commandsAndMenu.tsx:1376 src/commandsAndMenu.tsx:1537 src/commandsAndMenu.tsx:1559 src/commandsAndMenu.tsx:722 src/commandsAndMenu.tsx:724 src/commandsAndMenu.tsx:730 src/commandsAndMenu.tsx:735 src/commandsAndMenu.tsx:744 src/commandsAndMenu.tsx:746 src/commandsAndMenu.tsx:752 src/commandsAndMenu.tsx:755 src/commandsAndMenu.tsx:756 src/commandsAndMenu.tsx:757 src/commandsAndMenu.tsx:777 src/commandsAndMenu.tsx:778 src/commandsAndMenu.tsx:857 src/commandsAndMenu.tsx:879 src/commandsAndMenu.tsx:921 src/commandsAndMenu.tsx:943 src/commandsAndMenu.tsx:980 src/commandsAndMenu.tsx:981 src/components/BranchMenu.tsx:345 src/components/BranchMenu.tsx:368 src/components/BranchMenu.tsx:373 src/components/BranchMenu.tsx:375 msgid "Delete" msgstr "" -#: src/commandsAndMenu.tsx:1004 src/commandsAndMenu.tsx:1007 src/commandsAndMenu.tsx:1068 src/commandsAndMenu.tsx:1071 src/commandsAndMenu.tsx:1128 src/commandsAndMenu.tsx:1129 src/commandsAndMenu.tsx:1131 src/commandsAndMenu.tsx:1132 src/commandsAndMenu.tsx:1197 src/commandsAndMenu.tsx:1200 src/commandsAndMenu.tsx:1213 src/commandsAndMenu.tsx:1216 src/commandsAndMenu.tsx:1235 src/commandsAndMenu.tsx:1238 src/commandsAndMenu.tsx:1239 src/commandsAndMenu.tsx:1242 src/commandsAndMenu.tsx:1268 src/commandsAndMenu.tsx:1271 src/commandsAndMenu.tsx:1497 src/commandsAndMenu.tsx:1500 src/commandsAndMenu.tsx:1502 src/commandsAndMenu.tsx:1505 src/commandsAndMenu.tsx:869 src/commandsAndMenu.tsx:871 src/commandsAndMenu.tsx:872 src/commandsAndMenu.tsx:874 src/commandsAndMenu.tsx:877 src/commandsAndMenu.tsx:880 src/commandsAndMenu.tsx:882 src/commandsAndMenu.tsx:885 src/commandsAndMenu.tsx:902 src/commandsAndMenu.tsx:903 src/commandsAndMenu.tsx:905 src/commandsAndMenu.tsx:906 +#: src/commandsAndMenu.tsx:1004 src/commandsAndMenu.tsx:1007 src/commandsAndMenu.tsx:1068 src/commandsAndMenu.tsx:1071 src/commandsAndMenu.tsx:1128 src/commandsAndMenu.tsx:1129 src/commandsAndMenu.tsx:1131 src/commandsAndMenu.tsx:1132 src/commandsAndMenu.tsx:1197 src/commandsAndMenu.tsx:1200 src/commandsAndMenu.tsx:1213 src/commandsAndMenu.tsx:1216 src/commandsAndMenu.tsx:1235 src/commandsAndMenu.tsx:1238 src/commandsAndMenu.tsx:1239 src/commandsAndMenu.tsx:1242 src/commandsAndMenu.tsx:1268 src/commandsAndMenu.tsx:1271 src/commandsAndMenu.tsx:1497 src/commandsAndMenu.tsx:1500 src/commandsAndMenu.tsx:1502 src/commandsAndMenu.tsx:1505 src/commandsAndMenu.tsx:1694 src/commandsAndMenu.tsx:1697 src/commandsAndMenu.tsx:869 src/commandsAndMenu.tsx:871 src/commandsAndMenu.tsx:872 src/commandsAndMenu.tsx:874 src/commandsAndMenu.tsx:877 src/commandsAndMenu.tsx:880 src/commandsAndMenu.tsx:882 src/commandsAndMenu.tsx:885 src/commandsAndMenu.tsx:902 src/commandsAndMenu.tsx:903 src/commandsAndMenu.tsx:905 src/commandsAndMenu.tsx:906 msgid "Ignore" msgstr "" -#: src/commandsAndMenu.tsx:1004 src/commandsAndMenu.tsx:999 +#: src/commandsAndMenu.tsx:1004 src/commandsAndMenu.tsx:1181 src/commandsAndMenu.tsx:999 msgid "Failed to get the stash" msgstr "" -#: src/commandsAndMenu.tsx:1007 src/commandsAndMenu.tsx:1066 src/commandsAndMenu.tsx:1067 src/commandsAndMenu.tsx:1135 src/commandsAndMenu.tsx:1151 src/commandsAndMenu.tsx:1173 src/commandsAndMenu.tsx:1177 src/commandsAndMenu.tsx:1206 src/commandsAndMenu.tsx:1435 src/commandsAndMenu.tsx:1440 src/commandsAndMenu.tsx:808 src/commandsAndMenu.tsx:810 src/commandsAndMenu.tsx:816 src/commandsAndMenu.tsx:821 src/commandsAndMenu.tsx:841 src/commandsAndMenu.tsx:842 src/commandsAndMenu.tsx:943 +#: src/commandsAndMenu.tsx:1004 src/commandsAndMenu.tsx:834 src/commandsAndMenu.tsx:839 +msgid "Failed to rebase branch '%1' onto '%2'." +msgstr "" + +#: src/commandsAndMenu.tsx:1007 src/commandsAndMenu.tsx:1066 src/commandsAndMenu.tsx:1067 src/commandsAndMenu.tsx:1135 src/commandsAndMenu.tsx:1151 src/commandsAndMenu.tsx:1173 src/commandsAndMenu.tsx:1177 src/commandsAndMenu.tsx:1206 src/commandsAndMenu.tsx:1435 src/commandsAndMenu.tsx:1440 src/commandsAndMenu.tsx:1623 src/commandsAndMenu.tsx:808 src/commandsAndMenu.tsx:810 src/commandsAndMenu.tsx:816 src/commandsAndMenu.tsx:821 src/commandsAndMenu.tsx:841 src/commandsAndMenu.tsx:842 src/commandsAndMenu.tsx:943 msgid "Discard changes for %1 failed." msgstr "" -#: src/commandsAndMenu.tsx:1008 src/commandsAndMenu.tsx:1024 src/commandsAndMenu.tsx:1046 src/commandsAndMenu.tsx:1050 src/commandsAndMenu.tsx:1079 src/commandsAndMenu.tsx:1308 src/commandsAndMenu.tsx:1313 src/commandsAndMenu.tsx:681 src/commandsAndMenu.tsx:683 src/commandsAndMenu.tsx:689 src/commandsAndMenu.tsx:694 src/commandsAndMenu.tsx:714 src/commandsAndMenu.tsx:715 src/commandsAndMenu.tsx:816 src/commandsAndMenu.tsx:880 src/commandsAndMenu.tsx:939 src/commandsAndMenu.tsx:940 +#: src/commandsAndMenu.tsx:1008 src/commandsAndMenu.tsx:1024 src/commandsAndMenu.tsx:1046 src/commandsAndMenu.tsx:1050 src/commandsAndMenu.tsx:1079 src/commandsAndMenu.tsx:1308 src/commandsAndMenu.tsx:1313 src/commandsAndMenu.tsx:1496 src/commandsAndMenu.tsx:681 src/commandsAndMenu.tsx:683 src/commandsAndMenu.tsx:689 src/commandsAndMenu.tsx:694 src/commandsAndMenu.tsx:714 src/commandsAndMenu.tsx:715 src/commandsAndMenu.tsx:816 src/commandsAndMenu.tsx:880 src/commandsAndMenu.tsx:939 src/commandsAndMenu.tsx:940 msgid "Track" msgstr "" -#: src/commandsAndMenu.tsx:1009 src/commandsAndMenu.tsx:1013 src/commandsAndMenu.tsx:1014 src/commandsAndMenu.tsx:1068 src/commandsAndMenu.tsx:1069 src/commandsAndMenu.tsx:1082 src/commandsAndMenu.tsx:1098 src/commandsAndMenu.tsx:1120 src/commandsAndMenu.tsx:1124 src/commandsAndMenu.tsx:1137 src/commandsAndMenu.tsx:1153 src/commandsAndMenu.tsx:1175 src/commandsAndMenu.tsx:1179 src/commandsAndMenu.tsx:1208 src/commandsAndMenu.tsx:1382 src/commandsAndMenu.tsx:1387 src/commandsAndMenu.tsx:1437 src/commandsAndMenu.tsx:1442 src/commandsAndMenu.tsx:954 src/components/Alert.tsx:106 src/components/Alert.tsx:123 src/components/BranchMenu.tsx:69 src/components/BranchMenu.tsx:70 src/components/TagMenu.tsx:63 src/components/TagMenu.tsx:65 src/index.ts:135 src/index.ts:136 src/index.ts:141 +#: src/commandsAndMenu.tsx:1009 src/commandsAndMenu.tsx:1013 src/commandsAndMenu.tsx:1014 src/commandsAndMenu.tsx:1068 src/commandsAndMenu.tsx:1069 src/commandsAndMenu.tsx:1082 src/commandsAndMenu.tsx:1098 src/commandsAndMenu.tsx:1120 src/commandsAndMenu.tsx:1124 src/commandsAndMenu.tsx:1137 src/commandsAndMenu.tsx:1153 src/commandsAndMenu.tsx:1175 src/commandsAndMenu.tsx:1179 src/commandsAndMenu.tsx:1208 src/commandsAndMenu.tsx:1382 src/commandsAndMenu.tsx:1387 src/commandsAndMenu.tsx:1437 src/commandsAndMenu.tsx:1442 src/commandsAndMenu.tsx:1570 src/commandsAndMenu.tsx:1625 src/commandsAndMenu.tsx:954 src/components/Alert.tsx:106 src/components/Alert.tsx:123 src/components/BranchMenu.tsx:68 src/components/BranchMenu.tsx:69 src/components/BranchMenu.tsx:70 src/components/TagMenu.tsx:63 src/components/TagMenu.tsx:64 src/components/TagMenu.tsx:65 src/index.ts:135 src/index.ts:136 src/index.ts:141 src/index.ts:142 src/notifications.ts:22 src/notifications.ts:53 msgid "Dismiss" msgstr "" -#: src/commandsAndMenu.tsx:1009 src/commandsAndMenu.tsx:1014 src/commandsAndMenu.tsx:511 src/commandsAndMenu.tsx:513 src/commandsAndMenu.tsx:518 src/commandsAndMenu.tsx:522 src/commandsAndMenu.tsx:523 src/commandsAndMenu.tsx:579 src/commandsAndMenu.tsx:643 src/commandsAndMenu.tsx:702 src/commandsAndMenu.tsx:703 src/commandsAndMenu.tsx:722 src/commandsAndMenu.tsx:738 src/commandsAndMenu.tsx:760 src/commandsAndMenu.tsx:764 src/commandsAndMenu.tsx:785 +#: src/commandsAndMenu.tsx:1009 src/commandsAndMenu.tsx:1014 src/commandsAndMenu.tsx:1190 src/commandsAndMenu.tsx:511 src/commandsAndMenu.tsx:513 src/commandsAndMenu.tsx:518 src/commandsAndMenu.tsx:522 src/commandsAndMenu.tsx:523 src/commandsAndMenu.tsx:579 src/commandsAndMenu.tsx:643 src/commandsAndMenu.tsx:702 src/commandsAndMenu.tsx:703 src/commandsAndMenu.tsx:722 src/commandsAndMenu.tsx:738 src/commandsAndMenu.tsx:760 src/commandsAndMenu.tsx:764 src/commandsAndMenu.tsx:785 msgid "Open" msgstr "" -#: src/commandsAndMenu.tsx:1009 src/commandsAndMenu.tsx:1031 src/commandsAndMenu.tsx:1035 src/commandsAndMenu.tsx:1064 src/commandsAndMenu.tsx:1293 src/commandsAndMenu.tsx:1298 src/commandsAndMenu.tsx:666 src/commandsAndMenu.tsx:668 src/commandsAndMenu.tsx:674 src/commandsAndMenu.tsx:679 src/commandsAndMenu.tsx:699 src/commandsAndMenu.tsx:700 src/commandsAndMenu.tsx:801 src/commandsAndMenu.tsx:865 src/commandsAndMenu.tsx:924 src/commandsAndMenu.tsx:925 src/commandsAndMenu.tsx:993 +#: src/commandsAndMenu.tsx:1009 src/commandsAndMenu.tsx:1031 src/commandsAndMenu.tsx:1035 src/commandsAndMenu.tsx:1064 src/commandsAndMenu.tsx:1293 src/commandsAndMenu.tsx:1298 src/commandsAndMenu.tsx:1481 src/commandsAndMenu.tsx:666 src/commandsAndMenu.tsx:668 src/commandsAndMenu.tsx:674 src/commandsAndMenu.tsx:679 src/commandsAndMenu.tsx:699 src/commandsAndMenu.tsx:700 src/commandsAndMenu.tsx:801 src/commandsAndMenu.tsx:865 src/commandsAndMenu.tsx:924 src/commandsAndMenu.tsx:925 src/commandsAndMenu.tsx:993 msgid "Stage" msgstr "" -#: src/commandsAndMenu.tsx:1010 src/commandsAndMenu.tsx:1026 src/commandsAndMenu.tsx:1048 src/commandsAndMenu.tsx:1052 src/commandsAndMenu.tsx:1081 src/commandsAndMenu.tsx:1310 src/commandsAndMenu.tsx:1315 src/commandsAndMenu.tsx:683 src/commandsAndMenu.tsx:685 src/commandsAndMenu.tsx:691 src/commandsAndMenu.tsx:696 src/commandsAndMenu.tsx:716 src/commandsAndMenu.tsx:717 src/commandsAndMenu.tsx:818 src/commandsAndMenu.tsx:882 src/commandsAndMenu.tsx:941 src/commandsAndMenu.tsx:942 +#: src/commandsAndMenu.tsx:1010 src/commandsAndMenu.tsx:1026 src/commandsAndMenu.tsx:1048 src/commandsAndMenu.tsx:1052 src/commandsAndMenu.tsx:1081 src/commandsAndMenu.tsx:1310 src/commandsAndMenu.tsx:1315 src/commandsAndMenu.tsx:1498 src/commandsAndMenu.tsx:683 src/commandsAndMenu.tsx:685 src/commandsAndMenu.tsx:691 src/commandsAndMenu.tsx:696 src/commandsAndMenu.tsx:716 src/commandsAndMenu.tsx:717 src/commandsAndMenu.tsx:818 src/commandsAndMenu.tsx:882 src/commandsAndMenu.tsx:941 src/commandsAndMenu.tsx:942 msgid "Start tracking selected file" msgstr "" -#: src/commandsAndMenu.tsx:1011 src/commandsAndMenu.tsx:1016 src/commandsAndMenu.tsx:513 src/commandsAndMenu.tsx:515 src/commandsAndMenu.tsx:520 src/commandsAndMenu.tsx:524 src/commandsAndMenu.tsx:525 src/commandsAndMenu.tsx:581 src/commandsAndMenu.tsx:645 src/commandsAndMenu.tsx:704 src/commandsAndMenu.tsx:705 src/commandsAndMenu.tsx:724 src/commandsAndMenu.tsx:740 src/commandsAndMenu.tsx:762 src/commandsAndMenu.tsx:766 src/commandsAndMenu.tsx:787 +#: src/commandsAndMenu.tsx:1011 src/commandsAndMenu.tsx:1016 src/commandsAndMenu.tsx:1192 src/commandsAndMenu.tsx:513 src/commandsAndMenu.tsx:515 src/commandsAndMenu.tsx:520 src/commandsAndMenu.tsx:524 src/commandsAndMenu.tsx:525 src/commandsAndMenu.tsx:581 src/commandsAndMenu.tsx:645 src/commandsAndMenu.tsx:704 src/commandsAndMenu.tsx:705 src/commandsAndMenu.tsx:724 src/commandsAndMenu.tsx:740 src/commandsAndMenu.tsx:762 src/commandsAndMenu.tsx:766 src/commandsAndMenu.tsx:787 msgid "Open selected file" msgstr "" -#: src/commandsAndMenu.tsx:1011 src/commandsAndMenu.tsx:1027 src/commandsAndMenu.tsx:1049 src/commandsAndMenu.tsx:1053 src/commandsAndMenu.tsx:1082 src/commandsAndMenu.tsx:1311 src/commandsAndMenu.tsx:1316 src/commandsAndMenu.tsx:684 src/commandsAndMenu.tsx:686 src/commandsAndMenu.tsx:692 src/commandsAndMenu.tsx:697 src/commandsAndMenu.tsx:717 src/commandsAndMenu.tsx:718 src/commandsAndMenu.tsx:819 src/commandsAndMenu.tsx:883 src/commandsAndMenu.tsx:942 src/commandsAndMenu.tsx:943 +#: src/commandsAndMenu.tsx:1011 src/commandsAndMenu.tsx:1027 src/commandsAndMenu.tsx:1049 src/commandsAndMenu.tsx:1053 src/commandsAndMenu.tsx:1082 src/commandsAndMenu.tsx:1311 src/commandsAndMenu.tsx:1316 src/commandsAndMenu.tsx:1499 src/commandsAndMenu.tsx:684 src/commandsAndMenu.tsx:686 src/commandsAndMenu.tsx:692 src/commandsAndMenu.tsx:697 src/commandsAndMenu.tsx:717 src/commandsAndMenu.tsx:718 src/commandsAndMenu.tsx:819 src/commandsAndMenu.tsx:883 src/commandsAndMenu.tsx:942 src/commandsAndMenu.tsx:943 msgid "Start tracking selected files" msgstr "" -#: src/commandsAndMenu.tsx:1011 src/commandsAndMenu.tsx:1033 src/commandsAndMenu.tsx:1037 src/commandsAndMenu.tsx:1066 src/commandsAndMenu.tsx:1295 src/commandsAndMenu.tsx:1300 src/commandsAndMenu.tsx:668 src/commandsAndMenu.tsx:670 src/commandsAndMenu.tsx:676 src/commandsAndMenu.tsx:681 src/commandsAndMenu.tsx:701 src/commandsAndMenu.tsx:702 src/commandsAndMenu.tsx:803 src/commandsAndMenu.tsx:867 src/commandsAndMenu.tsx:926 src/commandsAndMenu.tsx:927 src/commandsAndMenu.tsx:995 +#: src/commandsAndMenu.tsx:1011 src/commandsAndMenu.tsx:1033 src/commandsAndMenu.tsx:1037 src/commandsAndMenu.tsx:1066 src/commandsAndMenu.tsx:1295 src/commandsAndMenu.tsx:1300 src/commandsAndMenu.tsx:1483 src/commandsAndMenu.tsx:668 src/commandsAndMenu.tsx:670 src/commandsAndMenu.tsx:676 src/commandsAndMenu.tsx:681 src/commandsAndMenu.tsx:701 src/commandsAndMenu.tsx:702 src/commandsAndMenu.tsx:803 src/commandsAndMenu.tsx:867 src/commandsAndMenu.tsx:926 src/commandsAndMenu.tsx:927 src/commandsAndMenu.tsx:995 msgid "Stage the changes of selected file" msgstr "" -#: src/commandsAndMenu.tsx:1012 src/commandsAndMenu.tsx:1013 src/commandsAndMenu.tsx:1081 src/commandsAndMenu.tsx:1097 src/commandsAndMenu.tsx:1119 src/commandsAndMenu.tsx:1123 src/commandsAndMenu.tsx:1152 src/commandsAndMenu.tsx:1381 src/commandsAndMenu.tsx:1386 src/commandsAndMenu.tsx:754 src/commandsAndMenu.tsx:756 src/commandsAndMenu.tsx:762 src/commandsAndMenu.tsx:767 src/commandsAndMenu.tsx:787 src/commandsAndMenu.tsx:788 src/commandsAndMenu.tsx:889 src/commandsAndMenu.tsx:953 +#: src/commandsAndMenu.tsx:1012 src/commandsAndMenu.tsx:1013 src/commandsAndMenu.tsx:1081 src/commandsAndMenu.tsx:1097 src/commandsAndMenu.tsx:1119 src/commandsAndMenu.tsx:1123 src/commandsAndMenu.tsx:1152 src/commandsAndMenu.tsx:1381 src/commandsAndMenu.tsx:1386 src/commandsAndMenu.tsx:1569 src/commandsAndMenu.tsx:754 src/commandsAndMenu.tsx:756 src/commandsAndMenu.tsx:762 src/commandsAndMenu.tsx:767 src/commandsAndMenu.tsx:787 src/commandsAndMenu.tsx:788 src/commandsAndMenu.tsx:889 src/commandsAndMenu.tsx:953 msgid "Deleting %1 failed." msgstr "" -#: src/commandsAndMenu.tsx:1012 src/commandsAndMenu.tsx:1017 src/commandsAndMenu.tsx:514 src/commandsAndMenu.tsx:516 src/commandsAndMenu.tsx:521 src/commandsAndMenu.tsx:525 src/commandsAndMenu.tsx:526 src/commandsAndMenu.tsx:582 src/commandsAndMenu.tsx:646 src/commandsAndMenu.tsx:705 src/commandsAndMenu.tsx:706 src/commandsAndMenu.tsx:725 src/commandsAndMenu.tsx:741 src/commandsAndMenu.tsx:763 src/commandsAndMenu.tsx:767 src/commandsAndMenu.tsx:788 +#: src/commandsAndMenu.tsx:1012 src/commandsAndMenu.tsx:1017 src/commandsAndMenu.tsx:1193 src/commandsAndMenu.tsx:514 src/commandsAndMenu.tsx:516 src/commandsAndMenu.tsx:521 src/commandsAndMenu.tsx:525 src/commandsAndMenu.tsx:526 src/commandsAndMenu.tsx:582 src/commandsAndMenu.tsx:646 src/commandsAndMenu.tsx:705 src/commandsAndMenu.tsx:706 src/commandsAndMenu.tsx:725 src/commandsAndMenu.tsx:741 src/commandsAndMenu.tsx:763 src/commandsAndMenu.tsx:767 src/commandsAndMenu.tsx:788 msgid "Open selected files" msgstr "" -#: src/commandsAndMenu.tsx:1012 src/commandsAndMenu.tsx:1034 src/commandsAndMenu.tsx:1038 src/commandsAndMenu.tsx:1067 src/commandsAndMenu.tsx:1296 src/commandsAndMenu.tsx:1301 src/commandsAndMenu.tsx:669 src/commandsAndMenu.tsx:671 src/commandsAndMenu.tsx:677 src/commandsAndMenu.tsx:682 src/commandsAndMenu.tsx:702 src/commandsAndMenu.tsx:703 src/commandsAndMenu.tsx:804 src/commandsAndMenu.tsx:868 src/commandsAndMenu.tsx:927 src/commandsAndMenu.tsx:928 src/commandsAndMenu.tsx:996 +#: src/commandsAndMenu.tsx:1012 src/commandsAndMenu.tsx:1034 src/commandsAndMenu.tsx:1038 src/commandsAndMenu.tsx:1067 src/commandsAndMenu.tsx:1296 src/commandsAndMenu.tsx:1301 src/commandsAndMenu.tsx:1484 src/commandsAndMenu.tsx:669 src/commandsAndMenu.tsx:671 src/commandsAndMenu.tsx:677 src/commandsAndMenu.tsx:682 src/commandsAndMenu.tsx:702 src/commandsAndMenu.tsx:703 src/commandsAndMenu.tsx:804 src/commandsAndMenu.tsx:868 src/commandsAndMenu.tsx:927 src/commandsAndMenu.tsx:928 src/commandsAndMenu.tsx:996 msgid "Stage the changes of selected files" msgstr "" -#: src/commandsAndMenu.tsx:1016 src/commandsAndMenu.tsx:1020 src/commandsAndMenu.tsx:1049 src/commandsAndMenu.tsx:1278 src/commandsAndMenu.tsx:1283 src/commandsAndMenu.tsx:651 src/commandsAndMenu.tsx:653 src/commandsAndMenu.tsx:659 src/commandsAndMenu.tsx:664 src/commandsAndMenu.tsx:684 src/commandsAndMenu.tsx:685 src/commandsAndMenu.tsx:786 src/commandsAndMenu.tsx:850 src/commandsAndMenu.tsx:909 src/commandsAndMenu.tsx:910 src/commandsAndMenu.tsx:978 src/commandsAndMenu.tsx:994 src/components/ManageRemoteDialogue.tsx:159 +#: src/commandsAndMenu.tsx:1016 src/commandsAndMenu.tsx:1020 src/commandsAndMenu.tsx:1049 src/commandsAndMenu.tsx:1278 src/commandsAndMenu.tsx:1283 src/commandsAndMenu.tsx:1466 src/commandsAndMenu.tsx:651 src/commandsAndMenu.tsx:653 src/commandsAndMenu.tsx:659 src/commandsAndMenu.tsx:664 src/commandsAndMenu.tsx:684 src/commandsAndMenu.tsx:685 src/commandsAndMenu.tsx:786 src/commandsAndMenu.tsx:850 src/commandsAndMenu.tsx:909 src/commandsAndMenu.tsx:910 src/commandsAndMenu.tsx:978 src/commandsAndMenu.tsx:994 src/components/ManageRemoteDialogue.tsx:159 msgid "Add" msgstr "" -#: src/commandsAndMenu.tsx:1018 src/commandsAndMenu.tsx:1022 src/commandsAndMenu.tsx:1051 src/commandsAndMenu.tsx:1280 src/commandsAndMenu.tsx:1285 src/commandsAndMenu.tsx:653 src/commandsAndMenu.tsx:655 src/commandsAndMenu.tsx:661 src/commandsAndMenu.tsx:666 src/commandsAndMenu.tsx:686 src/commandsAndMenu.tsx:687 src/commandsAndMenu.tsx:788 src/commandsAndMenu.tsx:852 src/commandsAndMenu.tsx:911 src/commandsAndMenu.tsx:912 src/commandsAndMenu.tsx:980 src/commandsAndMenu.tsx:996 +#: src/commandsAndMenu.tsx:1017 src/commandsAndMenu.tsx:846 src/commandsAndMenu.tsx:851 +msgid "Branch '%1' rebase onto '%2'." +msgstr "" + +#: src/commandsAndMenu.tsx:1018 src/commandsAndMenu.tsx:1022 src/commandsAndMenu.tsx:1051 src/commandsAndMenu.tsx:1280 src/commandsAndMenu.tsx:1285 src/commandsAndMenu.tsx:1468 src/commandsAndMenu.tsx:653 src/commandsAndMenu.tsx:655 src/commandsAndMenu.tsx:661 src/commandsAndMenu.tsx:666 src/commandsAndMenu.tsx:686 src/commandsAndMenu.tsx:687 src/commandsAndMenu.tsx:788 src/commandsAndMenu.tsx:852 src/commandsAndMenu.tsx:911 src/commandsAndMenu.tsx:912 src/commandsAndMenu.tsx:980 src/commandsAndMenu.tsx:996 msgid "Stage or track the changes to selected file" msgstr "" -#: src/commandsAndMenu.tsx:1019 src/commandsAndMenu.tsx:1023 src/commandsAndMenu.tsx:1052 src/commandsAndMenu.tsx:1281 src/commandsAndMenu.tsx:1286 src/commandsAndMenu.tsx:654 src/commandsAndMenu.tsx:656 src/commandsAndMenu.tsx:662 src/commandsAndMenu.tsx:667 src/commandsAndMenu.tsx:687 src/commandsAndMenu.tsx:688 src/commandsAndMenu.tsx:789 src/commandsAndMenu.tsx:853 src/commandsAndMenu.tsx:912 src/commandsAndMenu.tsx:913 src/commandsAndMenu.tsx:981 src/commandsAndMenu.tsx:997 +#: src/commandsAndMenu.tsx:1019 src/commandsAndMenu.tsx:1023 src/commandsAndMenu.tsx:1052 src/commandsAndMenu.tsx:1281 src/commandsAndMenu.tsx:1286 src/commandsAndMenu.tsx:1469 src/commandsAndMenu.tsx:654 src/commandsAndMenu.tsx:656 src/commandsAndMenu.tsx:662 src/commandsAndMenu.tsx:667 src/commandsAndMenu.tsx:687 src/commandsAndMenu.tsx:688 src/commandsAndMenu.tsx:789 src/commandsAndMenu.tsx:853 src/commandsAndMenu.tsx:912 src/commandsAndMenu.tsx:913 src/commandsAndMenu.tsx:981 src/commandsAndMenu.tsx:997 msgid "Stage or track the changes of selected files" msgstr "" -#: src/commandsAndMenu.tsx:1020 src/commandsAndMenu.tsx:1024 src/commandsAndMenu.tsx:1079 src/commandsAndMenu.tsx:1080 src/commandsAndMenu.tsx:1083 src/commandsAndMenu.tsx:1084 src/commandsAndMenu.tsx:1148 src/commandsAndMenu.tsx:1152 src/commandsAndMenu.tsx:1164 src/commandsAndMenu.tsx:1168 src/commandsAndMenu.tsx:1186 src/commandsAndMenu.tsx:1190 src/commandsAndMenu.tsx:1194 src/commandsAndMenu.tsx:1219 src/commandsAndMenu.tsx:1223 src/commandsAndMenu.tsx:1448 src/commandsAndMenu.tsx:1452 src/commandsAndMenu.tsx:1453 src/commandsAndMenu.tsx:1457 src/commandsAndMenu.tsx:821 src/commandsAndMenu.tsx:823 src/commandsAndMenu.tsx:825 src/commandsAndMenu.tsx:827 src/commandsAndMenu.tsx:829 src/commandsAndMenu.tsx:833 src/commandsAndMenu.tsx:834 src/commandsAndMenu.tsx:838 src/commandsAndMenu.tsx:854 src/commandsAndMenu.tsx:855 src/commandsAndMenu.tsx:858 src/commandsAndMenu.tsx:859 src/commandsAndMenu.tsx:956 src/commandsAndMenu.tsx:960 +#: src/commandsAndMenu.tsx:1020 src/commandsAndMenu.tsx:1024 src/commandsAndMenu.tsx:1079 src/commandsAndMenu.tsx:1080 src/commandsAndMenu.tsx:1083 src/commandsAndMenu.tsx:1084 src/commandsAndMenu.tsx:1148 src/commandsAndMenu.tsx:1152 src/commandsAndMenu.tsx:1164 src/commandsAndMenu.tsx:1168 src/commandsAndMenu.tsx:1186 src/commandsAndMenu.tsx:1190 src/commandsAndMenu.tsx:1194 src/commandsAndMenu.tsx:1219 src/commandsAndMenu.tsx:1223 src/commandsAndMenu.tsx:1448 src/commandsAndMenu.tsx:1452 src/commandsAndMenu.tsx:1453 src/commandsAndMenu.tsx:1457 src/commandsAndMenu.tsx:1636 src/commandsAndMenu.tsx:1640 src/commandsAndMenu.tsx:821 src/commandsAndMenu.tsx:823 src/commandsAndMenu.tsx:825 src/commandsAndMenu.tsx:827 src/commandsAndMenu.tsx:829 src/commandsAndMenu.tsx:833 src/commandsAndMenu.tsx:834 src/commandsAndMenu.tsx:838 src/commandsAndMenu.tsx:854 src/commandsAndMenu.tsx:855 src/commandsAndMenu.tsx:858 src/commandsAndMenu.tsx:859 src/commandsAndMenu.tsx:956 src/commandsAndMenu.tsx:960 msgid "Ignore this file (add to .gitignore)" msgstr "" -#: src/commandsAndMenu.tsx:1020 src/commandsAndMenu.tsx:1025 src/commandsAndMenu.tsx:522 src/commandsAndMenu.tsx:524 src/commandsAndMenu.tsx:529 src/commandsAndMenu.tsx:533 src/commandsAndMenu.tsx:534 src/commandsAndMenu.tsx:590 src/commandsAndMenu.tsx:654 src/commandsAndMenu.tsx:713 src/commandsAndMenu.tsx:714 src/commandsAndMenu.tsx:733 src/commandsAndMenu.tsx:749 src/commandsAndMenu.tsx:771 src/commandsAndMenu.tsx:775 src/commandsAndMenu.tsx:796 +#: src/commandsAndMenu.tsx:1020 src/commandsAndMenu.tsx:1025 src/commandsAndMenu.tsx:1201 src/commandsAndMenu.tsx:522 src/commandsAndMenu.tsx:524 src/commandsAndMenu.tsx:529 src/commandsAndMenu.tsx:533 src/commandsAndMenu.tsx:534 src/commandsAndMenu.tsx:590 src/commandsAndMenu.tsx:654 src/commandsAndMenu.tsx:713 src/commandsAndMenu.tsx:714 src/commandsAndMenu.tsx:733 src/commandsAndMenu.tsx:749 src/commandsAndMenu.tsx:771 src/commandsAndMenu.tsx:775 src/commandsAndMenu.tsx:796 msgid "Open File Failed" msgstr "" -#: src/commandsAndMenu.tsx:1021 src/commandsAndMenu.tsx:1025 src/commandsAndMenu.tsx:1080 src/commandsAndMenu.tsx:1081 src/commandsAndMenu.tsx:1084 src/commandsAndMenu.tsx:1085 src/commandsAndMenu.tsx:1149 src/commandsAndMenu.tsx:1153 src/commandsAndMenu.tsx:1165 src/commandsAndMenu.tsx:1169 src/commandsAndMenu.tsx:1187 src/commandsAndMenu.tsx:1191 src/commandsAndMenu.tsx:1195 src/commandsAndMenu.tsx:1220 src/commandsAndMenu.tsx:1224 src/commandsAndMenu.tsx:1449 src/commandsAndMenu.tsx:1453 src/commandsAndMenu.tsx:1454 src/commandsAndMenu.tsx:1458 src/commandsAndMenu.tsx:822 src/commandsAndMenu.tsx:824 src/commandsAndMenu.tsx:826 src/commandsAndMenu.tsx:828 src/commandsAndMenu.tsx:830 src/commandsAndMenu.tsx:834 src/commandsAndMenu.tsx:835 src/commandsAndMenu.tsx:839 src/commandsAndMenu.tsx:855 src/commandsAndMenu.tsx:856 src/commandsAndMenu.tsx:859 src/commandsAndMenu.tsx:860 src/commandsAndMenu.tsx:957 src/commandsAndMenu.tsx:961 +#: src/commandsAndMenu.tsx:1021 src/commandsAndMenu.tsx:1025 src/commandsAndMenu.tsx:1080 src/commandsAndMenu.tsx:1081 src/commandsAndMenu.tsx:1084 src/commandsAndMenu.tsx:1085 src/commandsAndMenu.tsx:1149 src/commandsAndMenu.tsx:1153 src/commandsAndMenu.tsx:1165 src/commandsAndMenu.tsx:1169 src/commandsAndMenu.tsx:1187 src/commandsAndMenu.tsx:1191 src/commandsAndMenu.tsx:1195 src/commandsAndMenu.tsx:1220 src/commandsAndMenu.tsx:1224 src/commandsAndMenu.tsx:1449 src/commandsAndMenu.tsx:1453 src/commandsAndMenu.tsx:1454 src/commandsAndMenu.tsx:1458 src/commandsAndMenu.tsx:1637 src/commandsAndMenu.tsx:1641 src/commandsAndMenu.tsx:822 src/commandsAndMenu.tsx:824 src/commandsAndMenu.tsx:826 src/commandsAndMenu.tsx:828 src/commandsAndMenu.tsx:830 src/commandsAndMenu.tsx:834 src/commandsAndMenu.tsx:835 src/commandsAndMenu.tsx:839 src/commandsAndMenu.tsx:855 src/commandsAndMenu.tsx:856 src/commandsAndMenu.tsx:859 src/commandsAndMenu.tsx:860 src/commandsAndMenu.tsx:957 src/commandsAndMenu.tsx:961 msgid "Ignore these files (add to .gitignore)" msgstr "" -#: src/commandsAndMenu.tsx:1021 src/commandsAndMenu.tsx:1026 src/commandsAndMenu.tsx:523 src/commandsAndMenu.tsx:525 src/commandsAndMenu.tsx:530 src/commandsAndMenu.tsx:534 src/commandsAndMenu.tsx:535 src/commandsAndMenu.tsx:591 src/commandsAndMenu.tsx:655 src/commandsAndMenu.tsx:714 src/commandsAndMenu.tsx:715 src/commandsAndMenu.tsx:734 src/commandsAndMenu.tsx:750 src/commandsAndMenu.tsx:772 src/commandsAndMenu.tsx:776 src/commandsAndMenu.tsx:797 +#: src/commandsAndMenu.tsx:1021 src/commandsAndMenu.tsx:1026 src/commandsAndMenu.tsx:1202 src/commandsAndMenu.tsx:523 src/commandsAndMenu.tsx:525 src/commandsAndMenu.tsx:530 src/commandsAndMenu.tsx:534 src/commandsAndMenu.tsx:535 src/commandsAndMenu.tsx:591 src/commandsAndMenu.tsx:655 src/commandsAndMenu.tsx:714 src/commandsAndMenu.tsx:715 src/commandsAndMenu.tsx:734 src/commandsAndMenu.tsx:750 src/commandsAndMenu.tsx:772 src/commandsAndMenu.tsx:776 src/commandsAndMenu.tsx:797 msgid "This file has been deleted!" msgstr "" -#: src/commandsAndMenu.tsx:1023 src/commandsAndMenu.tsx:1024 src/commandsAndMenu.tsx:1045 src/commandsAndMenu.tsx:1046 src/commandsAndMenu.tsx:1092 src/commandsAndMenu.tsx:1108 src/commandsAndMenu.tsx:1114 src/commandsAndMenu.tsx:1130 src/commandsAndMenu.tsx:1134 src/commandsAndMenu.tsx:1152 src/commandsAndMenu.tsx:1156 src/commandsAndMenu.tsx:1163 src/commandsAndMenu.tsx:1185 src/commandsAndMenu.tsx:1392 src/commandsAndMenu.tsx:1397 src/commandsAndMenu.tsx:1414 src/commandsAndMenu.tsx:1419 src/commandsAndMenu.tsx:765 src/commandsAndMenu.tsx:767 src/commandsAndMenu.tsx:773 src/commandsAndMenu.tsx:778 src/commandsAndMenu.tsx:787 src/commandsAndMenu.tsx:789 src/commandsAndMenu.tsx:795 src/commandsAndMenu.tsx:798 src/commandsAndMenu.tsx:799 src/commandsAndMenu.tsx:800 src/commandsAndMenu.tsx:820 src/commandsAndMenu.tsx:821 src/commandsAndMenu.tsx:900 src/commandsAndMenu.tsx:922 src/commandsAndMenu.tsx:964 src/commandsAndMenu.tsx:986 src/components/FileList.tsx:183 src/components/FileList.tsx:192 src/components/FileList.tsx:194 src/components/FileList.tsx:197 src/components/FileList.tsx:208 src/components/FileList.tsx:217 src/components/FileList.tsx:219 src/components/FileList.tsx:258 src/components/FileList.tsx:268 src/widgets/discardAllChanges.ts:26 +#: src/commandsAndMenu.tsx:1023 src/commandsAndMenu.tsx:1024 src/commandsAndMenu.tsx:1045 src/commandsAndMenu.tsx:1046 src/commandsAndMenu.tsx:1092 src/commandsAndMenu.tsx:1108 src/commandsAndMenu.tsx:1114 src/commandsAndMenu.tsx:1130 src/commandsAndMenu.tsx:1134 src/commandsAndMenu.tsx:1152 src/commandsAndMenu.tsx:1156 src/commandsAndMenu.tsx:1163 src/commandsAndMenu.tsx:1185 src/commandsAndMenu.tsx:1392 src/commandsAndMenu.tsx:1397 src/commandsAndMenu.tsx:1414 src/commandsAndMenu.tsx:1419 src/commandsAndMenu.tsx:1580 src/commandsAndMenu.tsx:1602 src/commandsAndMenu.tsx:765 src/commandsAndMenu.tsx:767 src/commandsAndMenu.tsx:773 src/commandsAndMenu.tsx:778 src/commandsAndMenu.tsx:787 src/commandsAndMenu.tsx:789 src/commandsAndMenu.tsx:795 src/commandsAndMenu.tsx:798 src/commandsAndMenu.tsx:799 src/commandsAndMenu.tsx:800 src/commandsAndMenu.tsx:820 src/commandsAndMenu.tsx:821 src/commandsAndMenu.tsx:900 src/commandsAndMenu.tsx:922 src/commandsAndMenu.tsx:964 src/commandsAndMenu.tsx:986 src/components/FileList.tsx:183 src/components/FileList.tsx:192 src/components/FileList.tsx:194 src/components/FileList.tsx:197 src/components/FileList.tsx:208 src/components/FileList.tsx:217 src/components/FileList.tsx:219 src/components/FileList.tsx:258 src/components/FileList.tsx:268 src/components/FileList.tsx:269 src/widgets/discardAllChanges.ts:26 msgid "Discard" msgstr "" -#: src/commandsAndMenu.tsx:1023 src/commandsAndMenu.tsx:1039 src/commandsAndMenu.tsx:1061 src/commandsAndMenu.tsx:1065 src/commandsAndMenu.tsx:1094 src/commandsAndMenu.tsx:1323 src/commandsAndMenu.tsx:1328 src/commandsAndMenu.tsx:696 src/commandsAndMenu.tsx:698 src/commandsAndMenu.tsx:704 src/commandsAndMenu.tsx:709 src/commandsAndMenu.tsx:729 src/commandsAndMenu.tsx:730 src/commandsAndMenu.tsx:831 src/commandsAndMenu.tsx:895 src/commandsAndMenu.tsx:954 src/commandsAndMenu.tsx:955 +#: src/commandsAndMenu.tsx:1023 src/commandsAndMenu.tsx:1039 src/commandsAndMenu.tsx:1061 src/commandsAndMenu.tsx:1065 src/commandsAndMenu.tsx:1094 src/commandsAndMenu.tsx:1323 src/commandsAndMenu.tsx:1328 src/commandsAndMenu.tsx:1511 src/commandsAndMenu.tsx:696 src/commandsAndMenu.tsx:698 src/commandsAndMenu.tsx:704 src/commandsAndMenu.tsx:709 src/commandsAndMenu.tsx:729 src/commandsAndMenu.tsx:730 src/commandsAndMenu.tsx:831 src/commandsAndMenu.tsx:895 src/commandsAndMenu.tsx:954 src/commandsAndMenu.tsx:955 msgid "Unstage" msgstr "" -#: src/commandsAndMenu.tsx:1024 src/commandsAndMenu.tsx:1088 src/commandsAndMenu.tsx:1148 src/commandsAndMenu.tsx:1149 src/commandsAndMenu.tsx:1217 src/commandsAndMenu.tsx:1233 src/commandsAndMenu.tsx:1255 src/commandsAndMenu.tsx:1259 src/commandsAndMenu.tsx:1288 src/commandsAndMenu.tsx:1517 src/commandsAndMenu.tsx:1522 src/commandsAndMenu.tsx:902 src/commandsAndMenu.tsx:922 src/commandsAndMenu.tsx:923 src/components/GitPanel.tsx:344 src/components/GitPanel.tsx:358 src/components/GitPanel.tsx:363 src/components/GitPanel.tsx:370 src/components/GitPanel.tsx:383 src/components/GitPanel.tsx:391 src/components/GitPanel.tsx:414 src/components/GitPanel.tsx:415 src/components/GitPanel.tsx:449 src/components/GitPanel.tsx:468 +#: src/commandsAndMenu.tsx:1024 src/commandsAndMenu.tsx:1088 src/commandsAndMenu.tsx:1148 src/commandsAndMenu.tsx:1149 src/commandsAndMenu.tsx:1217 src/commandsAndMenu.tsx:1233 src/commandsAndMenu.tsx:1255 src/commandsAndMenu.tsx:1259 src/commandsAndMenu.tsx:1288 src/commandsAndMenu.tsx:1517 src/commandsAndMenu.tsx:1522 src/commandsAndMenu.tsx:1714 src/commandsAndMenu.tsx:902 src/commandsAndMenu.tsx:922 src/commandsAndMenu.tsx:923 src/components/GitPanel.tsx:344 src/components/GitPanel.tsx:358 src/components/GitPanel.tsx:363 src/components/GitPanel.tsx:370 src/components/GitPanel.tsx:383 src/components/GitPanel.tsx:391 src/components/GitPanel.tsx:414 src/components/GitPanel.tsx:415 src/components/GitPanel.tsx:449 src/components/GitPanel.tsx:462 src/components/GitPanel.tsx:468 msgid "History" msgstr "" -#: src/commandsAndMenu.tsx:1025 src/commandsAndMenu.tsx:1026 src/commandsAndMenu.tsx:1094 src/commandsAndMenu.tsx:1110 src/commandsAndMenu.tsx:1132 src/commandsAndMenu.tsx:1136 src/commandsAndMenu.tsx:1165 src/commandsAndMenu.tsx:1394 src/commandsAndMenu.tsx:1399 src/commandsAndMenu.tsx:767 src/commandsAndMenu.tsx:769 src/commandsAndMenu.tsx:775 src/commandsAndMenu.tsx:780 src/commandsAndMenu.tsx:800 src/commandsAndMenu.tsx:801 src/commandsAndMenu.tsx:902 src/commandsAndMenu.tsx:966 +#: src/commandsAndMenu.tsx:1025 src/commandsAndMenu.tsx:1026 src/commandsAndMenu.tsx:1094 src/commandsAndMenu.tsx:1110 src/commandsAndMenu.tsx:1132 src/commandsAndMenu.tsx:1136 src/commandsAndMenu.tsx:1165 src/commandsAndMenu.tsx:1394 src/commandsAndMenu.tsx:1399 src/commandsAndMenu.tsx:1582 src/commandsAndMenu.tsx:767 src/commandsAndMenu.tsx:769 src/commandsAndMenu.tsx:775 src/commandsAndMenu.tsx:780 src/commandsAndMenu.tsx:800 src/commandsAndMenu.tsx:801 src/commandsAndMenu.tsx:902 src/commandsAndMenu.tsx:966 msgid "Discard recent changes of selected file" msgstr "" -#: src/commandsAndMenu.tsx:1025 src/commandsAndMenu.tsx:1041 src/commandsAndMenu.tsx:1063 src/commandsAndMenu.tsx:1067 src/commandsAndMenu.tsx:1096 src/commandsAndMenu.tsx:1325 src/commandsAndMenu.tsx:1330 src/commandsAndMenu.tsx:698 src/commandsAndMenu.tsx:700 src/commandsAndMenu.tsx:706 src/commandsAndMenu.tsx:711 src/commandsAndMenu.tsx:731 src/commandsAndMenu.tsx:732 src/commandsAndMenu.tsx:833 src/commandsAndMenu.tsx:897 src/commandsAndMenu.tsx:956 src/commandsAndMenu.tsx:957 +#: src/commandsAndMenu.tsx:1025 src/commandsAndMenu.tsx:1041 src/commandsAndMenu.tsx:1063 src/commandsAndMenu.tsx:1067 src/commandsAndMenu.tsx:1096 src/commandsAndMenu.tsx:1325 src/commandsAndMenu.tsx:1330 src/commandsAndMenu.tsx:1513 src/commandsAndMenu.tsx:698 src/commandsAndMenu.tsx:700 src/commandsAndMenu.tsx:706 src/commandsAndMenu.tsx:711 src/commandsAndMenu.tsx:731 src/commandsAndMenu.tsx:732 src/commandsAndMenu.tsx:833 src/commandsAndMenu.tsx:897 src/commandsAndMenu.tsx:956 src/commandsAndMenu.tsx:957 msgid "Unstage the changes of selected file" msgstr "" -#: src/commandsAndMenu.tsx:1025 src/commandsAndMenu.tsx:1089 src/commandsAndMenu.tsx:1149 src/commandsAndMenu.tsx:1150 src/commandsAndMenu.tsx:1218 src/commandsAndMenu.tsx:1234 src/commandsAndMenu.tsx:1256 src/commandsAndMenu.tsx:1260 src/commandsAndMenu.tsx:1289 src/commandsAndMenu.tsx:1518 src/commandsAndMenu.tsx:1523 src/commandsAndMenu.tsx:903 src/commandsAndMenu.tsx:923 src/commandsAndMenu.tsx:924 +#: src/commandsAndMenu.tsx:1025 src/commandsAndMenu.tsx:1089 src/commandsAndMenu.tsx:1149 src/commandsAndMenu.tsx:1150 src/commandsAndMenu.tsx:1218 src/commandsAndMenu.tsx:1234 src/commandsAndMenu.tsx:1256 src/commandsAndMenu.tsx:1260 src/commandsAndMenu.tsx:1289 src/commandsAndMenu.tsx:1518 src/commandsAndMenu.tsx:1523 src/commandsAndMenu.tsx:1715 src/commandsAndMenu.tsx:903 src/commandsAndMenu.tsx:923 src/commandsAndMenu.tsx:924 msgid "View the history of this file" msgstr "" -#: src/commandsAndMenu.tsx:1026 src/commandsAndMenu.tsx:1027 src/commandsAndMenu.tsx:1095 src/commandsAndMenu.tsx:1111 src/commandsAndMenu.tsx:1133 src/commandsAndMenu.tsx:1137 src/commandsAndMenu.tsx:1166 src/commandsAndMenu.tsx:1395 src/commandsAndMenu.tsx:1400 src/commandsAndMenu.tsx:768 src/commandsAndMenu.tsx:770 src/commandsAndMenu.tsx:776 src/commandsAndMenu.tsx:781 src/commandsAndMenu.tsx:801 src/commandsAndMenu.tsx:802 src/commandsAndMenu.tsx:903 src/commandsAndMenu.tsx:967 +#: src/commandsAndMenu.tsx:1026 src/commandsAndMenu.tsx:1027 src/commandsAndMenu.tsx:1095 src/commandsAndMenu.tsx:1111 src/commandsAndMenu.tsx:1133 src/commandsAndMenu.tsx:1137 src/commandsAndMenu.tsx:1166 src/commandsAndMenu.tsx:1395 src/commandsAndMenu.tsx:1400 src/commandsAndMenu.tsx:1583 src/commandsAndMenu.tsx:768 src/commandsAndMenu.tsx:770 src/commandsAndMenu.tsx:776 src/commandsAndMenu.tsx:781 src/commandsAndMenu.tsx:801 src/commandsAndMenu.tsx:802 src/commandsAndMenu.tsx:903 src/commandsAndMenu.tsx:967 msgid "Discard recent changes of selected files" msgstr "" -#: src/commandsAndMenu.tsx:1026 src/commandsAndMenu.tsx:1042 src/commandsAndMenu.tsx:1064 src/commandsAndMenu.tsx:1068 src/commandsAndMenu.tsx:1097 src/commandsAndMenu.tsx:1326 src/commandsAndMenu.tsx:1331 src/commandsAndMenu.tsx:699 src/commandsAndMenu.tsx:701 src/commandsAndMenu.tsx:707 src/commandsAndMenu.tsx:712 src/commandsAndMenu.tsx:732 src/commandsAndMenu.tsx:733 src/commandsAndMenu.tsx:834 src/commandsAndMenu.tsx:898 src/commandsAndMenu.tsx:957 src/commandsAndMenu.tsx:958 +#: src/commandsAndMenu.tsx:1026 src/commandsAndMenu.tsx:1042 src/commandsAndMenu.tsx:1064 src/commandsAndMenu.tsx:1068 src/commandsAndMenu.tsx:1097 src/commandsAndMenu.tsx:1326 src/commandsAndMenu.tsx:1331 src/commandsAndMenu.tsx:1514 src/commandsAndMenu.tsx:699 src/commandsAndMenu.tsx:701 src/commandsAndMenu.tsx:707 src/commandsAndMenu.tsx:712 src/commandsAndMenu.tsx:732 src/commandsAndMenu.tsx:733 src/commandsAndMenu.tsx:834 src/commandsAndMenu.tsx:898 src/commandsAndMenu.tsx:957 src/commandsAndMenu.tsx:958 msgid "Unstage the changes of selected files" msgstr "" -#: src/commandsAndMenu.tsx:1033 src/commandsAndMenu.tsx:1034 src/commandsAndMenu.tsx:1102 src/commandsAndMenu.tsx:1118 src/commandsAndMenu.tsx:1140 src/commandsAndMenu.tsx:1144 src/commandsAndMenu.tsx:1173 src/commandsAndMenu.tsx:1402 src/commandsAndMenu.tsx:1407 src/commandsAndMenu.tsx:775 src/commandsAndMenu.tsx:777 src/commandsAndMenu.tsx:783 src/commandsAndMenu.tsx:788 src/commandsAndMenu.tsx:808 src/commandsAndMenu.tsx:809 src/commandsAndMenu.tsx:910 src/commandsAndMenu.tsx:974 src/components/FileList.tsx:1125 src/components/FileList.tsx:1129 src/components/FileList.tsx:1151 src/components/FileList.tsx:1155 src/components/FileList.tsx:457 src/components/FileList.tsx:466 src/components/FileList.tsx:534 src/components/FileList.tsx:535 src/components/FileList.tsx:655 src/components/FileList.tsx:664 src/components/FileList.tsx:681 src/components/FileList.tsx:690 src/components/FileList.tsx:733 src/components/FileList.tsx:759 src/components/FileList.tsx:810 src/components/FileList.tsx:835 src/components/FileList.tsx:836 src/components/FileList.tsx:837 +#: src/commandsAndMenu.tsx:1033 src/commandsAndMenu.tsx:1034 src/commandsAndMenu.tsx:1102 src/commandsAndMenu.tsx:1118 src/commandsAndMenu.tsx:1140 src/commandsAndMenu.tsx:1144 src/commandsAndMenu.tsx:1173 src/commandsAndMenu.tsx:1402 src/commandsAndMenu.tsx:1407 src/commandsAndMenu.tsx:1590 src/commandsAndMenu.tsx:775 src/commandsAndMenu.tsx:777 src/commandsAndMenu.tsx:783 src/commandsAndMenu.tsx:788 src/commandsAndMenu.tsx:808 src/commandsAndMenu.tsx:809 src/commandsAndMenu.tsx:910 src/commandsAndMenu.tsx:974 src/components/FileList.tsx:1125 src/components/FileList.tsx:1129 src/components/FileList.tsx:1151 src/components/FileList.tsx:1153 src/components/FileList.tsx:1155 src/components/FileList.tsx:1179 src/components/FileList.tsx:457 src/components/FileList.tsx:466 src/components/FileList.tsx:534 src/components/FileList.tsx:535 src/components/FileList.tsx:655 src/components/FileList.tsx:664 src/components/FileList.tsx:681 src/components/FileList.tsx:690 src/components/FileList.tsx:733 src/components/FileList.tsx:759 src/components/FileList.tsx:810 src/components/FileList.tsx:835 src/components/FileList.tsx:836 src/components/FileList.tsx:837 src/components/FileList.tsx:859 msgid "Discard changes" msgstr "" -#: src/commandsAndMenu.tsx:1036 src/commandsAndMenu.tsx:1037 src/commandsAndMenu.tsx:1105 src/commandsAndMenu.tsx:1121 src/commandsAndMenu.tsx:1143 src/commandsAndMenu.tsx:1147 src/commandsAndMenu.tsx:1176 src/commandsAndMenu.tsx:1405 src/commandsAndMenu.tsx:1410 src/commandsAndMenu.tsx:778 src/commandsAndMenu.tsx:780 src/commandsAndMenu.tsx:786 src/commandsAndMenu.tsx:791 src/commandsAndMenu.tsx:811 src/commandsAndMenu.tsx:812 src/commandsAndMenu.tsx:913 src/commandsAndMenu.tsx:977 +#: src/commandsAndMenu.tsx:1035 src/commandsAndMenu.tsx:864 src/commandsAndMenu.tsx:869 +msgid "Continue rebase" +msgstr "" + +#: src/commandsAndMenu.tsx:1036 src/commandsAndMenu.tsx:1037 src/commandsAndMenu.tsx:1105 src/commandsAndMenu.tsx:1121 src/commandsAndMenu.tsx:1143 src/commandsAndMenu.tsx:1147 src/commandsAndMenu.tsx:1176 src/commandsAndMenu.tsx:1405 src/commandsAndMenu.tsx:1410 src/commandsAndMenu.tsx:1593 src/commandsAndMenu.tsx:778 src/commandsAndMenu.tsx:780 src/commandsAndMenu.tsx:786 src/commandsAndMenu.tsx:791 src/commandsAndMenu.tsx:811 src/commandsAndMenu.tsx:812 src/commandsAndMenu.tsx:913 src/commandsAndMenu.tsx:977 msgid "Are you sure you want to permanently discard changes to the following files? This action cannot be undone." msgstr "" -#: src/commandsAndMenu.tsx:1042 src/commandsAndMenu.tsx:1047 src/commandsAndMenu.tsx:755 src/commandsAndMenu.tsx:771 src/commandsAndMenu.tsx:793 src/commandsAndMenu.tsx:797 src/commandsAndMenu.tsx:818 +#: src/commandsAndMenu.tsx:1037 src/commandsAndMenu.tsx:866 src/commandsAndMenu.tsx:871 +msgid "Skip current commit" +msgstr "" + +#: src/commandsAndMenu.tsx:1039 src/commandsAndMenu.tsx:868 src/commandsAndMenu.tsx:873 src/components/RebaseAction.tsx:72 src/components/RebaseAction.tsx:76 +msgid "Abort rebase" +msgstr "" + +#: src/commandsAndMenu.tsx:1041 src/commandsAndMenu.tsx:1055 src/commandsAndMenu.tsx:870 src/commandsAndMenu.tsx:875 src/commandsAndMenu.tsx:884 src/commandsAndMenu.tsx:889 +msgid "Resolve rebase" +msgstr "" + +#: src/commandsAndMenu.tsx:1042 src/commandsAndMenu.tsx:1047 src/commandsAndMenu.tsx:1223 src/commandsAndMenu.tsx:755 src/commandsAndMenu.tsx:771 src/commandsAndMenu.tsx:793 src/commandsAndMenu.tsx:797 src/commandsAndMenu.tsx:818 msgid "Open File" msgstr "" -#: src/commandsAndMenu.tsx:1043 src/commandsAndMenu.tsx:1048 src/commandsAndMenu.tsx:756 src/commandsAndMenu.tsx:772 src/commandsAndMenu.tsx:794 src/commandsAndMenu.tsx:798 src/commandsAndMenu.tsx:819 +#: src/commandsAndMenu.tsx:1043 src/commandsAndMenu.tsx:1048 src/commandsAndMenu.tsx:1224 src/commandsAndMenu.tsx:756 src/commandsAndMenu.tsx:772 src/commandsAndMenu.tsx:794 src/commandsAndMenu.tsx:798 src/commandsAndMenu.tsx:819 msgid "Open file from its diff view" msgstr "" -#: src/commandsAndMenu.tsx:1043 src/commandsAndMenu.tsx:1103 src/commandsAndMenu.tsx:1104 src/commandsAndMenu.tsx:1172 src/commandsAndMenu.tsx:1188 src/commandsAndMenu.tsx:1210 src/commandsAndMenu.tsx:1214 src/commandsAndMenu.tsx:1243 src/commandsAndMenu.tsx:1472 src/commandsAndMenu.tsx:1477 src/commandsAndMenu.tsx:844 src/commandsAndMenu.tsx:846 src/commandsAndMenu.tsx:852 src/commandsAndMenu.tsx:857 src/commandsAndMenu.tsx:877 src/commandsAndMenu.tsx:878 src/commandsAndMenu.tsx:979 +#: src/commandsAndMenu.tsx:1043 src/commandsAndMenu.tsx:1103 src/commandsAndMenu.tsx:1104 src/commandsAndMenu.tsx:1172 src/commandsAndMenu.tsx:1188 src/commandsAndMenu.tsx:1210 src/commandsAndMenu.tsx:1214 src/commandsAndMenu.tsx:1243 src/commandsAndMenu.tsx:1472 src/commandsAndMenu.tsx:1477 src/commandsAndMenu.tsx:1669 src/commandsAndMenu.tsx:844 src/commandsAndMenu.tsx:846 src/commandsAndMenu.tsx:852 src/commandsAndMenu.tsx:857 src/commandsAndMenu.tsx:877 src/commandsAndMenu.tsx:878 src/commandsAndMenu.tsx:979 msgid "Ignore %2 extension (add to .gitignore)" msgid_plural "Ignore %2 extensions (add to .gitignore)" msgstr[0] "" msgstr[1] "" -#: src/commandsAndMenu.tsx:1043 src/commandsAndMenu.tsx:1107 src/commandsAndMenu.tsx:1167 src/commandsAndMenu.tsx:1168 src/commandsAndMenu.tsx:1236 src/commandsAndMenu.tsx:1252 src/commandsAndMenu.tsx:1274 src/commandsAndMenu.tsx:1278 src/commandsAndMenu.tsx:1307 src/commandsAndMenu.tsx:1536 src/commandsAndMenu.tsx:1541 src/commandsAndMenu.tsx:889 src/commandsAndMenu.tsx:891 src/commandsAndMenu.tsx:897 src/commandsAndMenu.tsx:921 src/commandsAndMenu.tsx:941 src/commandsAndMenu.tsx:942 +#: src/commandsAndMenu.tsx:1043 src/commandsAndMenu.tsx:1107 src/commandsAndMenu.tsx:1167 src/commandsAndMenu.tsx:1168 src/commandsAndMenu.tsx:1236 src/commandsAndMenu.tsx:1252 src/commandsAndMenu.tsx:1274 src/commandsAndMenu.tsx:1278 src/commandsAndMenu.tsx:1307 src/commandsAndMenu.tsx:1536 src/commandsAndMenu.tsx:1541 src/commandsAndMenu.tsx:1733 src/commandsAndMenu.tsx:889 src/commandsAndMenu.tsx:891 src/commandsAndMenu.tsx:897 src/commandsAndMenu.tsx:921 src/commandsAndMenu.tsx:941 src/commandsAndMenu.tsx:942 msgid "No actions available" msgstr "" -#: src/commandsAndMenu.tsx:1051 src/commandsAndMenu.tsx:1067 src/commandsAndMenu.tsx:1089 src/commandsAndMenu.tsx:1093 src/commandsAndMenu.tsx:1122 src/commandsAndMenu.tsx:1351 src/commandsAndMenu.tsx:1356 src/commandsAndMenu.tsx:724 src/commandsAndMenu.tsx:726 src/commandsAndMenu.tsx:732 src/commandsAndMenu.tsx:737 src/commandsAndMenu.tsx:757 src/commandsAndMenu.tsx:758 src/commandsAndMenu.tsx:859 src/commandsAndMenu.tsx:923 src/commandsAndMenu.tsx:982 src/commandsAndMenu.tsx:983 +#: src/commandsAndMenu.tsx:1047 src/commandsAndMenu.tsx:876 src/commandsAndMenu.tsx:881 +msgid "Continue the rebase by committing the current state." +msgstr "" + +#: src/commandsAndMenu.tsx:1051 src/commandsAndMenu.tsx:1067 src/commandsAndMenu.tsx:1089 src/commandsAndMenu.tsx:1093 src/commandsAndMenu.tsx:1122 src/commandsAndMenu.tsx:1351 src/commandsAndMenu.tsx:1356 src/commandsAndMenu.tsx:1539 src/commandsAndMenu.tsx:724 src/commandsAndMenu.tsx:726 src/commandsAndMenu.tsx:732 src/commandsAndMenu.tsx:737 src/commandsAndMenu.tsx:757 src/commandsAndMenu.tsx:758 src/commandsAndMenu.tsx:859 src/commandsAndMenu.tsx:923 src/commandsAndMenu.tsx:982 src/commandsAndMenu.tsx:983 msgid "Delete this file" msgstr "" -#: src/commandsAndMenu.tsx:1051 src/commandsAndMenu.tsx:1111 src/commandsAndMenu.tsx:1112 src/commandsAndMenu.tsx:1180 src/commandsAndMenu.tsx:1196 src/commandsAndMenu.tsx:1218 src/commandsAndMenu.tsx:1222 src/commandsAndMenu.tsx:1251 src/commandsAndMenu.tsx:1480 src/commandsAndMenu.tsx:1485 src/commandsAndMenu.tsx:852 src/commandsAndMenu.tsx:854 src/commandsAndMenu.tsx:860 src/commandsAndMenu.tsx:865 src/commandsAndMenu.tsx:885 src/commandsAndMenu.tsx:886 src/commandsAndMenu.tsx:987 +#: src/commandsAndMenu.tsx:1051 src/commandsAndMenu.tsx:1111 src/commandsAndMenu.tsx:1112 src/commandsAndMenu.tsx:1180 src/commandsAndMenu.tsx:1196 src/commandsAndMenu.tsx:1218 src/commandsAndMenu.tsx:1222 src/commandsAndMenu.tsx:1251 src/commandsAndMenu.tsx:1480 src/commandsAndMenu.tsx:1485 src/commandsAndMenu.tsx:1677 src/commandsAndMenu.tsx:852 src/commandsAndMenu.tsx:854 src/commandsAndMenu.tsx:860 src/commandsAndMenu.tsx:865 src/commandsAndMenu.tsx:885 src/commandsAndMenu.tsx:886 src/commandsAndMenu.tsx:987 msgid "Ignore this file extension (add to .gitignore)" msgstr "" -#: src/commandsAndMenu.tsx:1052 src/commandsAndMenu.tsx:1068 src/commandsAndMenu.tsx:1090 src/commandsAndMenu.tsx:1094 src/commandsAndMenu.tsx:1123 src/commandsAndMenu.tsx:1352 src/commandsAndMenu.tsx:1357 src/commandsAndMenu.tsx:725 src/commandsAndMenu.tsx:727 src/commandsAndMenu.tsx:733 src/commandsAndMenu.tsx:738 src/commandsAndMenu.tsx:758 src/commandsAndMenu.tsx:759 src/commandsAndMenu.tsx:860 src/commandsAndMenu.tsx:924 src/commandsAndMenu.tsx:983 src/commandsAndMenu.tsx:984 +#: src/commandsAndMenu.tsx:1051 src/commandsAndMenu.tsx:880 src/commandsAndMenu.tsx:885 +msgid "Skip current commit and continue the rebase." +msgstr "" + +#: src/commandsAndMenu.tsx:1052 src/commandsAndMenu.tsx:1068 src/commandsAndMenu.tsx:1090 src/commandsAndMenu.tsx:1094 src/commandsAndMenu.tsx:1123 src/commandsAndMenu.tsx:1352 src/commandsAndMenu.tsx:1357 src/commandsAndMenu.tsx:1540 src/commandsAndMenu.tsx:725 src/commandsAndMenu.tsx:727 src/commandsAndMenu.tsx:733 src/commandsAndMenu.tsx:738 src/commandsAndMenu.tsx:758 src/commandsAndMenu.tsx:759 src/commandsAndMenu.tsx:860 src/commandsAndMenu.tsx:924 src/commandsAndMenu.tsx:983 src/commandsAndMenu.tsx:984 msgid "Delete these files" msgstr "" -#: src/commandsAndMenu.tsx:1052 src/commandsAndMenu.tsx:1112 src/commandsAndMenu.tsx:1113 src/commandsAndMenu.tsx:1181 src/commandsAndMenu.tsx:1197 src/commandsAndMenu.tsx:1219 src/commandsAndMenu.tsx:1223 src/commandsAndMenu.tsx:1252 src/commandsAndMenu.tsx:1481 src/commandsAndMenu.tsx:1486 src/commandsAndMenu.tsx:853 src/commandsAndMenu.tsx:855 src/commandsAndMenu.tsx:861 src/commandsAndMenu.tsx:866 src/commandsAndMenu.tsx:886 src/commandsAndMenu.tsx:887 src/commandsAndMenu.tsx:988 +#: src/commandsAndMenu.tsx:1052 src/commandsAndMenu.tsx:1112 src/commandsAndMenu.tsx:1113 src/commandsAndMenu.tsx:1181 src/commandsAndMenu.tsx:1197 src/commandsAndMenu.tsx:1219 src/commandsAndMenu.tsx:1223 src/commandsAndMenu.tsx:1252 src/commandsAndMenu.tsx:1481 src/commandsAndMenu.tsx:1486 src/commandsAndMenu.tsx:1678 src/commandsAndMenu.tsx:853 src/commandsAndMenu.tsx:855 src/commandsAndMenu.tsx:861 src/commandsAndMenu.tsx:866 src/commandsAndMenu.tsx:886 src/commandsAndMenu.tsx:887 src/commandsAndMenu.tsx:988 msgid "Ignore these files extension (add to .gitignore)" msgstr "" -#: src/commandsAndMenu.tsx:1059 src/commandsAndMenu.tsx:1075 src/commandsAndMenu.tsx:1097 src/commandsAndMenu.tsx:1101 src/commandsAndMenu.tsx:1130 src/commandsAndMenu.tsx:1359 src/commandsAndMenu.tsx:1364 src/commandsAndMenu.tsx:732 src/commandsAndMenu.tsx:734 src/commandsAndMenu.tsx:740 src/commandsAndMenu.tsx:745 src/commandsAndMenu.tsx:765 src/commandsAndMenu.tsx:766 src/commandsAndMenu.tsx:867 src/commandsAndMenu.tsx:931 src/commandsAndMenu.tsx:990 src/commandsAndMenu.tsx:991 +#: src/commandsAndMenu.tsx:1053 src/commandsAndMenu.tsx:882 src/commandsAndMenu.tsx:887 +msgid "Abort the rebase" +msgstr "" + +#: src/commandsAndMenu.tsx:1059 src/commandsAndMenu.tsx:1075 src/commandsAndMenu.tsx:1097 src/commandsAndMenu.tsx:1101 src/commandsAndMenu.tsx:1130 src/commandsAndMenu.tsx:1359 src/commandsAndMenu.tsx:1364 src/commandsAndMenu.tsx:1547 src/commandsAndMenu.tsx:732 src/commandsAndMenu.tsx:734 src/commandsAndMenu.tsx:740 src/commandsAndMenu.tsx:745 src/commandsAndMenu.tsx:765 src/commandsAndMenu.tsx:766 src/commandsAndMenu.tsx:867 src/commandsAndMenu.tsx:931 src/commandsAndMenu.tsx:990 src/commandsAndMenu.tsx:991 msgid "Delete Files" msgstr "" -#: src/commandsAndMenu.tsx:1061 src/commandsAndMenu.tsx:1121 src/commandsAndMenu.tsx:1122 src/commandsAndMenu.tsx:1190 src/commandsAndMenu.tsx:1206 src/commandsAndMenu.tsx:1228 src/commandsAndMenu.tsx:1232 src/commandsAndMenu.tsx:1261 src/commandsAndMenu.tsx:1490 src/commandsAndMenu.tsx:1495 src/commandsAndMenu.tsx:862 src/commandsAndMenu.tsx:864 src/commandsAndMenu.tsx:870 src/commandsAndMenu.tsx:875 src/commandsAndMenu.tsx:895 src/commandsAndMenu.tsx:896 src/commandsAndMenu.tsx:997 +#: src/commandsAndMenu.tsx:1061 src/commandsAndMenu.tsx:1121 src/commandsAndMenu.tsx:1122 src/commandsAndMenu.tsx:1190 src/commandsAndMenu.tsx:1206 src/commandsAndMenu.tsx:1228 src/commandsAndMenu.tsx:1232 src/commandsAndMenu.tsx:1261 src/commandsAndMenu.tsx:1490 src/commandsAndMenu.tsx:1495 src/commandsAndMenu.tsx:1687 src/commandsAndMenu.tsx:862 src/commandsAndMenu.tsx:864 src/commandsAndMenu.tsx:870 src/commandsAndMenu.tsx:875 src/commandsAndMenu.tsx:895 src/commandsAndMenu.tsx:896 src/commandsAndMenu.tsx:997 msgid "Ignore file extension" msgstr "" -#: src/commandsAndMenu.tsx:1062 src/commandsAndMenu.tsx:1078 src/commandsAndMenu.tsx:1100 src/commandsAndMenu.tsx:1104 src/commandsAndMenu.tsx:1133 src/commandsAndMenu.tsx:1362 src/commandsAndMenu.tsx:1367 src/commandsAndMenu.tsx:735 src/commandsAndMenu.tsx:737 src/commandsAndMenu.tsx:743 src/commandsAndMenu.tsx:748 src/commandsAndMenu.tsx:768 src/commandsAndMenu.tsx:769 src/commandsAndMenu.tsx:870 src/commandsAndMenu.tsx:934 src/commandsAndMenu.tsx:993 src/commandsAndMenu.tsx:994 +#: src/commandsAndMenu.tsx:1062 src/commandsAndMenu.tsx:1078 src/commandsAndMenu.tsx:1100 src/commandsAndMenu.tsx:1104 src/commandsAndMenu.tsx:1133 src/commandsAndMenu.tsx:1362 src/commandsAndMenu.tsx:1367 src/commandsAndMenu.tsx:1550 src/commandsAndMenu.tsx:735 src/commandsAndMenu.tsx:737 src/commandsAndMenu.tsx:743 src/commandsAndMenu.tsx:748 src/commandsAndMenu.tsx:768 src/commandsAndMenu.tsx:769 src/commandsAndMenu.tsx:870 src/commandsAndMenu.tsx:934 src/commandsAndMenu.tsx:993 src/commandsAndMenu.tsx:994 msgid "Are you sure you want to permanently delete the following files? This action cannot be undone." msgstr "" -#: src/commandsAndMenu.tsx:1062 src/commandsAndMenu.tsx:1122 src/commandsAndMenu.tsx:1123 src/commandsAndMenu.tsx:1191 src/commandsAndMenu.tsx:1207 src/commandsAndMenu.tsx:1229 src/commandsAndMenu.tsx:1233 src/commandsAndMenu.tsx:1262 src/commandsAndMenu.tsx:1491 src/commandsAndMenu.tsx:1496 src/commandsAndMenu.tsx:863 src/commandsAndMenu.tsx:865 src/commandsAndMenu.tsx:871 src/commandsAndMenu.tsx:876 src/commandsAndMenu.tsx:896 src/commandsAndMenu.tsx:897 src/commandsAndMenu.tsx:998 +#: src/commandsAndMenu.tsx:1062 src/commandsAndMenu.tsx:1122 src/commandsAndMenu.tsx:1123 src/commandsAndMenu.tsx:1191 src/commandsAndMenu.tsx:1207 src/commandsAndMenu.tsx:1229 src/commandsAndMenu.tsx:1233 src/commandsAndMenu.tsx:1262 src/commandsAndMenu.tsx:1491 src/commandsAndMenu.tsx:1496 src/commandsAndMenu.tsx:1688 src/commandsAndMenu.tsx:863 src/commandsAndMenu.tsx:865 src/commandsAndMenu.tsx:871 src/commandsAndMenu.tsx:876 src/commandsAndMenu.tsx:896 src/commandsAndMenu.tsx:897 src/commandsAndMenu.tsx:998 msgid "Are you sure you want to ignore all %1 files within this git repository?" msgstr "" -#: src/commandsAndMenu.tsx:1062 src/commandsAndMenu.tsx:1126 src/commandsAndMenu.tsx:1186 src/commandsAndMenu.tsx:1187 src/commandsAndMenu.tsx:1255 src/commandsAndMenu.tsx:1271 src/commandsAndMenu.tsx:1293 src/commandsAndMenu.tsx:1297 src/commandsAndMenu.tsx:1326 src/commandsAndMenu.tsx:1555 src/commandsAndMenu.tsx:1633 src/commandsAndMenu.tsx:908 src/commandsAndMenu.tsx:910 src/commandsAndMenu.tsx:916 src/commandsAndMenu.tsx:940 src/commandsAndMenu.tsx:960 src/commandsAndMenu.tsx:961 +#: src/commandsAndMenu.tsx:1062 src/commandsAndMenu.tsx:1126 src/commandsAndMenu.tsx:1186 src/commandsAndMenu.tsx:1187 src/commandsAndMenu.tsx:1255 src/commandsAndMenu.tsx:1271 src/commandsAndMenu.tsx:1293 src/commandsAndMenu.tsx:1297 src/commandsAndMenu.tsx:1326 src/commandsAndMenu.tsx:1555 src/commandsAndMenu.tsx:1633 src/commandsAndMenu.tsx:1823 src/commandsAndMenu.tsx:908 src/commandsAndMenu.tsx:910 src/commandsAndMenu.tsx:916 src/commandsAndMenu.tsx:940 src/commandsAndMenu.tsx:960 src/commandsAndMenu.tsx:961 msgid "Set Up Remotes" msgstr "" -#: src/commandsAndMenu.tsx:1066 src/commandsAndMenu.tsx:1130 src/commandsAndMenu.tsx:1190 src/commandsAndMenu.tsx:1191 src/commandsAndMenu.tsx:1259 src/commandsAndMenu.tsx:1275 src/commandsAndMenu.tsx:1297 src/commandsAndMenu.tsx:1301 src/commandsAndMenu.tsx:1330 src/commandsAndMenu.tsx:1559 src/commandsAndMenu.tsx:1637 src/commandsAndMenu.tsx:912 src/commandsAndMenu.tsx:914 src/commandsAndMenu.tsx:920 src/commandsAndMenu.tsx:944 src/commandsAndMenu.tsx:964 src/commandsAndMenu.tsx:965 +#: src/commandsAndMenu.tsx:1066 src/commandsAndMenu.tsx:1130 src/commandsAndMenu.tsx:1190 src/commandsAndMenu.tsx:1191 src/commandsAndMenu.tsx:1259 src/commandsAndMenu.tsx:1275 src/commandsAndMenu.tsx:1297 src/commandsAndMenu.tsx:1301 src/commandsAndMenu.tsx:1330 src/commandsAndMenu.tsx:1559 src/commandsAndMenu.tsx:1637 src/commandsAndMenu.tsx:1827 src/commandsAndMenu.tsx:912 src/commandsAndMenu.tsx:914 src/commandsAndMenu.tsx:920 src/commandsAndMenu.tsx:944 src/commandsAndMenu.tsx:964 src/commandsAndMenu.tsx:965 msgid "Git Documentation" msgstr "" -#: src/commandsAndMenu.tsx:1091 src/commandsAndMenu.tsx:1096 src/commandsAndMenu.tsx:544 src/commandsAndMenu.tsx:546 src/commandsAndMenu.tsx:551 src/commandsAndMenu.tsx:555 src/commandsAndMenu.tsx:556 src/commandsAndMenu.tsx:612 src/commandsAndMenu.tsx:676 src/commandsAndMenu.tsx:735 src/commandsAndMenu.tsx:736 src/commandsAndMenu.tsx:804 src/commandsAndMenu.tsx:820 src/commandsAndMenu.tsx:842 src/commandsAndMenu.tsx:846 src/commandsAndMenu.tsx:867 +#: src/commandsAndMenu.tsx:1066 src/commandsAndMenu.tsx:894 src/commandsAndMenu.tsx:899 +msgid "Continue the rebase…" +msgstr "" + +#: src/commandsAndMenu.tsx:1068 src/commandsAndMenu.tsx:896 src/commandsAndMenu.tsx:901 +msgid "Skip current commit…" +msgstr "" + +#: src/commandsAndMenu.tsx:1070 src/commandsAndMenu.tsx:898 src/commandsAndMenu.tsx:903 +msgid "Abort the rebase…" +msgstr "" + +#: src/commandsAndMenu.tsx:1084 src/commandsAndMenu.tsx:912 src/commandsAndMenu.tsx:917 +msgid "Fail to continue rebasing." +msgstr "" + +#: src/commandsAndMenu.tsx:1086 src/commandsAndMenu.tsx:914 src/commandsAndMenu.tsx:919 +msgid "Fail to skip current commit when rebasing." +msgstr "" + +#: src/commandsAndMenu.tsx:1088 src/commandsAndMenu.tsx:916 src/commandsAndMenu.tsx:921 +msgid "Fail to abort the rebase." +msgstr "" + +#: src/commandsAndMenu.tsx:1091 src/commandsAndMenu.tsx:1096 src/commandsAndMenu.tsx:1272 src/commandsAndMenu.tsx:544 src/commandsAndMenu.tsx:546 src/commandsAndMenu.tsx:551 src/commandsAndMenu.tsx:555 src/commandsAndMenu.tsx:556 src/commandsAndMenu.tsx:612 src/commandsAndMenu.tsx:676 src/commandsAndMenu.tsx:735 src/commandsAndMenu.tsx:736 src/commandsAndMenu.tsx:804 src/commandsAndMenu.tsx:820 src/commandsAndMenu.tsx:842 src/commandsAndMenu.tsx:846 src/commandsAndMenu.tsx:867 msgid "Diff" msgstr "" -#: src/commandsAndMenu.tsx:1093 src/commandsAndMenu.tsx:1098 src/commandsAndMenu.tsx:546 src/commandsAndMenu.tsx:548 src/commandsAndMenu.tsx:553 src/commandsAndMenu.tsx:557 src/commandsAndMenu.tsx:558 src/commandsAndMenu.tsx:614 src/commandsAndMenu.tsx:678 src/commandsAndMenu.tsx:737 src/commandsAndMenu.tsx:738 src/commandsAndMenu.tsx:806 src/commandsAndMenu.tsx:822 src/commandsAndMenu.tsx:844 src/commandsAndMenu.tsx:848 src/commandsAndMenu.tsx:869 +#: src/commandsAndMenu.tsx:1093 src/commandsAndMenu.tsx:1098 src/commandsAndMenu.tsx:1274 src/commandsAndMenu.tsx:546 src/commandsAndMenu.tsx:548 src/commandsAndMenu.tsx:553 src/commandsAndMenu.tsx:557 src/commandsAndMenu.tsx:558 src/commandsAndMenu.tsx:614 src/commandsAndMenu.tsx:678 src/commandsAndMenu.tsx:737 src/commandsAndMenu.tsx:738 src/commandsAndMenu.tsx:806 src/commandsAndMenu.tsx:822 src/commandsAndMenu.tsx:844 src/commandsAndMenu.tsx:848 src/commandsAndMenu.tsx:869 msgid "Diff selected file" msgstr "" -#: src/commandsAndMenu.tsx:1094 src/commandsAndMenu.tsx:1099 src/commandsAndMenu.tsx:547 src/commandsAndMenu.tsx:549 src/commandsAndMenu.tsx:554 src/commandsAndMenu.tsx:558 src/commandsAndMenu.tsx:559 src/commandsAndMenu.tsx:615 src/commandsAndMenu.tsx:679 src/commandsAndMenu.tsx:738 src/commandsAndMenu.tsx:739 src/commandsAndMenu.tsx:807 src/commandsAndMenu.tsx:823 src/commandsAndMenu.tsx:845 src/commandsAndMenu.tsx:849 src/commandsAndMenu.tsx:870 +#: src/commandsAndMenu.tsx:1094 src/commandsAndMenu.tsx:1099 src/commandsAndMenu.tsx:1275 src/commandsAndMenu.tsx:547 src/commandsAndMenu.tsx:549 src/commandsAndMenu.tsx:554 src/commandsAndMenu.tsx:558 src/commandsAndMenu.tsx:559 src/commandsAndMenu.tsx:615 src/commandsAndMenu.tsx:679 src/commandsAndMenu.tsx:738 src/commandsAndMenu.tsx:739 src/commandsAndMenu.tsx:807 src/commandsAndMenu.tsx:823 src/commandsAndMenu.tsx:845 src/commandsAndMenu.tsx:849 src/commandsAndMenu.tsx:870 msgid "Diff selected files" msgstr "" -#: src/commandsAndMenu.tsx:1100 src/commandsAndMenu.tsx:1168 src/commandsAndMenu.tsx:1229 src/commandsAndMenu.tsx:1230 src/commandsAndMenu.tsx:1298 src/commandsAndMenu.tsx:1314 src/commandsAndMenu.tsx:1336 src/commandsAndMenu.tsx:1340 src/commandsAndMenu.tsx:1369 src/commandsAndMenu.tsx:1599 src/commandsAndMenu.tsx:1677 src/commandsAndMenu.tsx:943 src/commandsAndMenu.tsx:945 src/commandsAndMenu.tsx:951 src/commandsAndMenu.tsx:978 src/commandsAndMenu.tsx:998 src/commandsAndMenu.tsx:999 +#: src/commandsAndMenu.tsx:1100 src/commandsAndMenu.tsx:1168 src/commandsAndMenu.tsx:1229 src/commandsAndMenu.tsx:1230 src/commandsAndMenu.tsx:1298 src/commandsAndMenu.tsx:1314 src/commandsAndMenu.tsx:1336 src/commandsAndMenu.tsx:1340 src/commandsAndMenu.tsx:1369 src/commandsAndMenu.tsx:1599 src/commandsAndMenu.tsx:1677 src/commandsAndMenu.tsx:1867 src/commandsAndMenu.tsx:943 src/commandsAndMenu.tsx:945 src/commandsAndMenu.tsx:951 src/commandsAndMenu.tsx:978 src/commandsAndMenu.tsx:998 src/commandsAndMenu.tsx:999 msgid " Help " msgstr "" -#: src/commandsAndMenu.tsx:117 src/commandsAndMenu.tsx:118 src/commandsAndMenu.tsx:119 src/commandsAndMenu.tsx:122 src/commandsAndMenu.tsx:124 src/commandsAndMenu.tsx:125 src/commandsAndMenu.tsx:126 src/commandsAndMenu.tsx:127 src/commandsAndMenu.tsx:133 src/commandsAndMenu.tsx:137 src/commandsAndMenu.tsx:139 src/commandsAndMenu.tsx:140 src/commandsAndMenu.tsx:145 +#: src/commandsAndMenu.tsx:1104 src/commandsAndMenu.tsx:930 src/commandsAndMenu.tsx:935 +msgid "Commit submitted continuing rebase." +msgstr "" + +#: src/commandsAndMenu.tsx:1106 src/commandsAndMenu.tsx:932 src/commandsAndMenu.tsx:937 +msgid "Current commit skipped." +msgstr "" + +#: src/commandsAndMenu.tsx:1108 src/commandsAndMenu.tsx:934 src/commandsAndMenu.tsx:939 +msgid "Rebase aborted." +msgstr "" + +#: src/commandsAndMenu.tsx:1123 src/commandsAndMenu.tsx:947 src/commandsAndMenu.tsx:952 +msgid "Stash Changes" +msgstr "" + +#: src/commandsAndMenu.tsx:1124 src/commandsAndMenu.tsx:948 src/commandsAndMenu.tsx:953 +msgid "Stash all current changes" +msgstr "" + +#: src/commandsAndMenu.tsx:1129 src/commandsAndMenu.tsx:953 src/commandsAndMenu.tsx:958 +msgid "Do you want to stash your changes? " +msgstr "" + +#: src/commandsAndMenu.tsx:1130 src/commandsAndMenu.tsx:954 src/commandsAndMenu.tsx:959 +msgid "Stash message (optional)" +msgstr "" + +#: src/commandsAndMenu.tsx:1131 src/commandsAndMenu.tsx:955 src/commandsAndMenu.tsx:960 src/components/GitStash.tsx:240 src/components/GitStash.tsx:241 +msgid "Stash" +msgstr "" + +#: src/commandsAndMenu.tsx:1137 src/commandsAndMenu.tsx:962 src/commandsAndMenu.tsx:967 +msgid "Stashing changes" +msgstr "" + +#: src/commandsAndMenu.tsx:1146 src/commandsAndMenu.tsx:968 src/commandsAndMenu.tsx:973 +msgid "Successfully stashed" +msgstr "" + +#: src/commandsAndMenu.tsx:1157 +msgid "Failed to stash" +msgstr "" + +#: src/commandsAndMenu.tsx:117 src/commandsAndMenu.tsx:118 src/commandsAndMenu.tsx:119 src/commandsAndMenu.tsx:122 src/commandsAndMenu.tsx:124 src/commandsAndMenu.tsx:125 src/commandsAndMenu.tsx:126 src/commandsAndMenu.tsx:127 src/commandsAndMenu.tsx:133 src/commandsAndMenu.tsx:137 src/commandsAndMenu.tsx:139 src/commandsAndMenu.tsx:140 src/commandsAndMenu.tsx:145 src/commandsAndMenu.tsx:152 msgid "Commit from the Commit Box" msgstr "" -#: src/commandsAndMenu.tsx:1172 src/commandsAndMenu.tsx:1174 src/commandsAndMenu.tsx:1180 src/commandsAndMenu.tsx:1203 src/commandsAndMenu.tsx:1232 src/commandsAndMenu.tsx:1236 src/commandsAndMenu.tsx:1241 src/commandsAndMenu.tsx:1338 src/commandsAndMenu.tsx:1404 src/commandsAndMenu.tsx:1465 src/commandsAndMenu.tsx:1470 src/commandsAndMenu.tsx:1538 src/commandsAndMenu.tsx:1562 src/commandsAndMenu.tsx:1590 src/commandsAndMenu.tsx:1596 src/commandsAndMenu.tsx:1625 src/commandsAndMenu.tsx:1928 src/commandsAndMenu.tsx:2021 +#: src/commandsAndMenu.tsx:1171 src/commandsAndMenu.tsx:986 src/commandsAndMenu.tsx:991 +msgid "Stash List" +msgstr "" + +#: src/commandsAndMenu.tsx:1172 src/commandsAndMenu.tsx:1174 src/commandsAndMenu.tsx:1180 src/commandsAndMenu.tsx:1203 src/commandsAndMenu.tsx:1232 src/commandsAndMenu.tsx:1236 src/commandsAndMenu.tsx:1241 src/commandsAndMenu.tsx:1338 src/commandsAndMenu.tsx:1404 src/commandsAndMenu.tsx:1465 src/commandsAndMenu.tsx:1470 src/commandsAndMenu.tsx:1538 src/commandsAndMenu.tsx:1562 src/commandsAndMenu.tsx:1590 src/commandsAndMenu.tsx:1596 src/commandsAndMenu.tsx:1625 src/commandsAndMenu.tsx:1928 src/commandsAndMenu.tsx:2021 src/commandsAndMenu.tsx:2216 msgid "Git credentials required" msgstr "" -#: src/commandsAndMenu.tsx:1175 src/commandsAndMenu.tsx:1177 src/commandsAndMenu.tsx:1183 src/commandsAndMenu.tsx:1206 src/commandsAndMenu.tsx:1235 src/commandsAndMenu.tsx:1239 src/commandsAndMenu.tsx:1244 src/commandsAndMenu.tsx:1341 src/commandsAndMenu.tsx:1407 src/commandsAndMenu.tsx:1468 src/commandsAndMenu.tsx:1473 src/commandsAndMenu.tsx:1541 src/commandsAndMenu.tsx:1565 src/commandsAndMenu.tsx:1593 src/commandsAndMenu.tsx:1599 src/commandsAndMenu.tsx:1628 src/commandsAndMenu.tsx:1931 src/commandsAndMenu.tsx:2024 src/widgets/CredentialsBox.tsx:14 src/widgets/CredentialsBox.tsx:15 src/widgets/CredentialsBox.tsx:16 +#: src/commandsAndMenu.tsx:1172 src/commandsAndMenu.tsx:987 src/commandsAndMenu.tsx:992 +msgid "Get all the stashed changes" +msgstr "" + +#: src/commandsAndMenu.tsx:1175 src/commandsAndMenu.tsx:1177 src/commandsAndMenu.tsx:1183 src/commandsAndMenu.tsx:1206 src/commandsAndMenu.tsx:1235 src/commandsAndMenu.tsx:1239 src/commandsAndMenu.tsx:1244 src/commandsAndMenu.tsx:1341 src/commandsAndMenu.tsx:1407 src/commandsAndMenu.tsx:1468 src/commandsAndMenu.tsx:1473 src/commandsAndMenu.tsx:1541 src/commandsAndMenu.tsx:1565 src/commandsAndMenu.tsx:1593 src/commandsAndMenu.tsx:1599 src/commandsAndMenu.tsx:1628 src/commandsAndMenu.tsx:1931 src/commandsAndMenu.tsx:2024 src/commandsAndMenu.tsx:2219 src/widgets/CredentialsBox.tsx:14 src/widgets/CredentialsBox.tsx:15 src/widgets/CredentialsBox.tsx:16 msgid "Enter credentials for remote repository" msgstr "" -#: src/commandsAndMenu.tsx:1176 src/commandsAndMenu.tsx:1178 src/commandsAndMenu.tsx:1184 src/commandsAndMenu.tsx:1207 src/commandsAndMenu.tsx:1236 src/commandsAndMenu.tsx:1240 src/commandsAndMenu.tsx:1245 src/commandsAndMenu.tsx:1342 src/commandsAndMenu.tsx:1408 src/commandsAndMenu.tsx:1469 src/commandsAndMenu.tsx:1474 src/commandsAndMenu.tsx:1542 src/commandsAndMenu.tsx:1566 src/commandsAndMenu.tsx:1594 src/commandsAndMenu.tsx:1600 src/commandsAndMenu.tsx:1629 src/commandsAndMenu.tsx:1932 src/commandsAndMenu.tsx:2025 +#: src/commandsAndMenu.tsx:1176 src/commandsAndMenu.tsx:1178 src/commandsAndMenu.tsx:1184 src/commandsAndMenu.tsx:1207 src/commandsAndMenu.tsx:1236 src/commandsAndMenu.tsx:1240 src/commandsAndMenu.tsx:1245 src/commandsAndMenu.tsx:1342 src/commandsAndMenu.tsx:1408 src/commandsAndMenu.tsx:1469 src/commandsAndMenu.tsx:1474 src/commandsAndMenu.tsx:1542 src/commandsAndMenu.tsx:1566 src/commandsAndMenu.tsx:1594 src/commandsAndMenu.tsx:1600 src/commandsAndMenu.tsx:1629 src/commandsAndMenu.tsx:1932 src/commandsAndMenu.tsx:2025 src/commandsAndMenu.tsx:2220 msgid "Incorrect username or password." msgstr "" -#: src/commandsAndMenu.tsx:118 src/commandsAndMenu.tsx:119 src/commandsAndMenu.tsx:120 src/commandsAndMenu.tsx:123 src/commandsAndMenu.tsx:125 src/commandsAndMenu.tsx:126 src/commandsAndMenu.tsx:127 src/commandsAndMenu.tsx:128 src/commandsAndMenu.tsx:134 src/commandsAndMenu.tsx:138 src/commandsAndMenu.tsx:140 src/commandsAndMenu.tsx:141 src/commandsAndMenu.tsx:146 +#: src/commandsAndMenu.tsx:1178 src/commandsAndMenu.tsx:994 src/commandsAndMenu.tsx:999 +msgid "Got the stash list" +msgstr "" + +#: src/commandsAndMenu.tsx:118 src/commandsAndMenu.tsx:119 src/commandsAndMenu.tsx:120 src/commandsAndMenu.tsx:123 src/commandsAndMenu.tsx:125 src/commandsAndMenu.tsx:126 src/commandsAndMenu.tsx:127 src/commandsAndMenu.tsx:128 src/commandsAndMenu.tsx:134 src/commandsAndMenu.tsx:138 src/commandsAndMenu.tsx:140 src/commandsAndMenu.tsx:141 src/commandsAndMenu.tsx:146 src/commandsAndMenu.tsx:153 msgid "Submit the commit using the summary and description from commit box" msgstr "" -#: src/commandsAndMenu.tsx:1195 src/commandsAndMenu.tsx:1200 src/commandsAndMenu.tsx:768 src/commandsAndMenu.tsx:827 src/commandsAndMenu.tsx:828 src/commandsAndMenu.tsx:896 src/commandsAndMenu.tsx:912 src/commandsAndMenu.tsx:934 src/commandsAndMenu.tsx:938 src/commandsAndMenu.tsx:966 +#: src/commandsAndMenu.tsx:1195 src/commandsAndMenu.tsx:1200 src/commandsAndMenu.tsx:1381 src/commandsAndMenu.tsx:768 src/commandsAndMenu.tsx:827 src/commandsAndMenu.tsx:828 src/commandsAndMenu.tsx:896 src/commandsAndMenu.tsx:912 src/commandsAndMenu.tsx:934 src/commandsAndMenu.tsx:938 src/commandsAndMenu.tsx:966 msgid "Current" msgstr "" -#: src/commandsAndMenu.tsx:1196 src/commandsAndMenu.tsx:1201 src/commandsAndMenu.tsx:769 src/commandsAndMenu.tsx:828 src/commandsAndMenu.tsx:829 src/commandsAndMenu.tsx:897 src/commandsAndMenu.tsx:913 src/commandsAndMenu.tsx:935 src/commandsAndMenu.tsx:939 src/commandsAndMenu.tsx:967 +#: src/commandsAndMenu.tsx:1196 src/commandsAndMenu.tsx:1201 src/commandsAndMenu.tsx:1382 src/commandsAndMenu.tsx:769 src/commandsAndMenu.tsx:828 src/commandsAndMenu.tsx:829 src/commandsAndMenu.tsx:897 src/commandsAndMenu.tsx:913 src/commandsAndMenu.tsx:935 src/commandsAndMenu.tsx:939 src/commandsAndMenu.tsx:967 msgid "Incoming" msgstr "" -#: src/commandsAndMenu.tsx:1212 src/commandsAndMenu.tsx:1217 src/commandsAndMenu.tsx:785 src/commandsAndMenu.tsx:844 src/commandsAndMenu.tsx:845 src/commandsAndMenu.tsx:913 src/commandsAndMenu.tsx:929 src/commandsAndMenu.tsx:951 src/commandsAndMenu.tsx:955 src/commandsAndMenu.tsx:983 +#: src/commandsAndMenu.tsx:1212 src/commandsAndMenu.tsx:1217 src/commandsAndMenu.tsx:1398 src/commandsAndMenu.tsx:785 src/commandsAndMenu.tsx:844 src/commandsAndMenu.tsx:845 src/commandsAndMenu.tsx:913 src/commandsAndMenu.tsx:929 src/commandsAndMenu.tsx:951 src/commandsAndMenu.tsx:955 src/commandsAndMenu.tsx:983 msgid "Result" msgstr "" -#: src/commandsAndMenu.tsx:129 src/commandsAndMenu.tsx:130 src/commandsAndMenu.tsx:131 src/commandsAndMenu.tsx:134 src/commandsAndMenu.tsx:136 src/commandsAndMenu.tsx:137 src/commandsAndMenu.tsx:138 src/commandsAndMenu.tsx:139 src/commandsAndMenu.tsx:145 src/commandsAndMenu.tsx:149 src/commandsAndMenu.tsx:151 src/commandsAndMenu.tsx:152 src/commandsAndMenu.tsx:157 +#: src/commandsAndMenu.tsx:129 src/commandsAndMenu.tsx:130 src/commandsAndMenu.tsx:131 src/commandsAndMenu.tsx:134 src/commandsAndMenu.tsx:136 src/commandsAndMenu.tsx:137 src/commandsAndMenu.tsx:138 src/commandsAndMenu.tsx:139 src/commandsAndMenu.tsx:145 src/commandsAndMenu.tsx:149 src/commandsAndMenu.tsx:151 src/commandsAndMenu.tsx:152 src/commandsAndMenu.tsx:157 src/commandsAndMenu.tsx:164 msgid "Open Git Repository in Terminal" msgstr "" -#: src/commandsAndMenu.tsx:130 src/commandsAndMenu.tsx:131 src/commandsAndMenu.tsx:132 src/commandsAndMenu.tsx:135 src/commandsAndMenu.tsx:137 src/commandsAndMenu.tsx:138 src/commandsAndMenu.tsx:139 src/commandsAndMenu.tsx:140 src/commandsAndMenu.tsx:146 src/commandsAndMenu.tsx:150 src/commandsAndMenu.tsx:152 src/commandsAndMenu.tsx:153 src/commandsAndMenu.tsx:158 +#: src/commandsAndMenu.tsx:130 src/commandsAndMenu.tsx:131 src/commandsAndMenu.tsx:132 src/commandsAndMenu.tsx:135 src/commandsAndMenu.tsx:137 src/commandsAndMenu.tsx:138 src/commandsAndMenu.tsx:139 src/commandsAndMenu.tsx:140 src/commandsAndMenu.tsx:146 src/commandsAndMenu.tsx:150 src/commandsAndMenu.tsx:152 src/commandsAndMenu.tsx:153 src/commandsAndMenu.tsx:158 src/commandsAndMenu.tsx:165 msgid "Open a New Terminal to the Git Repository" msgstr "" -#: src/commandsAndMenu.tsx:1303 src/commandsAndMenu.tsx:1307 src/commandsAndMenu.tsx:1336 src/commandsAndMenu.tsx:1509 src/commandsAndMenu.tsx:1513 src/commandsAndMenu.tsx:1542 src/commandsAndMenu.tsx:1565 src/commandsAndMenu.tsx:1643 src/commandsAndMenu.tsx:1772 src/commandsAndMenu.tsx:1865 +#: src/commandsAndMenu.tsx:1303 src/commandsAndMenu.tsx:1307 src/commandsAndMenu.tsx:1336 src/commandsAndMenu.tsx:1509 src/commandsAndMenu.tsx:1513 src/commandsAndMenu.tsx:1542 src/commandsAndMenu.tsx:1565 src/commandsAndMenu.tsx:1643 src/commandsAndMenu.tsx:1772 src/commandsAndMenu.tsx:1833 src/commandsAndMenu.tsx:1865 src/commandsAndMenu.tsx:2060 msgid "Git" msgstr "" -#: src/commandsAndMenu.tsx:1547 +#: src/commandsAndMenu.tsx:1547 src/commandsAndMenu.tsx:1739 msgid "Add Tag" msgstr "" -#: src/commandsAndMenu.tsx:1548 +#: src/commandsAndMenu.tsx:1548 src/commandsAndMenu.tsx:1740 msgid "Add tag pointing to selected commit" msgstr "" -#: src/commandsAndMenu.tsx:1586 +#: src/commandsAndMenu.tsx:1586 src/commandsAndMenu.tsx:1776 msgid "Create tag pointing to '%1'..." msgstr "" -#: src/commandsAndMenu.tsx:159 src/commandsAndMenu.tsx:161 src/commandsAndMenu.tsx:162 src/commandsAndMenu.tsx:163 src/commandsAndMenu.tsx:166 src/commandsAndMenu.tsx:168 src/commandsAndMenu.tsx:169 src/commandsAndMenu.tsx:170 src/commandsAndMenu.tsx:171 src/commandsAndMenu.tsx:177 src/commandsAndMenu.tsx:181 src/commandsAndMenu.tsx:187 src/commandsAndMenu.tsx:188 src/commandsAndMenu.tsx:193 +#: src/commandsAndMenu.tsx:159 src/commandsAndMenu.tsx:161 src/commandsAndMenu.tsx:162 src/commandsAndMenu.tsx:163 src/commandsAndMenu.tsx:166 src/commandsAndMenu.tsx:168 src/commandsAndMenu.tsx:169 src/commandsAndMenu.tsx:170 src/commandsAndMenu.tsx:171 src/commandsAndMenu.tsx:177 src/commandsAndMenu.tsx:181 src/commandsAndMenu.tsx:187 src/commandsAndMenu.tsx:188 src/commandsAndMenu.tsx:193 src/commandsAndMenu.tsx:200 msgid "Git Interface" msgstr "" -#: src/commandsAndMenu.tsx:1596 +#: src/commandsAndMenu.tsx:1596 src/commandsAndMenu.tsx:1784 msgid "Failed to create tag '%1' poining to '%2'." msgstr "" -#: src/commandsAndMenu.tsx:160 src/commandsAndMenu.tsx:162 src/commandsAndMenu.tsx:163 src/commandsAndMenu.tsx:164 src/commandsAndMenu.tsx:167 src/commandsAndMenu.tsx:169 src/commandsAndMenu.tsx:170 src/commandsAndMenu.tsx:171 src/commandsAndMenu.tsx:172 src/commandsAndMenu.tsx:178 src/commandsAndMenu.tsx:182 src/commandsAndMenu.tsx:188 src/commandsAndMenu.tsx:189 src/commandsAndMenu.tsx:194 +#: src/commandsAndMenu.tsx:160 src/commandsAndMenu.tsx:162 src/commandsAndMenu.tsx:163 src/commandsAndMenu.tsx:164 src/commandsAndMenu.tsx:167 src/commandsAndMenu.tsx:169 src/commandsAndMenu.tsx:170 src/commandsAndMenu.tsx:171 src/commandsAndMenu.tsx:172 src/commandsAndMenu.tsx:178 src/commandsAndMenu.tsx:182 src/commandsAndMenu.tsx:188 src/commandsAndMenu.tsx:189 src/commandsAndMenu.tsx:194 src/commandsAndMenu.tsx:201 msgid "Go to Git user interface" msgstr "" -#: src/commandsAndMenu.tsx:1608 +#: src/commandsAndMenu.tsx:1608 src/commandsAndMenu.tsx:1797 msgid "Created tag '%1' pointing to '%2'." msgstr "" -#: src/commandsAndMenu.tsx:172 src/commandsAndMenu.tsx:174 src/commandsAndMenu.tsx:175 src/commandsAndMenu.tsx:176 src/commandsAndMenu.tsx:179 src/commandsAndMenu.tsx:181 src/commandsAndMenu.tsx:182 src/commandsAndMenu.tsx:183 src/commandsAndMenu.tsx:184 src/commandsAndMenu.tsx:186 src/commandsAndMenu.tsx:188 src/commandsAndMenu.tsx:189 src/commandsAndMenu.tsx:190 src/commandsAndMenu.tsx:191 src/commandsAndMenu.tsx:194 src/commandsAndMenu.tsx:197 src/commandsAndMenu.tsx:200 src/commandsAndMenu.tsx:201 src/commandsAndMenu.tsx:206 src/commandsAndMenu.tsx:207 src/commandsAndMenu.tsx:208 src/commandsAndMenu.tsx:213 src/components/GitPanel.tsx:445 src/components/GitPanel.tsx:461 src/components/GitPanel.tsx:466 src/components/GitPanel.tsx:473 src/components/GitPanel.tsx:487 src/components/GitPanel.tsx:495 src/components/GitPanel.tsx:594 src/components/GitPanel.tsx:595 src/components/GitPanel.tsx:678 src/components/GitPanel.tsx:697 src/components/GitPanel.tsx:698 +#: src/commandsAndMenu.tsx:172 src/commandsAndMenu.tsx:174 src/commandsAndMenu.tsx:175 src/commandsAndMenu.tsx:176 src/commandsAndMenu.tsx:179 src/commandsAndMenu.tsx:181 src/commandsAndMenu.tsx:182 src/commandsAndMenu.tsx:183 src/commandsAndMenu.tsx:184 src/commandsAndMenu.tsx:186 src/commandsAndMenu.tsx:188 src/commandsAndMenu.tsx:189 src/commandsAndMenu.tsx:190 src/commandsAndMenu.tsx:191 src/commandsAndMenu.tsx:194 src/commandsAndMenu.tsx:197 src/commandsAndMenu.tsx:200 src/commandsAndMenu.tsx:201 src/commandsAndMenu.tsx:206 src/commandsAndMenu.tsx:207 src/commandsAndMenu.tsx:208 src/commandsAndMenu.tsx:213 src/commandsAndMenu.tsx:222 src/components/GitPanel.tsx:445 src/components/GitPanel.tsx:461 src/components/GitPanel.tsx:466 src/components/GitPanel.tsx:473 src/components/GitPanel.tsx:487 src/components/GitPanel.tsx:495 src/components/GitPanel.tsx:594 src/components/GitPanel.tsx:595 src/components/GitPanel.tsx:678 src/components/GitPanel.tsx:691 src/components/GitPanel.tsx:697 src/components/GitPanel.tsx:698 msgid "Initialize a Repository" msgstr "" -#: src/commandsAndMenu.tsx:173 src/commandsAndMenu.tsx:175 src/commandsAndMenu.tsx:176 src/commandsAndMenu.tsx:177 src/commandsAndMenu.tsx:180 src/commandsAndMenu.tsx:182 src/commandsAndMenu.tsx:183 src/commandsAndMenu.tsx:184 src/commandsAndMenu.tsx:185 src/commandsAndMenu.tsx:191 src/commandsAndMenu.tsx:195 src/commandsAndMenu.tsx:201 src/commandsAndMenu.tsx:202 src/commandsAndMenu.tsx:207 +#: src/commandsAndMenu.tsx:173 src/commandsAndMenu.tsx:175 src/commandsAndMenu.tsx:176 src/commandsAndMenu.tsx:177 src/commandsAndMenu.tsx:180 src/commandsAndMenu.tsx:182 src/commandsAndMenu.tsx:183 src/commandsAndMenu.tsx:184 src/commandsAndMenu.tsx:185 src/commandsAndMenu.tsx:191 src/commandsAndMenu.tsx:195 src/commandsAndMenu.tsx:201 src/commandsAndMenu.tsx:202 src/commandsAndMenu.tsx:207 src/commandsAndMenu.tsx:214 msgid "Create an empty Git repository or reinitialize an existing one" msgstr "" -#: src/commandsAndMenu.tsx:180 src/commandsAndMenu.tsx:182 src/commandsAndMenu.tsx:183 src/commandsAndMenu.tsx:184 src/commandsAndMenu.tsx:187 src/commandsAndMenu.tsx:189 src/commandsAndMenu.tsx:190 src/commandsAndMenu.tsx:191 src/commandsAndMenu.tsx:192 src/commandsAndMenu.tsx:198 src/commandsAndMenu.tsx:202 src/commandsAndMenu.tsx:208 src/commandsAndMenu.tsx:209 src/commandsAndMenu.tsx:214 +#: src/commandsAndMenu.tsx:180 src/commandsAndMenu.tsx:182 src/commandsAndMenu.tsx:183 src/commandsAndMenu.tsx:184 src/commandsAndMenu.tsx:187 src/commandsAndMenu.tsx:189 src/commandsAndMenu.tsx:190 src/commandsAndMenu.tsx:191 src/commandsAndMenu.tsx:192 src/commandsAndMenu.tsx:198 src/commandsAndMenu.tsx:202 src/commandsAndMenu.tsx:208 src/commandsAndMenu.tsx:209 src/commandsAndMenu.tsx:214 src/commandsAndMenu.tsx:223 msgid "Do you really want to make this directory a Git Repo?" msgstr "" -#: src/commandsAndMenu.tsx:183 src/commandsAndMenu.tsx:185 src/commandsAndMenu.tsx:186 src/commandsAndMenu.tsx:187 src/commandsAndMenu.tsx:190 src/commandsAndMenu.tsx:192 src/commandsAndMenu.tsx:193 src/commandsAndMenu.tsx:194 src/commandsAndMenu.tsx:195 src/commandsAndMenu.tsx:201 src/commandsAndMenu.tsx:205 src/commandsAndMenu.tsx:211 src/commandsAndMenu.tsx:212 src/commandsAndMenu.tsx:217 +#: src/commandsAndMenu.tsx:183 src/commandsAndMenu.tsx:185 src/commandsAndMenu.tsx:186 src/commandsAndMenu.tsx:187 src/commandsAndMenu.tsx:190 src/commandsAndMenu.tsx:192 src/commandsAndMenu.tsx:193 src/commandsAndMenu.tsx:194 src/commandsAndMenu.tsx:195 src/commandsAndMenu.tsx:201 src/commandsAndMenu.tsx:205 src/commandsAndMenu.tsx:211 src/commandsAndMenu.tsx:212 src/commandsAndMenu.tsx:217 src/commandsAndMenu.tsx:226 msgid "Yes" msgstr "" -#: src/commandsAndMenu.tsx:1883 src/commandsAndMenu.tsx:1976 src/widgets/CredentialsBox.tsx:18 src/widgets/CredentialsBox.tsx:37 src/widgets/CredentialsBox.tsx:38 src/widgets/CredentialsBox.tsx:44 +#: src/commandsAndMenu.tsx:1883 src/commandsAndMenu.tsx:1976 src/commandsAndMenu.tsx:2171 src/widgets/CredentialsBox.tsx:18 src/widgets/CredentialsBox.tsx:37 src/widgets/CredentialsBox.tsx:38 src/widgets/CredentialsBox.tsx:44 msgid "password / personal access token" msgstr "" @@ -496,31 +626,31 @@ msgstr "" msgid "Initializing..." msgstr "" -#: src/commandsAndMenu.tsx:1924 src/commandsAndMenu.tsx:2017 +#: src/commandsAndMenu.tsx:1924 src/commandsAndMenu.tsx:2017 src/commandsAndMenu.tsx:2212 msgid "personal access token" msgstr "" -#: src/commandsAndMenu.tsx:196 src/commandsAndMenu.tsx:198 src/commandsAndMenu.tsx:199 src/commandsAndMenu.tsx:200 src/commandsAndMenu.tsx:203 src/commandsAndMenu.tsx:205 src/commandsAndMenu.tsx:206 src/commandsAndMenu.tsx:207 src/commandsAndMenu.tsx:208 src/commandsAndMenu.tsx:214 src/commandsAndMenu.tsx:218 src/commandsAndMenu.tsx:224 src/commandsAndMenu.tsx:225 src/commandsAndMenu.tsx:230 +#: src/commandsAndMenu.tsx:196 src/commandsAndMenu.tsx:198 src/commandsAndMenu.tsx:199 src/commandsAndMenu.tsx:200 src/commandsAndMenu.tsx:203 src/commandsAndMenu.tsx:205 src/commandsAndMenu.tsx:206 src/commandsAndMenu.tsx:207 src/commandsAndMenu.tsx:208 src/commandsAndMenu.tsx:214 src/commandsAndMenu.tsx:218 src/commandsAndMenu.tsx:224 src/commandsAndMenu.tsx:225 src/commandsAndMenu.tsx:230 src/commandsAndMenu.tsx:239 msgid "Git repository initialized." msgstr "" -#: src/commandsAndMenu.tsx:198 src/commandsAndMenu.tsx:199 src/commandsAndMenu.tsx:200 src/commandsAndMenu.tsx:201 src/commandsAndMenu.tsx:207 src/commandsAndMenu.tsx:211 src/commandsAndMenu.tsx:217 src/commandsAndMenu.tsx:218 src/commandsAndMenu.tsx:223 +#: src/commandsAndMenu.tsx:198 src/commandsAndMenu.tsx:199 src/commandsAndMenu.tsx:200 src/commandsAndMenu.tsx:201 src/commandsAndMenu.tsx:207 src/commandsAndMenu.tsx:211 src/commandsAndMenu.tsx:217 src/commandsAndMenu.tsx:218 src/commandsAndMenu.tsx:223 src/commandsAndMenu.tsx:231 msgid "Initializing…" msgstr "" -#: src/commandsAndMenu.tsx:201 src/commandsAndMenu.tsx:203 src/commandsAndMenu.tsx:204 src/commandsAndMenu.tsx:205 src/commandsAndMenu.tsx:208 src/commandsAndMenu.tsx:210 src/commandsAndMenu.tsx:211 src/commandsAndMenu.tsx:212 src/commandsAndMenu.tsx:213 src/commandsAndMenu.tsx:219 src/commandsAndMenu.tsx:223 src/commandsAndMenu.tsx:229 src/commandsAndMenu.tsx:230 src/commandsAndMenu.tsx:235 +#: src/commandsAndMenu.tsx:201 src/commandsAndMenu.tsx:203 src/commandsAndMenu.tsx:204 src/commandsAndMenu.tsx:205 src/commandsAndMenu.tsx:208 src/commandsAndMenu.tsx:210 src/commandsAndMenu.tsx:211 src/commandsAndMenu.tsx:212 src/commandsAndMenu.tsx:213 src/commandsAndMenu.tsx:219 src/commandsAndMenu.tsx:223 src/commandsAndMenu.tsx:229 src/commandsAndMenu.tsx:230 src/commandsAndMenu.tsx:235 src/commandsAndMenu.tsx:245 msgid "Encountered an error when initializing the repository. Error: " msgstr "" -#: src/commandsAndMenu.tsx:207 src/commandsAndMenu.tsx:209 src/commandsAndMenu.tsx:210 src/commandsAndMenu.tsx:211 src/commandsAndMenu.tsx:214 src/commandsAndMenu.tsx:216 src/commandsAndMenu.tsx:217 src/commandsAndMenu.tsx:218 src/commandsAndMenu.tsx:219 src/commandsAndMenu.tsx:225 src/commandsAndMenu.tsx:229 src/commandsAndMenu.tsx:235 src/commandsAndMenu.tsx:236 src/commandsAndMenu.tsx:241 +#: src/commandsAndMenu.tsx:207 src/commandsAndMenu.tsx:209 src/commandsAndMenu.tsx:210 src/commandsAndMenu.tsx:211 src/commandsAndMenu.tsx:214 src/commandsAndMenu.tsx:216 src/commandsAndMenu.tsx:217 src/commandsAndMenu.tsx:218 src/commandsAndMenu.tsx:219 src/commandsAndMenu.tsx:225 src/commandsAndMenu.tsx:229 src/commandsAndMenu.tsx:235 src/commandsAndMenu.tsx:236 src/commandsAndMenu.tsx:241 src/commandsAndMenu.tsx:252 msgid "Failed to initialize the Git repository" msgstr "" -#: src/commandsAndMenu.tsx:228 src/commandsAndMenu.tsx:230 src/commandsAndMenu.tsx:231 src/commandsAndMenu.tsx:232 src/commandsAndMenu.tsx:235 src/commandsAndMenu.tsx:237 src/commandsAndMenu.tsx:238 src/commandsAndMenu.tsx:239 src/commandsAndMenu.tsx:240 src/commandsAndMenu.tsx:246 src/commandsAndMenu.tsx:250 src/commandsAndMenu.tsx:256 src/commandsAndMenu.tsx:257 src/commandsAndMenu.tsx:262 +#: src/commandsAndMenu.tsx:228 src/commandsAndMenu.tsx:230 src/commandsAndMenu.tsx:231 src/commandsAndMenu.tsx:232 src/commandsAndMenu.tsx:235 src/commandsAndMenu.tsx:237 src/commandsAndMenu.tsx:238 src/commandsAndMenu.tsx:239 src/commandsAndMenu.tsx:240 src/commandsAndMenu.tsx:246 src/commandsAndMenu.tsx:250 src/commandsAndMenu.tsx:256 src/commandsAndMenu.tsx:257 src/commandsAndMenu.tsx:262 src/commandsAndMenu.tsx:273 msgid "Simple staging" msgstr "" -#: src/commandsAndMenu.tsx:237 src/commandsAndMenu.tsx:239 src/commandsAndMenu.tsx:240 src/commandsAndMenu.tsx:241 src/commandsAndMenu.tsx:244 src/commandsAndMenu.tsx:246 src/commandsAndMenu.tsx:247 src/commandsAndMenu.tsx:248 src/commandsAndMenu.tsx:249 src/commandsAndMenu.tsx:255 src/commandsAndMenu.tsx:259 src/commandsAndMenu.tsx:265 src/commandsAndMenu.tsx:266 src/commandsAndMenu.tsx:271 +#: src/commandsAndMenu.tsx:237 src/commandsAndMenu.tsx:239 src/commandsAndMenu.tsx:240 src/commandsAndMenu.tsx:241 src/commandsAndMenu.tsx:244 src/commandsAndMenu.tsx:246 src/commandsAndMenu.tsx:247 src/commandsAndMenu.tsx:248 src/commandsAndMenu.tsx:249 src/commandsAndMenu.tsx:255 src/commandsAndMenu.tsx:259 src/commandsAndMenu.tsx:265 src/commandsAndMenu.tsx:266 src/commandsAndMenu.tsx:271 src/commandsAndMenu.tsx:282 msgid "Double click opens diff" msgstr "" @@ -532,11 +662,11 @@ msgstr "" msgid "Add a Git remote repository" msgstr "" -#: src/commandsAndMenu.tsx:252 src/commandsAndMenu.tsx:254 src/commandsAndMenu.tsx:255 src/commandsAndMenu.tsx:256 src/commandsAndMenu.tsx:259 src/commandsAndMenu.tsx:261 src/commandsAndMenu.tsx:262 src/commandsAndMenu.tsx:263 src/commandsAndMenu.tsx:264 src/commandsAndMenu.tsx:270 src/commandsAndMenu.tsx:274 src/commandsAndMenu.tsx:280 src/commandsAndMenu.tsx:281 src/commandsAndMenu.tsx:286 +#: src/commandsAndMenu.tsx:252 src/commandsAndMenu.tsx:254 src/commandsAndMenu.tsx:255 src/commandsAndMenu.tsx:256 src/commandsAndMenu.tsx:259 src/commandsAndMenu.tsx:261 src/commandsAndMenu.tsx:262 src/commandsAndMenu.tsx:263 src/commandsAndMenu.tsx:264 src/commandsAndMenu.tsx:270 src/commandsAndMenu.tsx:274 src/commandsAndMenu.tsx:280 src/commandsAndMenu.tsx:281 src/commandsAndMenu.tsx:286 src/commandsAndMenu.tsx:297 msgid "Not in a Git repository. Unable to add a remote." msgstr "" -#: src/commandsAndMenu.tsx:258 src/commandsAndMenu.tsx:259 src/commandsAndMenu.tsx:264 src/commandsAndMenu.tsx:265 src/commandsAndMenu.tsx:268 src/commandsAndMenu.tsx:269 src/commandsAndMenu.tsx:274 src/commandsAndMenu.tsx:275 src/commandsAndMenu.tsx:276 src/commandsAndMenu.tsx:280 src/commandsAndMenu.tsx:281 +#: src/commandsAndMenu.tsx:258 src/commandsAndMenu.tsx:259 src/commandsAndMenu.tsx:264 src/commandsAndMenu.tsx:265 src/commandsAndMenu.tsx:268 src/commandsAndMenu.tsx:269 src/commandsAndMenu.tsx:274 src/commandsAndMenu.tsx:275 src/commandsAndMenu.tsx:276 src/commandsAndMenu.tsx:280 src/commandsAndMenu.tsx:281 src/commandsAndMenu.tsx:291 src/commandsAndMenu.tsx:292 msgid "Manage Remote Repositories" msgstr "" @@ -552,7 +682,7 @@ msgstr "" msgid "Error when adding remote repository" msgstr "" -#: src/commandsAndMenu.tsx:291 src/commandsAndMenu.tsx:292 src/commandsAndMenu.tsx:295 src/commandsAndMenu.tsx:296 src/commandsAndMenu.tsx:297 src/commandsAndMenu.tsx:298 src/commandsAndMenu.tsx:301 src/commandsAndMenu.tsx:302 src/commandsAndMenu.tsx:307 src/commandsAndMenu.tsx:308 src/commandsAndMenu.tsx:309 src/commandsAndMenu.tsx:313 src/commandsAndMenu.tsx:314 src/commandsAndMenu.tsx:335 src/commandsAndMenu.tsx:336 src/commandsAndMenu.tsx:337 src/commandsAndMenu.tsx:338 src/commandsAndMenu.tsx:339 src/commandsAndMenu.tsx:340 src/commandsAndMenu.tsx:342 src/commandsAndMenu.tsx:343 +#: src/commandsAndMenu.tsx:291 src/commandsAndMenu.tsx:292 src/commandsAndMenu.tsx:295 src/commandsAndMenu.tsx:296 src/commandsAndMenu.tsx:297 src/commandsAndMenu.tsx:298 src/commandsAndMenu.tsx:301 src/commandsAndMenu.tsx:302 src/commandsAndMenu.tsx:307 src/commandsAndMenu.tsx:308 src/commandsAndMenu.tsx:309 src/commandsAndMenu.tsx:313 src/commandsAndMenu.tsx:314 src/commandsAndMenu.tsx:335 src/commandsAndMenu.tsx:336 src/commandsAndMenu.tsx:337 src/commandsAndMenu.tsx:338 src/commandsAndMenu.tsx:339 src/commandsAndMenu.tsx:340 src/commandsAndMenu.tsx:342 src/commandsAndMenu.tsx:343 src/commandsAndMenu.tsx:431 src/commandsAndMenu.tsx:432 msgid "Open .gitignore" msgstr "" @@ -564,15 +694,15 @@ msgstr "" msgid "Cloning..." msgstr "" -#: src/commandsAndMenu.tsx:303 src/commandsAndMenu.tsx:309 src/commandsAndMenu.tsx:313 src/commandsAndMenu.tsx:319 src/commandsAndMenu.tsx:320 src/commandsAndMenu.tsx:325 +#: src/commandsAndMenu.tsx:303 src/commandsAndMenu.tsx:309 src/commandsAndMenu.tsx:313 src/commandsAndMenu.tsx:319 src/commandsAndMenu.tsx:320 src/commandsAndMenu.tsx:325 src/commandsAndMenu.tsx:452 msgid "Push to Remote (Advanced)" msgstr "" -#: src/commandsAndMenu.tsx:304 src/commandsAndMenu.tsx:308 src/commandsAndMenu.tsx:309 src/commandsAndMenu.tsx:310 src/commandsAndMenu.tsx:314 src/commandsAndMenu.tsx:320 src/commandsAndMenu.tsx:321 src/commandsAndMenu.tsx:326 src/commandsAndMenu.tsx:345 src/commandsAndMenu.tsx:347 src/commandsAndMenu.tsx:351 src/commandsAndMenu.tsx:352 src/commandsAndMenu.tsx:355 +#: src/commandsAndMenu.tsx:304 src/commandsAndMenu.tsx:308 src/commandsAndMenu.tsx:309 src/commandsAndMenu.tsx:310 src/commandsAndMenu.tsx:314 src/commandsAndMenu.tsx:320 src/commandsAndMenu.tsx:321 src/commandsAndMenu.tsx:326 src/commandsAndMenu.tsx:345 src/commandsAndMenu.tsx:347 src/commandsAndMenu.tsx:351 src/commandsAndMenu.tsx:352 src/commandsAndMenu.tsx:355 src/commandsAndMenu.tsx:453 msgid "Push to Remote" msgstr "" -#: src/commandsAndMenu.tsx:305 src/commandsAndMenu.tsx:309 src/commandsAndMenu.tsx:310 src/commandsAndMenu.tsx:311 src/commandsAndMenu.tsx:315 src/commandsAndMenu.tsx:321 src/commandsAndMenu.tsx:322 src/commandsAndMenu.tsx:327 src/commandsAndMenu.tsx:346 src/commandsAndMenu.tsx:348 src/commandsAndMenu.tsx:352 src/commandsAndMenu.tsx:353 src/commandsAndMenu.tsx:356 +#: src/commandsAndMenu.tsx:305 src/commandsAndMenu.tsx:309 src/commandsAndMenu.tsx:310 src/commandsAndMenu.tsx:311 src/commandsAndMenu.tsx:315 src/commandsAndMenu.tsx:321 src/commandsAndMenu.tsx:322 src/commandsAndMenu.tsx:327 src/commandsAndMenu.tsx:346 src/commandsAndMenu.tsx:348 src/commandsAndMenu.tsx:352 src/commandsAndMenu.tsx:353 src/commandsAndMenu.tsx:356 src/commandsAndMenu.tsx:454 msgid "Push code to remote repository" msgstr "" @@ -580,39 +710,39 @@ msgstr "" msgid "Push to Remote (Force)" msgstr "" -#: src/commandsAndMenu.tsx:314 src/commandsAndMenu.tsx:315 src/commandsAndMenu.tsx:316 src/commandsAndMenu.tsx:331 src/commandsAndMenu.tsx:337 src/commandsAndMenu.tsx:341 src/commandsAndMenu.tsx:347 src/commandsAndMenu.tsx:348 src/commandsAndMenu.tsx:353 +#: src/commandsAndMenu.tsx:314 src/commandsAndMenu.tsx:315 src/commandsAndMenu.tsx:316 src/commandsAndMenu.tsx:331 src/commandsAndMenu.tsx:337 src/commandsAndMenu.tsx:341 src/commandsAndMenu.tsx:347 src/commandsAndMenu.tsx:348 src/commandsAndMenu.tsx:353 src/commandsAndMenu.tsx:479 msgid "Pushing…" msgstr "" -#: src/commandsAndMenu.tsx:314 src/commandsAndMenu.tsx:320 src/commandsAndMenu.tsx:324 src/commandsAndMenu.tsx:330 src/commandsAndMenu.tsx:331 src/commandsAndMenu.tsx:336 +#: src/commandsAndMenu.tsx:314 src/commandsAndMenu.tsx:320 src/commandsAndMenu.tsx:324 src/commandsAndMenu.tsx:330 src/commandsAndMenu.tsx:331 src/commandsAndMenu.tsx:336 src/commandsAndMenu.tsx:464 msgid "Please select push options." msgstr "" -#: src/commandsAndMenu.tsx:318 src/commandsAndMenu.tsx:324 src/commandsAndMenu.tsx:328 src/commandsAndMenu.tsx:334 src/commandsAndMenu.tsx:335 src/commandsAndMenu.tsx:340 src/commandsAndMenu.tsx:433 src/commandsAndMenu.tsx:434 src/commandsAndMenu.tsx:450 src/commandsAndMenu.tsx:472 src/commandsAndMenu.tsx:476 src/commandsAndMenu.tsx:482 src/commandsAndMenu.tsx:483 src/commandsAndMenu.tsx:488 +#: src/commandsAndMenu.tsx:318 src/commandsAndMenu.tsx:324 src/commandsAndMenu.tsx:328 src/commandsAndMenu.tsx:334 src/commandsAndMenu.tsx:335 src/commandsAndMenu.tsx:340 src/commandsAndMenu.tsx:433 src/commandsAndMenu.tsx:434 src/commandsAndMenu.tsx:450 src/commandsAndMenu.tsx:468 src/commandsAndMenu.tsx:472 src/commandsAndMenu.tsx:476 src/commandsAndMenu.tsx:482 src/commandsAndMenu.tsx:483 src/commandsAndMenu.tsx:488 src/commandsAndMenu.tsx:625 msgid "Proceed" msgstr "" -#: src/commandsAndMenu.tsx:323 src/commandsAndMenu.tsx:324 src/commandsAndMenu.tsx:325 src/commandsAndMenu.tsx:341 src/commandsAndMenu.tsx:347 src/commandsAndMenu.tsx:351 src/commandsAndMenu.tsx:357 src/commandsAndMenu.tsx:358 src/commandsAndMenu.tsx:360 src/commandsAndMenu.tsx:362 src/commandsAndMenu.tsx:363 src/commandsAndMenu.tsx:366 src/commandsAndMenu.tsx:367 src/commandsAndMenu.tsx:370 +#: src/commandsAndMenu.tsx:323 src/commandsAndMenu.tsx:324 src/commandsAndMenu.tsx:325 src/commandsAndMenu.tsx:341 src/commandsAndMenu.tsx:347 src/commandsAndMenu.tsx:351 src/commandsAndMenu.tsx:357 src/commandsAndMenu.tsx:358 src/commandsAndMenu.tsx:360 src/commandsAndMenu.tsx:362 src/commandsAndMenu.tsx:363 src/commandsAndMenu.tsx:366 src/commandsAndMenu.tsx:367 src/commandsAndMenu.tsx:370 src/commandsAndMenu.tsx:491 msgid "Successfully pushed" msgstr "" -#: src/commandsAndMenu.tsx:329 src/commandsAndMenu.tsx:330 src/commandsAndMenu.tsx:331 src/commandsAndMenu.tsx:347 src/commandsAndMenu.tsx:354 src/commandsAndMenu.tsx:358 src/commandsAndMenu.tsx:364 src/commandsAndMenu.tsx:365 src/commandsAndMenu.tsx:366 src/commandsAndMenu.tsx:368 src/commandsAndMenu.tsx:370 src/commandsAndMenu.tsx:372 src/commandsAndMenu.tsx:373 src/commandsAndMenu.tsx:376 +#: src/commandsAndMenu.tsx:329 src/commandsAndMenu.tsx:330 src/commandsAndMenu.tsx:331 src/commandsAndMenu.tsx:347 src/commandsAndMenu.tsx:354 src/commandsAndMenu.tsx:358 src/commandsAndMenu.tsx:364 src/commandsAndMenu.tsx:365 src/commandsAndMenu.tsx:366 src/commandsAndMenu.tsx:368 src/commandsAndMenu.tsx:370 src/commandsAndMenu.tsx:372 src/commandsAndMenu.tsx:373 src/commandsAndMenu.tsx:376 src/commandsAndMenu.tsx:498 msgid "Encountered an error when pushing changes. Error: " msgstr "" -#: src/commandsAndMenu.tsx:333 src/commandsAndMenu.tsx:334 src/commandsAndMenu.tsx:335 src/commandsAndMenu.tsx:351 src/commandsAndMenu.tsx:358 src/commandsAndMenu.tsx:362 src/commandsAndMenu.tsx:368 src/commandsAndMenu.tsx:369 src/commandsAndMenu.tsx:370 src/commandsAndMenu.tsx:372 src/commandsAndMenu.tsx:374 src/commandsAndMenu.tsx:376 src/commandsAndMenu.tsx:377 src/commandsAndMenu.tsx:380 +#: src/commandsAndMenu.tsx:333 src/commandsAndMenu.tsx:334 src/commandsAndMenu.tsx:335 src/commandsAndMenu.tsx:351 src/commandsAndMenu.tsx:358 src/commandsAndMenu.tsx:362 src/commandsAndMenu.tsx:368 src/commandsAndMenu.tsx:369 src/commandsAndMenu.tsx:370 src/commandsAndMenu.tsx:372 src/commandsAndMenu.tsx:374 src/commandsAndMenu.tsx:376 src/commandsAndMenu.tsx:377 src/commandsAndMenu.tsx:380 src/commandsAndMenu.tsx:502 msgid "Failed to push" msgstr "" -#: src/commandsAndMenu.tsx:345 src/commandsAndMenu.tsx:346 src/commandsAndMenu.tsx:347 src/commandsAndMenu.tsx:363 src/commandsAndMenu.tsx:377 src/commandsAndMenu.tsx:381 src/commandsAndMenu.tsx:387 src/commandsAndMenu.tsx:388 src/commandsAndMenu.tsx:393 +#: src/commandsAndMenu.tsx:345 src/commandsAndMenu.tsx:346 src/commandsAndMenu.tsx:347 src/commandsAndMenu.tsx:363 src/commandsAndMenu.tsx:377 src/commandsAndMenu.tsx:381 src/commandsAndMenu.tsx:387 src/commandsAndMenu.tsx:388 src/commandsAndMenu.tsx:393 src/commandsAndMenu.tsx:527 msgid "Pull from Remote (Force)" msgstr "" -#: src/commandsAndMenu.tsx:346 src/commandsAndMenu.tsx:347 src/commandsAndMenu.tsx:348 src/commandsAndMenu.tsx:364 src/commandsAndMenu.tsx:378 src/commandsAndMenu.tsx:380 src/commandsAndMenu.tsx:382 src/commandsAndMenu.tsx:386 src/commandsAndMenu.tsx:387 src/commandsAndMenu.tsx:388 src/commandsAndMenu.tsx:389 src/commandsAndMenu.tsx:390 src/commandsAndMenu.tsx:394 +#: src/commandsAndMenu.tsx:346 src/commandsAndMenu.tsx:347 src/commandsAndMenu.tsx:348 src/commandsAndMenu.tsx:364 src/commandsAndMenu.tsx:378 src/commandsAndMenu.tsx:380 src/commandsAndMenu.tsx:382 src/commandsAndMenu.tsx:386 src/commandsAndMenu.tsx:387 src/commandsAndMenu.tsx:388 src/commandsAndMenu.tsx:389 src/commandsAndMenu.tsx:390 src/commandsAndMenu.tsx:394 src/commandsAndMenu.tsx:528 msgid "Pull from Remote" msgstr "" -#: src/commandsAndMenu.tsx:349 src/commandsAndMenu.tsx:350 src/commandsAndMenu.tsx:351 src/commandsAndMenu.tsx:367 src/commandsAndMenu.tsx:381 src/commandsAndMenu.tsx:385 src/commandsAndMenu.tsx:391 src/commandsAndMenu.tsx:392 src/commandsAndMenu.tsx:397 +#: src/commandsAndMenu.tsx:349 src/commandsAndMenu.tsx:350 src/commandsAndMenu.tsx:351 src/commandsAndMenu.tsx:367 src/commandsAndMenu.tsx:381 src/commandsAndMenu.tsx:385 src/commandsAndMenu.tsx:391 src/commandsAndMenu.tsx:392 src/commandsAndMenu.tsx:397 src/commandsAndMenu.tsx:531 msgid "Discard all current changes and pull from remote repository" msgstr "" @@ -620,15 +750,19 @@ msgstr "" msgid "Pushing..." msgstr "" -#: src/commandsAndMenu.tsx:352 src/commandsAndMenu.tsx:353 src/commandsAndMenu.tsx:354 src/commandsAndMenu.tsx:370 src/commandsAndMenu.tsx:381 src/commandsAndMenu.tsx:383 src/commandsAndMenu.tsx:384 src/commandsAndMenu.tsx:387 src/commandsAndMenu.tsx:388 src/commandsAndMenu.tsx:391 src/commandsAndMenu.tsx:394 src/commandsAndMenu.tsx:395 src/commandsAndMenu.tsx:400 +#: src/commandsAndMenu.tsx:352 src/commandsAndMenu.tsx:353 src/commandsAndMenu.tsx:354 src/commandsAndMenu.tsx:370 src/commandsAndMenu.tsx:381 src/commandsAndMenu.tsx:383 src/commandsAndMenu.tsx:384 src/commandsAndMenu.tsx:387 src/commandsAndMenu.tsx:388 src/commandsAndMenu.tsx:391 src/commandsAndMenu.tsx:394 src/commandsAndMenu.tsx:395 src/commandsAndMenu.tsx:400 src/commandsAndMenu.tsx:534 msgid "Pull latest code from remote repository" msgstr "" -#: src/commandsAndMenu.tsx:361 src/commandsAndMenu.tsx:362 src/commandsAndMenu.tsx:363 src/commandsAndMenu.tsx:379 src/commandsAndMenu.tsx:393 src/commandsAndMenu.tsx:397 src/commandsAndMenu.tsx:403 src/commandsAndMenu.tsx:404 src/commandsAndMenu.tsx:409 +#: src/commandsAndMenu.tsx:361 src/commandsAndMenu.tsx:362 src/commandsAndMenu.tsx:363 src/commandsAndMenu.tsx:379 src/commandsAndMenu.tsx:393 src/commandsAndMenu.tsx:397 src/commandsAndMenu.tsx:403 src/commandsAndMenu.tsx:404 src/commandsAndMenu.tsx:409 src/commandsAndMenu.tsx:542 msgid "Pulling…" msgstr "" -#: src/commandsAndMenu.tsx:369 src/commandsAndMenu.tsx:370 src/commandsAndMenu.tsx:371 src/commandsAndMenu.tsx:387 src/commandsAndMenu.tsx:395 src/commandsAndMenu.tsx:397 src/commandsAndMenu.tsx:401 src/commandsAndMenu.tsx:402 src/commandsAndMenu.tsx:405 src/commandsAndMenu.tsx:411 src/commandsAndMenu.tsx:412 src/commandsAndMenu.tsx:417 +#: src/commandsAndMenu.tsx:369 +msgid "Saves .gitignore" +msgstr "" + +#: src/commandsAndMenu.tsx:369 src/commandsAndMenu.tsx:370 src/commandsAndMenu.tsx:371 src/commandsAndMenu.tsx:387 src/commandsAndMenu.tsx:395 src/commandsAndMenu.tsx:397 src/commandsAndMenu.tsx:401 src/commandsAndMenu.tsx:402 src/commandsAndMenu.tsx:405 src/commandsAndMenu.tsx:411 src/commandsAndMenu.tsx:412 src/commandsAndMenu.tsx:417 src/commandsAndMenu.tsx:552 msgid "Successfully pulled" msgstr "" @@ -636,103 +770,127 @@ msgstr "" msgid "Pulling..." msgstr "" -#: src/commandsAndMenu.tsx:403 src/commandsAndMenu.tsx:404 src/commandsAndMenu.tsx:405 src/commandsAndMenu.tsx:407 src/commandsAndMenu.tsx:411 src/commandsAndMenu.tsx:412 src/commandsAndMenu.tsx:415 src/commandsAndMenu.tsx:421 src/commandsAndMenu.tsx:436 src/commandsAndMenu.tsx:440 src/commandsAndMenu.tsx:446 src/commandsAndMenu.tsx:447 src/commandsAndMenu.tsx:452 +#: src/commandsAndMenu.tsx:388 +msgid "Warning: The .gitignore file is a hidden file." +msgstr "" + +#: src/commandsAndMenu.tsx:391 +msgid "Hidden files by default cannot be accessed with the regular code editor. In order to open the .gitignore file you must:" +msgstr "" + +#: src/commandsAndMenu.tsx:396 +msgid "Print the command below to create a jupyter_server_config.py file with defaults commented out. If you already have the file located in .jupyter, skip this step." +msgstr "" + +#: src/commandsAndMenu.tsx:403 src/commandsAndMenu.tsx:404 src/commandsAndMenu.tsx:405 src/commandsAndMenu.tsx:407 src/commandsAndMenu.tsx:411 src/commandsAndMenu.tsx:412 src/commandsAndMenu.tsx:415 src/commandsAndMenu.tsx:421 src/commandsAndMenu.tsx:436 src/commandsAndMenu.tsx:440 src/commandsAndMenu.tsx:446 src/commandsAndMenu.tsx:447 src/commandsAndMenu.tsx:452 src/commandsAndMenu.tsx:584 msgid "Failed to pull" msgstr "" -#: src/commandsAndMenu.tsx:416 src/commandsAndMenu.tsx:417 src/commandsAndMenu.tsx:421 src/commandsAndMenu.tsx:422 src/commandsAndMenu.tsx:433 src/commandsAndMenu.tsx:438 src/commandsAndMenu.tsx:455 src/commandsAndMenu.tsx:459 src/commandsAndMenu.tsx:460 src/commandsAndMenu.tsx:464 src/commandsAndMenu.tsx:465 src/commandsAndMenu.tsx:466 src/commandsAndMenu.tsx:470 src/commandsAndMenu.tsx:471 src/commandsAndMenu.tsx:476 +#: src/commandsAndMenu.tsx:404 +msgid "Open jupyter_server_config.py, uncomment out the following line and set it to True:" +msgstr "" + +#: src/commandsAndMenu.tsx:416 +msgid "Show .gitignore file anyways" +msgstr "" + +#: src/commandsAndMenu.tsx:416 src/commandsAndMenu.tsx:417 src/commandsAndMenu.tsx:421 src/commandsAndMenu.tsx:422 src/commandsAndMenu.tsx:433 src/commandsAndMenu.tsx:438 src/commandsAndMenu.tsx:455 src/commandsAndMenu.tsx:459 src/commandsAndMenu.tsx:460 src/commandsAndMenu.tsx:464 src/commandsAndMenu.tsx:465 src/commandsAndMenu.tsx:466 src/commandsAndMenu.tsx:470 src/commandsAndMenu.tsx:471 src/commandsAndMenu.tsx:476 src/commandsAndMenu.tsx:608 src/commandsAndMenu.tsx:613 msgid "Reset to Remote" msgstr "" -#: src/commandsAndMenu.tsx:417 src/commandsAndMenu.tsx:418 src/commandsAndMenu.tsx:434 src/commandsAndMenu.tsx:456 src/commandsAndMenu.tsx:460 src/commandsAndMenu.tsx:466 src/commandsAndMenu.tsx:467 src/commandsAndMenu.tsx:472 +#: src/commandsAndMenu.tsx:417 src/commandsAndMenu.tsx:418 src/commandsAndMenu.tsx:434 src/commandsAndMenu.tsx:456 src/commandsAndMenu.tsx:460 src/commandsAndMenu.tsx:466 src/commandsAndMenu.tsx:467 src/commandsAndMenu.tsx:472 src/commandsAndMenu.tsx:609 msgid "Reset Current Branch to Remote State" msgstr "" -#: src/commandsAndMenu.tsx:421 src/commandsAndMenu.tsx:422 src/commandsAndMenu.tsx:423 src/commandsAndMenu.tsx:427 src/commandsAndMenu.tsx:428 src/commandsAndMenu.tsx:432 src/commandsAndMenu.tsx:481 src/commandsAndMenu.tsx:482 src/commandsAndMenu.tsx:498 src/commandsAndMenu.tsx:520 src/commandsAndMenu.tsx:524 src/commandsAndMenu.tsx:530 src/commandsAndMenu.tsx:531 src/commandsAndMenu.tsx:536 +#: src/commandsAndMenu.tsx:419 +msgid "Do not show this warning again" +msgstr "" + +#: src/commandsAndMenu.tsx:421 src/commandsAndMenu.tsx:422 src/commandsAndMenu.tsx:423 src/commandsAndMenu.tsx:427 src/commandsAndMenu.tsx:428 src/commandsAndMenu.tsx:432 src/commandsAndMenu.tsx:481 src/commandsAndMenu.tsx:482 src/commandsAndMenu.tsx:498 src/commandsAndMenu.tsx:520 src/commandsAndMenu.tsx:524 src/commandsAndMenu.tsx:530 src/commandsAndMenu.tsx:531 src/commandsAndMenu.tsx:536 src/commandsAndMenu.tsx:690 msgid "Show Diff" msgstr "" -#: src/commandsAndMenu.tsx:422 src/commandsAndMenu.tsx:423 src/commandsAndMenu.tsx:424 src/commandsAndMenu.tsx:428 src/commandsAndMenu.tsx:429 src/commandsAndMenu.tsx:433 src/commandsAndMenu.tsx:482 src/commandsAndMenu.tsx:483 src/commandsAndMenu.tsx:499 src/commandsAndMenu.tsx:521 src/commandsAndMenu.tsx:525 src/commandsAndMenu.tsx:531 src/commandsAndMenu.tsx:532 src/commandsAndMenu.tsx:537 +#: src/commandsAndMenu.tsx:422 src/commandsAndMenu.tsx:423 src/commandsAndMenu.tsx:424 src/commandsAndMenu.tsx:428 src/commandsAndMenu.tsx:429 src/commandsAndMenu.tsx:433 src/commandsAndMenu.tsx:482 src/commandsAndMenu.tsx:483 src/commandsAndMenu.tsx:499 src/commandsAndMenu.tsx:521 src/commandsAndMenu.tsx:525 src/commandsAndMenu.tsx:531 src/commandsAndMenu.tsx:532 src/commandsAndMenu.tsx:537 src/commandsAndMenu.tsx:691 msgid "Display a file diff." msgstr "" -#: src/commandsAndMenu.tsx:423 src/commandsAndMenu.tsx:424 src/commandsAndMenu.tsx:440 src/commandsAndMenu.tsx:462 src/commandsAndMenu.tsx:466 src/commandsAndMenu.tsx:472 src/commandsAndMenu.tsx:473 src/commandsAndMenu.tsx:478 +#: src/commandsAndMenu.tsx:423 src/commandsAndMenu.tsx:424 src/commandsAndMenu.tsx:440 src/commandsAndMenu.tsx:462 src/commandsAndMenu.tsx:466 src/commandsAndMenu.tsx:472 src/commandsAndMenu.tsx:473 src/commandsAndMenu.tsx:478 src/commandsAndMenu.tsx:615 msgid "To bring the current branch to the state of its corresponding remote tracking branch, a hard reset will be performed, which may result in some files being permanently deleted and some changes being permanently discarded. Are you sure you want to proceed? This action cannot be undone." msgstr "" -#: src/commandsAndMenu.tsx:429 src/commandsAndMenu.tsx:430 src/commandsAndMenu.tsx:446 src/commandsAndMenu.tsx:468 src/commandsAndMenu.tsx:472 src/commandsAndMenu.tsx:478 src/commandsAndMenu.tsx:479 src/commandsAndMenu.tsx:484 +#: src/commandsAndMenu.tsx:429 src/commandsAndMenu.tsx:430 src/commandsAndMenu.tsx:446 src/commandsAndMenu.tsx:468 src/commandsAndMenu.tsx:472 src/commandsAndMenu.tsx:478 src/commandsAndMenu.tsx:479 src/commandsAndMenu.tsx:484 src/commandsAndMenu.tsx:621 msgid "Close all opened files to avoid conflicts" msgstr "" -#: src/commandsAndMenu.tsx:440 src/commandsAndMenu.tsx:441 src/commandsAndMenu.tsx:457 src/commandsAndMenu.tsx:479 src/commandsAndMenu.tsx:483 src/commandsAndMenu.tsx:489 src/commandsAndMenu.tsx:490 src/commandsAndMenu.tsx:495 +#: src/commandsAndMenu.tsx:440 src/commandsAndMenu.tsx:441 src/commandsAndMenu.tsx:457 src/commandsAndMenu.tsx:479 src/commandsAndMenu.tsx:483 src/commandsAndMenu.tsx:489 src/commandsAndMenu.tsx:490 src/commandsAndMenu.tsx:495 src/commandsAndMenu.tsx:633 msgid "Closing all opened files..." msgstr "" -#: src/commandsAndMenu.tsx:446 src/commandsAndMenu.tsx:447 src/commandsAndMenu.tsx:463 src/commandsAndMenu.tsx:485 src/commandsAndMenu.tsx:489 src/commandsAndMenu.tsx:495 src/commandsAndMenu.tsx:496 src/commandsAndMenu.tsx:501 +#: src/commandsAndMenu.tsx:446 src/commandsAndMenu.tsx:447 src/commandsAndMenu.tsx:463 src/commandsAndMenu.tsx:485 src/commandsAndMenu.tsx:489 src/commandsAndMenu.tsx:495 src/commandsAndMenu.tsx:496 src/commandsAndMenu.tsx:501 src/commandsAndMenu.tsx:638 msgid "Resetting..." msgstr "" -#: src/commandsAndMenu.tsx:451 src/commandsAndMenu.tsx:452 src/commandsAndMenu.tsx:468 src/commandsAndMenu.tsx:490 src/commandsAndMenu.tsx:494 src/commandsAndMenu.tsx:500 src/commandsAndMenu.tsx:501 src/commandsAndMenu.tsx:506 +#: src/commandsAndMenu.tsx:451 src/commandsAndMenu.tsx:452 src/commandsAndMenu.tsx:468 src/commandsAndMenu.tsx:490 src/commandsAndMenu.tsx:494 src/commandsAndMenu.tsx:500 src/commandsAndMenu.tsx:501 src/commandsAndMenu.tsx:506 src/commandsAndMenu.tsx:650 msgid "Successfully reset" msgstr "" -#: src/commandsAndMenu.tsx:453 src/commandsAndMenu.tsx:454 src/commandsAndMenu.tsx:470 src/commandsAndMenu.tsx:492 src/commandsAndMenu.tsx:496 src/commandsAndMenu.tsx:502 src/commandsAndMenu.tsx:503 src/commandsAndMenu.tsx:508 +#: src/commandsAndMenu.tsx:453 src/commandsAndMenu.tsx:454 src/commandsAndMenu.tsx:470 src/commandsAndMenu.tsx:492 src/commandsAndMenu.tsx:496 src/commandsAndMenu.tsx:502 src/commandsAndMenu.tsx:503 src/commandsAndMenu.tsx:508 src/commandsAndMenu.tsx:653 msgid "Successfully reset the current branch to its remote state" msgstr "" -#: src/commandsAndMenu.tsx:463 src/commandsAndMenu.tsx:464 src/commandsAndMenu.tsx:480 src/commandsAndMenu.tsx:502 src/commandsAndMenu.tsx:506 src/commandsAndMenu.tsx:512 src/commandsAndMenu.tsx:513 src/commandsAndMenu.tsx:518 +#: src/commandsAndMenu.tsx:463 src/commandsAndMenu.tsx:464 src/commandsAndMenu.tsx:480 src/commandsAndMenu.tsx:502 src/commandsAndMenu.tsx:506 src/commandsAndMenu.tsx:512 src/commandsAndMenu.tsx:513 src/commandsAndMenu.tsx:518 src/commandsAndMenu.tsx:664 msgid "Reset failed" msgstr "" -#: src/commandsAndMenu.tsx:468 src/commandsAndMenu.tsx:470 src/commandsAndMenu.tsx:474 src/commandsAndMenu.tsx:475 src/commandsAndMenu.tsx:519 src/commandsAndMenu.tsx:529 src/commandsAndMenu.tsx:578 src/commandsAndMenu.tsx:579 src/commandsAndMenu.tsx:580 src/commandsAndMenu.tsx:596 src/commandsAndMenu.tsx:618 src/commandsAndMenu.tsx:622 src/commandsAndMenu.tsx:643 src/commandsAndMenu.tsx:644 src/commandsAndMenu.tsx:649 +#: src/commandsAndMenu.tsx:468 src/commandsAndMenu.tsx:470 src/commandsAndMenu.tsx:474 src/commandsAndMenu.tsx:475 src/commandsAndMenu.tsx:519 src/commandsAndMenu.tsx:529 src/commandsAndMenu.tsx:578 src/commandsAndMenu.tsx:579 src/commandsAndMenu.tsx:580 src/commandsAndMenu.tsx:596 src/commandsAndMenu.tsx:618 src/commandsAndMenu.tsx:622 src/commandsAndMenu.tsx:643 src/commandsAndMenu.tsx:644 src/commandsAndMenu.tsx:649 src/commandsAndMenu.tsx:811 msgid "Refresh" msgstr "" -#: src/commandsAndMenu.tsx:473 src/commandsAndMenu.tsx:475 src/commandsAndMenu.tsx:479 src/commandsAndMenu.tsx:480 src/commandsAndMenu.tsx:524 src/commandsAndMenu.tsx:534 src/commandsAndMenu.tsx:583 src/commandsAndMenu.tsx:584 src/commandsAndMenu.tsx:585 src/commandsAndMenu.tsx:601 src/commandsAndMenu.tsx:623 src/commandsAndMenu.tsx:627 src/commandsAndMenu.tsx:648 src/commandsAndMenu.tsx:649 src/commandsAndMenu.tsx:654 +#: src/commandsAndMenu.tsx:473 src/commandsAndMenu.tsx:475 src/commandsAndMenu.tsx:479 src/commandsAndMenu.tsx:480 src/commandsAndMenu.tsx:524 src/commandsAndMenu.tsx:534 src/commandsAndMenu.tsx:583 src/commandsAndMenu.tsx:584 src/commandsAndMenu.tsx:585 src/commandsAndMenu.tsx:601 src/commandsAndMenu.tsx:623 src/commandsAndMenu.tsx:627 src/commandsAndMenu.tsx:648 src/commandsAndMenu.tsx:649 src/commandsAndMenu.tsx:654 src/commandsAndMenu.tsx:816 msgid "Refresh diff widget" msgstr "" -#: src/commandsAndMenu.tsx:480 src/commandsAndMenu.tsx:490 src/commandsAndMenu.tsx:539 src/commandsAndMenu.tsx:540 src/commandsAndMenu.tsx:541 src/commandsAndMenu.tsx:557 src/commandsAndMenu.tsx:579 src/commandsAndMenu.tsx:583 src/commandsAndMenu.tsx:604 src/commandsAndMenu.tsx:605 src/commandsAndMenu.tsx:610 +#: src/commandsAndMenu.tsx:480 src/commandsAndMenu.tsx:490 src/commandsAndMenu.tsx:539 src/commandsAndMenu.tsx:540 src/commandsAndMenu.tsx:541 src/commandsAndMenu.tsx:557 src/commandsAndMenu.tsx:579 src/commandsAndMenu.tsx:583 src/commandsAndMenu.tsx:604 src/commandsAndMenu.tsx:605 src/commandsAndMenu.tsx:610 src/commandsAndMenu.tsx:773 msgid "Mark as resolved" msgstr "" -#: src/commandsAndMenu.tsx:484 src/commandsAndMenu.tsx:494 src/commandsAndMenu.tsx:543 src/commandsAndMenu.tsx:544 src/commandsAndMenu.tsx:545 src/commandsAndMenu.tsx:561 src/commandsAndMenu.tsx:583 src/commandsAndMenu.tsx:587 src/commandsAndMenu.tsx:608 src/commandsAndMenu.tsx:609 src/commandsAndMenu.tsx:614 +#: src/commandsAndMenu.tsx:484 src/commandsAndMenu.tsx:494 src/commandsAndMenu.tsx:543 src/commandsAndMenu.tsx:544 src/commandsAndMenu.tsx:545 src/commandsAndMenu.tsx:561 src/commandsAndMenu.tsx:583 src/commandsAndMenu.tsx:587 src/commandsAndMenu.tsx:608 src/commandsAndMenu.tsx:609 src/commandsAndMenu.tsx:614 src/commandsAndMenu.tsx:777 msgid "Resolve with conflicts" msgstr "" -#: src/commandsAndMenu.tsx:485 src/commandsAndMenu.tsx:495 src/commandsAndMenu.tsx:544 src/commandsAndMenu.tsx:545 src/commandsAndMenu.tsx:546 src/commandsAndMenu.tsx:562 src/commandsAndMenu.tsx:584 src/commandsAndMenu.tsx:588 src/commandsAndMenu.tsx:609 src/commandsAndMenu.tsx:610 src/commandsAndMenu.tsx:615 +#: src/commandsAndMenu.tsx:485 src/commandsAndMenu.tsx:495 src/commandsAndMenu.tsx:544 src/commandsAndMenu.tsx:545 src/commandsAndMenu.tsx:546 src/commandsAndMenu.tsx:562 src/commandsAndMenu.tsx:584 src/commandsAndMenu.tsx:588 src/commandsAndMenu.tsx:609 src/commandsAndMenu.tsx:610 src/commandsAndMenu.tsx:615 src/commandsAndMenu.tsx:778 msgid "Are you sure you want to mark this file as resolved with merge conflicts?" msgstr "" -#: src/commandsAndMenu.tsx:496 src/commandsAndMenu.tsx:498 src/commandsAndMenu.tsx:503 src/commandsAndMenu.tsx:507 src/commandsAndMenu.tsx:508 src/commandsAndMenu.tsx:554 src/commandsAndMenu.tsx:564 src/commandsAndMenu.tsx:613 src/commandsAndMenu.tsx:614 src/commandsAndMenu.tsx:633 src/commandsAndMenu.tsx:649 src/commandsAndMenu.tsx:671 src/commandsAndMenu.tsx:675 src/commandsAndMenu.tsx:696 src/commandsAndMenu.tsx:697 src/commandsAndMenu.tsx:702 +#: src/commandsAndMenu.tsx:496 src/commandsAndMenu.tsx:498 src/commandsAndMenu.tsx:503 src/commandsAndMenu.tsx:507 src/commandsAndMenu.tsx:508 src/commandsAndMenu.tsx:554 src/commandsAndMenu.tsx:564 src/commandsAndMenu.tsx:613 src/commandsAndMenu.tsx:614 src/commandsAndMenu.tsx:633 src/commandsAndMenu.tsx:649 src/commandsAndMenu.tsx:671 src/commandsAndMenu.tsx:675 src/commandsAndMenu.tsx:696 src/commandsAndMenu.tsx:697 src/commandsAndMenu.tsx:702 src/commandsAndMenu.tsx:864 msgid "Diff Not Supported" msgstr "" -#: src/commandsAndMenu.tsx:497 src/commandsAndMenu.tsx:499 src/commandsAndMenu.tsx:504 src/commandsAndMenu.tsx:508 src/commandsAndMenu.tsx:509 src/commandsAndMenu.tsx:555 src/commandsAndMenu.tsx:565 src/commandsAndMenu.tsx:614 src/commandsAndMenu.tsx:615 src/commandsAndMenu.tsx:634 src/commandsAndMenu.tsx:650 src/commandsAndMenu.tsx:672 src/commandsAndMenu.tsx:676 src/commandsAndMenu.tsx:697 src/commandsAndMenu.tsx:698 src/commandsAndMenu.tsx:703 +#: src/commandsAndMenu.tsx:497 src/commandsAndMenu.tsx:499 src/commandsAndMenu.tsx:504 src/commandsAndMenu.tsx:508 src/commandsAndMenu.tsx:509 src/commandsAndMenu.tsx:555 src/commandsAndMenu.tsx:565 src/commandsAndMenu.tsx:614 src/commandsAndMenu.tsx:615 src/commandsAndMenu.tsx:634 src/commandsAndMenu.tsx:650 src/commandsAndMenu.tsx:672 src/commandsAndMenu.tsx:676 src/commandsAndMenu.tsx:697 src/commandsAndMenu.tsx:698 src/commandsAndMenu.tsx:703 src/commandsAndMenu.tsx:865 msgid "Diff is not supported for %1 files." msgstr "" -#: src/commandsAndMenu.tsx:512 src/commandsAndMenu.tsx:522 src/commandsAndMenu.tsx:571 src/commandsAndMenu.tsx:572 src/commandsAndMenu.tsx:573 src/commandsAndMenu.tsx:589 src/commandsAndMenu.tsx:611 src/commandsAndMenu.tsx:615 src/commandsAndMenu.tsx:636 src/commandsAndMenu.tsx:637 src/commandsAndMenu.tsx:642 +#: src/commandsAndMenu.tsx:512 src/commandsAndMenu.tsx:522 src/commandsAndMenu.tsx:571 src/commandsAndMenu.tsx:572 src/commandsAndMenu.tsx:573 src/commandsAndMenu.tsx:589 src/commandsAndMenu.tsx:611 src/commandsAndMenu.tsx:615 src/commandsAndMenu.tsx:636 src/commandsAndMenu.tsx:637 src/commandsAndMenu.tsx:642 src/commandsAndMenu.tsx:804 msgid "Mark file as resolved" msgstr "" -#: src/commandsAndMenu.tsx:568 src/commandsAndMenu.tsx:627 src/commandsAndMenu.tsx:628 src/commandsAndMenu.tsx:647 src/commandsAndMenu.tsx:663 src/commandsAndMenu.tsx:685 src/commandsAndMenu.tsx:689 src/commandsAndMenu.tsx:710 src/commandsAndMenu.tsx:711 src/commandsAndMenu.tsx:716 +#: src/commandsAndMenu.tsx:568 src/commandsAndMenu.tsx:627 src/commandsAndMenu.tsx:628 src/commandsAndMenu.tsx:647 src/commandsAndMenu.tsx:663 src/commandsAndMenu.tsx:685 src/commandsAndMenu.tsx:689 src/commandsAndMenu.tsx:710 src/commandsAndMenu.tsx:711 src/commandsAndMenu.tsx:716 src/commandsAndMenu.tsx:878 msgid "Merge Branch…" msgstr "" -#: src/commandsAndMenu.tsx:569 src/commandsAndMenu.tsx:628 src/commandsAndMenu.tsx:629 src/commandsAndMenu.tsx:648 src/commandsAndMenu.tsx:664 src/commandsAndMenu.tsx:686 src/commandsAndMenu.tsx:690 src/commandsAndMenu.tsx:711 src/commandsAndMenu.tsx:712 src/commandsAndMenu.tsx:717 +#: src/commandsAndMenu.tsx:569 src/commandsAndMenu.tsx:628 src/commandsAndMenu.tsx:629 src/commandsAndMenu.tsx:648 src/commandsAndMenu.tsx:664 src/commandsAndMenu.tsx:686 src/commandsAndMenu.tsx:690 src/commandsAndMenu.tsx:711 src/commandsAndMenu.tsx:712 src/commandsAndMenu.tsx:717 src/commandsAndMenu.tsx:879 msgid "Merge selected branch in the current branch" msgstr "" -#: src/commandsAndMenu.tsx:608 src/commandsAndMenu.tsx:667 src/commandsAndMenu.tsx:668 src/commandsAndMenu.tsx:687 src/commandsAndMenu.tsx:703 src/commandsAndMenu.tsx:725 src/commandsAndMenu.tsx:729 src/commandsAndMenu.tsx:750 src/commandsAndMenu.tsx:752 src/commandsAndMenu.tsx:757 +#: src/commandsAndMenu.tsx:608 src/commandsAndMenu.tsx:667 src/commandsAndMenu.tsx:668 src/commandsAndMenu.tsx:687 src/commandsAndMenu.tsx:703 src/commandsAndMenu.tsx:725 src/commandsAndMenu.tsx:729 src/commandsAndMenu.tsx:750 src/commandsAndMenu.tsx:752 src/commandsAndMenu.tsx:757 src/commandsAndMenu.tsx:918 msgid "Merging branch '%1'…" msgstr "" -#: src/commandsAndMenu.tsx:615 src/commandsAndMenu.tsx:674 src/commandsAndMenu.tsx:675 src/commandsAndMenu.tsx:694 src/commandsAndMenu.tsx:710 src/commandsAndMenu.tsx:732 src/commandsAndMenu.tsx:736 src/commandsAndMenu.tsx:757 src/commandsAndMenu.tsx:759 src/commandsAndMenu.tsx:764 +#: src/commandsAndMenu.tsx:615 src/commandsAndMenu.tsx:674 src/commandsAndMenu.tsx:675 src/commandsAndMenu.tsx:694 src/commandsAndMenu.tsx:710 src/commandsAndMenu.tsx:732 src/commandsAndMenu.tsx:736 src/commandsAndMenu.tsx:757 src/commandsAndMenu.tsx:759 src/commandsAndMenu.tsx:764 src/commandsAndMenu.tsx:927 msgid "Failed to merge branch '%1' into '%2'." msgstr "" -#: src/commandsAndMenu.tsx:627 src/commandsAndMenu.tsx:686 src/commandsAndMenu.tsx:687 src/commandsAndMenu.tsx:706 src/commandsAndMenu.tsx:722 src/commandsAndMenu.tsx:744 src/commandsAndMenu.tsx:748 src/commandsAndMenu.tsx:769 src/commandsAndMenu.tsx:771 src/commandsAndMenu.tsx:776 +#: src/commandsAndMenu.tsx:627 src/commandsAndMenu.tsx:686 src/commandsAndMenu.tsx:687 src/commandsAndMenu.tsx:706 src/commandsAndMenu.tsx:722 src/commandsAndMenu.tsx:744 src/commandsAndMenu.tsx:748 src/commandsAndMenu.tsx:769 src/commandsAndMenu.tsx:771 src/commandsAndMenu.tsx:776 src/commandsAndMenu.tsx:940 msgid "Branch '%1' merged into '%2'." msgstr "" @@ -752,131 +910,19 @@ msgstr "" msgid "DISMISS" msgstr "" -#: src/commandsAndMenu.tsx:786 src/commandsAndMenu.tsx:791 +#: src/commandsAndMenu.tsx:786 src/commandsAndMenu.tsx:791 src/commandsAndMenu.tsx:955 msgid "Rebase branch…" msgstr "" -#: src/commandsAndMenu.tsx:787 src/commandsAndMenu.tsx:792 +#: src/commandsAndMenu.tsx:787 src/commandsAndMenu.tsx:792 src/commandsAndMenu.tsx:956 msgid "Rebase current branch onto the selected branch" msgstr "" -#: src/commandsAndMenu.tsx:827 src/commandsAndMenu.tsx:832 +#: src/commandsAndMenu.tsx:827 src/commandsAndMenu.tsx:832 src/commandsAndMenu.tsx:995 msgid "Rebasing current branch onto '%1'…" msgstr "" -#: src/commandsAndMenu.tsx:834 src/commandsAndMenu.tsx:839 -msgid "Failed to rebase branch '%1' onto '%2'." -msgstr "" - -#: src/commandsAndMenu.tsx:846 src/commandsAndMenu.tsx:851 -msgid "Branch '%1' rebase onto '%2'." -msgstr "" - -#: src/commandsAndMenu.tsx:864 src/commandsAndMenu.tsx:869 -msgid "Continue rebase" -msgstr "" - -#: src/commandsAndMenu.tsx:866 src/commandsAndMenu.tsx:871 -msgid "Skip current commit" -msgstr "" - -#: src/commandsAndMenu.tsx:868 src/commandsAndMenu.tsx:873 src/components/RebaseAction.tsx:76 -msgid "Abort rebase" -msgstr "" - -#: src/commandsAndMenu.tsx:870 src/commandsAndMenu.tsx:875 src/commandsAndMenu.tsx:884 src/commandsAndMenu.tsx:889 -msgid "Resolve rebase" -msgstr "" - -#: src/commandsAndMenu.tsx:876 src/commandsAndMenu.tsx:881 -msgid "Continue the rebase by committing the current state." -msgstr "" - -#: src/commandsAndMenu.tsx:880 src/commandsAndMenu.tsx:885 -msgid "Skip current commit and continue the rebase." -msgstr "" - -#: src/commandsAndMenu.tsx:882 src/commandsAndMenu.tsx:887 -msgid "Abort the rebase" -msgstr "" - -#: src/commandsAndMenu.tsx:894 src/commandsAndMenu.tsx:899 -msgid "Continue the rebase…" -msgstr "" - -#: src/commandsAndMenu.tsx:896 src/commandsAndMenu.tsx:901 -msgid "Skip current commit…" -msgstr "" - -#: src/commandsAndMenu.tsx:898 src/commandsAndMenu.tsx:903 -msgid "Abort the rebase…" -msgstr "" - -#: src/commandsAndMenu.tsx:912 src/commandsAndMenu.tsx:917 -msgid "Fail to continue rebasing." -msgstr "" - -#: src/commandsAndMenu.tsx:914 src/commandsAndMenu.tsx:919 -msgid "Fail to skip current commit when rebasing." -msgstr "" - -#: src/commandsAndMenu.tsx:916 src/commandsAndMenu.tsx:921 -msgid "Fail to abort the rebase." -msgstr "" - -#: src/commandsAndMenu.tsx:930 src/commandsAndMenu.tsx:935 -msgid "Commit submitted continuing rebase." -msgstr "" - -#: src/commandsAndMenu.tsx:932 src/commandsAndMenu.tsx:937 -msgid "Current commit skipped." -msgstr "" - -#: src/commandsAndMenu.tsx:934 src/commandsAndMenu.tsx:939 -msgid "Rebase aborted." -msgstr "" - -#: src/commandsAndMenu.tsx:947 src/commandsAndMenu.tsx:952 -msgid "Stash Changes" -msgstr "" - -#: src/commandsAndMenu.tsx:948 src/commandsAndMenu.tsx:953 -msgid "Stash all current changes" -msgstr "" - -#: src/commandsAndMenu.tsx:953 src/commandsAndMenu.tsx:958 -msgid "Do you want to stash your changes? " -msgstr "" - -#: src/commandsAndMenu.tsx:954 src/commandsAndMenu.tsx:959 -msgid "Stash message (optional)" -msgstr "" - -#: src/commandsAndMenu.tsx:955 src/commandsAndMenu.tsx:960 src/components/GitStash.tsx:240 -msgid "Stash" -msgstr "" - -#: src/commandsAndMenu.tsx:962 src/commandsAndMenu.tsx:967 -msgid "Stashing changes" -msgstr "" - -#: src/commandsAndMenu.tsx:968 src/commandsAndMenu.tsx:973 -msgid "Successfully stashed" -msgstr "" - -#: src/commandsAndMenu.tsx:986 src/commandsAndMenu.tsx:991 -msgid "Stash List" -msgstr "" - -#: src/commandsAndMenu.tsx:987 src/commandsAndMenu.tsx:992 -msgid "Get all the stashed changes" -msgstr "" - -#: src/commandsAndMenu.tsx:994 src/commandsAndMenu.tsx:999 -msgid "Got the stash list" -msgstr "" - -#: src/components/Alert.tsx:105 +#: src/components/Alert.tsx:105 src/notifications.ts:21 msgid "Error" msgstr "" @@ -884,15 +930,15 @@ msgstr "" msgid "SHOW" msgstr "" -#: src/components/Alert.tsx:110 +#: src/components/Alert.tsx:110 src/notifications.ts:19 msgid "Show" msgstr "" -#: src/components/Alert.tsx:120 +#: src/components/Alert.tsx:120 src/notifications.ts:52 msgid "Detailed message" msgstr "" -#: src/components/Alert.tsx:128 +#: src/components/Alert.tsx:128 src/notifications.ts:50 msgid "Details" msgstr "" @@ -904,19 +950,19 @@ msgstr "" msgid "The current branch contains files with uncommitted changes. Please commit or discard these changes before switching to or creating another branch." msgstr "" -#: src/components/BranchMenu.tsx:195 src/components/BranchMenu.tsx:201 src/components/BranchPicker.tsx:157 src/components/MergeBranchDialog.tsx:138 src/components/NewBranchDialog.tsx:177 src/components/NewBranchDialog.tsx:184 src/components/TagMenu.tsx:185 src/components/TagMenu.tsx:189 +#: src/components/BranchMenu.tsx:195 src/components/BranchMenu.tsx:201 src/components/BranchPicker.tsx:157 src/components/BranchPicker.tsx:159 src/components/MergeBranchDialog.tsx:138 src/components/NewBranchDialog.tsx:172 src/components/NewBranchDialog.tsx:177 src/components/NewBranchDialog.tsx:184 src/components/TagMenu.tsx:180 src/components/TagMenu.tsx:185 src/components/TagMenu.tsx:189 msgid "Filter" msgstr "" -#: src/components/BranchMenu.tsx:196 src/components/BranchMenu.tsx:202 src/components/NewBranchDialog.tsx:178 src/components/NewBranchDialog.tsx:185 src/components/TagMenu.tsx:190 +#: src/components/BranchMenu.tsx:196 src/components/BranchMenu.tsx:202 src/components/NewBranchDialog.tsx:173 src/components/NewBranchDialog.tsx:178 src/components/NewBranchDialog.tsx:185 src/components/TagMenu.tsx:190 msgid "Filter branch menu" msgstr "" -#: src/components/BranchMenu.tsx:201 src/components/BranchMenu.tsx:207 src/components/BranchPicker.tsx:163 src/components/MergeBranchDialog.tsx:144 src/components/NewBranchDialog.tsx:183 src/components/NewBranchDialog.tsx:190 src/components/NewTagDialog.tsx:443 src/components/NewTagDialog.tsx:458 src/components/TagMenu.tsx:191 src/components/TagMenu.tsx:195 +#: src/components/BranchMenu.tsx:201 src/components/BranchMenu.tsx:207 src/components/BranchPicker.tsx:163 src/components/BranchPicker.tsx:165 src/components/MergeBranchDialog.tsx:144 src/components/NewBranchDialog.tsx:178 src/components/NewBranchDialog.tsx:183 src/components/NewBranchDialog.tsx:190 src/components/NewTagDialog.tsx:443 src/components/NewTagDialog.tsx:453 src/components/NewTagDialog.tsx:458 src/components/TagMenu.tsx:186 src/components/TagMenu.tsx:191 src/components/TagMenu.tsx:195 msgid "Clear the current filter" msgstr "" -#: src/components/BranchMenu.tsx:211 src/components/BranchMenu.tsx:217 src/components/NewBranchDialog.tsx:208 src/components/NewBranchDialog.tsx:215 +#: src/components/BranchMenu.tsx:211 src/components/BranchMenu.tsx:217 src/components/NewBranchDialog.tsx:203 src/components/NewBranchDialog.tsx:208 src/components/NewBranchDialog.tsx:215 msgid "Create a new branch" msgstr "" @@ -924,95 +970,107 @@ msgstr "" msgid "New Branch" msgstr "" -#: src/components/BranchMenu.tsx:261 src/components/BranchMenu.tsx:269 src/components/BranchMenu.tsx:276 +#: src/components/BranchMenu.tsx:261 src/components/BranchMenu.tsx:269 src/components/BranchMenu.tsx:270 src/components/BranchMenu.tsx:276 msgid "Switch to branch: %1" msgstr "" -#: src/components/BranchMenu.tsx:275 src/components/BranchMenu.tsx:286 src/components/BranchMenu.tsx:293 +#: src/components/BranchMenu.tsx:275 src/components/BranchMenu.tsx:286 src/components/BranchMenu.tsx:288 src/components/BranchMenu.tsx:293 msgid "Delete this branch locally" msgstr "" -#: src/components/BranchMenu.tsx:295 src/components/BranchMenu.tsx:302 +#: src/components/BranchMenu.tsx:295 src/components/BranchMenu.tsx:299 src/components/BranchMenu.tsx:302 msgid "Merge this branch into the current one" msgstr "" -#: src/components/BranchMenu.tsx:332 src/components/BranchMenu.tsx:355 src/components/BranchMenu.tsx:362 +#: src/components/BranchMenu.tsx:332 src/components/BranchMenu.tsx:355 src/components/BranchMenu.tsx:360 src/components/BranchMenu.tsx:362 msgid "Delete branch" msgstr "" -#: src/components/BranchMenu.tsx:335 src/components/BranchMenu.tsx:358 src/components/BranchMenu.tsx:365 +#: src/components/BranchMenu.tsx:335 src/components/BranchMenu.tsx:358 src/components/BranchMenu.tsx:363 src/components/BranchMenu.tsx:365 msgid "Are you sure you want to permanently delete the branch " msgstr "" -#: src/components/BranchMenu.tsx:340 src/components/BranchMenu.tsx:363 src/components/BranchMenu.tsx:370 +#: src/components/BranchMenu.tsx:340 src/components/BranchMenu.tsx:363 src/components/BranchMenu.tsx:368 src/components/BranchMenu.tsx:370 msgid "This action cannot be undone." msgstr "" -#: src/components/BranchMenu.tsx:366 src/components/BranchMenu.tsx:398 src/components/BranchMenu.tsx:405 +#: src/components/BranchMenu.tsx:366 src/components/BranchMenu.tsx:398 src/components/BranchMenu.tsx:403 src/components/BranchMenu.tsx:405 msgid "Creating a new branch is disabled" msgstr "" -#: src/components/BranchMenu.tsx:51 src/components/BranchMenu.tsx:52 +#: src/components/BranchMenu.tsx:439 +msgid "Switching branches is disabled" +msgstr "" + +#: src/components/BranchMenu.tsx:449 +msgid "Switching branch…" +msgstr "" + +#: src/components/BranchMenu.tsx:462 +msgid "Switched branch." +msgstr "" + +#: src/components/BranchMenu.tsx:50 src/components/BranchMenu.tsx:51 src/components/BranchMenu.tsx:52 msgid "Unable to switch branch" msgstr "" -#: src/components/BranchMenu.tsx:55 src/components/BranchMenu.tsx:56 src/components/TagMenu.tsx:49 src/components/TagMenu.tsx:51 +#: src/components/BranchMenu.tsx:54 src/components/BranchMenu.tsx:55 src/components/BranchMenu.tsx:56 src/components/TagMenu.tsx:49 src/components/TagMenu.tsx:50 src/components/TagMenu.tsx:51 msgid "Your changes to the following files would be overwritten by switching:" msgstr "" -#: src/components/BranchMenu.tsx:63 src/components/BranchMenu.tsx:64 +#: src/components/BranchMenu.tsx:62 src/components/BranchMenu.tsx:63 src/components/BranchMenu.tsx:64 msgid "Please commit, stash, or discard your changes before you switch branches." msgstr "" -#: src/components/BranchMenu.tsx:74 src/components/BranchMenu.tsx:75 +#: src/components/BranchMenu.tsx:73 src/components/BranchMenu.tsx:74 src/components/BranchMenu.tsx:75 msgid "Failed to switch branch." msgstr "" -#: src/components/BranchPicker.tsx:126 src/components/MergeBranchDialog.tsx:114 +#: src/components/BranchPicker.tsx:126 src/components/BranchPicker.tsx:128 src/components/MergeBranchDialog.tsx:114 msgid "Merge Branch" msgstr "" -#: src/components/BranchPicker.tsx:127 +#: src/components/BranchPicker.tsx:127 src/components/BranchPicker.tsx:129 msgid "Rebase Branch" msgstr "" -#: src/components/BranchPicker.tsx:131 src/components/ManageRemoteDialogue.tsx:95 src/components/MergeBranchDialog.tsx:117 src/components/NewBranchDialog.tsx:150 src/components/NewBranchDialog.tsx:157 src/components/NewTagDialog.tsx:412 src/components/NewTagDialog.tsx:426 src/components/ResetRevertDialog.tsx:130 src/components/ResetRevertDialog.tsx:132 +#: src/components/BranchPicker.tsx:131 src/components/BranchPicker.tsx:133 src/components/ManageRemoteDialogue.tsx:95 src/components/MergeBranchDialog.tsx:117 src/components/NewBranchDialog.tsx:145 src/components/NewBranchDialog.tsx:150 src/components/NewBranchDialog.tsx:157 src/components/NewTagDialog.tsx:412 src/components/NewTagDialog.tsx:421 src/components/NewTagDialog.tsx:426 src/components/ResetRevertDialog.tsx:126 src/components/ResetRevertDialog.tsx:130 src/components/ResetRevertDialog.tsx:132 msgid "Close this dialog" msgstr "" -#: src/components/BranchPicker.tsx:142 src/components/MergeBranchDialog.tsx:127 +#: src/components/BranchPicker.tsx:142 src/components/BranchPicker.tsx:144 src/components/MergeBranchDialog.tsx:127 msgid "Select the branch to merge in %1" msgstr "" -#: src/components/BranchPicker.tsx:143 +#: src/components/BranchPicker.tsx:143 src/components/BranchPicker.tsx:145 msgid "Select the branch to rebase %1 onto" msgstr "" -#: src/components/BranchPicker.tsx:158 src/components/MergeBranchDialog.tsx:139 +#: src/components/BranchPicker.tsx:158 src/components/BranchPicker.tsx:160 src/components/MergeBranchDialog.tsx:139 msgid "Filter branch list" msgstr "" -#: src/components/BranchPicker.tsx:193 src/components/MergeBranchDialog.tsx:172 +#: src/components/BranchPicker.tsx:193 src/components/BranchPicker.tsx:195 src/components/MergeBranchDialog.tsx:172 msgid "Close this dialog without merging a branch" msgstr "" -#: src/components/BranchPicker.tsx:194 +#: src/components/BranchPicker.tsx:194 src/components/BranchPicker.tsx:196 msgid "Close this dialog without rebasing the branch" msgstr "" -#: src/components/BranchPicker.tsx:206 src/components/MergeBranchDialog.tsx:181 +#: src/components/BranchPicker.tsx:206 src/components/BranchPicker.tsx:208 src/components/MergeBranchDialog.tsx:181 msgid "Merge branch" msgstr "" -#: src/components/BranchPicker.tsx:207 +#: src/components/BranchPicker.tsx:207 src/components/BranchPicker.tsx:209 msgid "Rebase branch" msgstr "" -#: src/components/BranchPicker.tsx:209 +#: src/components/BranchPicker.tsx:209 src/components/BranchPicker.tsx:211 msgid "Rebase" msgstr "" -#: src/components/BranchPicker.tsx:209 src/components/MergeBranchDialog.tsx:182 +#: src/components/BranchPicker.tsx:209 src/components/BranchPicker.tsx:211 src/components/MergeBranchDialog.tsx:182 msgid "Merge" msgstr "" @@ -1036,11 +1094,11 @@ msgstr "" msgid "Enter a commit message summary (a single line, preferably less than 50 characters)" msgstr "" -#: src/components/CommitBox.tsx:126 src/components/CommitBox.tsx:127 src/components/CommitMessage.tsx:140 src/components/CommitMessage.tsx:146 +#: src/components/CommitBox.tsx:126 src/components/CommitBox.tsx:127 src/components/CommitMessage.tsx:140 src/components/CommitMessage.tsx:145 src/components/CommitMessage.tsx:146 msgid "Description (optional)" msgstr "" -#: src/components/CommitBox.tsx:127 src/components/CommitBox.tsx:128 src/components/CommitMessage.tsx:147 src/components/CommitMessage.tsx:153 src/components/ResetRevertDialog.tsx:165 +#: src/components/CommitBox.tsx:127 src/components/CommitBox.tsx:128 src/components/CommitMessage.tsx:147 src/components/CommitMessage.tsx:152 src/components/CommitMessage.tsx:153 src/components/ResetRevertDialog.tsx:165 msgid "Enter a commit message description" msgstr "" @@ -1064,7 +1122,7 @@ msgstr "" msgid "Disabled: No files are staged for commit" msgstr "" -#: src/components/CommitBox.tsx:195 src/components/GitPanel.tsx:440 src/components/GitPanel.tsx:441 src/components/GitPanel.tsx:475 src/components/GitPanel.tsx:494 +#: src/components/CommitBox.tsx:195 src/components/GitPanel.tsx:440 src/components/GitPanel.tsx:441 src/components/GitPanel.tsx:475 src/components/GitPanel.tsx:488 src/components/GitPanel.tsx:494 msgid "Warning" msgstr "" @@ -1072,15 +1130,15 @@ msgstr "" msgid "Looks like you still have unsaved staged files. Remember to save and stage all needed changes before committing!" msgstr "" -#: src/components/CommitComparisonBox.tsx:163 +#: src/components/CommitComparisonBox.tsx:159 src/components/CommitComparisonBox.tsx:163 msgid "Close" msgstr "" -#: src/components/CommitComparisonBox.tsx:184 +#: src/components/CommitComparisonBox.tsx:184 src/components/CommitComparisonBox.tsx:185 msgid "No changes" msgstr "" -#: src/components/CommitComparisonBox.tsx:185 +#: src/components/CommitComparisonBox.tsx:185 src/components/CommitComparisonBox.tsx:186 msgid "No challenger commit selected." msgstr "" @@ -1092,7 +1150,7 @@ msgstr "" msgid "# Deletions" msgstr "" -#: src/components/CommitDiff.tsx:121 src/components/FileList.tsx:1211 src/components/FileList.tsx:1215 src/components/FileList.tsx:518 src/components/FileList.tsx:527 src/components/FileList.tsx:595 src/components/FileList.tsx:596 src/components/FileList.tsx:728 src/components/FileList.tsx:737 src/components/FileList.tsx:806 src/components/FileList.tsx:883 src/components/FileList.tsx:906 src/components/FileList.tsx:910 src/components/SinglePastCommitInfo.tsx:197 src/components/SinglePastCommitInfo.tsx:208 src/components/SinglePastCommitInfo.tsx:210 +#: src/components/CommitDiff.tsx:121 src/components/FileList.tsx:1211 src/components/FileList.tsx:1215 src/components/FileList.tsx:1239 src/components/FileList.tsx:518 src/components/FileList.tsx:527 src/components/FileList.tsx:595 src/components/FileList.tsx:596 src/components/FileList.tsx:728 src/components/FileList.tsx:737 src/components/FileList.tsx:806 src/components/FileList.tsx:883 src/components/FileList.tsx:906 src/components/FileList.tsx:910 src/components/FileList.tsx:934 src/components/SinglePastCommitInfo.tsx:197 src/components/SinglePastCommitInfo.tsx:208 src/components/SinglePastCommitInfo.tsx:210 msgid "Changed" msgstr "" @@ -1104,39 +1162,83 @@ msgstr "" msgid "# Files Changed" msgstr "" -#: src/components/CommitMessage.tsx:114 src/components/CommitMessage.tsx:120 src/components/CommitMessage.tsx:144 src/components/CommitMessage.tsx:150 +#: src/components/CommitMessage.tsx:114 src/components/CommitMessage.tsx:120 src/components/CommitMessage.tsx:144 src/components/CommitMessage.tsx:149 src/components/CommitMessage.tsx:150 msgid "Amending the commit will re-use the previous commit summary" msgstr "" -#: src/components/CommitMessage.tsx:66 src/components/CommitMessage.tsx:71 +#: src/components/CommitMessage.tsx:66 src/components/CommitMessage.tsx:71 src/components/CommitMessage.tsx:72 msgid "Summary" msgstr "" -#: src/components/FileList.tsx:1000 src/components/FileList.tsx:602 src/components/FileList.tsx:611 src/components/FileList.tsx:679 src/components/FileList.tsx:680 src/components/FileList.tsx:996 +#: src/components/FileItem.tsx:162 +msgid "Unmodified" +msgstr "" + +#: src/components/FileItem.tsx:208 src/components/FileList.tsx:404 src/components/FileList.tsx:405 src/components/FileList.tsx:703 src/components/FileList.tsx:713 src/components/FileList.tsx:727 +msgid "Conflicted" +msgstr "" + +#: src/components/FileItem.tsx:268 +msgid "Modified" +msgstr "" + +#: src/components/FileItem.tsx:269 +msgid "Added" +msgstr "" + +#: src/components/FileItem.tsx:270 +msgid "Deleted" +msgstr "" + +#: src/components/FileItem.tsx:271 +msgid "Renamed" +msgstr "" + +#: src/components/FileItem.tsx:272 +msgid "Copied" +msgstr "" + +#: src/components/FileItem.tsx:273 +msgid "Updated" +msgstr "" + +#: src/components/FileItem.tsx:274 +msgid "Behind" +msgstr "" + +#: src/components/FileItem.tsx:275 src/components/FileList.tsx:1000 src/components/FileList.tsx:1024 src/components/FileList.tsx:602 src/components/FileList.tsx:611 src/components/FileList.tsx:679 src/components/FileList.tsx:680 src/components/FileList.tsx:996 msgid "Untracked" msgstr "" -#: src/components/FileList.tsx:1027 src/components/FileList.tsx:1031 src/components/FileList.tsx:1105 src/components/FileList.tsx:1109 src/components/FileList.tsx:1118 src/components/FileList.tsx:1122 src/components/FileList.tsx:1144 src/components/FileList.tsx:1148 src/components/FileList.tsx:363 src/components/FileList.tsx:372 src/components/FileList.tsx:440 src/components/FileList.tsx:441 src/components/FileList.tsx:450 src/components/FileList.tsx:459 src/components/FileList.tsx:527 src/components/FileList.tsx:528 src/components/FileList.tsx:549 src/components/FileList.tsx:558 src/components/FileList.tsx:626 src/components/FileList.tsx:627 src/components/FileList.tsx:635 src/components/FileList.tsx:644 src/components/FileList.tsx:648 src/components/FileList.tsx:657 src/components/FileList.tsx:674 src/components/FileList.tsx:683 src/components/FileList.tsx:710 src/components/FileList.tsx:713 src/components/FileList.tsx:726 src/components/FileList.tsx:734 src/components/FileList.tsx:744 src/components/FileList.tsx:752 src/components/FileList.tsx:790 src/components/FileList.tsx:803 src/components/FileList.tsx:826 src/components/FileList.tsx:828 src/components/FileList.tsx:829 src/components/FileList.tsx:937 src/components/FileList.tsx:941 +#: src/components/FileItem.tsx:276 +msgid "Ignored" +msgstr "" + +#: src/components/FileList.tsx:1019 src/components/FileList.tsx:597 src/components/FileList.tsx:606 src/components/FileList.tsx:674 src/components/FileList.tsx:675 src/components/FileList.tsx:991 src/components/FileList.tsx:995 +msgid "Track all untracked files" +msgstr "" + +#: src/components/FileList.tsx:1027 src/components/FileList.tsx:1031 src/components/FileList.tsx:1055 src/components/FileList.tsx:1105 src/components/FileList.tsx:1109 src/components/FileList.tsx:1118 src/components/FileList.tsx:1122 src/components/FileList.tsx:1133 src/components/FileList.tsx:1144 src/components/FileList.tsx:1146 src/components/FileList.tsx:1148 src/components/FileList.tsx:1172 src/components/FileList.tsx:363 src/components/FileList.tsx:372 src/components/FileList.tsx:440 src/components/FileList.tsx:441 src/components/FileList.tsx:450 src/components/FileList.tsx:459 src/components/FileList.tsx:527 src/components/FileList.tsx:528 src/components/FileList.tsx:549 src/components/FileList.tsx:558 src/components/FileList.tsx:626 src/components/FileList.tsx:627 src/components/FileList.tsx:635 src/components/FileList.tsx:644 src/components/FileList.tsx:648 src/components/FileList.tsx:657 src/components/FileList.tsx:674 src/components/FileList.tsx:683 src/components/FileList.tsx:710 src/components/FileList.tsx:713 src/components/FileList.tsx:726 src/components/FileList.tsx:734 src/components/FileList.tsx:744 src/components/FileList.tsx:752 src/components/FileList.tsx:758 src/components/FileList.tsx:790 src/components/FileList.tsx:803 src/components/FileList.tsx:826 src/components/FileList.tsx:828 src/components/FileList.tsx:829 src/components/FileList.tsx:850 src/components/FileList.tsx:937 src/components/FileList.tsx:941 src/components/FileList.tsx:965 msgid "Open this file" msgstr "" -#: src/components/FileList.tsx:1066 src/components/FileList.tsx:1070 src/components/FileList.tsx:751 +#: src/components/FileList.tsx:1066 src/components/FileList.tsx:1070 src/components/FileList.tsx:1094 src/components/FileList.tsx:751 msgid "Pull from remote branch" msgstr "" -#: src/components/FileList.tsx:1071 src/components/FileList.tsx:1075 src/components/FileList.tsx:756 +#: src/components/FileList.tsx:1071 src/components/FileList.tsx:1075 src/components/FileList.tsx:1099 src/components/FileList.tsx:756 msgid "Remote Changes" msgstr "" -#: src/components/FileList.tsx:1207 src/components/FileList.tsx:1211 src/components/FileList.tsx:505 src/components/FileList.tsx:514 src/components/FileList.tsx:582 src/components/FileList.tsx:583 src/components/FileList.tsx:724 src/components/FileList.tsx:733 src/components/FileList.tsx:802 src/components/FileList.tsx:879 src/components/FileList.tsx:893 src/components/FileList.tsx:897 +#: src/components/FileList.tsx:1207 src/components/FileList.tsx:1211 src/components/FileList.tsx:1235 src/components/FileList.tsx:505 src/components/FileList.tsx:514 src/components/FileList.tsx:582 src/components/FileList.tsx:583 src/components/FileList.tsx:724 src/components/FileList.tsx:733 src/components/FileList.tsx:802 src/components/FileList.tsx:879 src/components/FileList.tsx:893 src/components/FileList.tsx:897 src/components/FileList.tsx:921 msgid "Discard All Changes" msgstr "" -#: src/components/FileList.tsx:1244 src/components/FileList.tsx:1248 src/components/FileList.tsx:749 src/components/FileList.tsx:758 src/components/FileList.tsx:827 src/components/FileList.tsx:904 +#: src/components/FileList.tsx:1244 src/components/FileList.tsx:1248 src/components/FileList.tsx:1272 src/components/FileList.tsx:749 src/components/FileList.tsx:758 src/components/FileList.tsx:827 src/components/FileList.tsx:904 msgid "Diff this file" msgstr "" -#: src/components/FileList.tsx:177 src/components/FileList.tsx:186 src/components/FileList.tsx:188 src/components/FileList.tsx:191 src/components/FileList.tsx:202 src/components/FileList.tsx:211 src/components/FileList.tsx:213 src/components/FileList.tsx:252 src/components/FileList.tsx:262 src/widgets/discardAllChanges.ts:16 +#: src/components/FileList.tsx:177 src/components/FileList.tsx:186 src/components/FileList.tsx:188 src/components/FileList.tsx:191 src/components/FileList.tsx:202 src/components/FileList.tsx:211 src/components/FileList.tsx:213 src/components/FileList.tsx:252 src/components/FileList.tsx:262 src/components/FileList.tsx:263 src/widgets/discardAllChanges.ts:16 msgid "Discard all changes" msgstr "" @@ -1144,11 +1246,11 @@ msgstr "" msgid "Are you sure you want to permanently discard changes to all files? This action cannot be undone." msgstr "" -#: src/components/FileList.tsx:191 src/components/FileList.tsx:200 src/components/FileList.tsx:202 src/components/FileList.tsx:205 src/components/FileList.tsx:266 src/components/FileList.tsx:276 +#: src/components/FileList.tsx:191 src/components/FileList.tsx:200 src/components/FileList.tsx:202 src/components/FileList.tsx:205 src/components/FileList.tsx:266 src/components/FileList.tsx:276 src/components/FileList.tsx:277 msgid "Discard all unstaged changes failed." msgstr "" -#: src/components/FileList.tsx:192 src/components/FileList.tsx:253 src/components/FileList.tsx:263 +#: src/components/FileList.tsx:192 src/components/FileList.tsx:253 src/components/FileList.tsx:263 src/components/FileList.tsx:264 msgid "Are you sure you want to permanently discard changes to all unstaged files? This action cannot be undone." msgstr "" @@ -1156,167 +1258,159 @@ msgstr "" msgid "Discard all changes failed." msgstr "" -#: src/components/FileList.tsx:370 src/components/FileList.tsx:379 src/components/FileList.tsx:447 src/components/FileList.tsx:448 src/components/FileList.tsx:743 src/components/FileList.tsx:753 +#: src/components/FileList.tsx:370 src/components/FileList.tsx:379 src/components/FileList.tsx:447 src/components/FileList.tsx:448 src/components/FileList.tsx:743 src/components/FileList.tsx:753 src/components/FileList.tsx:767 msgid "Unstage this change" msgstr "" -#: src/components/FileList.tsx:404 src/components/FileList.tsx:405 src/components/FileList.tsx:703 src/components/FileList.tsx:713 -msgid "Conflicted" -msgstr "" - -#: src/components/FileList.tsx:408 src/components/FileList.tsx:417 src/components/FileList.tsx:485 src/components/FileList.tsx:486 src/components/FileList.tsx:788 src/components/FileList.tsx:791 +#: src/components/FileList.tsx:408 src/components/FileList.tsx:417 src/components/FileList.tsx:485 src/components/FileList.tsx:486 src/components/FileList.tsx:788 src/components/FileList.tsx:791 src/components/FileList.tsx:812 msgid "Unstage all changes" msgstr "" -#: src/components/FileList.tsx:414 src/components/FileList.tsx:423 src/components/FileList.tsx:491 src/components/FileList.tsx:492 src/components/FileList.tsx:795 src/components/FileList.tsx:797 +#: src/components/FileList.tsx:414 src/components/FileList.tsx:423 src/components/FileList.tsx:491 src/components/FileList.tsx:492 src/components/FileList.tsx:795 src/components/FileList.tsx:797 src/components/FileList.tsx:819 msgid "Staged" msgstr "" -#: src/components/FileList.tsx:465 src/components/FileList.tsx:474 src/components/FileList.tsx:542 src/components/FileList.tsx:543 src/components/FileList.tsx:843 src/components/FileList.tsx:845 +#: src/components/FileList.tsx:465 src/components/FileList.tsx:474 src/components/FileList.tsx:542 src/components/FileList.tsx:543 src/components/FileList.tsx:843 src/components/FileList.tsx:845 src/components/FileList.tsx:867 msgid "Stage this change" msgstr "" -#: src/components/FileList.tsx:512 src/components/FileList.tsx:521 src/components/FileList.tsx:589 src/components/FileList.tsx:590 src/components/FileList.tsx:900 src/components/FileList.tsx:904 +#: src/components/FileList.tsx:512 src/components/FileList.tsx:521 src/components/FileList.tsx:589 src/components/FileList.tsx:590 src/components/FileList.tsx:900 src/components/FileList.tsx:904 src/components/FileList.tsx:928 msgid "Stage all changes" msgstr "" -#: src/components/FileList.tsx:559 src/components/FileList.tsx:568 src/components/FileList.tsx:636 src/components/FileList.tsx:637 src/components/FileList.tsx:945 src/components/FileList.tsx:949 +#: src/components/FileList.tsx:559 src/components/FileList.tsx:568 src/components/FileList.tsx:636 src/components/FileList.tsx:637 src/components/FileList.tsx:945 src/components/FileList.tsx:949 src/components/FileList.tsx:973 msgid "Track this file" msgstr "" -#: src/components/FileList.tsx:597 src/components/FileList.tsx:606 src/components/FileList.tsx:674 src/components/FileList.tsx:675 src/components/FileList.tsx:991 src/components/FileList.tsx:995 -msgid "Track all untracked files" -msgstr "" - -#: src/components/FileList.tsx:782 src/components/FileList.tsx:891 src/components/GitPanel.tsx:503 src/components/GitPanel.tsx:522 +#: src/components/FileList.tsx:782 src/components/FileList.tsx:806 src/components/FileList.tsx:891 src/components/FileList.tsx:915 src/components/GitPanel.tsx:503 src/components/GitPanel.tsx:516 src/components/GitPanel.tsx:522 msgid "Stash latest changes" msgstr "" -#: src/components/GitPanel.tsx:216 src/components/GitPanel.tsx:506 src/components/GitPanel.tsx:533 src/components/GitPanel.tsx:547 src/components/GitPanel.tsx:561 src/components/GitPanel.tsx:569 src/components/GitPanel.tsx:668 src/components/GitPanel.tsx:669 src/components/GitPanel.tsx:752 src/components/GitPanel.tsx:771 src/components/GitPanel.tsx:772 +#: src/components/GitPanel.tsx:216 src/components/GitPanel.tsx:506 src/components/GitPanel.tsx:533 src/components/GitPanel.tsx:547 src/components/GitPanel.tsx:561 src/components/GitPanel.tsx:569 src/components/GitPanel.tsx:668 src/components/GitPanel.tsx:669 src/components/GitPanel.tsx:752 src/components/GitPanel.tsx:766 src/components/GitPanel.tsx:771 src/components/GitPanel.tsx:772 msgid "Staging files..." msgstr "" -#: src/components/GitPanel.tsx:237 src/components/GitPanel.tsx:523 src/components/GitPanel.tsx:550 src/components/GitPanel.tsx:564 src/components/GitPanel.tsx:578 src/components/GitPanel.tsx:586 src/components/GitPanel.tsx:685 src/components/GitPanel.tsx:686 src/components/GitPanel.tsx:769 src/components/GitPanel.tsx:788 src/components/GitPanel.tsx:789 +#: src/components/GitPanel.tsx:237 src/components/GitPanel.tsx:523 src/components/GitPanel.tsx:550 src/components/GitPanel.tsx:564 src/components/GitPanel.tsx:578 src/components/GitPanel.tsx:586 src/components/GitPanel.tsx:685 src/components/GitPanel.tsx:686 src/components/GitPanel.tsx:769 src/components/GitPanel.tsx:786 src/components/GitPanel.tsx:788 src/components/GitPanel.tsx:789 msgid "Failed to commit changes." msgstr "" -#: src/components/GitPanel.tsx:250 src/components/GitPanel.tsx:531 src/components/GitPanel.tsx:558 src/components/GitPanel.tsx:572 src/components/GitPanel.tsx:586 src/components/GitPanel.tsx:594 src/components/GitPanel.tsx:693 src/components/GitPanel.tsx:694 src/components/GitPanel.tsx:777 src/components/GitPanel.tsx:796 src/components/GitPanel.tsx:797 +#: src/components/GitPanel.tsx:250 src/components/GitPanel.tsx:531 src/components/GitPanel.tsx:558 src/components/GitPanel.tsx:572 src/components/GitPanel.tsx:586 src/components/GitPanel.tsx:594 src/components/GitPanel.tsx:693 src/components/GitPanel.tsx:694 src/components/GitPanel.tsx:777 src/components/GitPanel.tsx:791 src/components/GitPanel.tsx:796 src/components/GitPanel.tsx:797 msgid "Committing changes..." msgstr "" -#: src/components/GitPanel.tsx:257 src/components/GitPanel.tsx:538 src/components/GitPanel.tsx:569 src/components/GitPanel.tsx:583 src/components/GitPanel.tsx:597 src/components/GitPanel.tsx:605 src/components/GitPanel.tsx:704 src/components/GitPanel.tsx:705 src/components/GitPanel.tsx:788 src/components/GitPanel.tsx:807 src/components/GitPanel.tsx:808 +#: src/components/GitPanel.tsx:257 src/components/GitPanel.tsx:538 src/components/GitPanel.tsx:569 src/components/GitPanel.tsx:583 src/components/GitPanel.tsx:597 src/components/GitPanel.tsx:605 src/components/GitPanel.tsx:704 src/components/GitPanel.tsx:705 src/components/GitPanel.tsx:788 src/components/GitPanel.tsx:807 src/components/GitPanel.tsx:808 src/components/GitPanel.tsx:813 msgid "Committed changes." msgstr "" -#: src/components/GitPanel.tsx:333 src/components/GitPanel.tsx:347 src/components/GitPanel.tsx:352 src/components/GitPanel.tsx:359 src/components/GitPanel.tsx:372 src/components/GitPanel.tsx:380 src/components/GitPanel.tsx:403 src/components/GitPanel.tsx:404 src/components/GitPanel.tsx:438 src/components/GitPanel.tsx:457 +#: src/components/GitPanel.tsx:333 src/components/GitPanel.tsx:347 src/components/GitPanel.tsx:352 src/components/GitPanel.tsx:359 src/components/GitPanel.tsx:372 src/components/GitPanel.tsx:380 src/components/GitPanel.tsx:403 src/components/GitPanel.tsx:404 src/components/GitPanel.tsx:438 src/components/GitPanel.tsx:451 src/components/GitPanel.tsx:457 msgid "View changed files" msgstr "" -#: src/components/GitPanel.tsx:334 src/components/GitPanel.tsx:348 src/components/GitPanel.tsx:353 src/components/GitPanel.tsx:360 src/components/GitPanel.tsx:373 src/components/GitPanel.tsx:381 src/components/GitPanel.tsx:404 src/components/GitPanel.tsx:405 src/components/GitPanel.tsx:439 src/components/GitPanel.tsx:458 +#: src/components/GitPanel.tsx:334 src/components/GitPanel.tsx:348 src/components/GitPanel.tsx:353 src/components/GitPanel.tsx:360 src/components/GitPanel.tsx:373 src/components/GitPanel.tsx:381 src/components/GitPanel.tsx:404 src/components/GitPanel.tsx:405 src/components/GitPanel.tsx:439 src/components/GitPanel.tsx:452 src/components/GitPanel.tsx:458 msgid "Changes" msgstr "" -#: src/components/GitPanel.tsx:343 src/components/GitPanel.tsx:357 src/components/GitPanel.tsx:362 src/components/GitPanel.tsx:369 src/components/GitPanel.tsx:382 src/components/GitPanel.tsx:390 src/components/GitPanel.tsx:413 src/components/GitPanel.tsx:414 src/components/GitPanel.tsx:448 src/components/GitPanel.tsx:467 +#: src/components/GitPanel.tsx:343 src/components/GitPanel.tsx:357 src/components/GitPanel.tsx:362 src/components/GitPanel.tsx:369 src/components/GitPanel.tsx:382 src/components/GitPanel.tsx:390 src/components/GitPanel.tsx:413 src/components/GitPanel.tsx:414 src/components/GitPanel.tsx:448 src/components/GitPanel.tsx:461 src/components/GitPanel.tsx:467 msgid "View commit history" msgstr "" -#: src/components/GitPanel.tsx:364 src/components/GitPanel.tsx:378 src/components/GitPanel.tsx:383 src/components/GitPanel.tsx:390 src/components/GitPanel.tsx:403 src/components/GitPanel.tsx:411 src/components/GitPanel.tsx:436 src/components/GitPanel.tsx:437 src/components/GitPanel.tsx:471 src/components/GitPanel.tsx:490 +#: src/components/GitPanel.tsx:364 src/components/GitPanel.tsx:378 src/components/GitPanel.tsx:383 src/components/GitPanel.tsx:390 src/components/GitPanel.tsx:403 src/components/GitPanel.tsx:411 src/components/GitPanel.tsx:436 src/components/GitPanel.tsx:437 src/components/GitPanel.tsx:471 src/components/GitPanel.tsx:484 src/components/GitPanel.tsx:490 msgid "Commit and Push" msgstr "" -#: src/components/GitPanel.tsx:365 src/components/GitPanel.tsx:379 src/components/GitPanel.tsx:384 src/components/GitPanel.tsx:391 src/components/GitPanel.tsx:404 src/components/GitPanel.tsx:412 src/components/GitPanel.tsx:439 src/components/GitPanel.tsx:440 src/components/GitPanel.tsx:474 src/components/GitPanel.tsx:493 +#: src/components/GitPanel.tsx:365 src/components/GitPanel.tsx:379 src/components/GitPanel.tsx:384 src/components/GitPanel.tsx:391 src/components/GitPanel.tsx:404 src/components/GitPanel.tsx:412 src/components/GitPanel.tsx:439 src/components/GitPanel.tsx:440 src/components/GitPanel.tsx:474 src/components/GitPanel.tsx:487 src/components/GitPanel.tsx:493 msgid "Commit" msgstr "" -#: src/components/GitPanel.tsx:426 src/components/GitPanel.tsx:442 src/components/GitPanel.tsx:447 src/components/GitPanel.tsx:454 src/components/GitPanel.tsx:468 src/components/GitPanel.tsx:476 src/components/GitPanel.tsx:575 src/components/GitPanel.tsx:576 src/components/GitPanel.tsx:659 src/components/GitPanel.tsx:678 src/components/GitPanel.tsx:679 +#: src/components/GitPanel.tsx:426 src/components/GitPanel.tsx:442 src/components/GitPanel.tsx:447 src/components/GitPanel.tsx:454 src/components/GitPanel.tsx:468 src/components/GitPanel.tsx:476 src/components/GitPanel.tsx:575 src/components/GitPanel.tsx:576 src/components/GitPanel.tsx:659 src/components/GitPanel.tsx:672 src/components/GitPanel.tsx:678 src/components/GitPanel.tsx:679 msgid "is not" msgstr "" -#: src/components/GitPanel.tsx:429 src/components/GitPanel.tsx:445 src/components/GitPanel.tsx:450 src/components/GitPanel.tsx:457 src/components/GitPanel.tsx:471 src/components/GitPanel.tsx:479 src/components/GitPanel.tsx:578 src/components/GitPanel.tsx:579 src/components/GitPanel.tsx:662 src/components/GitPanel.tsx:681 src/components/GitPanel.tsx:682 +#: src/components/GitPanel.tsx:429 src/components/GitPanel.tsx:445 src/components/GitPanel.tsx:450 src/components/GitPanel.tsx:457 src/components/GitPanel.tsx:471 src/components/GitPanel.tsx:479 src/components/GitPanel.tsx:578 src/components/GitPanel.tsx:579 src/components/GitPanel.tsx:662 src/components/GitPanel.tsx:675 src/components/GitPanel.tsx:681 src/components/GitPanel.tsx:682 msgid "You are not currently in" msgstr "" -#: src/components/GitPanel.tsx:431 src/components/GitPanel.tsx:447 src/components/GitPanel.tsx:452 src/components/GitPanel.tsx:459 src/components/GitPanel.tsx:473 src/components/GitPanel.tsx:481 src/components/GitPanel.tsx:580 src/components/GitPanel.tsx:581 src/components/GitPanel.tsx:664 src/components/GitPanel.tsx:683 src/components/GitPanel.tsx:684 +#: src/components/GitPanel.tsx:431 src/components/GitPanel.tsx:447 src/components/GitPanel.tsx:452 src/components/GitPanel.tsx:459 src/components/GitPanel.tsx:473 src/components/GitPanel.tsx:481 src/components/GitPanel.tsx:580 src/components/GitPanel.tsx:581 src/components/GitPanel.tsx:664 src/components/GitPanel.tsx:677 src/components/GitPanel.tsx:683 src/components/GitPanel.tsx:684 msgid " a Git repository. To use Git, navigate to a local repository, initialize a repository here, or clone an existing repository." msgstr "" -#: src/components/GitPanel.tsx:435 src/components/GitPanel.tsx:436 src/components/GitPanel.tsx:470 src/components/GitPanel.tsx:489 +#: src/components/GitPanel.tsx:435 src/components/GitPanel.tsx:436 src/components/GitPanel.tsx:470 src/components/GitPanel.tsx:483 src/components/GitPanel.tsx:489 msgid "Commit (Amend) and Push" msgstr "" -#: src/components/GitPanel.tsx:438 src/components/GitPanel.tsx:439 src/components/GitPanel.tsx:473 src/components/GitPanel.tsx:492 +#: src/components/GitPanel.tsx:438 src/components/GitPanel.tsx:439 src/components/GitPanel.tsx:473 src/components/GitPanel.tsx:486 src/components/GitPanel.tsx:492 msgid "Commit (Amend)" msgstr "" -#: src/components/GitPanel.tsx:439 src/components/GitPanel.tsx:455 src/components/GitPanel.tsx:460 src/components/GitPanel.tsx:467 src/components/GitPanel.tsx:481 src/components/GitPanel.tsx:489 src/components/GitPanel.tsx:588 src/components/GitPanel.tsx:589 src/components/GitPanel.tsx:672 src/components/GitPanel.tsx:691 src/components/GitPanel.tsx:692 +#: src/components/GitPanel.tsx:439 src/components/GitPanel.tsx:455 src/components/GitPanel.tsx:460 src/components/GitPanel.tsx:467 src/components/GitPanel.tsx:481 src/components/GitPanel.tsx:489 src/components/GitPanel.tsx:588 src/components/GitPanel.tsx:589 src/components/GitPanel.tsx:672 src/components/GitPanel.tsx:685 src/components/GitPanel.tsx:691 src/components/GitPanel.tsx:692 msgid "Open the FileBrowser" msgstr "" -#: src/components/GitPanel.tsx:445 src/components/GitPanel.tsx:446 src/components/GitPanel.tsx:480 src/components/GitPanel.tsx:499 +#: src/components/GitPanel.tsx:445 src/components/GitPanel.tsx:446 src/components/GitPanel.tsx:480 src/components/GitPanel.tsx:493 src/components/GitPanel.tsx:499 msgid "You have unsaved tracked files. You probably want to save all changes before committing." msgstr "" -#: src/components/GitPanel.tsx:448 src/components/GitPanel.tsx:449 src/components/GitPanel.tsx:483 src/components/GitPanel.tsx:502 +#: src/components/GitPanel.tsx:448 src/components/GitPanel.tsx:449 src/components/GitPanel.tsx:483 src/components/GitPanel.tsx:496 src/components/GitPanel.tsx:502 msgid "You have unsaved staged files. You probably want to save and stage all needed changes before committing." msgstr "" -#: src/components/GitPanel.tsx:509 src/components/GitPanel.tsx:528 +#: src/components/GitPanel.tsx:509 src/components/GitPanel.tsx:522 src/components/GitPanel.tsx:528 msgid "Apply the latest stash" msgstr "" -#: src/components/GitPanel.tsx:513 src/components/GitPanel.tsx:571 src/components/GitPanel.tsx:602 src/components/GitPanel.tsx:616 src/components/GitPanel.tsx:630 src/components/GitPanel.tsx:638 src/components/GitPanel.tsx:737 src/components/GitPanel.tsx:738 src/components/GitPanel.tsx:840 src/components/GitPanel.tsx:859 src/components/GitPanel.tsx:860 +#: src/components/GitPanel.tsx:513 src/components/GitPanel.tsx:571 src/components/GitPanel.tsx:602 src/components/GitPanel.tsx:616 src/components/GitPanel.tsx:630 src/components/GitPanel.tsx:638 src/components/GitPanel.tsx:737 src/components/GitPanel.tsx:738 src/components/GitPanel.tsx:840 src/components/GitPanel.tsx:859 src/components/GitPanel.tsx:860 src/components/GitPanel.tsx:878 msgid "Who is committing?" msgstr "" -#: src/components/GitPanel.tsx:517 src/components/GitPanel.tsx:536 +#: src/components/GitPanel.tsx:517 src/components/GitPanel.tsx:530 src/components/GitPanel.tsx:536 msgid "Clear the entire stash" msgstr "" -#: src/components/GitPanel.tsx:524 src/components/GitPanel.tsx:525 src/components/GitPanel.tsx:608 src/components/GitPanel.tsx:627 src/components/GitPanel.tsx:628 +#: src/components/GitPanel.tsx:524 src/components/GitPanel.tsx:525 src/components/GitPanel.tsx:608 src/components/GitPanel.tsx:622 src/components/GitPanel.tsx:627 src/components/GitPanel.tsx:628 msgid "Compare %1 and %2" msgstr "" -#: src/components/GitPanel.tsx:537 src/components/GitPanel.tsx:594 src/components/GitPanel.tsx:625 src/components/GitPanel.tsx:639 src/components/GitPanel.tsx:653 src/components/GitPanel.tsx:661 src/components/GitPanel.tsx:760 src/components/GitPanel.tsx:761 src/components/GitPanel.tsx:871 src/components/GitPanel.tsx:890 src/components/GitPanel.tsx:891 +#: src/components/GitPanel.tsx:537 src/components/GitPanel.tsx:594 src/components/GitPanel.tsx:625 src/components/GitPanel.tsx:639 src/components/GitPanel.tsx:653 src/components/GitPanel.tsx:661 src/components/GitPanel.tsx:760 src/components/GitPanel.tsx:761 src/components/GitPanel.tsx:871 src/components/GitPanel.tsx:890 src/components/GitPanel.tsx:891 src/components/GitPanel.tsx:910 msgid "Failed to set your identity. %1" msgstr "" -#: src/components/GitPanel.tsx:577 src/components/GitPanel.tsx:608 src/components/GitPanel.tsx:622 src/components/GitPanel.tsx:636 src/components/GitPanel.tsx:644 src/components/GitPanel.tsx:743 src/components/GitPanel.tsx:744 src/components/GitPanel.tsx:846 src/components/GitPanel.tsx:865 src/components/GitPanel.tsx:866 +#: src/components/GitPanel.tsx:577 src/components/GitPanel.tsx:608 src/components/GitPanel.tsx:622 src/components/GitPanel.tsx:636 src/components/GitPanel.tsx:644 src/components/GitPanel.tsx:743 src/components/GitPanel.tsx:744 src/components/GitPanel.tsx:846 src/components/GitPanel.tsx:865 src/components/GitPanel.tsx:866 src/components/GitPanel.tsx:884 msgid "User refused to set identity." msgstr "" -#: src/components/GitPanel.tsx:685 src/components/GitPanel.tsx:699 src/components/GitPanel.tsx:707 src/components/GitPanel.tsx:806 src/components/GitPanel.tsx:807 src/components/GitPanel.tsx:917 src/components/GitPanel.tsx:936 src/components/GitPanel.tsx:937 +#: src/components/GitPanel.tsx:685 src/components/GitPanel.tsx:699 src/components/GitPanel.tsx:707 src/components/GitPanel.tsx:806 src/components/GitPanel.tsx:807 src/components/GitPanel.tsx:917 src/components/GitPanel.tsx:936 src/components/GitPanel.tsx:937 src/components/GitPanel.tsx:958 msgid "One or more open files are behind %1 head. Do you want to pull the latest remote version?" msgstr "" -#: src/components/GitPanel.tsx:694 src/components/GitPanel.tsx:708 src/components/GitPanel.tsx:716 src/components/GitPanel.tsx:815 src/components/GitPanel.tsx:816 src/components/GitPanel.tsx:926 src/components/GitPanel.tsx:945 src/components/GitPanel.tsx:946 +#: src/components/GitPanel.tsx:694 src/components/GitPanel.tsx:708 src/components/GitPanel.tsx:716 src/components/GitPanel.tsx:815 src/components/GitPanel.tsx:816 src/components/GitPanel.tsx:926 src/components/GitPanel.tsx:945 src/components/GitPanel.tsx:946 src/components/GitPanel.tsx:967 msgid "Continue Without Pulling" msgstr "" -#: src/components/GitPanel.tsx:697 src/components/GitPanel.tsx:711 src/components/GitPanel.tsx:719 src/components/GitPanel.tsx:818 src/components/GitPanel.tsx:819 src/components/GitPanel.tsx:929 src/components/GitPanel.tsx:948 src/components/GitPanel.tsx:949 +#: src/components/GitPanel.tsx:697 src/components/GitPanel.tsx:711 src/components/GitPanel.tsx:719 src/components/GitPanel.tsx:818 src/components/GitPanel.tsx:819 src/components/GitPanel.tsx:929 src/components/GitPanel.tsx:948 src/components/GitPanel.tsx:949 src/components/GitPanel.tsx:970 msgid "Pull" msgstr "" -#: src/components/GitPanel.tsx:698 src/components/GitPanel.tsx:712 src/components/GitPanel.tsx:720 src/components/GitPanel.tsx:819 src/components/GitPanel.tsx:820 src/components/GitPanel.tsx:930 src/components/GitPanel.tsx:949 src/components/GitPanel.tsx:950 +#: src/components/GitPanel.tsx:698 src/components/GitPanel.tsx:712 src/components/GitPanel.tsx:720 src/components/GitPanel.tsx:819 src/components/GitPanel.tsx:820 src/components/GitPanel.tsx:930 src/components/GitPanel.tsx:949 src/components/GitPanel.tsx:950 src/components/GitPanel.tsx:971 msgid "Git Pull from Remote Branch" msgstr "" -#: src/components/GitPanel.tsx:722 src/components/GitPanel.tsx:736 src/components/GitPanel.tsx:744 src/components/GitPanel.tsx:843 src/components/GitPanel.tsx:844 src/components/GitPanel.tsx:954 src/components/GitPanel.tsx:973 src/components/GitPanel.tsx:974 +#: src/components/GitPanel.tsx:722 src/components/GitPanel.tsx:736 src/components/GitPanel.tsx:744 src/components/GitPanel.tsx:843 src/components/GitPanel.tsx:844 src/components/GitPanel.tsx:954 src/components/GitPanel.tsx:973 src/components/GitPanel.tsx:974 src/components/GitPanel.tsx:995 msgid "The following open files remain behind:" msgstr "" -#: src/components/GitStash.tsx:144 +#: src/components/GitStash.tsx:144 src/components/GitStash.tsx:145 msgid "%1 (on %2)" msgstr "" -#: src/components/GitStash.tsx:282 +#: src/components/GitStash.tsx:282 src/components/GitStash.tsx:283 msgid "Pop stash entry" msgstr "" -#: src/components/GitStash.tsx:290 +#: src/components/GitStash.tsx:290 src/components/GitStash.tsx:291 msgid "Apply stash entry" msgstr "" -#: src/components/GitStash.tsx:298 +#: src/components/GitStash.tsx:298 src/components/GitStash.tsx:299 msgid "Drop stash entry" msgstr "" @@ -1336,7 +1430,7 @@ msgstr "" msgid "Discard file history" msgstr "" -#: src/components/HistorySideBar.tsx:187 src/components/HistorySideBar.tsx:189 src/components/HistorySideBar.tsx:192 src/components/HistorySideBar.tsx:241 src/components/HistorySideBar.tsx:271 +#: src/components/HistorySideBar.tsx:187 src/components/HistorySideBar.tsx:189 src/components/HistorySideBar.tsx:192 src/components/HistorySideBar.tsx:241 src/components/HistorySideBar.tsx:271 src/components/HistorySideBar.tsx:273 msgid "No history found." msgstr "" @@ -1368,23 +1462,23 @@ msgstr "" msgid "Manage Remotes" msgstr "" -#: src/components/MergeBranchDialog.tsx:87 src/components/NewBranchDialog.tsx:309 src/components/NewBranchDialog.tsx:313 src/components/NewBranchDialog.tsx:315 +#: src/components/MergeBranchDialog.tsx:87 src/components/NewBranchDialog.tsx:309 src/components/NewBranchDialog.tsx:310 src/components/NewBranchDialog.tsx:313 src/components/NewBranchDialog.tsx:315 msgid "Create a new branch based on: %1" msgstr "" -#: src/components/NewBranchDialog.tsx:147 src/components/NewBranchDialog.tsx:154 +#: src/components/NewBranchDialog.tsx:142 src/components/NewBranchDialog.tsx:147 src/components/NewBranchDialog.tsx:154 msgid "Create a Branch" msgstr "" -#: src/components/NewBranchDialog.tsx:160 src/components/NewBranchDialog.tsx:167 src/components/NewTagDialog.tsx:420 src/components/NewTagDialog.tsx:434 +#: src/components/NewBranchDialog.tsx:155 src/components/NewBranchDialog.tsx:160 src/components/NewBranchDialog.tsx:167 src/components/NewTagDialog.tsx:420 src/components/NewTagDialog.tsx:429 src/components/NewTagDialog.tsx:434 msgid "Name" msgstr "" -#: src/components/NewBranchDialog.tsx:167 src/components/NewBranchDialog.tsx:174 +#: src/components/NewBranchDialog.tsx:162 src/components/NewBranchDialog.tsx:167 src/components/NewBranchDialog.tsx:174 msgid "Enter a branch name" msgstr "" -#: src/components/NewBranchDialog.tsx:169 +#: src/components/NewBranchDialog.tsx:164 src/components/NewBranchDialog.tsx:169 msgid "Create branch based on…" msgstr "" @@ -1392,83 +1486,83 @@ msgstr "" msgid "Create branch based on..." msgstr "" -#: src/components/NewBranchDialog.tsx:199 src/components/NewBranchDialog.tsx:206 +#: src/components/NewBranchDialog.tsx:194 src/components/NewBranchDialog.tsx:199 src/components/NewBranchDialog.tsx:206 msgid "Close this dialog without creating a new branch" msgstr "" -#: src/components/NewBranchDialog.tsx:209 src/components/NewBranchDialog.tsx:216 +#: src/components/NewBranchDialog.tsx:204 src/components/NewBranchDialog.tsx:209 src/components/NewBranchDialog.tsx:216 msgid "Create Branch" msgstr "" -#: src/components/NewBranchDialog.tsx:300 src/components/NewBranchDialog.tsx:302 +#: src/components/NewBranchDialog.tsx:297 src/components/NewBranchDialog.tsx:300 src/components/NewBranchDialog.tsx:302 msgid "The current branch. Pick this if you want to build on work done in this branch." msgstr "" -#: src/components/NewBranchDialog.tsx:305 src/components/NewBranchDialog.tsx:307 +#: src/components/NewBranchDialog.tsx:302 src/components/NewBranchDialog.tsx:305 src/components/NewBranchDialog.tsx:307 msgid "The default branch. Pick this if you want to start fresh from the default branch." msgstr "" -#: src/components/NewBranchDialog.tsx:427 src/components/NewBranchDialog.tsx:434 +#: src/components/NewBranchDialog.tsx:419 src/components/NewBranchDialog.tsx:427 src/components/NewBranchDialog.tsx:434 msgid "Creating branch…" msgstr "" -#: src/components/NewBranchDialog.tsx:433 src/components/NewBranchDialog.tsx:434 -msgid "Creating branch..." +#: src/components/NewBranchDialog.tsx:431 src/components/NewBranchDialog.tsx:437 src/components/NewBranchDialog.tsx:443 src/components/NewBranchDialog.tsx:444 +msgid "Failed to create branch." msgstr "" -#: src/components/NewBranchDialog.tsx:437 src/components/NewBranchDialog.tsx:443 src/components/NewBranchDialog.tsx:444 -msgid "Failed to create branch." +#: src/components/NewBranchDialog.tsx:433 src/components/NewBranchDialog.tsx:434 +msgid "Creating branch..." msgstr "" -#: src/components/NewBranchDialog.tsx:444 src/components/NewBranchDialog.tsx:450 src/components/NewBranchDialog.tsx:451 +#: src/components/NewBranchDialog.tsx:440 src/components/NewBranchDialog.tsx:444 src/components/NewBranchDialog.tsx:450 src/components/NewBranchDialog.tsx:451 msgid "Branch created." msgstr "" -#: src/components/NewTagDialog.tsx:260 src/components/NewTagDialog.tsx:274 +#: src/components/NewTagDialog.tsx:260 src/components/NewTagDialog.tsx:264 src/components/NewTagDialog.tsx:274 msgid "Create a new tag pointing to commit %1: %2 by %3" msgstr "" -#: src/components/NewTagDialog.tsx:376 src/components/NewTagDialog.tsx:390 +#: src/components/NewTagDialog.tsx:376 src/components/NewTagDialog.tsx:379 src/components/NewTagDialog.tsx:390 msgid "Creating tag…" msgstr "" -#: src/components/NewTagDialog.tsx:384 src/components/NewTagDialog.tsx:398 +#: src/components/NewTagDialog.tsx:384 src/components/NewTagDialog.tsx:389 src/components/NewTagDialog.tsx:398 msgid "Failed to create tag." msgstr "" -#: src/components/NewTagDialog.tsx:391 src/components/NewTagDialog.tsx:405 +#: src/components/NewTagDialog.tsx:391 src/components/NewTagDialog.tsx:398 src/components/NewTagDialog.tsx:405 msgid "Tag created." msgstr "" -#: src/components/NewTagDialog.tsx:409 src/components/NewTagDialog.tsx:423 +#: src/components/NewTagDialog.tsx:409 src/components/NewTagDialog.tsx:418 src/components/NewTagDialog.tsx:423 msgid "Create a Tag" msgstr "" -#: src/components/NewTagDialog.tsx:427 src/components/NewTagDialog.tsx:441 +#: src/components/NewTagDialog.tsx:427 src/components/NewTagDialog.tsx:436 src/components/NewTagDialog.tsx:441 msgid "Enter a tag name" msgstr "" -#: src/components/NewTagDialog.tsx:429 src/components/NewTagDialog.tsx:443 +#: src/components/NewTagDialog.tsx:429 src/components/NewTagDialog.tsx:438 src/components/NewTagDialog.tsx:443 msgid "Create tag pointing to…" msgstr "" -#: src/components/NewTagDialog.tsx:437 src/components/NewTagDialog.tsx:452 +#: src/components/NewTagDialog.tsx:437 src/components/NewTagDialog.tsx:447 src/components/NewTagDialog.tsx:452 msgid "Filter by commit message" msgstr "" -#: src/components/NewTagDialog.tsx:438 src/components/NewTagDialog.tsx:453 +#: src/components/NewTagDialog.tsx:438 src/components/NewTagDialog.tsx:448 src/components/NewTagDialog.tsx:453 msgid "Filter history of commits menu" msgstr "" -#: src/components/NewTagDialog.tsx:467 src/components/NewTagDialog.tsx:484 +#: src/components/NewTagDialog.tsx:467 src/components/NewTagDialog.tsx:478 src/components/NewTagDialog.tsx:484 msgid "Close this dialog without creating a new tag" msgstr "" -#: src/components/NewTagDialog.tsx:474 src/components/NewTagDialog.tsx:491 src/components/TagMenu.tsx:201 +#: src/components/NewTagDialog.tsx:474 src/components/NewTagDialog.tsx:485 src/components/NewTagDialog.tsx:491 src/components/TagMenu.tsx:196 src/components/TagMenu.tsx:201 msgid "Create a new tag" msgstr "" -#: src/components/NewTagDialog.tsx:475 src/components/NewTagDialog.tsx:492 +#: src/components/NewTagDialog.tsx:475 src/components/NewTagDialog.tsx:486 src/components/NewTagDialog.tsx:492 msgid "Create Tag" msgstr "" @@ -1484,63 +1578,63 @@ msgstr "" msgid "Compare with selected" msgstr "" -#: src/components/RebaseAction.tsx:100 +#: src/components/RebaseAction.tsx:100 src/components/RebaseAction.tsx:96 msgid "Continue the rebase." msgstr "" -#: src/components/RebaseAction.tsx:103 -msgid "Continue" +#: src/components/RebaseAction.tsx:102 src/components/RebaseAction.tsx:106 +msgid "Pick another rebase action." msgstr "" -#: src/components/RebaseAction.tsx:106 -msgid "Pick another rebase action." +#: src/components/RebaseAction.tsx:103 src/components/RebaseAction.tsx:99 +msgid "Continue" msgstr "" -#: src/components/RebaseAction.tsx:129 +#: src/components/RebaseAction.tsx:124 src/components/RebaseAction.tsx:129 msgid "Skip the current commit." msgstr "" -#: src/components/RebaseAction.tsx:131 +#: src/components/RebaseAction.tsx:126 src/components/RebaseAction.tsx:131 msgid "Skip" msgstr "" -#: src/components/RebaseAction.tsx:137 +#: src/components/RebaseAction.tsx:132 src/components/RebaseAction.tsx:137 msgid "Abort the rebase." msgstr "" -#: src/components/RebaseAction.tsx:139 src/components/RebaseAction.tsx:80 +#: src/components/RebaseAction.tsx:134 src/components/RebaseAction.tsx:139 src/components/RebaseAction.tsx:76 src/components/RebaseAction.tsx:80 msgid "Abort" msgstr "" -#: src/components/RebaseAction.tsx:77 +#: src/components/RebaseAction.tsx:73 src/components/RebaseAction.tsx:77 msgid "Are you sure you want to abort the rebase?" msgstr "" -#: src/components/ResetRevertDialog.tsx:125 src/components/ResetRevertDialog.tsx:127 +#: src/components/ResetRevertDialog.tsx:121 src/components/ResetRevertDialog.tsx:125 src/components/ResetRevertDialog.tsx:127 msgid "Revert Changes" msgstr "" -#: src/components/ResetRevertDialog.tsx:126 src/components/ResetRevertDialog.tsx:128 +#: src/components/ResetRevertDialog.tsx:122 src/components/ResetRevertDialog.tsx:126 src/components/ResetRevertDialog.tsx:128 msgid "Reset Changes" msgstr "" -#: src/components/ResetRevertDialog.tsx:139 src/components/ResetRevertDialog.tsx:141 +#: src/components/ResetRevertDialog.tsx:135 src/components/ResetRevertDialog.tsx:139 src/components/ResetRevertDialog.tsx:141 msgid "These changes will be reverted. Only commit if you're sure you're okay losing these changes." msgstr "" -#: src/components/ResetRevertDialog.tsx:142 src/components/ResetRevertDialog.tsx:144 +#: src/components/ResetRevertDialog.tsx:138 src/components/ResetRevertDialog.tsx:142 src/components/ResetRevertDialog.tsx:144 msgid "All changes after commit %1 will be gone forever (hard reset). Are you sure?" msgstr "" -#: src/components/ResetRevertDialog.tsx:166 src/components/ResetRevertDialog.tsx:179 +#: src/components/ResetRevertDialog.tsx:162 src/components/ResetRevertDialog.tsx:166 src/components/ResetRevertDialog.tsx:179 msgid "Cancel changes" msgstr "" -#: src/components/ResetRevertDialog.tsx:174 src/components/ResetRevertDialog.tsx:187 +#: src/components/ResetRevertDialog.tsx:170 src/components/ResetRevertDialog.tsx:174 src/components/ResetRevertDialog.tsx:187 msgid "Submit changes" msgstr "" -#: src/components/ResetRevertDialog.tsx:229 +#: src/components/ResetRevertDialog.tsx:224 src/components/ResetRevertDialog.tsx:229 msgid "Discarding changes…" msgstr "" @@ -1548,15 +1642,15 @@ msgstr "" msgid "Discarding changes..." msgstr "" -#: src/components/ResetRevertDialog.tsx:235 src/components/ResetRevertDialog.tsx:252 +#: src/components/ResetRevertDialog.tsx:232 src/components/ResetRevertDialog.tsx:235 src/components/ResetRevertDialog.tsx:252 msgid "Successfully discarded changes." msgstr "" -#: src/components/ResetRevertDialog.tsx:240 src/components/ResetRevertDialog.tsx:257 +#: src/components/ResetRevertDialog.tsx:239 src/components/ResetRevertDialog.tsx:240 src/components/ResetRevertDialog.tsx:257 msgid "Failed to discard changes." msgstr "" -#: src/components/ResetRevertDialog.tsx:256 +#: src/components/ResetRevertDialog.tsx:256 src/components/ResetRevertDialog.tsx:258 msgid "Reverting changes…" msgstr "" @@ -1564,31 +1658,31 @@ msgstr "" msgid "Reverting changes..." msgstr "" -#: src/components/ResetRevertDialog.tsx:262 src/components/ResetRevertDialog.tsx:279 +#: src/components/ResetRevertDialog.tsx:262 src/components/ResetRevertDialog.tsx:266 src/components/ResetRevertDialog.tsx:279 msgid "Successfully reverted changes." msgstr "" -#: src/components/ResetRevertDialog.tsx:267 src/components/ResetRevertDialog.tsx:284 +#: src/components/ResetRevertDialog.tsx:267 src/components/ResetRevertDialog.tsx:273 src/components/ResetRevertDialog.tsx:284 msgid "Failed to revert changes." msgstr "" -#: src/components/ResetRevertDialog.tsx:299 src/components/ResetRevertDialog.tsx:316 +#: src/components/ResetRevertDialog.tsx:299 src/components/ResetRevertDialog.tsx:309 src/components/ResetRevertDialog.tsx:316 msgid "Revert '%1'" msgstr "" -#: src/components/ResetRevertDialog.tsx:308 src/components/ResetRevertDialog.tsx:325 +#: src/components/ResetRevertDialog.tsx:308 src/components/ResetRevertDialog.tsx:318 src/components/ResetRevertDialog.tsx:325 msgid "This reverts commit %1" msgstr "" -#: src/components/SinglePastCommitInfo.tsx:159 src/components/SinglePastCommitInfo.tsx:169 src/components/SinglePastCommitInfo.tsx:180 src/components/SinglePastCommitInfo.tsx:182 +#: src/components/SinglePastCommitInfo.tsx:159 src/components/SinglePastCommitInfo.tsx:169 src/components/SinglePastCommitInfo.tsx:170 src/components/SinglePastCommitInfo.tsx:180 src/components/SinglePastCommitInfo.tsx:182 msgid "Error loading commit data" msgstr "" -#: src/components/SinglePastCommitInfo.tsx:168 src/components/SinglePastCommitInfo.tsx:180 src/components/SinglePastCommitInfo.tsx:201 src/components/SinglePastCommitInfo.tsx:212 src/components/SinglePastCommitInfo.tsx:214 +#: src/components/SinglePastCommitInfo.tsx:168 src/components/SinglePastCommitInfo.tsx:180 src/components/SinglePastCommitInfo.tsx:181 src/components/SinglePastCommitInfo.tsx:201 src/components/SinglePastCommitInfo.tsx:212 src/components/SinglePastCommitInfo.tsx:214 msgid "Revert changes introduced by this commit" msgstr "" -#: src/components/SinglePastCommitInfo.tsx:176 src/components/SinglePastCommitInfo.tsx:188 src/components/SinglePastCommitInfo.tsx:209 src/components/SinglePastCommitInfo.tsx:220 src/components/SinglePastCommitInfo.tsx:222 +#: src/components/SinglePastCommitInfo.tsx:176 src/components/SinglePastCommitInfo.tsx:188 src/components/SinglePastCommitInfo.tsx:189 src/components/SinglePastCommitInfo.tsx:209 src/components/SinglePastCommitInfo.tsx:220 src/components/SinglePastCommitInfo.tsx:222 msgid "Discard changes introduced *after* this commit (hard reset)" msgstr "" @@ -1600,11 +1694,11 @@ msgstr "" msgid "Fail to get the tags." msgstr "" -#: src/components/TagMenu.tsx:186 +#: src/components/TagMenu.tsx:181 src/components/TagMenu.tsx:186 msgid "Filter tag menu" msgstr "" -#: src/components/TagMenu.tsx:202 +#: src/components/TagMenu.tsx:197 src/components/TagMenu.tsx:202 msgid "New Tag" msgstr "" @@ -1612,99 +1706,115 @@ msgstr "" msgid "Checkout to tag: %1" msgstr "" -#: src/components/TagMenu.tsx:308 src/components/TagMenu.tsx:310 +#: src/components/TagMenu.tsx:304 src/components/TagMenu.tsx:308 src/components/TagMenu.tsx:310 msgid "Creating a new tag is disabled" msgstr "" -#: src/components/TagMenu.tsx:309 src/components/TagMenu.tsx:311 +#: src/components/TagMenu.tsx:305 src/components/TagMenu.tsx:309 src/components/TagMenu.tsx:311 msgid "Error in creating new tag" msgstr "" -#: src/components/TagMenu.tsx:45 src/components/TagMenu.tsx:47 +#: src/components/TagMenu.tsx:340 +msgid "Checkout tags is disabled" +msgstr "" + +#: src/components/TagMenu.tsx:341 +msgid "The repository contains files with uncommitted changes. Please commit or discard these changes before switching to a tag." +msgstr "" + +#: src/components/TagMenu.tsx:349 +msgid "Checking tag out…" +msgstr "" + +#: src/components/TagMenu.tsx:362 +msgid "Tag checkout." +msgstr "" + +#: src/components/TagMenu.tsx:45 src/components/TagMenu.tsx:46 src/components/TagMenu.tsx:47 msgid "Unable to checkout tag" msgstr "" -#: src/components/TagMenu.tsx:57 src/components/TagMenu.tsx:59 +#: src/components/TagMenu.tsx:57 src/components/TagMenu.tsx:58 src/components/TagMenu.tsx:59 msgid "Please commit, stash, or discard your changes before you checkout tags." msgstr "" -#: src/components/TagMenu.tsx:68 src/components/TagMenu.tsx:70 +#: src/components/TagMenu.tsx:68 src/components/TagMenu.tsx:69 src/components/TagMenu.tsx:70 msgid "Failed to checkout tag." msgstr "" -#: src/components/Toolbar.tsx:173 src/components/Toolbar.tsx:183 +#: src/components/Toolbar.tsx:173 src/components/Toolbar.tsx:178 src/components/Toolbar.tsx:183 msgid "Pull latest changes" msgstr "" -#: src/components/Toolbar.tsx:175 src/components/Toolbar.tsx:185 +#: src/components/Toolbar.tsx:175 src/components/Toolbar.tsx:180 src/components/Toolbar.tsx:185 msgid " (behind by %1 commits)" msgstr "" -#: src/components/Toolbar.tsx:180 src/components/Toolbar.tsx:190 src/components/Toolbar.tsx:208 src/components/Toolbar.tsx:218 +#: src/components/Toolbar.tsx:180 src/components/Toolbar.tsx:185 src/components/Toolbar.tsx:190 src/components/Toolbar.tsx:208 src/components/Toolbar.tsx:212 src/components/Toolbar.tsx:218 msgid "No remote repository defined" msgstr "" -#: src/components/Toolbar.tsx:200 src/components/Toolbar.tsx:210 +#: src/components/Toolbar.tsx:200 src/components/Toolbar.tsx:204 src/components/Toolbar.tsx:210 msgid "Push committed changes" msgstr "" -#: src/components/Toolbar.tsx:202 src/components/Toolbar.tsx:212 +#: src/components/Toolbar.tsx:202 src/components/Toolbar.tsx:206 src/components/Toolbar.tsx:212 msgid " (ahead by %1 commits)" msgstr "" -#: src/components/Toolbar.tsx:207 src/components/Toolbar.tsx:217 +#: src/components/Toolbar.tsx:207 src/components/Toolbar.tsx:211 src/components/Toolbar.tsx:217 msgid "Publish branch" msgstr "" -#: src/components/Toolbar.tsx:217 src/components/Toolbar.tsx:227 +#: src/components/Toolbar.tsx:217 src/components/Toolbar.tsx:221 src/components/Toolbar.tsx:227 msgid "Refresh the repository to detect local and remote changes" msgstr "" -#: src/components/Toolbar.tsx:236 src/components/Toolbar.tsx:240 src/components/Toolbar.tsx:250 +#: src/components/Toolbar.tsx:236 src/components/Toolbar.tsx:240 src/components/Toolbar.tsx:244 src/components/Toolbar.tsx:250 msgid "Current repository: %1" msgstr "" -#: src/components/Toolbar.tsx:245 src/components/Toolbar.tsx:248 src/components/Toolbar.tsx:258 +#: src/components/Toolbar.tsx:245 src/components/Toolbar.tsx:248 src/components/Toolbar.tsx:255 src/components/Toolbar.tsx:258 msgid "Current Repository" msgstr "" -#: src/components/Toolbar.tsx:269 src/components/Toolbar.tsx:279 +#: src/components/Toolbar.tsx:269 src/components/Toolbar.tsx:276 src/components/Toolbar.tsx:279 msgid "Cherry picking in" msgstr "" -#: src/components/Toolbar.tsx:272 src/components/Toolbar.tsx:273 src/components/Toolbar.tsx:291 src/components/Toolbar.tsx:301 +#: src/components/Toolbar.tsx:272 src/components/Toolbar.tsx:273 src/components/Toolbar.tsx:291 src/components/Toolbar.tsx:298 src/components/Toolbar.tsx:301 msgid "Manage branches and tags" msgstr "" -#: src/components/Toolbar.tsx:272 src/components/Toolbar.tsx:282 +#: src/components/Toolbar.tsx:272 src/components/Toolbar.tsx:279 src/components/Toolbar.tsx:282 msgid "Detached Head at" msgstr "" -#: src/components/Toolbar.tsx:275 src/components/Toolbar.tsx:285 +#: src/components/Toolbar.tsx:275 src/components/Toolbar.tsx:282 src/components/Toolbar.tsx:285 msgid "Merging in" msgstr "" -#: src/components/Toolbar.tsx:278 src/components/Toolbar.tsx:279 src/components/Toolbar.tsx:281 src/components/Toolbar.tsx:291 +#: src/components/Toolbar.tsx:278 src/components/Toolbar.tsx:279 src/components/Toolbar.tsx:281 src/components/Toolbar.tsx:288 src/components/Toolbar.tsx:291 msgid "Current Branch" msgstr "" -#: src/components/Toolbar.tsx:278 src/components/Toolbar.tsx:288 +#: src/components/Toolbar.tsx:278 src/components/Toolbar.tsx:285 src/components/Toolbar.tsx:288 msgid "Rebasing" msgstr "" -#: src/components/Toolbar.tsx:315 src/components/Toolbar.tsx:316 src/components/Toolbar.tsx:332 src/components/Toolbar.tsx:342 +#: src/components/Toolbar.tsx:315 src/components/Toolbar.tsx:316 src/components/Toolbar.tsx:332 src/components/Toolbar.tsx:342 src/components/Toolbar.tsx:345 msgid "View branches" msgstr "" -#: src/components/Toolbar.tsx:316 src/components/Toolbar.tsx:317 src/components/Toolbar.tsx:333 src/components/Toolbar.tsx:343 +#: src/components/Toolbar.tsx:316 src/components/Toolbar.tsx:317 src/components/Toolbar.tsx:333 src/components/Toolbar.tsx:343 src/components/Toolbar.tsx:346 msgid "Branches" msgstr "" -#: src/components/Toolbar.tsx:325 src/components/Toolbar.tsx:326 src/components/Toolbar.tsx:342 src/components/Toolbar.tsx:352 +#: src/components/Toolbar.tsx:325 src/components/Toolbar.tsx:326 src/components/Toolbar.tsx:342 src/components/Toolbar.tsx:352 src/components/Toolbar.tsx:355 msgid "View tags" msgstr "" -#: src/components/Toolbar.tsx:326 src/components/Toolbar.tsx:327 src/components/Toolbar.tsx:343 src/components/Toolbar.tsx:353 +#: src/components/Toolbar.tsx:326 src/components/Toolbar.tsx:327 src/components/Toolbar.tsx:343 src/components/Toolbar.tsx:353 src/components/Toolbar.tsx:356 msgid "Tags" msgstr "" @@ -1716,51 +1826,51 @@ msgstr "" msgid "Refreshing…" msgstr "" -#: src/components/Toolbar.tsx:408 src/components/Toolbar.tsx:409 src/components/Toolbar.tsx:410 src/components/Toolbar.tsx:426 src/components/Toolbar.tsx:438 +#: src/components/Toolbar.tsx:408 src/components/Toolbar.tsx:409 src/components/Toolbar.tsx:410 src/components/Toolbar.tsx:426 src/components/Toolbar.tsx:438 src/components/Toolbar.tsx:440 msgid "Successfully refreshed." msgstr "" -#: src/components/Toolbar.tsx:414 src/components/Toolbar.tsx:415 src/components/Toolbar.tsx:416 src/components/Toolbar.tsx:432 src/components/Toolbar.tsx:444 +#: src/components/Toolbar.tsx:414 src/components/Toolbar.tsx:415 src/components/Toolbar.tsx:416 src/components/Toolbar.tsx:432 src/components/Toolbar.tsx:444 src/components/Toolbar.tsx:448 msgid "Failed to refresh." msgstr "" -#: src/components/diff/ImageDiff.tsx:142 +#: src/components/diff/ImageDiff.tsx:138 src/components/diff/ImageDiff.tsx:142 msgid "View Image Diff in 2-up Mode" msgstr "" -#: src/components/diff/ImageDiff.tsx:143 +#: src/components/diff/ImageDiff.tsx:139 src/components/diff/ImageDiff.tsx:143 msgid "2-up" msgstr "" -#: src/components/diff/ImageDiff.tsx:151 +#: src/components/diff/ImageDiff.tsx:147 src/components/diff/ImageDiff.tsx:151 msgid "View Image Diff in Swipe Mode" msgstr "" -#: src/components/diff/ImageDiff.tsx:152 +#: src/components/diff/ImageDiff.tsx:148 src/components/diff/ImageDiff.tsx:152 msgid "Swipe" msgstr "" -#: src/components/diff/ImageDiff.tsx:160 +#: src/components/diff/ImageDiff.tsx:156 src/components/diff/ImageDiff.tsx:160 msgid "View Image Diff in Onion Skin Mode" msgstr "" -#: src/components/diff/ImageDiff.tsx:161 +#: src/components/diff/ImageDiff.tsx:157 src/components/diff/ImageDiff.tsx:161 msgid "Onion Skin" msgstr "" -#: src/components/diff/ImageDiff.tsx:441 +#: src/components/diff/ImageDiff.tsx:426 src/components/diff/ImageDiff.tsx:441 msgid "Failed to refresh Image diff." msgstr "" -#: src/components/diff/ImageDiff.tsx:514 src/components/diff/NotebookDiff.ts:336 src/components/diff/NotebookDiff.ts:343 src/components/diff/PlainTextDiff.ts:244 src/components/diff/PlainTextDiff.ts:251 src/components/diff/PlainTextDiff.ts:294 +#: src/components/diff/ImageDiff.tsx:501 src/components/diff/ImageDiff.tsx:514 src/components/diff/NotebookDiff.ts:336 src/components/diff/NotebookDiff.ts:337 src/components/diff/NotebookDiff.ts:343 src/components/diff/PlainTextDiff.ts:244 src/components/diff/PlainTextDiff.ts:251 src/components/diff/PlainTextDiff.ts:282 src/components/diff/PlainTextDiff.ts:294 msgid "Failed to load file diff." msgstr "" -#: src/components/diff/ImageDiff.tsx:525 +#: src/components/diff/ImageDiff.tsx:512 src/components/diff/ImageDiff.tsx:525 msgid "Error Loading Image Diff:" msgstr "" -#: src/components/diff/NotebookDiff.ts:103 +#: src/components/diff/NotebookDiff.ts:100 src/components/diff/NotebookDiff.ts:103 msgid "Hide unchanged cells" msgstr "" @@ -1780,7 +1890,7 @@ msgstr "" msgid "Failed to init notebook diff view: %1" msgstr "" -#: src/components/diff/NotebookDiff.ts:347 src/components/diff/NotebookDiff.ts:354 +#: src/components/diff/NotebookDiff.ts:347 src/components/diff/NotebookDiff.ts:348 src/components/diff/NotebookDiff.ts:354 msgid "Error Loading Notebook Diff:" msgstr "" @@ -1788,7 +1898,7 @@ msgstr "" msgid "Failed to get a valid file value." msgstr "" -#: src/components/diff/PlainTextDiff.ts:250 src/components/diff/PlainTextDiff.ts:257 src/components/diff/PlainTextDiff.ts:300 +#: src/components/diff/PlainTextDiff.ts:250 src/components/diff/PlainTextDiff.ts:257 src/components/diff/PlainTextDiff.ts:293 src/components/diff/PlainTextDiff.ts:300 msgid "Error Loading File Diff:" msgstr "" @@ -1904,27 +2014,27 @@ msgstr "" msgid "Revert chunk" msgstr "" -#: src/index.ts:100 src/index.ts:101 src/index.ts:102 src/index.ts:107 src/index.ts:94 src/index.ts:98 +#: src/index.ts:100 src/index.ts:101 src/index.ts:102 src/index.ts:107 src/index.ts:108 src/index.ts:94 src/index.ts:98 msgid "git command not found - please ensure you have Git > 2 installed" msgstr "" -#: src/index.ts:102 src/index.ts:106 src/index.ts:108 src/index.ts:109 src/index.ts:110 src/index.ts:115 +#: src/index.ts:102 src/index.ts:106 src/index.ts:108 src/index.ts:109 src/index.ts:110 src/index.ts:115 src/index.ts:116 msgid "git command version must be > 2; got %1." msgstr "" -#: src/index.ts:109 src/index.ts:113 src/index.ts:115 src/index.ts:116 src/index.ts:117 src/index.ts:122 +#: src/index.ts:109 src/index.ts:113 src/index.ts:115 src/index.ts:116 src/index.ts:117 src/index.ts:122 src/index.ts:123 msgid "The versions of the JupyterLab Git server frontend and backend do not match. The @jupyterlab/git frontend extension has version: %1 while the python package has version %2. Please install identical version of jupyterlab-git Python package and the @jupyterlab/git extension. Try running: pip install --upgrade jupyterlab-git" msgstr "" -#: src/index.ts:126 src/index.ts:130 src/index.ts:132 src/index.ts:133 src/index.ts:134 src/index.ts:139 +#: src/index.ts:126 src/index.ts:130 src/index.ts:132 src/index.ts:133 src/index.ts:134 src/index.ts:139 src/index.ts:140 msgid "Failed to load the jupyterlab-git server extension" msgstr "" -#: src/index.ts:128 src/index.ts:129 src/index.ts:130 src/index.ts:135 +#: src/index.ts:128 src/index.ts:129 src/index.ts:130 src/index.ts:135 src/index.ts:136 msgid "Failed to load the jupyterlab-git server extension settings" msgstr "" -#: src/index.ts:90 src/index.ts:91 src/index.ts:92 src/index.ts:97 +#: src/index.ts:90 src/index.ts:91 src/index.ts:92 src/index.ts:97 src/index.ts:98 msgid "" "Failed to load settings for the Git Extension.\n" "%1" @@ -1950,11 +2060,11 @@ msgstr "" msgid "Force Push" msgstr "" -#: src/widgets/AuthorBox.ts:29 +#: src/widgets/AuthorBox.ts:29 src/widgets/AuthorBox.ts:30 msgid "Committer name:" msgstr "" -#: src/widgets/AuthorBox.ts:31 +#: src/widgets/AuthorBox.ts:31 src/widgets/AuthorBox.ts:32 msgid "Committer email:" msgstr "" @@ -1993,7 +2103,3 @@ msgstr "" #: src/widgets/discardAllChanges.ts:18 msgid "Your current changes forbid pulling the latest changes. Do you want to permanently discard those changes? This action cannot be undone." msgstr "" - -#: src/widgets/gitClone.tsx:38 -msgid "Git Clone" -msgstr ""