[meld] Update Danish translation
- From: Translations User D-L <translations src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] Update Danish translation
- Date: Tue, 20 Sep 2022 17:15:15 +0000 (UTC)
commit bcf43b8c2e4fb03d37b10ea83b3b320901bc1869
Author: Alan Mortensen <alanmortensen am gmail com>
Date: Tue Sep 20 17:15:13 2022 +0000
Update Danish translation
po/da.po | 443 +++++++++++++++++++++++++++++++++++----------------------------
1 file changed, 243 insertions(+), 200 deletions(-)
---
diff --git a/po/da.po b/po/da.po
index b9ba75c5..dc0dfcc5 100644
--- a/po/da.po
+++ b/po/da.po
@@ -15,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: meld master\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
-"POT-Creation-Date: 2022-03-15 12:52+0000\n"
-"PO-Revision-Date: 2022-03-23 20:01+0100\n"
+"POT-Creation-Date: 2022-09-06 06:29+0000\n"
+"PO-Revision-Date: 2022-09-11 18:58+0200\n"
"Last-Translator: Alan Mortensen <alanmortensen am gmail com>\n"
"Language-Team: Danish <dansk dansk-gruppen dk>\n"
"Language: da\n"
@@ -24,7 +24,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.3\n"
+"X-Generator: Poedit 3.0.1\n"
#: data/org.gnome.meld.desktop.in.in:3 data/org.gnome.meld.appdata.xml.in.in:11
#: meld/resources/ui/appwindow.ui:9 meld/resources/ui/appwindow.ui:17
@@ -529,370 +529,376 @@ msgstr "Opdatér sammenligningen"
#: meld/resources/gtk/help-overlay.ui:54
msgctxt "shortcut window"
+msgid "Open externally"
+msgstr "Åbn eksternt"
+
+#: meld/resources/gtk/help-overlay.ui:61
+msgctxt "shortcut window"
msgid "Fullscreen"
msgstr "Fuldskærm"
-#: meld/resources/gtk/help-overlay.ui:63
+#: meld/resources/gtk/help-overlay.ui:68
+msgctxt "shortcut window"
+msgid "Swap left and right panes"
+msgstr "Ombyt venstre og højre ruder"
+
+#: meld/resources/gtk/help-overlay.ui:77
msgctxt "shortcut window"
msgid "Panes"
msgstr "Ruder"
-#: meld/resources/gtk/help-overlay.ui:68
+#: meld/resources/gtk/help-overlay.ui:82
msgctxt "shortcut window"
msgid "Previous comparison pane"
msgstr "Forrige sammenligningsrude"
-#: meld/resources/gtk/help-overlay.ui:75
+#: meld/resources/gtk/help-overlay.ui:89
msgctxt "shortcut window"
msgid "Next comparison pane"
msgstr "Næste sammenligningsrude"
-#: meld/resources/gtk/help-overlay.ui:84
+#: meld/resources/gtk/help-overlay.ui:98
msgctxt "shortcut window"
msgid "Changes"
msgstr "Ændringer"
-#: meld/resources/gtk/help-overlay.ui:89
+#: meld/resources/gtk/help-overlay.ui:103
msgctxt "shortcut window"
msgid "Go to previous change"
msgstr "Gå til den forrige ændring"
-#: meld/resources/gtk/help-overlay.ui:96
+#: meld/resources/gtk/help-overlay.ui:110
msgctxt "shortcut window"
msgid "Go to next change"
msgstr "Gå til den næste ændring"
-#: meld/resources/gtk/help-overlay.ui:105
+#: meld/resources/gtk/help-overlay.ui:119
msgctxt "shortcut window"
msgid "Tabs"
msgstr "Faneblade"
-#: meld/resources/gtk/help-overlay.ui:110
+#: meld/resources/gtk/help-overlay.ui:124
msgctxt "shortcut window"
msgid "Go to previous tab"
msgstr "Gå til det forrige faneblad"
-#: meld/resources/gtk/help-overlay.ui:117
+#: meld/resources/gtk/help-overlay.ui:131
msgctxt "shortcut window"
msgid "Go to next tab"
msgstr "Gå til det næste faneblad"
-#: meld/resources/gtk/help-overlay.ui:124
+#: meld/resources/gtk/help-overlay.ui:138
msgctxt "shortcut window"
msgid "Switch to tab"
msgstr "Skift til faneblad"
-#: meld/resources/gtk/help-overlay.ui:131
+#: meld/resources/gtk/help-overlay.ui:145
msgctxt "shortcut window"
msgid "Move tab left"
msgstr "Flyt fanebladet til venstre"
-#: meld/resources/gtk/help-overlay.ui:138
+#: meld/resources/gtk/help-overlay.ui:152
msgctxt "shortcut window"
msgid "Move tab right"
msgstr "Flyt fanebladet til højre"
-#: meld/resources/gtk/help-overlay.ui:147
+#: meld/resources/gtk/help-overlay.ui:161
msgctxt "shortcut window"
msgid "Editing"
msgstr "Redigering"
-#: meld/resources/gtk/help-overlay.ui:152
+#: meld/resources/gtk/help-overlay.ui:166
msgctxt "shortcut window"
msgid "Undo"
msgstr "Fortryd"
-#: meld/resources/gtk/help-overlay.ui:159
+#: meld/resources/gtk/help-overlay.ui:173
msgctxt "shortcut window"
msgid "Redo"
msgstr "Gentag"
-#: meld/resources/gtk/help-overlay.ui:166
+#: meld/resources/gtk/help-overlay.ui:180
msgctxt "shortcut window"
msgid "Cut"
msgstr "Klip"
-#: meld/resources/gtk/help-overlay.ui:173
+#: meld/resources/gtk/help-overlay.ui:187
msgctxt "shortcut window"
msgid "Copy"
msgstr "Kopiér"
-#: meld/resources/gtk/help-overlay.ui:180
+#: meld/resources/gtk/help-overlay.ui:194
msgctxt "shortcut window"
msgid "Paste"
msgstr "Indsæt"
-#: meld/resources/gtk/help-overlay.ui:187
+#: meld/resources/gtk/help-overlay.ui:201
msgctxt "shortcut window"
msgid "Find"
msgstr "Find"
-#: meld/resources/gtk/help-overlay.ui:194
+#: meld/resources/gtk/help-overlay.ui:208
msgctxt "shortcut window"
msgid "Find Next"
msgstr "Find næste"
-#: meld/resources/gtk/help-overlay.ui:201
+#: meld/resources/gtk/help-overlay.ui:215
msgctxt "shortcut window"
msgid "Find Previous"
msgstr "Find forrige"
-#: meld/resources/gtk/help-overlay.ui:208
+#: meld/resources/gtk/help-overlay.ui:222
msgctxt "shortcut window"
msgid "Replace"
msgstr "Erstat"
-#: meld/resources/gtk/help-overlay.ui:217
+#: meld/resources/gtk/help-overlay.ui:231
msgctxt "shortcut window"
msgid "File comparison"
msgstr "Filsammenligning"
-#: meld/resources/gtk/help-overlay.ui:222
+#: meld/resources/gtk/help-overlay.ui:236
msgctxt "shortcut window"
msgid "Save current file"
msgstr "Gem den aktuelle fil"
-#: meld/resources/gtk/help-overlay.ui:229
+#: meld/resources/gtk/help-overlay.ui:243
msgctxt "shortcut window"
msgid "Save current file to new path"
msgstr "Gem den aktuelle fil et andet sted"
-#: meld/resources/gtk/help-overlay.ui:236
+#: meld/resources/gtk/help-overlay.ui:250
msgctxt "shortcut window"
msgid "Save all files in comparison"
msgstr "Gem alle filer i sammenligningen"
-#: meld/resources/gtk/help-overlay.ui:243
+#: meld/resources/gtk/help-overlay.ui:257
msgctxt "shortcut window"
msgid "Previous conflict"
msgstr "Forrige konflikt"
-#: meld/resources/gtk/help-overlay.ui:250
+#: meld/resources/gtk/help-overlay.ui:264
msgctxt "shortcut window"
msgid "Next conflict"
msgstr "Næste konflikt"
-#: meld/resources/gtk/help-overlay.ui:257
+#: meld/resources/gtk/help-overlay.ui:271
msgctxt "shortcut window"
msgid "Push change to left"
msgstr "Skub ændringen til venstre"
-#: meld/resources/gtk/help-overlay.ui:264
+#: meld/resources/gtk/help-overlay.ui:278
msgctxt "shortcut window"
msgid "Push change to right"
msgstr "Skub ændringen til højre"
-#: meld/resources/gtk/help-overlay.ui:271
+#: meld/resources/gtk/help-overlay.ui:285
msgctxt "shortcut window"
msgid "Pull change from left"
msgstr "Træk ændringen fra venstre"
-#: meld/resources/gtk/help-overlay.ui:278
+#: meld/resources/gtk/help-overlay.ui:292
msgctxt "shortcut window"
msgid "Pull change from right"
msgstr "Træk ændringen fra højre"
-#: meld/resources/gtk/help-overlay.ui:285
+#: meld/resources/gtk/help-overlay.ui:299
msgctxt "shortcut window"
msgid "Copy change above left"
msgstr "Kopiér ændringen ovenfor til venstre"
-#: meld/resources/gtk/help-overlay.ui:292
+#: meld/resources/gtk/help-overlay.ui:306
msgctxt "shortcut window"
msgid "Copy change below left"
msgstr "Kopiér ændringen nedenfor til venstre"
-#: meld/resources/gtk/help-overlay.ui:299
+#: meld/resources/gtk/help-overlay.ui:313
msgctxt "shortcut window"
msgid "Copy change above right"
msgstr "Kopiér ændringen ovenfor til højre"
-#: meld/resources/gtk/help-overlay.ui:306
+#: meld/resources/gtk/help-overlay.ui:320
msgctxt "shortcut window"
msgid "Copy change below right"
msgstr "Kopiér ændringen nedenfor til højre"
-#: meld/resources/gtk/help-overlay.ui:313
-#: meld/resources/gtk/help-overlay.ui:341
+#: meld/resources/gtk/help-overlay.ui:327
+#: meld/resources/gtk/help-overlay.ui:355
msgctxt "shortcut window"
msgid "Delete change"
msgstr "Slet ændring"
-#: meld/resources/gtk/help-overlay.ui:322
+#: meld/resources/gtk/help-overlay.ui:336
msgctxt "shortcut window"
msgid "Folder comparison"
msgstr "Mappesammenligning"
-#: meld/resources/gtk/help-overlay.ui:327
+#: meld/resources/gtk/help-overlay.ui:341
msgctxt "shortcut window"
msgid "Copy to left"
msgstr "Kopiér til venstre"
-#: meld/resources/gtk/help-overlay.ui:334
+#: meld/resources/gtk/help-overlay.ui:348
msgctxt "shortcut window"
msgid "Copy to right"
msgstr "Kopiér til højre"
-#: meld/resources/gtk/help-overlay.ui:350
+#: meld/resources/gtk/help-overlay.ui:364
msgctxt "shortcut window"
msgid "Version control comparison"
msgstr "Versionsstyringssammenligning"
-#: meld/resources/gtk/help-overlay.ui:355
+#: meld/resources/gtk/help-overlay.ui:369
msgctxt "shortcut window"
msgid "Commit to version control"
msgstr "Commit til versionsstyring"
-#: meld/resources/gtk/help-overlay.ui:362
+#: meld/resources/gtk/help-overlay.ui:376
msgctxt "shortcut window"
msgid "Show/hide console output"
msgstr "Vis/skjul konsoloutput"
#: meld/resources/gtk/menus.ui:7
-msgid "Refresh"
-msgstr "Opdatér"
-
-#: meld/resources/gtk/menus.ui:12
-msgid "Stop"
-msgstr "Stop"
-
-#: meld/resources/gtk/menus.ui:17
-msgid "Fullscreen"
-msgstr "Fuldskærm"
-
-#: meld/resources/gtk/menus.ui:26
msgid "Save As…"
msgstr "Gem som …"
-#: meld/resources/gtk/menus.ui:30
+#: meld/resources/gtk/menus.ui:11
msgid "Save A_ll"
msgstr "Gem a_lle"
-#: meld/resources/gtk/menus.ui:34
+#: meld/resources/gtk/menus.ui:15
msgid "Revert files…"
msgstr "Tilbagefør filer …"
-#: meld/resources/gtk/menus.ui:38
+#: meld/resources/gtk/menus.ui:19
msgid "Open Externally"
msgstr "Åbn eksternt"
-#: meld/resources/gtk/menus.ui:45
+#: meld/resources/gtk/menus.ui:26
+msgid "Refresh Comparison"
+msgstr "Opdatér sammenligningen"
+
+#: meld/resources/gtk/menus.ui:33
msgid "_Find…"
msgstr "_Find …"
-#: meld/resources/gtk/menus.ui:49
+#: meld/resources/gtk/menus.ui:37
msgid "_Replace…"
msgstr "_Erstat …"
-#: meld/resources/gtk/menus.ui:55
+#: meld/resources/gtk/menus.ui:43
msgid "View"
msgstr "Vis"
-#: meld/resources/gtk/menus.ui:59
+#: meld/resources/gtk/menus.ui:47
+msgid "Fullscreen"
+msgstr "Fuldskærm"
+
+#: meld/resources/gtk/menus.ui:52
msgid "Overview Map"
msgstr "Oversigtskort"
-#: meld/resources/gtk/menus.ui:63
+#: meld/resources/gtk/menus.ui:56
msgid "Version control console"
msgstr "Versionsstyringskonsol"
-#: meld/resources/gtk/menus.ui:67
+#: meld/resources/gtk/menus.ui:60
msgid "Lock scrolling"
msgstr "Lås rulning"
+#: meld/resources/gtk/menus.ui:67
+msgid "Swap left and right panes"
+msgstr "Ombyt venstre og højre ruder"
+
#: meld/resources/gtk/menus.ui:73
msgid "Comparison"
msgstr "Sammenligning"
-#: meld/resources/gtk/menus.ui:77
+#: meld/resources/gtk/menus.ui:75
+msgid "Stop"
+msgstr "Stop"
+
+#: meld/resources/gtk/menus.ui:81
msgid "Merge All from Left"
msgstr "Flet alle fra venstre"
-#: meld/resources/gtk/menus.ui:81
+#: meld/resources/gtk/menus.ui:85
msgid "Merge All from Right"
msgstr "Flet alle fra højre"
-#: meld/resources/gtk/menus.ui:85
+#: meld/resources/gtk/menus.ui:89
msgid "Merge All"
msgstr "Flet alle"
-#: meld/resources/gtk/menus.ui:92 meld/resources/ui/filediff-menus.ui:65
-msgid "Add Synchronization Point"
-msgstr "Tilføj synkroniseringspunkt"
-
-#: meld/resources/gtk/menus.ui:96 meld/resources/ui/filediff-menus.ui:69
-msgid "Clear Synchronization Points"
-msgstr "Ryd synkroniseringspunkter"
-
-#: meld/resources/gtk/menus.ui:103
+#: meld/resources/gtk/menus.ui:96
msgid "Format as Patch…"
msgstr "Formatér som rettelse (patch) …"
-#: meld/resources/gtk/menus.ui:112
+#: meld/resources/gtk/menus.ui:105
msgid "_Preferences"
msgstr "_Indstillinger"
-#: meld/resources/gtk/menus.ui:116
+#: meld/resources/gtk/menus.ui:109
msgid "Keyboard Shortcuts"
msgstr "Tastaturgenveje"
-#: meld/resources/gtk/menus.ui:120
+#: meld/resources/gtk/menus.ui:113
msgid "_Help"
msgstr "_Hjælp"
-#: meld/resources/gtk/menus.ui:125
+#: meld/resources/gtk/menus.ui:118
msgid "_About Meld"
msgstr "_Om Meld"
-#: meld/resources/gtk/menus.ui:138
+#: meld/resources/gtk/menus.ui:131
msgid "File status"
msgstr "Filstatus"
-#: meld/resources/gtk/menus.ui:140
+#: meld/resources/gtk/menus.ui:133
msgid "Same"
msgstr "Ens"
-#: meld/resources/gtk/menus.ui:144
+#: meld/resources/gtk/menus.ui:137
msgid "New"
msgstr "Ny"
-#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:171
-#: meld/vc/_vc.py:76
+#: meld/resources/gtk/menus.ui:141 meld/resources/gtk/menus.ui:164
+#: meld/vc/_vc.py:77
msgid "Modified"
msgstr "Ændret"
-#: meld/resources/gtk/menus.ui:158
+#: meld/resources/gtk/menus.ui:151
msgid "Ignore filename case"
msgstr "Ignorér forskelle på store/små bogstaver i filnavne"
-#: meld/resources/gtk/menus.ui:162
+#: meld/resources/gtk/menus.ui:155
msgid "Normalize Unicode paths"
msgstr "Normalisér Unicode-stier"
-#: meld/resources/gtk/menus.ui:175
+#: meld/resources/gtk/menus.ui:168
msgid "Normal"
msgstr "Normal"
# "Vis ikke-versionsstyrede filer"
-#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:70
+#: meld/resources/gtk/menus.ui:172 meld/vc/_vc.py:71
msgid "Unversioned"
msgstr "Uden versionering"
-#: meld/resources/gtk/menus.ui:183 meld/vc/_vc.py:69
+#: meld/resources/gtk/menus.ui:176 meld/vc/_vc.py:70
msgid "Ignored"
msgstr "Ignoreret"
-#: meld/resources/gtk/menus.ui:190
+#: meld/resources/gtk/menus.ui:183
msgid "Flatten folders"
msgstr "Fladgør mapper"
#: meld/resources/ui/about-dialog.ui:8
msgid ""
"Copyright © 2002-2009 Stephen Kennedy\n"
-"Copyright © 2009-2021 Kai Willadsen"
+"Copyright © 2009-2022 Kai Willadsen"
msgstr ""
"Ophavsret © 2002-2009 Stephen Kennedy\n"
-"Ophavsret © 2009-2021 Kai Willadsen"
+"Ophavsret © 2009-2022 Kai Willadsen"
#: meld/resources/ui/about-dialog.ui:14
msgid "translator-credits"
@@ -949,7 +955,7 @@ msgid "Column Name"
msgstr "Kolonnenavn"
#: meld/resources/ui/column-list.ui:83 meld/resources/ui/filter-list.ui:128
-#: meld/resources/ui/vcview-menus.ui:22 meld/vcview.py:741
+#: meld/resources/ui/vcview-menus.ui:22 meld/vcview.py:745
msgid "_Remove"
msgstr "_Fjern"
@@ -1155,7 +1161,7 @@ msgstr "Fil 1"
#. Create icon and filename CellRenderer
#: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
-#: meld/dirdiff.py:602
+#: meld/dirdiff.py:603
msgid "Name"
msgstr "Navn"
@@ -1195,7 +1201,7 @@ msgstr "Ombrudt"
msgid "Replace _All"
msgstr "Erstat _alle"
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1230 meld/iohelpers.py:117
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1231 meld/iohelpers.py:117
msgid "_Replace"
msgstr "_Erstat"
@@ -1587,7 +1593,7 @@ msgstr "Ændringerne går tabt permanent, hvis ikke du gemmer."
msgid "Close _without Saving"
msgstr "Luk _uden at gemme"
-#: meld/resources/ui/save-confirm-dialog.ui:41 meld/dirdiff.py:1228
+#: meld/resources/ui/save-confirm-dialog.ui:41 meld/dirdiff.py:1229
#: meld/iohelpers.py:56 meld/iohelpers.py:116
msgid "_Cancel"
msgstr "_Annullér"
@@ -1676,11 +1682,11 @@ msgstr "Ekstra"
msgid "Console output"
msgstr "Konsoloutput"
-#: meld/actiongutter.py:247
+#: meld/actiongutter.py:254
msgid "Copy _up"
msgstr "Kopiér _op"
-#: meld/actiongutter.py:248
+#: meld/actiongutter.py:255
msgid "Copy _down"
msgstr "Kopiér _ned"
@@ -1697,53 +1703,53 @@ msgid "Mac OS (CR)"
msgstr "Mac OS (CR)"
#. Create file size CellRenderer
-#: meld/dirdiff.py:623 meld/preferences.py:132
+#: meld/dirdiff.py:624 meld/preferences.py:132
msgid "Size"
msgstr "Størrelse"
#. Create date-time CellRenderer
-#: meld/dirdiff.py:631 meld/preferences.py:133
+#: meld/dirdiff.py:632 meld/preferences.py:133
msgid "Modification time"
msgstr "Ændringstidspunkt"
#. Create ISO-format date-time CellRenderer
-#: meld/dirdiff.py:639 meld/preferences.py:134
+#: meld/dirdiff.py:640 meld/preferences.py:134
msgid "Modification time (ISO)"
msgstr "Ændringstidspunkt (ISO)"
#. Create permissions CellRenderer
-#: meld/dirdiff.py:647 meld/preferences.py:135
+#: meld/dirdiff.py:648 meld/preferences.py:135
msgid "Permissions"
msgstr "Rettigheder"
-#: meld/dirdiff.py:900
+#: meld/dirdiff.py:901
#, python-brace-format
msgid "{filename} (scanning…)"
msgstr "{filename} (skanner …)"
-#: meld/dirdiff.py:932 meld/dirdiff.py:964
+#: meld/dirdiff.py:933 meld/dirdiff.py:965
#, python-brace-format
msgid "[{label}] Scanning {folder}"
msgstr "[{label}] Skanner {folder}"
-#: meld/dirdiff.py:1100
+#: meld/dirdiff.py:1101
#, python-brace-format
msgid "[{label}] Done"
msgstr "[{label}] Færdig"
-#: meld/dirdiff.py:1113
+#: meld/dirdiff.py:1114
msgid "Folder {} is being compared to itself"
msgstr "Mappen {} sammenlignes med sig selv"
-#: meld/dirdiff.py:1119
+#: meld/dirdiff.py:1120
msgid "Folders have no differences"
msgstr "Der er ingen forskelle på mapperne"
-#: meld/dirdiff.py:1121
+#: meld/dirdiff.py:1122
msgid "Contents of scanned files in folders are identical."
msgstr "Indholdet af de skannede filer i mapperne er ens."
-#: meld/dirdiff.py:1123
+#: meld/dirdiff.py:1124
msgid ""
"Scanned files in folders appear identical, but contents have not been "
"scanned."
@@ -1751,44 +1757,44 @@ msgstr ""
"De skannede filer i mapperne ser ud til at være ens, men indholdet er ikke "
"blevet skannet."
-#: meld/dirdiff.py:1126
+#: meld/dirdiff.py:1127
msgid "File filters are in use, so not all files have been scanned."
msgstr "Ikke alle filer er blevet skannet, da filfiltre er i brug."
-#: meld/dirdiff.py:1128
+#: meld/dirdiff.py:1129
msgid "Text filters are in use and may be masking content differences."
msgstr "Tekstfiltre er i brug og kan maskere forskelle i indhold."
-#: meld/dirdiff.py:1144 meld/filediff.py:1919
+#: meld/dirdiff.py:1145 meld/filediff.py:1997
msgid "Hide"
msgstr "Skjul"
-#: meld/dirdiff.py:1146 meld/filediff.py:1921 meld/filediff.py:1951
-#: meld/filediff.py:1953 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
+#: meld/dirdiff.py:1147 meld/filediff.py:1999 meld/filediff.py:2029
+#: meld/filediff.py:2031 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
msgid "Hi_de"
msgstr "_Skjul"
-#: meld/dirdiff.py:1155
+#: meld/dirdiff.py:1156
msgid "Multiple errors occurred while scanning this folder"
msgstr "Der opstod flere fejl, under skanning af mappen"
-#: meld/dirdiff.py:1156
+#: meld/dirdiff.py:1157
msgid "Files with invalid encodings found"
msgstr "Fandt filer med ugyldige kodninger"
#. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1158
+#: meld/dirdiff.py:1159
msgid "Some files were in an incorrect encoding. The names are something like:"
msgstr "Nogle filer var ikke kodet korrekt. Navnene er noget lignende dette:"
-#: meld/dirdiff.py:1160
+#: meld/dirdiff.py:1161
msgid "Files hidden by case insensitive comparison"
msgstr "Filer skjult af søgning, som ikke tager højde for store/små bogstaver"
# Du udfører en sammenligning uden forskel på store og små bogstaver på
# et filsystem, hvor der er forskel på store og små bogstaver.
#. TRANSLATORS: This is followed by a list of files
-#: meld/dirdiff.py:1162
+#: meld/dirdiff.py:1163
msgid ""
"You are running a case insensitive comparison on a case sensitive "
"filesystem. The following files in this folder are hidden:"
@@ -1797,17 +1803,17 @@ msgstr ""
"på et filsystem, som tager højde for store/små bogstaver. Følgende filer i "
"denne mappe er skjulte:"
-#: meld/dirdiff.py:1173
+#: meld/dirdiff.py:1174
#, python-brace-format
msgid "“{first_file}” hidden by “{second_file}”"
msgstr "“{first_file}” skjult af “{second_file}”"
-#: meld/dirdiff.py:1235
+#: meld/dirdiff.py:1236
#, python-format
msgid "Replace folder “%s”?"
msgstr "Erstat mappen “%s”?"
-#: meld/dirdiff.py:1237
+#: meld/dirdiff.py:1238
#, python-format
msgid ""
"Another folder with the same name already exists in “%s”.\n"
@@ -1816,11 +1822,11 @@ msgstr ""
"En mappe med det samme navn findes allerede i “%s”.\n"
"Hvis du erstatter den eksisterende mappe, vil alle filer i den gå tabt."
-#: meld/dirdiff.py:1250
+#: meld/dirdiff.py:1251
msgid "Error copying file"
msgstr "Fejl ved kopiering af fil"
-#: meld/dirdiff.py:1251
+#: meld/dirdiff.py:1252
#, python-brace-format
msgid ""
"Couldn’t copy {source}\n"
@@ -1833,19 +1839,23 @@ msgstr ""
"\n"
"{error}"
-#: meld/dirdiff.py:1276 meld/vcview.py:764
+#: meld/dirdiff.py:1277 meld/vcview.py:768
msgid "Error deleting {}"
msgstr "Fejl ved sletning af {}"
-#: meld/dirdiff.py:1819
+#: meld/dirdiff.py:1825
msgid "No folder"
msgstr "Ingen mappe"
-#: meld/filediff.py:1149
+#: meld/dirdiff.py:1838
+msgid "Folder comparison:"
+msgstr "Mappesammenligning:"
+
+#: meld/filediff.py:1168
msgid "Comparison results will be inaccurate"
msgstr "Resultatet af sammenligningen vil være unøjagtigt"
-#: meld/filediff.py:1151
+#: meld/filediff.py:1170
msgid ""
"A filter changed the number of lines in the file, which is unsupported. The "
"comparison will not be accurate."
@@ -1853,73 +1863,97 @@ msgstr ""
"Et filter ændrede antallet af linjer i filen, hvilket ikke understøttes. "
"Sammenligningen vil ikke være nøjagtig."
-#: meld/filediff.py:1223
+#: meld/filediff.py:1242
msgid "Mark conflict as resolved?"
msgstr "Markér konflikt som løst?"
-#: meld/filediff.py:1225
+#: meld/filediff.py:1244
msgid ""
"If the conflict was resolved successfully, you may mark it as resolved now."
msgstr "Hvis konflikten blev løst, kan du nu markere den som løst."
-#: meld/filediff.py:1228
+#: meld/filediff.py:1247
msgid "Cancel"
msgstr "Annullér"
-#: meld/filediff.py:1229
+#: meld/filediff.py:1248
msgid "Mark _Resolved"
msgstr "Markér som _løst"
-#: meld/filediff.py:1593
+#: meld/filediff.py:1439 meld/filediff.py:1455
+msgid "Add Synchronization Point"
+msgstr "Tilføj synkroniseringspunkt"
+
+#: meld/filediff.py:1443
+msgid "Remove Synchronization Point"
+msgstr "Fjern synkroniseringspunkt"
+
+#: meld/filediff.py:1447
+msgid "Move Synchronization Point"
+msgstr "Flyt synkroniseringspunkt"
+
+#: meld/filediff.py:1451
+msgid "Match Synchronization Point"
+msgstr "Match synkroniseringspunkt"
+
+#: meld/filediff.py:1475
+msgid "Clear Synchronization Points"
+msgstr "Ryd synkroniseringspunkter"
+
+#: meld/filediff.py:1535
+msgid "File comparison:"
+msgstr "Filsammenligning:"
+
+#: meld/filediff.py:1671
#, python-format
msgid "There was a problem opening the file “%s”."
msgstr "Der var et problem med at åbne filen “%s”."
-#: meld/filediff.py:1602
+#: meld/filediff.py:1680
#, python-format
msgid "File %s appears to be a binary file."
msgstr "Filen %s ser ud til at være en binær fil."
-#: meld/filediff.py:1604
+#: meld/filediff.py:1682
msgid "Do you want to open the file using the default application?"
msgstr "Vil du åbne filen med standardprogrammet?"
-#: meld/filediff.py:1606
+#: meld/filediff.py:1684
msgid "Open"
msgstr "Åbn"
-#: meld/filediff.py:1628
+#: meld/filediff.py:1706
#, python-format
msgid "[%s] Merging files"
msgstr "[%s] Fletter filer"
-#: meld/filediff.py:1642
+#: meld/filediff.py:1720
#, python-format
msgid "[%s] Computing differences"
msgstr "[%s] Beregner forskelle"
-#: meld/filediff.py:1702
+#: meld/filediff.py:1780
#, python-format
msgid "File %s has changed on disk"
msgstr "Filen %s er blevet ændret på disken"
-#: meld/filediff.py:1703
+#: meld/filediff.py:1781
msgid "Do you want to reload the file?"
msgstr "Vil du genindlæse filen?"
-#: meld/filediff.py:1705
+#: meld/filediff.py:1783
msgid "_Reload"
msgstr "_Genindlæs"
-#: meld/filediff.py:1875
+#: meld/filediff.py:1953
msgid "File {} is being compared to itself"
msgstr "Filen {} sammenlignes med sig selv"
-#: meld/filediff.py:1884
+#: meld/filediff.py:1962
msgid "Files are identical"
msgstr "Filer er identiske"
-#: meld/filediff.py:1897
+#: meld/filediff.py:1975
msgid ""
"Text filters are being used, and may be masking differences between files. "
"Would you like to compare the unfiltered files?"
@@ -1927,11 +1961,11 @@ msgstr ""
"Tekstfiltre er i brug og kan maskere forskelle mellem filer. Vil du "
"sammenligne de ikke-filtrerede filer?"
-#: meld/filediff.py:1902
+#: meld/filediff.py:1980
msgid "Files differ in line endings only"
msgstr "Filer er kun forskellige i slutningen af linjerne"
-#: meld/filediff.py:1904
+#: meld/filediff.py:1982
#, python-format
msgid ""
"Files are identical except for differing line endings:\n"
@@ -1940,15 +1974,15 @@ msgstr ""
"Filerne er ens bortset fra forskelle i slutningen af linjerne:\n"
"%s"
-#: meld/filediff.py:1924
+#: meld/filediff.py:2002
msgid "Show without filters"
msgstr "Vis uden filtre"
-#: meld/filediff.py:1946
+#: meld/filediff.py:2024
msgid "Change highlighting incomplete"
msgstr "Fremhævning af ændringer ufuldstændig"
-#: meld/filediff.py:1947
+#: meld/filediff.py:2025
msgid ""
"Some changes were not highlighted because they were too large. You can force "
"Meld to take longer to highlight larger changes, though this may be slow."
@@ -1957,19 +1991,19 @@ msgstr ""
"Meld til at bruge længere tid på at fremhæve større ændringer, selvom det "
"kan være langsomt."
-#: meld/filediff.py:1955
+#: meld/filediff.py:2033
msgid "Keep highlighting"
msgstr "Bliv ved med at fremhæve"
-#: meld/filediff.py:1957
+#: meld/filediff.py:2035
msgid "_Keep highlighting"
msgstr "_Bliv ved med at fremhæve"
-#: meld/filediff.py:1970
+#: meld/filediff.py:2048
msgid "Saving failed"
msgstr "Kunne ikke gemme"
-#: meld/filediff.py:1971
+#: meld/filediff.py:2049
msgid ""
"Please consider copying any critical changes to another program or file to "
"avoid data loss."
@@ -1977,37 +2011,37 @@ msgstr ""
"Overvej at kopiere kritiske ændringer til et andet program eller en anden "
"fil for at undgå tab af data."
-#: meld/filediff.py:1980
+#: meld/filediff.py:2058
msgid "Save Left Pane As"
msgstr "Gem venstre rude som"
-#: meld/filediff.py:1982
+#: meld/filediff.py:2060
msgid "Save Middle Pane As"
msgstr "Gem midterste rude som"
-#: meld/filediff.py:1984
+#: meld/filediff.py:2062
msgid "Save Right Pane As"
msgstr "Gem højre rude som"
-#: meld/filediff.py:1995
+#: meld/filediff.py:2073
#, python-format
msgid "File %s has changed on disk since it was opened"
msgstr "Filen %s er blevet ændret på disken, siden den blev åbnet"
-#: meld/filediff.py:1997
+#: meld/filediff.py:2075
msgid "If you save it, any external changes will be lost."
msgstr ""
"Hvis du gemmer den, vil alle ændringer, som er foretaget eksternt, gå tabt."
-#: meld/filediff.py:2000
+#: meld/filediff.py:2078
msgid "Save Anyway"
msgstr "Gem alligevel"
-#: meld/filediff.py:2001
+#: meld/filediff.py:2079
msgid "Don’t Save"
msgstr "Gem ikke"
-#: meld/filediff.py:2043
+#: meld/filediff.py:2121
msgid ""
"File “{}” contains characters that can’t be encoded using its current "
"encoding “{}”."
@@ -2015,7 +2049,7 @@ msgstr ""
"Filen “{}” indeholder tegn, som ikke kan kodes med filens aktuelle kodning "
"“{}”."
-#: meld/filediff.py:2047 meld/patchdialog.py:138
+#: meld/filediff.py:2125 meld/patchdialog.py:138
#, python-format
msgid ""
"Couldn’t save file due to:\n"
@@ -2024,16 +2058,16 @@ msgstr ""
"Kunne ikke gemme filen pga.:\n"
"%s"
-#: meld/filediff.py:2051 meld/patchdialog.py:137
+#: meld/filediff.py:2129 meld/patchdialog.py:137
#, python-format
msgid "Could not save file %s."
msgstr "Kunne ikke gemme filen %s."
-#: meld/filediff.py:2452
+#: meld/filediff.py:2539
msgid "Live comparison updating disabled"
msgstr "Liveopdatering af sammenligninger deaktiveret"
-#: meld/filediff.py:2453
+#: meld/filediff.py:2540
msgid ""
"Live updating of comparisons is disabled when synchronization points are "
"active. You can still manually refresh the comparison, and live updates will "
@@ -2225,7 +2259,8 @@ msgstr "Versionsstyring:"
#: meld/style.py:91
msgid "Couldn’t find colour scheme details for {}; this is a bad install"
msgstr ""
-"Kunne ikke finde farveskemadetaljer for {}; der er problemer med denne installation"
+"Kunne ikke finde farveskemadetaljer for {}; der er problemer med denne "
+"installation"
#: meld/ui/bufferselectors.py:110
#, python-brace-format
@@ -2300,52 +2335,52 @@ msgstr "Ingen"
msgid "Rev %s"
msgstr "Rev. %s"
-#: meld/vc/_vc.py:54
+#: meld/vc/_vc.py:55
msgid "Merged"
msgstr "Flettet"
-#: meld/vc/_vc.py:54
+#: meld/vc/_vc.py:55
msgid "Base"
msgstr "Base"
-#: meld/vc/_vc.py:54
+#: meld/vc/_vc.py:55
msgid "Local"
msgstr "Lokal"
-#: meld/vc/_vc.py:54
+#: meld/vc/_vc.py:55
msgid "Remote"
msgstr "Fjern"
-#: meld/vc/_vc.py:73
+#: meld/vc/_vc.py:74
msgid "Error"
msgstr "Fejl"
-#: meld/vc/_vc.py:75
+#: meld/vc/_vc.py:76
msgid "Newly added"
msgstr "Nyligt tilføjet"
-#: meld/vc/_vc.py:77
+#: meld/vc/_vc.py:78
msgid "Renamed"
msgstr "Omdøbt"
-#: meld/vc/_vc.py:78
+#: meld/vc/_vc.py:79
msgid "Conflict"
msgstr "Konflikt"
-#: meld/vc/_vc.py:79
+#: meld/vc/_vc.py:80
msgid "Removed"
msgstr "Fjernet"
# Manglende?
-#: meld/vc/_vc.py:80
+#: meld/vc/_vc.py:81
msgid "Missing"
msgstr "Mangler"
-#: meld/vc/_vc.py:81
+#: meld/vc/_vc.py:82
msgid "Not present"
msgstr "Ikke tilstedeværende"
-#: meld/vc/_vc.py:82
+#: meld/vc/_vc.py:83
msgid "Scanning…"
msgstr "Skanner …"
@@ -2378,68 +2413,69 @@ msgstr "Fandt ikke et gyldigt versionsstyringssystem i denne mappe"
msgid "Choose which version control system to use"
msgstr "Vælg hvilket versionsstyringssystem, der skal anvendes"
-#. TRANSLATORS: This is the location of the directory being viewed
-#: meld/vcview.py:412
+#. TRANSLATORS: This is the name of the version control
+#. system being used, e.g., "Git" or "Subversion"
+#: meld/vcview.py:414
#, python-brace-format
-msgid "Location: {path}"
-msgstr "Sted: {path}"
+msgid "{vc} comparison:"
+msgstr "{vc}-sammenligning:"
#. Initial yield so when we add this to our tasks, we don't
#. create iterators that may be invalidated.
-#: meld/vcview.py:419
+#: meld/vcview.py:423
msgid "Scanning repository"
msgstr "Skanner arkiv"
-#: meld/vcview.py:448
+#: meld/vcview.py:452
#, python-format
msgid "Scanning %s"
msgstr "Skanner %s"
-#: meld/vcview.py:487
+#: meld/vcview.py:491
msgid "(Empty)"
msgstr "(tom)"
-#: meld/vcview.py:535
+#: meld/vcview.py:539
#, python-format
msgid "%s — local"
msgstr "%s — lokal"
-#: meld/vcview.py:536
+#: meld/vcview.py:540
#, python-format
msgid "%s — remote"
msgstr "%s — fjern"
-#: meld/vcview.py:544
+#: meld/vcview.py:548
#, python-format
msgid "%s (local, merge, remote)"
msgstr "%s (lokal, flet, fjern)"
-#: meld/vcview.py:549
+#: meld/vcview.py:553
#, python-format
msgid "%s (remote, merge, local)"
msgstr "%s (fjern, flet, lokal)"
-#: meld/vcview.py:560
+#: meld/vcview.py:564
#, python-format
msgid "%s — repository"
msgstr "%s — arkiv"
# arbejdskopi?
-#: meld/vcview.py:566
+#: meld/vcview.py:570
#, python-format
msgid "%s (working, repository)"
msgstr "%s (arbejdskopi, arkiv)"
-#: meld/vcview.py:570
+#: meld/vcview.py:574
#, python-format
msgid "%s (repository, working)"
msgstr "%s (arkiv, arbejdskopi)"
-#: meld/vcview.py:735
+#: meld/vcview.py:739
msgid "Remove folder and all its files?"
msgstr "Fjern mappen og alle dens filer?"
-#: meld/vcview.py:737
+#: meld/vcview.py:741
msgid ""
"This will remove all selected files and folders, and all files within any "
"selected folders, from version control."
@@ -2447,10 +2483,17 @@ msgstr ""
"Dette vil fjerne alle valgte filer og mapper, samt alle filer i de valgte "
"mapper, fra versionsstyring."
-#: meld/vcview.py:850
+#: meld/vcview.py:854
msgid "Clear"
msgstr "Ryd"
+#~ msgid "Refresh"
+#~ msgstr "Opdatér"
+
+#, python-brace-format
+#~ msgid "Location: {path}"
+#~ msgstr "Sted: {path}"
+
#~ msgid "_Update"
#~ msgstr "_Opdatér"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]