diff options
| author | l10n daemon script <[email protected]> | 2018-04-30 05:25:52 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2018-04-30 05:25:52 +0200 |
| commit | 90e1cc9c03aed8299583f7714e05809d32d73357 (patch) | |
| tree | 9f2f8e770f00448c7db8047c064a617fb9065250 /src/settings/kcm/kcmdolphingeneral.desktop | |
| parent | ded82601ef42f86a2437696edc1d2c77a5fc2362 (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/kcmdolphingeneral.desktop')
| -rw-r--r-- | src/settings/kcm/kcmdolphingeneral.desktop | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop index 9075820d0..532f2f7ad 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -9,6 +9,7 @@ Name[el]=Dolphin Γενικά Name[en_GB]=Dolphin General Name[es]=Preferencias generales de Dolphin Name[et]=Dolphin üldiselt +Name[eu]=Dolphin orokorra Name[fi]=Dolphin – yleiset Name[fr]=Dolphin général Name[gl]=Xerais de Dolphin @@ -51,6 +52,7 @@ Comment[el]=Η υπηρεσία αυτή επιτρέπει τη διαμόρφ� Comment[en_GB]=This service allows configuration of general Dolphin settings. Comment[es]=Este servicio permite configurar las preferencias generales de Dolphin. Comment[et]=See teenus võimaldab seadistada Dolphini üldisi seadistusi. +Comment[eu]=Zerbitzu honek Dolphinen ezarpen orokorrak konfiguratzeko balio du. Comment[fi]=Tällä palvelulla voi muokata Dolphinin yleisasetuksia. Comment[fr]=Ce service permet de configurer les paramètres généraux de Dolphin. Comment[gl]=Este servizo permite configurar opcións xerais de Dolphin. @@ -105,6 +107,7 @@ Name[el]=Γενικά Name[en_GB]=General Name[es]=General Name[et]=Üldine +Name[eu]=Orokorra Name[fi]=Yleiset Name[fr]=Général Name[gl]=Xerais @@ -147,6 +150,7 @@ Comment[el]=Διαμόρφωση γενικών ρυθμίσεων διαχεί� Comment[en_GB]=Configure general file manager settings Comment[es]=Configurar las preferencias generales del gestor de archivos Comment[et]=Failihalduri üldine seadistamine +Comment[eu]=Konfiguratu fitxategi-kudeatzailearen ezarpen orokorrak Comment[fi]=Tiedostonhallinnan yleisasetukset Comment[fr]=Configuration des paramètres généraux du gestionnaire de fichiers Comment[gl]=Configurar opcións xerais de xestores de ficheiros. @@ -189,6 +193,7 @@ 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[eu]=Fitxategi-kudeatzailea X-KDE-Keywords[fi]=tiedostonhallinta X-KDE-Keywords[fr]=gestionnaire de fichiers X-KDE-Keywords[gl]=xestor de ficheiros |