From 0f90a2855896a25cb773870817d05c0ee0842f6e Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 14 Dec 2025 01:36:01 +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/hidefileitemaction.json | 1 + src/itemactions/setfoldericonitemaction.json | 1 + 2 files changed, 2 insertions(+) (limited to 'src') diff --git a/src/itemactions/hidefileitemaction.json b/src/itemactions/hidefileitemaction.json index 10cc7a07c..b77d15baa 100644 --- a/src/itemactions/hidefileitemaction.json +++ b/src/itemactions/hidefileitemaction.json @@ -26,6 +26,7 @@ "Name[nl]": "Verbergen", "Name[pl]": "Ukryj", "Name[pt_BR]": "Ocultar", + "Name[ro]": "Ascunde", "Name[ru]": "Скрыть", "Name[sl]": "Skrij", "Name[sv]": "Dölj", diff --git a/src/itemactions/setfoldericonitemaction.json b/src/itemactions/setfoldericonitemaction.json index cadd7187e..6c4e53495 100644 --- a/src/itemactions/setfoldericonitemaction.json +++ b/src/itemactions/setfoldericonitemaction.json @@ -29,6 +29,7 @@ "Name[pa]": "ਫੋਲਡਰ ਲਈ ਆਈਕਾਨ ਦਿਓ", "Name[pl]": "Ustaw ikonę katalogu", "Name[pt_BR]": "Definir ícone da pasta", + "Name[ro]": "Stabilește pictograma dosarului", "Name[ru]": "Задать значок папки", "Name[sl]": "Nastavi ikono mape", "Name[sv]": "Ange katalogikon", -- cgit v1.3