diff options
| author | l10n daemon script <[email protected]> | 2015-04-24 09:52:38 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-04-24 09:52:38 +0000 |
| commit | 0daae5336714c2124171ca89415eb8bf6098519d (patch) | |
| tree | 70ecc703522ecc885f3c7b029674e33727581dcf /src/settings/kcm/kcmdolphingeneral.desktop | |
| parent | 975d0d7bfa2994fd5d13f40a70ea0851c702674f (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 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop index 6c4ed4ddf..c57bcf38d 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -9,6 +9,7 @@ Name[gl]=Xerais de Dolphin Name[id]=Dolphin Umum Name[it]=Impostazioni generali di Dolphin Name[nl]=Dolphin algemeen +Name[nn]=Generelt for Dolphin Name[pl]=Ustawienia Dolphina Name[pt]=Geral do Dolphin Name[pt_BR]=Geral do Dolphin @@ -69,6 +70,7 @@ Name[gl]=Xerais Name[id]=Umum Name[it]=Generale Name[nl]=Algemeen +Name[nn]=Generelt Name[pl]=Ogólne Name[pt]=Geral Name[pt_BR]=Geral @@ -117,6 +119,7 @@ X-KDE-Keywords[gl]=xestor de ficheiros X-KDE-Keywords[id]=manajer berkas X-KDE-Keywords[it]=gestore dei file X-KDE-Keywords[nl]=bestandsbeheerder +X-KDE-Keywords[nn]=filhandsamar X-KDE-Keywords[pl]=zarządzanie plikami X-KDE-Keywords[pt]=gestor de ficheiros X-KDE-Keywords[pt_BR]=gerenciador de arquivos |