diff options
| author | l10n daemon script <[email protected]> | 2021-07-04 01:17:03 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2021-07-04 01:17:03 +0000 |
| commit | 7f562433c03534933d118b3b4abd6ab85bb4cabb (patch) | |
| tree | b687cb5795b7ae527a6bff78e4aa653a8462c41e | |
| parent | 902e8ee07e2dd67a407af3f727a03b6486d2adf8 (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"
| -rw-r--r-- | src/dolphinpart.desktop.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dolphinpart.desktop.in b/src/dolphinpart.desktop.in index 848f847d5..619b3c3a8 100644 --- a/src/dolphinpart.desktop.in +++ b/src/dolphinpart.desktop.in @@ -1,7 +1,7 @@ [Desktop Entry] Type=Service Name=Dolphin View -Name[ar]=منظور دولفين +Name[ar]=عرض دولفين Name[ast]=Vista de Dolphin Name[az]=Dolphin görünüşü Name[ca]=Vista del Dolphin |