From 517cc98e1574fdff4944f256d14ff10543b7c718 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 14 Dec 2024 01:47:37 +0000 Subject: 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" --- src/itemactions/movetonewfolderitemaction.json | 1 + 1 file changed, 1 insertion(+) (limited to 'src/itemactions') diff --git a/src/itemactions/movetonewfolderitemaction.json b/src/itemactions/movetonewfolderitemaction.json index c2956ea10..185667c32 100644 --- a/src/itemactions/movetonewfolderitemaction.json +++ b/src/itemactions/movetonewfolderitemaction.json @@ -38,6 +38,7 @@ "Name[pt_BR]": "Mover para pasta", "Name[ro]": "Mută în dosar nou", "Name[ru]": "Переместить в новую папку", + "Name[sa]": "New Folder इत्यत्र गच्छन्तु", "Name[sl]": "Premakni v novo mapo", "Name[sv]": "Flytta till ny katalog", "Name[ta]": "புதிய அடைவிற்கு நகர்த்து", -- cgit v1.3