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/kcmdolphinnavigation.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/kcmdolphinnavigation.desktop')
| -rw-r--r-- | src/settings/kcm/kcmdolphinnavigation.desktop | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop index 146939f85..6bde5f6eb 100644 --- a/src/settings/kcm/kcmdolphinnavigation.desktop +++ b/src/settings/kcm/kcmdolphinnavigation.desktop @@ -9,6 +9,7 @@ Name[gl]=Navegación de Dolphin Name[id]=Navigasi Dolphin Name[it]=Navigazione di Dolphin Name[nl]=Dolphin-navigatie +Name[nn]=Navigasjon i Dolphin Name[pl]=Nawigacja Dolphina Name[pt]=Navegação do Dolphin Name[pt_BR]=Navegação do Dolphin @@ -68,6 +69,7 @@ Name[gl]=Navegación Name[id]=Navigasi Name[it]=Navigazione Name[nl]=Navigatie +Name[nn]=Navigasjon Name[pl]=Nawigacja Name[pt]=Navegação Name[pt_BR]=Navegação @@ -92,6 +94,7 @@ Comment[gl]=Configurar a navegación do xestor de ficheiros. Comment[id]=Konfigurasi navigasi manajer berkas Comment[it]=Configura la navigazione col gestore dei file Comment[nl]=Bestandsbeheerdernavigatie configureren +Comment[nn]=Set opp navigasjonen i filhandsamaren Comment[pl]=Ustawienia nawigacji w zarządzaniu plikami Comment[pt]=Configurar a navegação do gestor de ficheiros Comment[pt_BR]=Configura a navegação do gerenciador de arquivos @@ -116,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 |