diff options
| author | l10n daemon script <[email protected]> | 2022-10-20 02:11:03 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-10-20 02:11:03 +0000 |
| commit | 3333246dba8df1da7f0e735c7816efbce270c96a (patch) | |
| tree | b8ae20ea3aeac484dbccdfc5da09f227c3108eff /src/org.kde.dolphin.desktop | |
| parent | 58ff9c9cc8f6023f484fd4dbf436e4f598b9fad4 (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, 0 insertions, 2 deletions
diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index 0d99a03ef..854997b56 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -1,7 +1,6 @@ [Desktop Entry] Name=Dolphin Name[ar]=دولفين -Name[ast]=Dolphin Name[az]=Dolphin Name[bg]=Dolphin Name[ca]=Dolphin @@ -62,7 +61,6 @@ X-DocPath=dolphin/index.html Categories=Qt;KDE;System;FileTools;FileManager; GenericName=File Manager GenericName[ar]=مدير ملفّات -GenericName[ast]=Xestor de ficheros GenericName[az]=Fayl meneceri GenericName[bg]=Файлов мениджър GenericName[ca]=Gestor de fitxers |