diff options
| author | l10n daemon script <[email protected]> | 2015-11-30 10:26:25 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-11-30 10:26:25 +0000 |
| commit | d3c9d3c31f4caa685e4ea7f909f88cb3dc21aafb (patch) | |
| tree | deed68addb9d84edd3450a6d34102b222db13b1c /src/settings/kcm/kcmdolphinviewmodes.desktop | |
| parent | 090f3e90ea4ce43c6d5e90c7b82c13a52222c72c (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/settings/kcm/kcmdolphinviewmodes.desktop')
| -rw-r--r-- | src/settings/kcm/kcmdolphinviewmodes.desktop | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop index a07a2a406..9e273adc8 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.desktop +++ b/src/settings/kcm/kcmdolphinviewmodes.desktop @@ -2,7 +2,6 @@ Name=Dolphin View Modes Name[ca]=Modes de vista del Dolphin Name[ca@valencia]=Modes de vista del Dolphin Name[cs]=Režimy pohledů Dolphinu -Name[da]=Dolphins visningstilstande Name[de]=Dolphin-Ansichtsmodi Name[el]=Dolphin Λειτουργίες Προβολής Name[en_GB]=Dolphin View Modes @@ -41,7 +40,6 @@ Comment=This service allows configuration of the Dolphin view modes. Comment[ca]=Aquest servei permet la configuració dels modes de vista del Dolphin. Comment[ca@valencia]=Este servei permet la configuració dels modes de vista del Dolphin. Comment[cs]=Tato služba umožňuje nastavení režimů pohledu Dolphinu. -Comment[da]=Denne tjeneste muliggør konfiguration af Dolphins visningstilstande. Comment[de]=Mit diesem Dienst können Dolphin-Ansichtsmodi eingerichtet werden. Comment[el]=Η υπηρεσία αυτή επιτρέπει τη διαμόρφωση των λειτουργιών προβολής του Dolphin Comment[en_GB]=This service allows configuration of the Dolphin view modes. @@ -89,7 +87,6 @@ Name=View Modes Name[ca]=Modes de vista Name[ca@valencia]=Modes de vista Name[cs]=Režimy pohledu -Name[da]=Visningstilstande Name[de]=Ansichts-Modi Name[el]=Λειτουργίες Προβολής Name[en_GB]=View Modes @@ -129,7 +126,6 @@ Comment=Configure file manager view modes Comment[ca]=Configura els modes de vista del gestor de fitxers Comment[ca@valencia]=Configura els modes de vista del gestor de fitxers Comment[cs]=Nastavení režimů pohledu správce souborů -Comment[da]=Indstil filhåndteringens visningstilstande Comment[de]=Dateiverwaltungs-Ansichten einrichten Comment[el]=Διαμόρφωση των λειτουργιών προβολής του διαχειριστή αρχείων Comment[en_GB]=Configure file manager view modes @@ -168,7 +164,6 @@ X-KDE-Keywords=file manager X-KDE-Keywords[ca]=gestor de fitxers X-KDE-Keywords[ca@valencia]=gestor de fitxers X-KDE-Keywords[cs]=správce souborů -X-KDE-Keywords[da]=filhåndtering X-KDE-Keywords[de]=Dateiverwaltung X-KDE-Keywords[el]=διαχειριστής αρχείων X-KDE-Keywords[en_GB]=file manager |