diff options
| author | l10n daemon script <[email protected]> | 2017-12-20 08:25:12 +0100 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2017-12-20 08:25:12 +0100 |
| commit | 91eb6aa37ae38c73441b6100a4ea9beb35e982f4 (patch) | |
| tree | dd24365c592988148069d46448f42f1055229c19 /src/dolphinpart.desktop | |
| parent | 6c5cd76d6f1f54974026a200217c30a84c5acd91 (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/dolphinpart.desktop')
| -rw-r--r-- | src/dolphinpart.desktop | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop index a0d7a96b2..9bf9f95cf 100644 --- a/src/dolphinpart.desktop +++ b/src/dolphinpart.desktop @@ -170,7 +170,7 @@ Name[gl]=Detalles Name[he]=פרטים Name[hu]=Részletek Name[ia]=Detalios -Name[id]=Detail +Name[id]=Perincian Name[it]=Dettagli Name[ja]=詳細 Name[ko]=자세히 |