From 0daae5336714c2124171ca89415eb8bf6098519d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 24 Apr 2015 09:52:38 +0000 Subject: 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" --- src/settings/kcm/kcmdolphinviewmodes.desktop | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/settings/kcm/kcmdolphinviewmodes.desktop') diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop index 0dc7cdf34..65c6a43f9 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.desktop +++ b/src/settings/kcm/kcmdolphinviewmodes.desktop @@ -9,6 +9,7 @@ Name[gl]=Modos de vista de Dolphin Name[id]=Mode Tampilan Dolphin Name[it]=Viste di Dolphin Name[nl]=Dolphin-weergavemodussen +Name[nn]=Dolphin-visingar Name[pl]=Tryby widoku Dolphina Name[pt]=Modos de Visualização do Dolphin Name[pt_BR]=Modos de exibição do Dolphin @@ -68,6 +69,7 @@ Name[gl]=Modos de vista Name[id]=Mode Tampilan Name[it]=Viste Name[nl]=Weergavemodi +Name[nn]=Visingsmodusar Name[pl]=Tryby widoku Name[pt]=Modos de Visualização Name[pt_BR]=Modos de exibição @@ -92,6 +94,7 @@ Comment[gl]=Configurar os modos de vista do xestor de ficheiros. Comment[id]=Konfigurasi mode tampilan manajer berkas Comment[it]=Configura le viste del gestore dei file Comment[nl]=Bestandsbeheerderweergavemodussen configureren +Comment[nn]=Set opp visingsmodusane i filhandsamaren Comment[pl]=Ustawienia trybów widoku zarządzania plikami Comment[pt]=Configurar os modos de visualização do gestor de ficheiros Comment[pt_BR]=Configura os modos de exibiçã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 -- cgit v1.3.1