diff options
| author | l10n daemon script <[email protected]> | 2026-02-26 01:41:19 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2026-02-26 01:41:19 +0000 |
| commit | a4fbadd0db961694cb57f75a8752e538cfe3f263 (patch) | |
| tree | 7f59997e17ac1ed923b69030dcf5aca1582d1e35 /src | |
| parent | 819b00871e126c11b2a40d1f3cc341640774255c (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"
Diffstat (limited to 'src')
| -rw-r--r-- | src/itemactions/hidefileitemaction.json | 1 | ||||
| -rw-r--r-- | src/itemactions/movetonewfolderitemaction.json | 1 | ||||
| -rw-r--r-- | src/itemactions/setfoldericonitemaction.json | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/src/itemactions/hidefileitemaction.json b/src/itemactions/hidefileitemaction.json index 14947faa1..cd87eef50 100644 --- a/src/itemactions/hidefileitemaction.json +++ b/src/itemactions/hidefileitemaction.json @@ -25,6 +25,7 @@ "Name[ko]": "숨기기", "Name[lt]": "Slėpti", "Name[lv]": "Paslēpt", + "Name[nb]": "Skjul", "Name[nl]": "Verbergen", "Name[pa]": "ਓਹਲੇ", "Name[pl]": "Ukryj", diff --git a/src/itemactions/movetonewfolderitemaction.json b/src/itemactions/movetonewfolderitemaction.json index efef02af9..6c27e343e 100644 --- a/src/itemactions/movetonewfolderitemaction.json +++ b/src/itemactions/movetonewfolderitemaction.json @@ -34,6 +34,7 @@ "Name[ko]": "새 폴더로 이동", "Name[lt]": "Perkelti į naują aplanką", "Name[lv]": "Pārvietot uz jaunu mapi", + "Name[nb]": "Flytt til ny mappe", "Name[nl]": "Naar nieuwe map verplaatsen", "Name[nn]": "Flytt til ny mappe", "Name[pa]": "ਨਵੇਂ ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ", diff --git a/src/itemactions/setfoldericonitemaction.json b/src/itemactions/setfoldericonitemaction.json index 5c45705aa..4d385aec8 100644 --- a/src/itemactions/setfoldericonitemaction.json +++ b/src/itemactions/setfoldericonitemaction.json @@ -27,6 +27,7 @@ "Name[ko]": "폴더 아이콘 설정", "Name[lt]": "Nustatyti aplanko piktogramą", "Name[lv]": "Norādīt datnes ikonu", + "Name[nb]": "Velg mappeikon", "Name[nl]": "Mappictogram instellen", "Name[pa]": "ਫੋਲਡਰ ਲਈ ਆਈਕਾਨ ਦਿਓ", "Name[pl]": "Ustaw ikonę katalogu", |