diff options
| author | l10n daemon script <[email protected]> | 2024-01-05 02:08:48 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-01-05 02:08:48 +0000 |
| commit | e13a47f01ff96e3de87d59dc6d5da61009bba563 (patch) | |
| tree | 58be6e1f41c23b96bd4a95a7a2f9b892649524ba /src/settings | |
| parent | 74cad372427939cc7bebf0082448f02490aaf60f (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/settings')
| -rw-r--r-- | src/settings/kcm/kcmdolphingeneral.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json index f168aadda..cc24b6d88 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -32,6 +32,7 @@ "Name[nb]": "Generelt", "Name[nl]": "Algemeen", "Name[nn]": "Generelt", + "Name[pa]": "ਸਧਾਰਨ", "Name[pl]": "Ogólne", "Name[pt]": "Geral", "Name[pt_BR]": "Geral", |