diff options
| author | l10n daemon script <[email protected]> | 2016-08-19 09:28:24 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2016-08-19 09:28:24 +0000 |
| commit | 50e366431dd8533f87cd10289422dc470f128541 (patch) | |
| tree | b38e6d3a2ad7862e40b19ba4785254253fba8b57 /src/settings/kcm/kcmdolphinservices.desktop | |
| parent | 8529547344cf940e9e51e74e8711d41f008add03 (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/kcmdolphinservices.desktop')
| -rw-r--r-- | src/settings/kcm/kcmdolphinservices.desktop | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop index 97f7cf2b0..3b27f9540 100644 --- a/src/settings/kcm/kcmdolphinservices.desktop +++ b/src/settings/kcm/kcmdolphinservices.desktop @@ -9,6 +9,7 @@ Name[de]=Dolphin-Dienste Name[el]=Dolphin Υπηρεσίες Name[en_GB]=Dolphin Services Name[es]=Servicios de Dolphin +Name[et]=Dolphini teenused Name[fi]=Dolphin – palvelut Name[fr]=Services de Dolphin Name[gl]=Servizos de Dolphin @@ -61,6 +62,7 @@ Name[de]=KDE-Dienste Name[el]=Υπηρεσίες Name[en_GB]=Services Name[es]=Servicios +Name[et]=Teenused Name[fi]=Palvelut Name[fr]=Services Name[gl]=Servizos @@ -102,6 +104,7 @@ Comment[de]=Dateiverwaltungs-Dienste einrichten Comment[el]=Διαμόρφωση υπηρεσιών του διαχειριστή αρχείων Comment[en_GB]=Configure file manager services Comment[es]=Configurar los servicios del gestor de archivos +Comment[et]=Failihalduri teenuste seadistamine Comment[fi]=Tiedostonhallinnan palveluasetukset Comment[fr]=Configuration des services du gestionnaire de fichiers Comment[gl]=Configurar servizos de xestores de ficheiros. @@ -143,6 +146,7 @@ X-KDE-Keywords[de]=Dateiverwaltung X-KDE-Keywords[el]=διαχειριστής αρχείων X-KDE-Keywords[en_GB]=file manager X-KDE-Keywords[es]=gestor de archivos +X-KDE-Keywords[et]=failihaldur X-KDE-Keywords[fi]=tiedostonhallinta X-KDE-Keywords[fr]=gestionnaire de fichiers X-KDE-Keywords[gl]=xestor de ficheiros |