diff options
| author | l10n daemon script <[email protected]> | 2024-10-29 01:24:40 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-10-29 01:24:40 +0000 |
| commit | 99c3c8be59bf1828ab1b9e8827a7c82baddc7501 (patch) | |
| tree | 0154f9181401134db6e8f7e06d80b7ba86eefa26 /src | |
| parent | 52da2dc809cde43d2ada7b76e014dd4fee5b62c3 (diff) | |
SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
Diffstat (limited to 'src')
| -rw-r--r-- | src/itemactions/movetonewfolderitemaction.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/itemactions/movetonewfolderitemaction.json b/src/itemactions/movetonewfolderitemaction.json index 3f2e4fc88..c82fccc9d 100644 --- a/src/itemactions/movetonewfolderitemaction.json +++ b/src/itemactions/movetonewfolderitemaction.json @@ -11,6 +11,7 @@ "Name[ca@valencia]": "Mou cap a una carpeta nova", "Name[ca]": "Mou a una carpeta nova", "Name[cs]": "Přesunout do nové složky", + "Name[da]": "Flyt til ny mappe", "Name[de]": "In neuen Ordner verschieben", "Name[el]": "Μετακίνηση σε Νέο Φάκελο", "Name[en_GB]": "Move to New Folder", |