diff options
| author | Rodrigo Moya <rodrigo.moya@xamarin.com> | 2019-03-28 15:56:28 +0300 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo.moya@xamarin.com> | 2019-04-03 16:53:36 +0300 |
| commit | 594f6289eace38b0899440ec6f77cd2dc4933e90 (patch) | |
| tree | 0c1c074be3c64b84479fb72b37fdf98b610d4839 /main/po/nb.po | |
| parent | 7ae2771897e4842b7320ad186966f0d9cafe2325 (diff) | |
Add new strings for translation
Diffstat (limited to 'main/po/nb.po')
| -rw-r--r-- | main/po/nb.po | 382 |
1 files changed, 222 insertions, 160 deletions
diff --git a/main/po/nb.po b/main/po/nb.po index 93b2e586d4..ace20d7775 100644 --- a/main/po/nb.po +++ b/main/po/nb.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2019-03-13 19:50:52+0100\n" +"POT-Creation-Date: 2019-03-28 13:54:02+0100\n" "PO-Revision-Date: 2010-11-09 04:54:59+0100\n" "Last-Translator: Lluis Sanchez Gual <lluis@novell.com>\n" "Language-Team: \n" @@ -35,6 +35,10 @@ msgstr "" msgid " (Loading)" msgstr "" +#: ../external/vs-editor-core/src/RoslynIntegration/EventHookup/EventHookupSessionManager.cs:59 +msgid " (Press TAB to insert)" +msgstr "" + #: ../external/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/InstallDialog.cs:142 msgid " (in user directory)" msgstr "" @@ -520,7 +524,7 @@ msgstr "Rammeverket '{0}' er ikke installert." msgid ".NET Core SDK" msgstr "Innebygd som resurs" -#: ../src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreNotInstalledDialog.cs:51 +#: ../src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreNotInstalledDialog.cs:50 msgid "" ".NET Core SDK is not installed. This is required to build and run .NET Core " "projects." @@ -535,7 +539,7 @@ msgstr "Rammeverket '{0}' er ikke installert." msgid ".NET Core is required to run this application." msgstr "" -#: ../src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreNotInstalledDialog.cs:58 +#: ../src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreNotInstalledDialog.cs:57 msgid "" ".NET Core {0} SDK is not installed. This is required to build and run .NET " "Core {0} projects." @@ -715,6 +719,7 @@ msgid "<b>Add a link</b> to the file" msgstr "" #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs:964 +#: ../src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewContent.cs:395 msgid "" "<b>An autosave file has been found for this file.</b>\n" "This could mean that another instance of MonoDevelop is editing this file, " @@ -968,6 +973,7 @@ msgid "<b>Task Priorities Foreground Colors</b>" msgstr "" #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs:712 +#: ../src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewContent.cs:630 msgid "" "<b>The file \"{0}\" has been changed outside of {1}.</b>\n" "Do you want to keep your changes, or reload the file from disk?" @@ -1032,7 +1038,7 @@ msgid "<b>{0}</b>" msgstr "Forfatter" #: ../src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionCaughtDialog.cs:1074 -#: ../src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.VSTextView/ExceptionCaught/ExceptionCaughtAdornmentManager.cs:267 +#: ../src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.VSTextView/ExceptionCaught/ExceptionCaughtAdornmentManager.cs:269 msgid "<b>{0}</b> has been thrown" msgstr "" @@ -1086,7 +1092,7 @@ msgid "" msgstr "" #: ../src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionRepository.cs:565 -#: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:1955 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:2020 msgid "<uncommitted>" msgstr "" @@ -1765,7 +1771,7 @@ msgid "Abort Update" msgstr "" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/CommonAboutDialog.cs:61 -#: ../src/addins/MacPlatform/MacPlatform.cs:524 +#: ../src/addins/MacPlatform/MacPlatform.cs:525 msgid "About {0}" msgstr "" @@ -2945,7 +2951,7 @@ msgid "Application to record audio/video files" msgstr "" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageFirstRun.cs:83 -#: ../src/addins/MacPlatform/MacPlatform.cs:700 +#: ../src/addins/MacPlatform/MacPlatform.cs:725 #, fuzzy msgid "ApplicationIcon" msgstr "Applikasjon definisjon" @@ -3010,7 +3016,7 @@ msgid "Apply to Project" msgstr "Lukk Prosjekt" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/GtkAlertDialog.cs:154 -#: ../src/addins/MacPlatform/Dialogs/MacAlertDialogHandler.cs:153 +#: ../src/addins/MacPlatform/Dialogs/MacAlertDialogHandler.cs:160 #: ../external/xwt/Xwt.Gtk/Xwt.GtkBackend/GtkAlertDialog.cs:126 msgid "Apply to all" msgstr "" @@ -3348,7 +3354,7 @@ msgstr "" msgid "Assembly:\t{0}" msgstr "" -#: ../src/addins/MacPlatform/MacPlatform.cs:327 +#: ../src/addins/MacPlatform/MacPlatform.cs:328 msgid "Assistive Technology Detected" msgstr "" @@ -3518,6 +3524,11 @@ msgstr "" msgid "Automatically insert punctuation (=\"\", />, etc.)" msgstr "" +#: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:1054 +msgid "Automatically stash/unstash changes when merging/rebasing" +msgstr "" + +#: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:1832 #: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/Gui/MonoDevelop.VersionControl.Git.GitOptionsPanelWidget.cs:29 msgid "Automatically stash/unstash changes when switching branches" msgstr "" @@ -3617,9 +3628,9 @@ msgstr "" msgid "Baltic" msgstr "" -#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs:105 -#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs:243 -#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs:270 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs:117 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs:255 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs:282 msgid "Base" msgstr "" @@ -4957,7 +4968,7 @@ msgstr "" msgid "Chemistry software" msgstr "" -#: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:1147 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:1172 msgid "Cherry-picking {0} - {1}/{2}" msgstr "" @@ -5286,7 +5297,7 @@ msgid "Clipboard Ring" msgstr "" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItemTitleTab.cs:255 -#: ../src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/PreviewVisualizerWindow.cs:62 +#: ../src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/PreviewVisualizerWindow.cs:63 #: ../src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/AddPackagesDialog.UI.cs:368 #: ../external/xwt/Xwt/Xwt/Command.cs:64 msgid "Close" @@ -5298,7 +5309,7 @@ msgstr "" msgid "Close All Files" msgstr "" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeStartup.cs:735 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeStartup.cs:671 msgid "Close MonoDevelop" msgstr "" @@ -5458,7 +5469,7 @@ msgstr "Referanse" msgid "Code completion database generation" msgstr "" -#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:342 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:343 #: ../src/tools/mdmonitor/gtk-gui/Mono.Instrumentation.Monitor.TimeLineViewWindow.cs:54 msgid "Collapse All" msgstr "" @@ -5603,15 +5614,15 @@ msgstr "" msgid "Commit _message:" msgstr "(Ingen melding)" -#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:637 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:659 msgid "Commit message (multiple selection):" msgstr "" -#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:635 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:657 msgid "Commit message for file '{0}':" msgstr "" -#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:230 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:231 msgid "Commit message:" msgstr "" @@ -5619,7 +5630,7 @@ msgstr "" msgid "Commit operation completed." msgstr "" -#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:136 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:137 msgid "Commit..." msgstr "" @@ -5848,6 +5859,10 @@ msgstr "Konflikt" msgid "Conflict {0}" msgstr "" +#: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:1078 +msgid "Conflicting local changes found" +msgstr "" + #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/KeyBindingsPanel.cs:819 #, fuzzy msgid "Conflicts:" @@ -5942,7 +5957,7 @@ msgstr "Innhold" msgid "Continue" msgstr "Innhold" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeStartup.cs:737 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeStartup.cs:673 #, fuzzy msgid "Continue Anyway" msgstr "Innhold" @@ -6203,7 +6218,7 @@ msgid "" "all code, not just user code." msgstr "" -#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:1090 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:1112 #: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ChangeSetView.cs:393 msgid "Could not get diff information. " msgstr "" @@ -6234,7 +6249,7 @@ msgid "Could not load solution item: {0}" msgstr "" #: ../src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/SlnFileFormat.cs:388 -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/Ide.cs:375 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/Ide.cs:421 msgid "Could not load solution: {0}" msgstr "" @@ -6252,7 +6267,7 @@ msgstr "Konfigurasjonen '{0}' finnes ikke i prosjektet '{0}'" msgid "Could not mount FUSE filesystem." msgstr "" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/Ide.cs:395 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/Ide.cs:441 #, fuzzy msgid "Could not open file: {0}" msgstr "Finner ikke supportfilen '{0}'." @@ -6380,7 +6395,7 @@ msgstr "" msgid "Create Package..." msgstr "" -#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:320 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:321 msgid "Create Patch" msgstr "" @@ -7152,11 +7167,11 @@ msgstr "Konsoll Prosjekt" msgid "Custom project started building" msgstr "" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeStartup.cs:865 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeStartup.cs:802 msgid "CustomizerAssemblyPath" msgstr "" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeStartup.cs:870 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeStartup.cs:807 msgid "CustomizerType" msgstr "" @@ -7315,13 +7330,13 @@ msgstr "" msgid "Debug session not started." msgstr "" -#: ../src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs:898 +#: ../src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs:900 #: ../src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.addin.xml:271 #: ../src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.addin.xml:281 msgid "Debugger" msgstr "Debugger" -#: ../src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs:900 +#: ../src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs:902 #, fuzzy msgid "Debugger information" msgstr "Debug applikasjonen" @@ -7913,7 +7928,7 @@ msgid "" "process with the debugger." msgstr "" -#: ../external/vs-editor-core/src/Editor/Text/Impl/CocoaView/WpfViewImpl/CocoaEditorGridView.cs:476 +#: ../external/vs-editor-core/src/Editor/Text/Impl/CocoaView/WpfViewImpl/CocoaEditorGridView.cs:481 msgid "Disable the New Editor Preview" msgstr "" @@ -8052,7 +8067,7 @@ msgstr "" msgid "Do you want to detach from the process being debugged?" msgstr "" -#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:939 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:961 #: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ChangeSetView.cs:307 msgid "Do you want to open all {0} files?" msgstr "" @@ -8190,7 +8205,7 @@ msgstr "" msgid "Double negation is redundant" msgstr "" -#: ../src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreNotInstalledDialog.cs:78 +#: ../src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreNotInstalledDialog.cs:77 msgid "Download .NET Core..." msgstr "" @@ -9275,13 +9290,13 @@ msgstr "" msgid "Error while getting revision text." msgstr "" -#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs:280 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs:292 msgid "" "Error while getting the base text of {0}:\n" "{1}" msgstr "" -#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs:184 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs:196 msgid "" "Error while getting the text of revision {0}:\n" "{1}" @@ -9541,7 +9556,7 @@ msgstr "Avslutt" msgid "Exit Full Screen" msgstr "" -#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:338 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:339 #: ../src/tools/mdmonitor/gtk-gui/Mono.Instrumentation.Monitor.TimeLineViewWindow.cs:43 msgid "Expand All" msgstr "" @@ -9747,7 +9762,7 @@ msgstr "" msgid "Extension packages" msgstr "Pakker" -#: ../src/addins/MacPlatform/MacPlatform.cs:470 +#: ../src/addins/MacPlatform/MacPlatform.cs:471 #, fuzzy msgid "Extensions..." msgstr "Alternativer" @@ -9984,7 +9999,7 @@ msgstr "" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/ErrorListPad.cs:676 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/CommentTasksView.cs:125 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs:157 -#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:192 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:193 #: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/CommitDialog.cs:78 #: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ChangeSetView.cs:100 #: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogWidget.cs:220 @@ -10005,7 +10020,7 @@ msgstr "Filen '{0}' ble ikke funnet." msgid "File '{0}' could not be moved." msgstr "Filen '{0}' ble ikke funnet." -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:1150 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:1153 msgid "File '{0}' could not be opened" msgstr "" @@ -10128,7 +10143,7 @@ msgstr "" msgid "File format:" msgstr "" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs:578 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs:583 msgid "File is not a project or solution: {0}" msgstr "" @@ -10165,8 +10180,8 @@ msgstr "Filen ble ikke funnet" #: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectService.cs:118 #: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectService.cs:212 -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:1089 -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs:572 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:1092 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs:577 msgid "File not found: {0}" msgstr "" @@ -10256,7 +10271,7 @@ msgid "" "the path to configure.in being set. Ignoring such files." msgstr "" -#: ../external/vs-editor-core/src/CocoaControls/FindAndReplace/VSFindField.cs:90 +#: ../external/vs-editor-core/src/CocoaControls/FindAndReplace/VSFindField.cs:91 msgid "Find" msgstr "" @@ -10810,7 +10825,7 @@ msgstr "Samler informasjon om klassen.." #: ../src/core/MonoDevelop.Ide/ExtensionModel/Templates.addin.xml:136 #: ../src/core/MonoDevelop.Ide/ExtensionModel/Templates.addin.xml:142 #: ../src/core/MonoDevelop.Ide/templates/AppManifest.xft.xml:6 -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/OptionsDialog.cs:761 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/OptionsDialog.cs:760 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/TemplatePickerWidget.cs:301 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/AssemblyRunConfigurationEditor.cs:130 #: ../src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml:295 @@ -10849,6 +10864,10 @@ msgstr "" msgid "Generate Asynchronous:" msgstr "" +#: ../external/vs-editor-core/src/RoslynIntegration/EventHookup/EventHookupCommandHandler_SessionCancellingCommands.cs:14 +msgid "Generate Event Subscription" +msgstr "" + #: ../src/addins/MonoDevelop.Autotools/MakefileOptionPanelWidget.cs:385 msgid "Generate Makefile..." msgstr "" @@ -11547,7 +11566,7 @@ msgstr "Detaljer" msgid "Hide other applications' windows" msgstr "Debug applikasjonen" -#: ../src/addins/MacPlatform/MacPlatform.cs:529 +#: ../src/addins/MacPlatform/MacPlatform.cs:530 msgid "Hide {0}" msgstr "" @@ -11780,8 +11799,8 @@ msgstr "" msgid "If you chose this option the Git configuration will be overwritten." msgstr "" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:421 -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:941 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:424 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:944 msgid "If you don't save, all changes will be permanently lost." msgstr "" @@ -12171,7 +12190,7 @@ msgstr "" msgid "Info" msgstr "" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/Ide.cs:620 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/Ide.cs:668 msgid "Information about the Instrumentation Service" msgstr "" @@ -12195,7 +12214,7 @@ msgstr "" msgid "Initialize readonly auto-property from parameter" msgstr "" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:87 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:88 msgid "Initializing Main Window" msgstr "" @@ -12248,7 +12267,7 @@ msgstr "Vis som:" msgid "Insert ChangeLog Entry" msgstr "" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopWorkspace.cs:691 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopWorkspace.cs:693 msgid "Insert Code" msgstr "" @@ -12256,7 +12275,7 @@ msgstr "" msgid "Insert Documentation Comments" msgstr "" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopWorkspace.cs:682 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopWorkspace.cs:684 #, fuzzy msgid "Insert Field" msgstr "Velg fil" @@ -12265,11 +12284,11 @@ msgstr "Velg fil" msgid "Insert GUID (Globally Unique Identifier)" msgstr "" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopWorkspace.cs:685 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopWorkspace.cs:687 msgid "Insert Method" msgstr "" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopWorkspace.cs:688 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopWorkspace.cs:690 #, fuzzy msgid "Insert Property" msgstr "Gå til Fil" @@ -12476,7 +12495,7 @@ msgstr "" msgid "Installing…" msgstr "" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/Ide.cs:618 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/Ide.cs:666 #, fuzzy msgid "Instrumentation" msgstr "Prosjekt Alternativer" @@ -12485,7 +12504,7 @@ msgstr "Prosjekt Alternativer" msgid "Instrumentation Monitor" msgstr "" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/Ide.cs:619 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/Ide.cs:667 msgid "Instrumentation service enabled" msgstr "" @@ -12629,7 +12648,7 @@ msgstr "" msgid "Invalid file move accross filesystem boundaries." msgstr "" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:1061 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:1064 msgid "Invalid file name" msgstr "" @@ -12993,7 +13012,7 @@ msgid "Leak Tracker" msgstr "" #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/GeneralOptionsPanel.cs:60 -#: ../external/vs-editor-core/src/Editor/Text/Impl/CocoaView/WpfViewImpl/CocoaEditorGridView.cs:489 +#: ../external/vs-editor-core/src/Editor/Text/Impl/CocoaView/WpfViewImpl/CocoaEditorGridView.cs:494 msgid "Learn more about the New Editor Preview" msgstr "" @@ -13131,7 +13150,7 @@ msgstr "" msgid "Loaded Assemblies" msgstr "Velg alle" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/Ide.cs:237 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/Ide.cs:240 msgid "Loading Workbench" msgstr "" @@ -13139,7 +13158,7 @@ msgstr "" msgid "Loading build log…" msgstr "" -#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:1081 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:1103 #: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ChangeSetView.cs:363 #: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogWidget.cs:495 msgid "Loading data..." @@ -13159,7 +13178,7 @@ msgstr "" msgid "Loading solution: {0}" msgstr "" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:1258 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:1261 msgid "Loading workspace documents" msgstr "" @@ -13183,14 +13202,15 @@ msgstr "" msgid "Loading..." msgstr "" -#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs:81 -#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs:87 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs:93 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs:99 msgid "Loading…" msgstr "" -#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs:104 -#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs:241 -#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs:263 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs:116 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs:253 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs:275 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffView.cs:104 msgid "Local" msgstr "" @@ -13766,7 +13786,7 @@ msgstr "" msgid "Merge Conflict Resolution" msgstr "" -#: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:1173 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:1203 msgid "Merging" msgstr "" @@ -14072,7 +14092,7 @@ msgstr "" msgid "More" msgstr "Mer" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeStartup.cs:736 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeStartup.cs:672 #, fuzzy msgid "More Information" msgstr "Ny konfigurasjon" @@ -14144,7 +14164,7 @@ msgstr "" msgid "Move to the next page" msgstr "" -#: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:1918 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:1983 #, fuzzy msgid "Moving files" msgstr "Sletter filer.." @@ -14411,6 +14431,7 @@ msgid "Native" msgstr "" #: ../src/addins/CSharpBinding/CSharpBinding.addin.xml:285 +#: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.addin.xml:201 #, fuzzy msgid "Navigate" msgstr "Naviger til" @@ -14517,7 +14538,7 @@ msgid "New Dialog..." msgstr "" #: ../src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewDisplayBinding.cs:37 -#: ../external/vs-editor-core/src/Editor/Text/Impl/CocoaView/WpfViewImpl/CocoaEditorGridView.cs:446 +#: ../external/vs-editor-core/src/Editor/Text/Impl/CocoaView/WpfViewImpl/CocoaEditorGridView.cs:451 #, fuzzy msgid "New Editor Preview" msgstr "Forhåndsvisning av alternativer" @@ -14554,7 +14575,7 @@ msgstr "" msgid "New Group..." msgstr "" -#: ../src/addins/MacPlatform/MacPlatform.cs:308 +#: ../src/addins/MacPlatform/MacPlatform.cs:309 msgid "New Instance" msgstr "" @@ -14716,7 +14737,7 @@ msgstr "Vis Endringer" #: ../src/addins/MonoDevelop.WebReferences/Gui/MonoDevelop.WebReferences.Dialogs.WCFConfigWidget.cs:111 #: ../src/addins/CSharpBinding/MonoDevelop.CSharp.OptionProvider/StyleViewModel.cs:1278 -#: ../src/addins/MacPlatform/MacPlatform.cs:330 +#: ../src/addins/MacPlatform/MacPlatform.cs:331 #: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Options/Style/AbstractCodeStyleOptionViewModel.cs:105 #: ../external/xwt/Xwt/Xwt/Command.cs:63 msgid "No" @@ -14730,7 +14751,7 @@ msgstr "" msgid "No LanguageBinding was found for the language '{0}'." msgstr "" -#: ../external/vs-editor-core/src/CocoaControls/FindAndReplace/VSFindReplaceView.cs:248 +#: ../external/vs-editor-core/src/CocoaControls/FindAndReplace/VSFindReplaceView.cs:251 msgid "No Results" msgstr "" @@ -14772,8 +14793,8 @@ msgstr "" msgid "No completions found" msgstr "Lås opp fullført." -#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:1078 -#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:1093 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:1100 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:1115 #: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ChangeSetView.cs:382 msgid "No differences found" msgstr "" @@ -14795,11 +14816,11 @@ msgstr "Lås opp fullført." msgid "No failed tests found." msgstr "" -#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:510 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:532 msgid "No files have local modifications." msgstr "" -#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:512 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:534 msgid "No files have local or remote modifications." msgstr "" @@ -15044,7 +15065,7 @@ msgstr "" msgid "NuGet Package" msgstr "Reverserer..." -#: ../src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreProjectExtension.cs:437 +#: ../src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreProjectExtension.cs:438 msgid "" "NuGet packages need to be restored before building. NuGet MSBuild targets " "are missing and are needed for building. The NuGet MSBuild targets are " @@ -15168,8 +15189,8 @@ msgstr "" msgid "Opacity" msgstr "" -#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:330 -#: ../src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/PreviewVisualizerWindow.cs:84 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:331 +#: ../src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/PreviewVisualizerWindow.cs:85 #: ../external/fsharpbinding/MonoDevelop.FSharpBinding/FSharpInteractivePad.fs:431 msgid "Open" msgstr "Åpne" @@ -15266,7 +15287,7 @@ msgstr "" msgid "Open..." msgstr "Åpne" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:651 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:654 msgid "Opening {0}" msgstr "" @@ -15294,7 +15315,7 @@ msgstr "" msgid "Operation" msgstr "" -#: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCredentials.cs:60 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCredentials.cs:62 #, fuzzy msgid "Operation cancelled" msgstr "Lagring feilet." @@ -15366,7 +15387,7 @@ msgstr "" msgid "OptionName" msgstr "" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:792 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:795 #: ../src/addins/MonoDevelop.Autotools/MakefileGeneratorTool.cs:132 #: ../src/addins/AspNet/Commands/AddViewDialog.cs:143 msgid "Options" @@ -16144,7 +16165,7 @@ msgstr "" msgid "Policies to set or replace:" msgstr "" -#: ../src/addins/MacPlatform/MacPlatform.cs:467 +#: ../src/addins/MacPlatform/MacPlatform.cs:468 msgid "Policies..." msgstr "" @@ -16357,11 +16378,11 @@ msgstr "" msgid "Prefer throw-expression" msgstr "" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:793 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:796 msgid "Preferences" msgstr "" -#: ../src/addins/MacPlatform/MacPlatform.cs:466 +#: ../src/addins/MacPlatform/MacPlatform.cs:467 msgid "Preferences..." msgstr "" @@ -16414,7 +16435,7 @@ msgstr "" msgid "Press the key combination you want to assign to the accelerator..." msgstr "" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbarController.cs:636 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbarController.cs:638 msgid "Press ‘{0}’ to search" msgstr "" @@ -16970,7 +16991,7 @@ msgstr "Url:" msgid "Push changes to remote repository after commit" msgstr "" -#: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:1608 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:1639 #, fuzzy msgid "Push operation successfully completed." msgstr "Låsing fullført." @@ -17239,7 +17260,7 @@ msgstr "" msgid "Rebase to Branch..." msgstr "" -#: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:1128 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:1153 msgid "Rebasing" msgstr "" @@ -17483,7 +17504,7 @@ msgid "References a strongly-typed model" msgstr "" #: ../src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml:590 -#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:303 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:304 #: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogWidget.cs:157 #: ../external/mono-addins/Mono.Addins.Gui/Gui/Mono.Addins.Gui.AddinManagerDialog.cs:155 #: ../external/mono-addins/Mono.Addins.Gui/Gui/Mono.Addins.Gui.AddinManagerDialog.cs:262 @@ -17595,7 +17616,7 @@ msgstr "Ekstern status" msgid "Remote Sources" msgstr "Ekstern status" -#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:205 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:206 msgid "Remote Status" msgstr "Ekstern status" @@ -17928,7 +17949,7 @@ msgstr "" #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs:160 #: ../src/addins/Xml/Editor/XmlSchemasPanelWidget.cs:457 #: ../external/vs-editor-core/src/CocoaControls/FindAndReplace/VSFindReplaceView.cs:84 -#: ../external/vs-editor-core/src/CocoaControls/FindAndReplace/VSFindReplaceView.cs:387 +#: ../external/vs-editor-core/src/CocoaControls/FindAndReplace/VSFindReplaceView.cs:390 msgid "Replace" msgstr "Erstatt" @@ -17946,7 +17967,7 @@ msgstr "Erstatt" msgid "Replace '{0}--' with '{0} -= 1'" msgstr "Erstatt" -#: ../external/vs-editor-core/src/CocoaControls/FindAndReplace/VSFindReplaceView.cs:388 +#: ../external/vs-editor-core/src/CocoaControls/FindAndReplace/VSFindReplaceView.cs:391 #, fuzzy msgid "Replace All" msgstr "Erstatt" @@ -18085,7 +18106,7 @@ msgstr "" msgid "Report Problem..." msgstr "Eksporter Prosjekt" -#: ../external/vs-editor-core/src/Editor/Text/Impl/CocoaView/WpfViewImpl/CocoaEditorGridView.cs:500 +#: ../external/vs-editor-core/src/Editor/Text/Impl/CocoaView/WpfViewImpl/CocoaEditorGridView.cs:505 #, fuzzy msgid "Report a Problem" msgstr "Eksporter Prosjekt" @@ -18228,7 +18249,7 @@ msgstr "" msgid "Restart Without Debugging" msgstr "" -#: ../src/addins/MacPlatform/MacPlatform.cs:329 +#: ../src/addins/MacPlatform/MacPlatform.cs:330 msgid "Restart and enable" msgstr "" @@ -18285,7 +18306,7 @@ msgstr "" msgid "Restored '{0}'" msgstr "" -#: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:1106 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:1126 msgid "Restoring local changes" msgstr "" @@ -18303,6 +18324,10 @@ msgstr "" msgid "Restoring packages for solution..." msgstr "Samler informasjon om klassen.." +#: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:1802 +msgid "Restoring stash for branch {0} failed" +msgstr "" + #: ../src/addins/MonoDevelop.UnitTesting/Gui/TestPad.cs:324 msgid "Result" msgstr "" @@ -18365,7 +18390,7 @@ msgstr "" msgid "Retrieving history…" msgstr "" -#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs:206 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs:218 msgid "Retrieving revision {0}..." msgstr "" @@ -18404,7 +18429,7 @@ msgstr "" msgid "Reverse 'for' loop'" msgstr "" -#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:142 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:143 msgid "Revert" msgstr "Reverser" @@ -18447,7 +18472,7 @@ msgstr "" msgid "Reverting ..." msgstr "Reverserer..." -#: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:1419 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:1450 #, fuzzy msgid "Reverting files" msgstr "Reverserer..." @@ -18472,7 +18497,7 @@ msgstr "" msgid "Revision {0}" msgstr "Versjon:" -#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs:195 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs:207 msgid "Revision {0}\t{1}\t{2}" msgstr "" @@ -18891,7 +18916,7 @@ msgstr "" msgid "S_witch Maximized/Normal View" msgstr "" -#: ../src/addins/PerformanceDiagnostics/PerformanceDiagnostics/Commands.cs:38 +#: ../src/addins/PerformanceDiagnostics/PerformanceDiagnostics/Commands.cs:44 msgid "Sample file output" msgstr "" @@ -18990,11 +19015,11 @@ msgstr "" msgid "Save the active document" msgstr "" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:937 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:940 msgid "Save the changes to document '{0}' before closing?" msgstr "" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:417 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:420 msgid "Save the changes to document '{0}' before creating a new solution?" msgstr "" @@ -19026,7 +19051,7 @@ msgstr "" msgid "Saving item: {0}" msgstr "" -#: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:1063 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:1062 msgid "Saving local changes" msgstr "" @@ -19046,11 +19071,11 @@ msgstr "" msgid "Scan for translations" msgstr "" -#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:439 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:440 msgid "Scanning for changes..." msgstr "" -#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:441 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:442 msgid "Scanning for local and remote changes..." msgstr "" @@ -19284,7 +19309,7 @@ msgstr "" msgid "Search pattern not found" msgstr "" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbarController.cs:637 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbarController.cs:639 #, fuzzy msgid "Search solution" msgstr "Søk etter tekst" @@ -19361,7 +19386,7 @@ msgid "Select" msgstr "" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Components/GtkUtil.cs:706 -#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:348 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:349 #: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.ExtractInterface/ExtractInterfaceDialog.cs:199 #: ../src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.PickMembersService/PickMembersDialog.cs:118 #: ../src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/StackTracePad.cs:352 @@ -19430,7 +19455,7 @@ msgstr "" msgid "Select Image..." msgstr "" -#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:352 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:353 #, fuzzy msgid "Select None" msgstr "Fjern alle" @@ -20239,7 +20264,7 @@ msgstr "" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/CommonAboutDialog.cs:79 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/CommonAboutDialog.cs:88 #: ../src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionCaughtDialog.cs:1022 -#: ../src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.VSTextView/ExceptionCaught/ExceptionCaughtAdornmentManager.cs:201 +#: ../src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.VSTextView/ExceptionCaught/ExceptionCaughtAdornmentManager.cs:203 #, fuzzy msgid "Show Details" msgstr "Detaljer" @@ -20358,7 +20383,7 @@ msgstr "" msgid "Show Previous ({0})" msgstr "" -#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:147 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:148 msgid "Show Remote Status" msgstr "" @@ -20821,7 +20846,7 @@ msgstr "" msgid "Solution could not be deployed: " msgstr "" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs:648 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs:670 msgid "Solution loaded." msgstr "" @@ -20874,7 +20899,7 @@ msgstr "Alternativer" msgid "Some additional changes on another file of the project." msgstr "" -#: ../src/addins/MacPlatform/MacPlatform.cs:222 +#: ../src/addins/MacPlatform/MacPlatform.cs:223 msgid "Some dependencies need to be updated" msgstr "" @@ -20886,13 +20911,13 @@ msgstr "" msgid "Some files could not be saved. Commit operation aborted" msgstr "" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs:944 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs:966 msgid "" "Some files may need to be reloaded, and editing status for those files (such " "as the undo queue) will be lost." msgstr "" -#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:769 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:791 msgid "Some of the files in this commit do not have ChangeLog messages." msgstr "" @@ -20947,7 +20972,7 @@ msgstr "" #: ../src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs:75 #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:133 -#: ../src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewContent.cs:183 +#: ../src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewContent.cs:206 msgid "Source" msgstr "" @@ -21356,7 +21381,6 @@ msgstr "" msgid "Startup project" msgstr "Nytt Prosjekt" -#: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:1056 #: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/Gui/MonoDevelop.VersionControl.Git.NewStashDialog.cs:18 msgid "Stash" msgstr "" @@ -21365,6 +21389,20 @@ msgstr "" msgid "Stash Manager" msgstr "" +#: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:1204 +#, fuzzy +msgid "Stash and Merge" +msgstr "Pakker" + +#: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:1154 +#, fuzzy +msgid "Stash and Rebase" +msgstr "Pakker" + +#: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:1831 +msgid "Stash and Switch" +msgstr "" + #: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitService.cs:172 msgid "Stash applied with conflicts" msgstr "" @@ -21417,7 +21455,7 @@ msgstr "" msgid "Static field in generic type" msgstr "" -#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:183 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:184 #: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/CommitDialog.cs:69 #: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ChangeSetView.cs:91 msgid "Status" @@ -21473,7 +21511,7 @@ msgstr "" msgid "Stop Debugger" msgstr "" -#: ../src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs:120 +#: ../src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs:122 msgid "Stop Debugging" msgstr "" @@ -21783,10 +21821,18 @@ msgstr "" msgid "Switch to {0}" msgstr "Reverserer..." -#: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:1762 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:1823 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:1842 msgid "Switching to branch {0}" msgstr "" +#: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:1835 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:1859 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:1863 +#, fuzzy +msgid "Switching to branch {0} failed" +msgstr "Kommandolinje Alternativer" + #: ../src/addins/CSharpBinding/Gui/MonoDevelop.CSharp.Project.CodeGenerationPanelWidget.cs:172 #: ../external/fsharpbinding/MonoDevelop.FSharp.Gui/MonoDevelop.FSharp.Gui.FSharpCompilerOptionsWidget.cs:186 msgid "Symbols only" @@ -22340,12 +22386,6 @@ msgstr "" msgid "The '{0}' directive requires one or two arguments" msgstr "" -#: ../src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreNotInstalledDialog.cs:52 -msgid "" -"The .NET Core SDK installed is not supported. Please install a more recent " -"version." -msgstr "" - #: ../src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Gui/DotNetCoreSdkLocationWidget.UI.cs:154 #, fuzzy msgid "The .NET Core SDK was found" @@ -22470,7 +22510,7 @@ msgstr "Prosjektet ble ikke lagret" #: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProject.cs:1940 #: ../src/core/MonoDevelop.Core/MonoDevelop.Projects/CompiledAssemblyProject.cs:173 #: ../src/addins/MonoDevelop.Autotools/MakefileProjectServiceExtension.cs:399 -#: ../src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreProjectExtension.cs:288 +#: ../src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreProjectExtension.cs:289 msgid "The application exited with code: {0}" msgstr "Applikasjonen avsluttet (kode {0})" @@ -22554,13 +22594,13 @@ msgstr "" msgid "The current scheme has conflicting key bindings" msgstr "" -#: ../src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs:118 +#: ../src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs:120 msgid "" "The debugger is currently running and will have to be stopped. Do you want " "to stop debugging?" msgstr "" -#: ../src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs:899 +#: ../src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs:901 #: ../src/addins/MonoDevelop.Debugger/Gui/MonoDevelop.Debugger.BusyEvaluatorDialog.cs:34 msgid "" "The debugger runtime is not responding. You can wait for it to recover, or " @@ -22638,19 +22678,19 @@ msgstr "" msgid "The file '{0}' could not be loaded." msgstr "" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:1629 #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:1632 -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:1653 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:1635 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:1656 msgid "The file '{0}' could not be opened." msgstr "" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:1625 -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:1649 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:1628 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:1652 msgid "The file '{0}' could not opened. File too large." msgstr "" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:1622 -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:1646 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:1625 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:1649 #, fuzzy msgid "The file '{0}' could not opened. {1}" msgstr "Filen '{0}' ble ikke funnet." @@ -23036,7 +23076,7 @@ msgstr "" msgid "The project '{0}' has already been added." msgstr "Klarte ikke å endre navn på prosjektet." -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs:948 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs:970 #: ../src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs:169 msgid "" "The project '{0}' has been modified by an external application. Do you want " @@ -23255,6 +23295,12 @@ msgid "" "want to use?" msgstr "" +#: ../src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreNotInstalledDialog.cs:55 +msgid "" +"The version of the .NET Core SDK currently installed ({0}) is not supported " +"and continuing to use it may result in a broken tooling experience." +msgstr "" + #: ../src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Commands/WebReferenceCommandHandler.cs:61 #, fuzzy msgid "The web reference could not be added" @@ -23709,6 +23755,19 @@ msgstr "" msgid "Themed Icons" msgstr "" +#: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:1830 +msgid "" +"There are local changes that conflict with changes committed in the <b>{0}</" +"b> branch. Would you like to stash the changes and continue with the " +"checkout?" +msgstr "" + +#: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:1052 +msgid "" +"There are local changes that conflict with changes committed in the <b>{0}</" +"b> branch. Would you like to stash the changes and continue?" +msgstr "" + #: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitService.cs:51 msgid "There are no changes to push." msgstr "" @@ -23794,7 +23853,11 @@ msgstr "" msgid "There was an error renaming the file." msgstr "" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/OptionsDialog.cs:794 +#: ../src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/PreviewVisualizerWindow.cs:116 +msgid "There was an error retrieving the value" +msgstr "" + +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/OptionsDialog.cs:793 msgid "There was an error saving the changes" msgstr "" @@ -23833,6 +23896,7 @@ msgid "" msgstr "" #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:725 +#: ../src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewContent.cs:515 msgid "" "This file {0} has been changed outside of {1}. Are you sure you want to " "overwrite the file?" @@ -24657,11 +24721,11 @@ msgstr "" msgid "Unable to save package source changes.{0}{0}{1}" msgstr "" -#: ../src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebugCommands.cs:737 +#: ../src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebugCommands.cs:740 msgid "Unable to set the next statement to this location." msgstr "" -#: ../src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebugCommands.cs:735 +#: ../src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebugCommands.cs:738 msgid "" "Unable to set the next statement. The next statement cannot be set to " "another function." @@ -25653,19 +25717,19 @@ msgstr "" msgid "WARNING: " msgstr "ADVARSEL:" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs:934 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs:956 msgid "" "WARNING: Some documents may need to be closed, and unsaved data will be " "lost. You will be asked to save the unsaved documents." msgstr "" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs:936 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs:958 msgid "" "WARNING: Some documents may need to be reloaded or closed, and unsaved data " "will be lost. You will be asked to save the unsaved documents." msgstr "" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs:938 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs:960 msgid "" "WARNING: Some files may need to be reloaded, and unsaved data will be lost. " "You will be asked to save the unsaved files." @@ -25675,11 +25739,11 @@ msgstr "" msgid "WARNING: The branch has not yet been merged to HEAD" msgstr "" -#: ../src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs:1517 +#: ../src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs:1560 msgid "Waiting for debugger" msgstr "" -#: ../src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs:1489 +#: ../src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs:1532 msgid "Waiting for debugger to connect..." msgstr "" @@ -25874,10 +25938,6 @@ msgstr "" msgid "Western" msgstr "" -#: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:1054 -msgid "What do you want to do?" -msgstr "" - #: ../src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/BreakpointPropertiesDialog.cs:76 msgid "When a function is entered" msgstr "" @@ -26310,11 +26370,7 @@ msgstr "" msgid "You do not have permission to create to {0}" msgstr "" -#: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:1053 -msgid "You have uncommitted changes" -msgstr "" - -#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:770 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:792 msgid "You may have forgotten to unselect items." msgstr "" @@ -27099,6 +27155,7 @@ msgid "_Icon Name:" msgstr "" #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs:741 +#: ../src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewContent.cs:623 msgid "_Ignore all" msgstr "" @@ -27162,6 +27219,7 @@ msgid "_Jump To {0}" msgstr "" #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs:725 +#: ../src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewContent.cs:618 msgid "_Keep changes" msgstr "" @@ -27191,6 +27249,7 @@ msgid "_Line..." msgstr "_Link" #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs:986 +#: ../src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewContent.cs:408 msgid "_Load from autosave" msgstr "" @@ -27287,7 +27346,7 @@ msgstr "" msgid "_Open" msgstr "" -#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:938 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:960 #: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ChangeSetView.cs:306 msgid "_Open All" msgstr "" @@ -27468,10 +27527,12 @@ msgid "_Reload" msgstr "" #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs:734 +#: ../src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewContent.cs:622 msgid "_Reload all" msgstr "" #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs:717 +#: ../src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewContent.cs:617 msgid "_Reload from disk" msgstr "" @@ -27838,6 +27899,7 @@ msgid "_Use custom author information for this solution" msgstr "" #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs:970 +#: ../src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewContent.cs:405 msgid "_Use original file" msgstr "" @@ -28262,9 +28324,9 @@ msgid "type * ptr = {0} type [ expr ];" msgstr "" #: ../src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionRepository.cs:565 -#: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:1955 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:2020 #: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/BaseRepositoryTests.cs:635 -#: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/BaseGitRepositoryTests.cs:622 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/BaseGitRepositoryTests.cs:643 msgid "working copy" msgstr "" @@ -28504,7 +28566,7 @@ msgstr[1] "" msgid "{0} Pad" msgstr "" -#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:278 +#: ../src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:279 #, fuzzy msgid "{0} Status" msgstr "Status" @@ -28644,7 +28706,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: ../src/addins/MacPlatform/MacPlatform.cs:328 +#: ../src/addins/MacPlatform/MacPlatform.cs:329 msgid "" "{0} has detected an assistive technology (such as VoiceOver) is running. Do " "you want to restart {0} and enable the accessibility features?" @@ -28661,11 +28723,11 @@ msgid "" " {0} {2};" msgstr "" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:1071 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:1074 msgid "{0} is a directory" msgstr "" -#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs:518 +#: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs:519 #, fuzzy msgid "{0} is already opened" msgstr "Filen '{0}' ble ikke funnet." @@ -28739,7 +28801,7 @@ msgstr "" #: ../src/core/MonoDevelop.Ide/MonoDevelop.Ide.BuildOutputView/BuildOutputWidget.cs:595 #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs:822 #: ../src/addins/MonoDevelop.SourceEditor2/VSEditor/Language/Impl/Intellisense/SignatureHelp/SignatureHelpSessionView.cs:344 -#: ../external/vs-editor-core/src/CocoaControls/FindAndReplace/VSFindReplaceView.cs:181 +#: ../external/vs-editor-core/src/CocoaControls/FindAndReplace/VSFindReplaceView.cs:180 msgid "{0} of {1}" msgstr "" @@ -28827,7 +28889,7 @@ msgstr "" msgid "{0} removed with warnings." msgstr "" -#: ../src/addins/MacPlatform/MacPlatform.cs:223 +#: ../src/addins/MacPlatform/MacPlatform.cs:224 msgid "" "{0} requires a newer version of GTK+, which is included with the Mono " "Framework. Please download and install the latest stable Mono Framework " |