diff options
| author | l10n daemon script <[email protected]> | 2021-08-09 02:11:38 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2021-08-09 02:11:38 +0000 |
| commit | e101560f8448470a629e70e78ca3571c222036ff (patch) | |
| tree | edf83db17dc1e1ee623649eef77d67bfee238491 /src/org.kde.dolphin.desktop | |
| parent | 9fc1e5397b4f625c6cebd0937378a2f9b337e78f (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/org.kde.dolphin.desktop')
| -rwxr-xr-x | src/org.kde.dolphin.desktop | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index 63509b476..9489ab370 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -17,6 +17,7 @@ Name[fi]=Dolphin Name[fr]=Dolphin Name[gl]=Dolphin Name[he]=Dolphin +Name[hi]=डॉल्फ़िन Name[hu]=Dolphin Name[ia]=Dolphin Name[id]=Dolphin @@ -73,6 +74,7 @@ GenericName[fi]=Tiedostonhallinta GenericName[fr]=Gestionnaire de fichiers GenericName[gl]=Xestor de ficheiros GenericName[he]=מנהל קבצים +GenericName[hi]=फ़ाइल प्रबंधक GenericName[hu]=Fájlkezelő GenericName[ia]=Gerente de file GenericName[id]=Pengelola File |