┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/itemactions/movetonewfolderitemaction.json
diff options
context:
space:
mode:
authorl10n daemon script <[email protected]>2024-08-28 01:32:24 +0000
committerl10n daemon script <[email protected]>2024-08-28 01:32:24 +0000
commit6b1a5a2779f404165fd1e0b117fdac6dbdf75cc5 (patch)
tree387b08a9a802cd34a58d248004c52b54a5c9b499 /src/itemactions/movetonewfolderitemaction.json
parent5797371c789f8814b2310b2ee659724d10a413c2 (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.json1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/itemactions/movetonewfolderitemaction.json b/src/itemactions/movetonewfolderitemaction.json
index 3f8efeddc..29603122f 100644
--- a/src/itemactions/movetonewfolderitemaction.json
+++ b/src/itemactions/movetonewfolderitemaction.json
@@ -13,6 +13,7 @@
"Name[cs]": "Přesunout do nové složky",
"Name[de]": "In neuen Ordner verschieben",
"Name[el]": "Μετακίνηση σε Νέο Φάκελο",
+ "Name[en_GB]": "Move to New Folder",
"Name[eo]": "Movi al Nova Dosierujo",
"Name[es]": "Mover a una nueva carpeta",
"Name[eu]": "Eraman karpeta berrira",