From 102664e1e8081e99a228d399aa0c0296f5db0633 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 26 Jan 2016 10:23:02 +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" --- .../messageviewergrantleetheme/themes/example/header.desktop | 2 ++ .../themes/example_fancy/header.desktop | 2 ++ .../messageviewer_defaultgrantleeheaderstyleplugin.json | 3 +++ 3 files changed, 7 insertions(+) diff --git a/examples/messageviewergrantleetheme/themes/example/header.desktop b/examples/messageviewergrantleetheme/themes/example/header.desktop index 1f864473..0f5d3223 100644 --- a/examples/messageviewergrantleetheme/themes/example/header.desktop +++ b/examples/messageviewergrantleetheme/themes/example/header.desktop @@ -7,6 +7,7 @@ Name[en_GB]=Example Name[es]=Ejemplo Name[fi]=Esimerkki Name[gl]=Exemplo +Name[it]=Esempio Name[nb]=Eksempel Name[nl]=Voorbeeld Name[pl]=Przykład @@ -30,6 +31,7 @@ Description[en_GB]=Example theme for header. Description[es]=Tema de ejemplo para encabezado. Description[fi]=Esimerkkiotsaketeema. Description[gl]=Tema de exemplo para a cabeceira. +Description[it]=Tema di esempio per l'intestazione. Description[nb]=Eksempel tema for hodelinje. Description[nl]=Voorbeeld van thema voor kop. Description[pl]=Przykładowy wystrój nagłówka. diff --git a/examples/messageviewergrantleetheme/themes/example_fancy/header.desktop b/examples/messageviewergrantleetheme/themes/example_fancy/header.desktop index e00875bf..557174ab 100644 --- a/examples/messageviewergrantleetheme/themes/example_fancy/header.desktop +++ b/examples/messageviewergrantleetheme/themes/example_fancy/header.desktop @@ -7,6 +7,7 @@ Name[en_GB]=Example fancy Name[es]=Ejemplo adornado Name[fi]=Tyylikäs esimerkki Name[gl]=Exemplo elegante +Name[it]=Esempio elegante Name[nb]=Eksempel flott Name[nl]=Voorbeeld van elegant Name[pl]=Przykładowy elegancki @@ -30,6 +31,7 @@ Description[en_GB]=Create fancy theme with grantlee. Description[es]=Crear tema adornado con grantlee. Description[fi]=Luo tyylikäs teema grantleeta käyttäen. Description[gl]=Crear un tema elegante con Grantlee. +Description[it]=Crea un tema elegante con grantlee. Description[nb]=Opprett et flott tema med grantlee. Description[nl]=Elegant thema maken met grantlee. Description[nn]=Skap ditt eige «grantlee»-tema. diff --git a/plugins/messageviewerheaderplugins/defaultgrantleeheaderstyleplugin/messageviewer_defaultgrantleeheaderstyleplugin.json b/plugins/messageviewerheaderplugins/defaultgrantleeheaderstyleplugin/messageviewer_defaultgrantleeheaderstyleplugin.json index 0f00cc90..ac41956f 100644 --- a/plugins/messageviewerheaderplugins/defaultgrantleeheaderstyleplugin/messageviewer_defaultgrantleeheaderstyleplugin.json +++ b/plugins/messageviewerheaderplugins/defaultgrantleeheaderstyleplugin/messageviewer_defaultgrantleeheaderstyleplugin.json @@ -2,8 +2,11 @@ "KPlugin": { "Name": "Default Grantlee Header Style", "Name[ca]": "Estil de capçalera «Grantlee» predeterminat", + "Name[es]": "Estilo de encabezado predeterminado Grantlee", "Name[fi]": "Grantlee-oletusotsaketyyli", "Name[nl]": "Stijl met standaard Grantlee header", + "Name[pt]": "Estilo de Cabeçalho Predefinido do Grantlee", + "Name[pt_BR]": "Estilo de cabeçalho Grantlee padrão", "Name[uk]": "Типовий стиль заголовків Grantlee", "Name[x-test]": "xxDefault Grantlee Header Stylexx", "ServiceTypes": [ -- GitLab