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/kcmdolphinnavigation.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/kcmdolphinnavigation.desktop')
| -rw-r--r-- | src/settings/kcm/kcmdolphinnavigation.desktop | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop index 86266ad06..b969dcb2a 100644 --- a/src/settings/kcm/kcmdolphinnavigation.desktop +++ b/src/settings/kcm/kcmdolphinnavigation.desktop @@ -2,7 +2,6 @@ Name=Dolphin Navigation Name[ca]=Navegació del Dolphin Name[ca@valencia]=Navegació del Dolphin Name[cs]=Navigace Dolphinu -Name[da]=Dolphin-navigation Name[de]=Dolphin-Navigation Name[el]=Dolphin Πλοήγηση Name[en_GB]=Dolphin Navigation @@ -42,7 +41,6 @@ Comment=This service allows configuration of the Dolphin navigation. Comment[ca]=Aquest servei permet la configuració de la navegació del Dolphin. Comment[ca@valencia]=Este servei permet la configuració de la navegació del Dolphin. Comment[cs]=Tato služba umožňuje nastavení navigace v Dolphinu. -Comment[da]=Denne tjeneste muliggør konfiguration af Dolphin-navigation. Comment[de]=Mit diesem Dienst kann die Navigation für Dolphin eingerichtet werden. Comment[el]=Η υπηρεσία αυτή επιτρέπει τη διαμόρφωση της πλοήγησης του Dolphin Comment[en_GB]=This service allows configuration of the Dolphin navigation. @@ -90,7 +88,6 @@ Name=Navigation Name[ca]=Navegació Name[ca@valencia]=Navegació Name[cs]=Navigace -Name[da]=Navigation Name[de]=Navigation Name[el]=Πλοήγηση Name[en_GB]=Navigation @@ -130,7 +127,6 @@ Comment=Configure file manager navigation Comment[ca]=Configura la navegació del gestor de fitxers Comment[ca@valencia]=Configura la navegació del gestor de fitxers Comment[cs]=Nastavení navigace správce souborů -Comment[da]=Indstil navigation i filhåndtering Comment[de]=Einstellungen zur Navigation mit der Dateiverwaltung Comment[el]=Διαμόρφωση πλοήγησης του διαχειριστή αρχείων Comment[en_GB]=Configure file manager navigation @@ -169,7 +165,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 |