diff options
| author | l10n daemon script <[email protected]> | 2024-08-26 01:23:13 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-08-26 01:23:13 +0000 |
| commit | 310c2c5a941c8b0112204305bb374497ad476976 (patch) | |
| tree | 8d2e5bd94cfa7086370e6b56f942fe6348120718 | |
| parent | f8a2960b368217272e8d6c697769fdeefceb323a (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"
| -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 d85984cf2..bf31f6739 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[de]": "In neuen Ordner verschieben", "Name[el]": "Μετακίνηση σε Νέο Φάκελο", "Name[eo]": "Movi al Nova Dosierujo", "Name[es]": "Mover a una nueva carpeta", |