diff options
| author | l10n daemon script <[email protected]> | 2024-06-28 01:27:14 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-06-28 01:27:14 +0000 |
| commit | 08347a59c0a442c42b6c97c692b6d4aabb2e70df (patch) | |
| tree | 079bd612ebaee083b7d2109bf066e04564ff1d9d /src/itemactions/movetonewfolderitemaction.json | |
| parent | 3a54a369d9115fa66ed474c4eee3ef51b300db3c (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/itemactions/movetonewfolderitemaction.json')
| -rw-r--r-- | src/itemactions/movetonewfolderitemaction.json | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/itemactions/movetonewfolderitemaction.json b/src/itemactions/movetonewfolderitemaction.json index 3d140705e..1b040416f 100644 --- a/src/itemactions/movetonewfolderitemaction.json +++ b/src/itemactions/movetonewfolderitemaction.json @@ -11,7 +11,6 @@ "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[en_GB]": "Move to New Folder", "Name[eo]": "Movi al Nova Dosierujo", "Name[es]": "Mover a una nueva carpeta", "Name[fr]": "Déplacer vers le nouveau dossier", |