┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorl10n daemon script <[email protected]>2024-06-22 01:22:28 +0000
committerl10n daemon script <[email protected]>2024-06-22 01:22:28 +0000
commitaf7e37139d32e562308975a46f28cab0e40965df (patch)
treefb0e298c49d053e0fc457007bb03c62423f96e63
parent6af359f2c7edbbcc33526f3490ce04ccebfc0e3a (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.json1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/itemactions/movetonewfolderitemaction.json b/src/itemactions/movetonewfolderitemaction.json
index f493b6521..3d140705e 100644
--- a/src/itemactions/movetonewfolderitemaction.json
+++ b/src/itemactions/movetonewfolderitemaction.json
@@ -22,6 +22,7 @@
"Name[lt]": "Perkelti į naują aplanką",
"Name[nl]": "Naar nieuwe map verplaatsen",
"Name[pl]": "Przenieś do nowego katalogu",
+ "Name[pt_BR]": "Mover para pasta",
"Name[ro]": "Mută în dosar nou",
"Name[ru]": "Переместить в новую папку",
"Name[sl]": "Premakni v novo mapo",