diff options
| author | l10n daemon script <[email protected]> | 2016-01-15 09:54:42 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2016-01-15 09:54:42 +0000 |
| commit | b336066e1d3b605853fa3502d31951ff47cc33f0 (patch) | |
| tree | 6101c2efd2efa59941bb8564b61b3b4d9d98e103 /src/dolphinpart.desktop | |
| parent | adb7c47885a805c1e8587d24d4767fde22ea15b5 (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 | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop index 123c40464..93d07704b 100644 --- a/src/dolphinpart.desktop +++ b/src/dolphinpart.desktop @@ -9,7 +9,6 @@ Name[de]=Dolphin-Ansicht Name[el]=Dolphin View Name[en_GB]=Dolphin View Name[es]=Vista de Dolphin -Name[et]=Dolphini vaade Name[fi]=Dolphin-näkymä Name[fr]=Vue de Dolphin Name[gl]=Vista de Dolphin @@ -65,7 +64,6 @@ Name[de]=Symbole Name[el]=Εικονίδια Name[en_GB]=Icons Name[es]=Iconos -Name[et]=Ikoonid Name[fi]=Kuvakkeet Name[fr]=Icônes Name[gl]=Iconas @@ -110,7 +108,6 @@ Name[de]=Kompakt Name[el]=Σύμπτυξη Name[en_GB]=Compact Name[es]=Compacto -Name[et]=Kompaktne Name[fi]=Tiivis Name[fr]=Concis Name[gl]=Compacta @@ -154,7 +151,6 @@ Name[de]=Details Name[el]=Λεπτομέρειες Name[en_GB]=Details Name[es]=Detalles -Name[et]=Üksikasjad Name[fi]=Yksityiskohdat Name[fr]=Détails Name[gl]=Detalles |