From 34eb94366ecff868d6e6d66e27a4ca1191564ebc Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 26 May 2024 01:17:41 +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 | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/itemactions') diff --git a/src/itemactions/movetonewfolderitemaction.json b/src/itemactions/movetonewfolderitemaction.json index f3b8243a4..ca0b1f3cf 100644 --- a/src/itemactions/movetonewfolderitemaction.json +++ b/src/itemactions/movetonewfolderitemaction.json @@ -5,13 +5,16 @@ "application/octet-stream" ], "Name": "Move to New Folder", + "Name[ar]": "انقل إلى مجلد جديد", "Name[ca@valencia]": "Mou cap a una carpeta nova", "Name[ca]": "Mou a una carpeta nova", "Name[en_GB]": "Move to New Folder", + "Name[eo]": "Movi al Nova Dosierujo", "Name[es]": "Mover a una nueva carpeta", "Name[he]": "העברה לתיקייה חדשה", "Name[ia]": "Move a nove dossier", "Name[ka]": "გადატანა ახალ საქაღალდეში", + "Name[lt]": "Perkelti į naują aplanką", "Name[nl]": "Naar nieuwe map verplaatsen", "Name[sl]": "Premakni v novo mapo", "Name[tr]": "Yeni Klasöre Taşı", -- cgit v1.3