diff options
| author | l10n daemon script <[email protected]> | 2025-09-17 01:36:00 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-09-17 01:36:00 +0000 |
| commit | 7be1e4aa5f1dd257ac1ad9f811e2e7665d8751a4 (patch) | |
| tree | a90abb6f598463438339eff6d49193edbafdb940 /src/itemactions | |
| parent | 7b52f81fe1c34ddfe7d5916cba0b24383428f12e (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/itemactions')
| -rw-r--r-- | src/itemactions/setfoldericonitemaction.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/itemactions/setfoldericonitemaction.json b/src/itemactions/setfoldericonitemaction.json index b12e1eba2..85febdccf 100644 --- a/src/itemactions/setfoldericonitemaction.json +++ b/src/itemactions/setfoldericonitemaction.json @@ -23,6 +23,7 @@ "Name[ko]": "폴더 아이콘 설정", "Name[lv]": "Norādīt datnes ikonu", "Name[nl]": "Mappictogram instellen", + "Name[pa]": "ਫੋਲਡਰ ਲਈ ਆਈਕਾਨ ਦਿਓ", "Name[pl]": "Ustaw ikonę katalogu", "Name[pt_BR]": "Definir ícone da pasta", "Name[ru]": "Задать значок папки", |