From 0daae5336714c2124171ca89415eb8bf6098519d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 24 Apr 2015 09:52:38 +0000 Subject: [PATCH] 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/dolphinpart.desktop | 3 +++ src/org.kde.dolphin.desktop | 2 ++ src/settings/kcm/kcmdolphingeneral.desktop | 3 +++ src/settings/kcm/kcmdolphinnavigation.desktop | 4 ++++ src/settings/kcm/kcmdolphinservices.desktop | 2 ++ src/settings/kcm/kcmdolphinviewmodes.desktop | 4 ++++ src/views/versioncontrol/fileviewversioncontrolplugin.desktop | 1 + 7 files changed, 19 insertions(+) diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop index 7fb47c3d2..52412b9b9 100644 --- a/src/dolphinpart.desktop +++ b/src/dolphinpart.desktop @@ -11,6 +11,7 @@ Name[gl]=Vista de Dolphin Name[id]=Tampilan Dolphin Name[it]=Vista di Dolphin Name[nl]=Dolphin-weergave +Name[nn]=Dolphin-vising Name[pl]=Widok Dolphina Name[pt]=Área do Dolphin Name[pt_BR]=Visualização do Dolphin @@ -49,6 +50,7 @@ Name[gl]=Iconas Name[id]=Ikon Name[it]=Icone Name[nl]=Pictogrammen +Name[nn]=Ikon Name[pl]=Ikony Name[pt]=Ícones Name[pt_BR]=Ícones @@ -107,6 +109,7 @@ Name[gl]=Detalles Name[id]=Detail Name[it]=Dettagli Name[nl]=Details +Name[nn]=Detaljar Name[pl]=Szczegóły Name[pt]=Detalhes Name[pt_BR]=Detalhes diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index 81bf729c6..2193f9533 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -10,6 +10,7 @@ Name[gl]=Dolphin Name[id]=Dolphin Name[it]=Dolphin Name[nl]=Dolphin +Name[nn]=Dolphin Name[pl]=Dolphin Name[pt]=Dolphin Name[pt_BR]=Dolphin @@ -39,6 +40,7 @@ GenericName[gl]=Xestor de ficheiros GenericName[id]=Manajer Berkas GenericName[it]=Gestore dei file GenericName[nl]=Bestandsbeheerder +GenericName[nn]=Filhandsamar GenericName[pl]=Zarządzanie plikami GenericName[pt]=Gestor de Ficheiros GenericName[pt_BR]=Gerenciador de arquivos 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 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 diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop index db259c356..d81785dd8 100644 --- a/src/settings/kcm/kcmdolphinservices.desktop +++ b/src/settings/kcm/kcmdolphinservices.desktop @@ -68,6 +68,7 @@ Comment[gl]=Configurar servizos de xestores de ficheiros. Comment[id]=Konfigurasi layanan manajer berkas Comment[it]=Configura i servizi del gestore dei file Comment[nl]=Bestandsbeheerderservices configureren +Comment[nn]=Set opp tenester i filhandsamaren Comment[pl]=Ustawienia usług zarządzania plikami Comment[pt]=Configurar os serviços do gestor de ficheiros Comment[pt_BR]=Configura os serviços do gerenciador de arquivos @@ -92,6 +93,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 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 diff --git a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop index 8e73788ce..eabf6e467 100644 --- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop +++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop @@ -12,6 +12,7 @@ Comment[gl]=Complemento de control de versión para vistas de ficheiros. Comment[id]=Plugin Kontrol Versi untuk Tampilan Berkas Comment[it]=Estensione di controllo delle versioni per le viste dei file Comment[nl]=Plugin voor versiecontrole op bestandoverzichten +Comment[nn]=Versjonskontroll-tillegg for filvisingar Comment[pl]=Wtyczka systemu zarządzania wersjami dla widoku plików Comment[pt]='Plugin' de Controlo de Versões para as Áreas de Ficheiros Comment[pt_BR]=Extensão de controle de versões para as visualizações de arquivos -- 2.47.3