diff options
| author | l10n daemon script <[email protected]> | 2025-08-27 01:36:52 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-08-27 01:36:52 +0000 |
| commit | 391c55f0a86a151b9f45d7a65f92db713bcc7013 (patch) | |
| tree | 75cb089d9450aa892699f00c72a8a8a741448df6 | |
| parent | b498e2e43c00d718474d973fb98e6c7d94e32d0a (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/movetonewfolderitemaction.json | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/dolphinpart.json.in b/src/dolphinpart.json.in index 94bcb2970..87489f09e 100644 --- a/src/dolphinpart.json.in +++ b/src/dolphinpart.json.in @@ -52,7 +52,7 @@ "Name[pa]": "ਡਾਲਫਿਨ ਝਲਕ", "Name[pl]": "Widok Dolphina", "Name[pt]": "Área do Dolphin", - "Name[pt_BR]": "Visualização do Dolphin", + "Name[pt_BR]": "Exibição do Dolphin", "Name[ro]": "Vizualizare Dolphin", "Name[ru]": "Представление Dolphin", "Name[sa]": "डॉल्फिन दृश्य", diff --git a/src/itemactions/movetonewfolderitemaction.json b/src/itemactions/movetonewfolderitemaction.json index ce394007d..aa6251d6c 100644 --- a/src/itemactions/movetonewfolderitemaction.json +++ b/src/itemactions/movetonewfolderitemaction.json @@ -36,7 +36,7 @@ "Name[nn]": "Flytt til ny mappe", "Name[pa]": "ਨਵੇਂ ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ", "Name[pl]": "Przenieś do nowego katalogu", - "Name[pt_BR]": "Mover para pasta", + "Name[pt_BR]": "Mover para nova pasta", "Name[ro]": "Mută în dosar nou", "Name[ru]": "Переместить в новую папку", "Name[sa]": "New Folder इत्यत्र गच्छन्तु", |