diff options
| author | l10n daemon script <[email protected]> | 2020-06-13 05:34:06 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2020-06-13 05:34:06 +0200 |
| commit | 799c532d239c2c04cb7fe5014aceba449268fd3d (patch) | |
| tree | 48493d409c5b2d623e4b2bb1e470a00e61369737 /src/org.kde.dolphin.desktop | |
| parent | 85f5156a332c5e2e38facf390dafd6a1fdf1c9a2 (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 6404808ee..94682ce6d 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -2,6 +2,7 @@ Name=Dolphin Name[ar]=دولفين Name[ast]=Dolphin +Name[az]=Dolphin Name[ca]=Dolphin Name[ca@valencia]=Dolphin Name[cs]=Dolphin @@ -53,6 +54,7 @@ Categories=Qt;KDE;System;FileTools;FileManager; GenericName=File Manager GenericName[ar]=مدير ملفّات GenericName[ast]=Xestor de ficheros +GenericName[az]=Fayl meneceri GenericName[ca]=Gestor de fitxers GenericName[ca@valencia]=Gestor de fitxers GenericName[cs]=Správce souborů |