diff options
| author | l10n daemon script <[email protected]> | 2026-02-12 01:41:25 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2026-02-12 01:41:25 +0000 |
| commit | d8461fc02ed4eac062840f0dbd3eee9fe3047101 (patch) | |
| tree | e53c912a2384d2eb1a8fb7042b9add73012b669a | |
| parent | ba2ec163dde22663b6c954324c02d3e43f3d8d90 (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/dolphinpart.json.in | 2 | ||||
| -rw-r--r-- | src/itemactions/hidefileitemaction.json | 1 | ||||
| -rw-r--r-- | src/itemactions/movetonewfolderitemaction.json | 1 | ||||
| -rw-r--r-- | src/itemactions/setfoldericonitemaction.json | 1 | ||||
| -rw-r--r-- | src/settings/kcm/kcmdolphinviewmodes.json | 2 |
5 files changed, 5 insertions, 2 deletions
diff --git a/src/dolphinpart.json.in b/src/dolphinpart.json.in index fa243cd6d..7ceb7e468 100644 --- a/src/dolphinpart.json.in +++ b/src/dolphinpart.json.in @@ -52,7 +52,7 @@ "Name[nn]": "Dolphin-vising", "Name[pa]": "ਡਾਲਫਿਨ ਝਲਕ", "Name[pl]": "Widok Dolphina", - "Name[pt]": "Área do Dolphin", + "Name[pt]": "Vista Dolphin", "Name[pt_BR]": "Exibição do Dolphin", "Name[ro]": "Vizualizare Dolphin", "Name[ru]": "Представление Dolphin", diff --git a/src/itemactions/hidefileitemaction.json b/src/itemactions/hidefileitemaction.json index fa3d202f6..0abaa8a91 100644 --- a/src/itemactions/hidefileitemaction.json +++ b/src/itemactions/hidefileitemaction.json @@ -27,6 +27,7 @@ "Name[lv]": "Paslēpt", "Name[nl]": "Verbergen", "Name[pl]": "Ukryj", + "Name[pt]": "Ocultar", "Name[pt_BR]": "Ocultar", "Name[ro]": "Ascunde", "Name[ru]": "Скрыть", diff --git a/src/itemactions/movetonewfolderitemaction.json b/src/itemactions/movetonewfolderitemaction.json index 0b1b67551..efef02af9 100644 --- a/src/itemactions/movetonewfolderitemaction.json +++ b/src/itemactions/movetonewfolderitemaction.json @@ -38,6 +38,7 @@ "Name[nn]": "Flytt til ny mappe", "Name[pa]": "ਨਵੇਂ ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ", "Name[pl]": "Przenieś do nowego katalogu", + "Name[pt]": "Mover para nova pasta", "Name[pt_BR]": "Mover para nova pasta", "Name[ro]": "Mută în dosar nou", "Name[ru]": "Переместить в новую папку", diff --git a/src/itemactions/setfoldericonitemaction.json b/src/itemactions/setfoldericonitemaction.json index 2d888da56..5c45705aa 100644 --- a/src/itemactions/setfoldericonitemaction.json +++ b/src/itemactions/setfoldericonitemaction.json @@ -30,6 +30,7 @@ "Name[nl]": "Mappictogram instellen", "Name[pa]": "ਫੋਲਡਰ ਲਈ ਆਈਕਾਨ ਦਿਓ", "Name[pl]": "Ustaw ikonę katalogu", + "Name[pt]": "Definir ícone da pasta", "Name[pt_BR]": "Definir ícone da pasta", "Name[ro]": "Stabilește pictograma dosarului", "Name[ru]": "Задать значок папки", diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json index e5732781e..11ff10228 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.json +++ b/src/settings/kcm/kcmdolphinviewmodes.json @@ -41,7 +41,7 @@ "Name[nn]": "Visingsmodusar", "Name[pa]": "ਵੇਖਣ ਢੰਗ", "Name[pl]": "Tryby widoku", - "Name[pt]": "Modos de Visualização", + "Name[pt]": "Modos de visualização", "Name[pt_BR]": "Modos de exibição", "Name[ro]": "Regimuri de vizualizare", "Name[ru]": "Режимы просмотра", |