Commit a125ae22 authored by Script Kiddy's avatar Script Kiddy
Browse files

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"
parent bc0914f7
...@@ -16,6 +16,7 @@ Name[nl]=Balkgrafiek ...@@ -16,6 +16,7 @@ Name[nl]=Balkgrafiek
Name[pt]=Gráfico de Barras Name[pt]=Gráfico de Barras
Name[pt_BR]=Gráfico de barras Name[pt_BR]=Gráfico de barras
Name[ro]=Diagramă de bare Name[ro]=Diagramă de bare
Name[sk]=Stĺpcový graf Name[sk]=Stĺpcový graf
Name[sl]=Stolpični grafikon Name[sl]=Stolpični grafikon
Name[sv]=Stapeldiagram Name[sv]=Stapeldiagram
...@@ -5,6 +5,7 @@ Name[cs]=Vodorovné pruhy ...@@ -5,6 +5,7 @@ Name[cs]=Vodorovné pruhy
Name[en_GB]=Horizontal Bars Name[en_GB]=Horizontal Bars
Name[es]=Barras horizontales Name[es]=Barras horizontales
Name[et]=Rõhttulbad Name[et]=Rõhttulbad
Name[eu]=Barra horizontalak
Name[fi]=Vaakapylväät Name[fi]=Vaakapylväät
Name[fr]=Barres horizontales Name[fr]=Barres horizontales
Name[it]=Barre orizzontali Name[it]=Barre orizzontali
...@@ -13,6 +14,7 @@ Name[nl]=Horizontale balken ...@@ -13,6 +14,7 @@ Name[nl]=Horizontale balken
Name[pt]=Barras Horizontais Name[pt]=Barras Horizontais
Name[pt_BR]=Barras horizontais Name[pt_BR]=Barras horizontais
Name[ro]=Bare orizontale Name[ro]=Bare orizontale
Name[ru]=Горизонтальные столбцы
Name[sk]=Vodorovné pruhy Name[sk]=Vodorovné pruhy
Name[sl]=Vodoravni stolpci Name[sl]=Vodoravni stolpci
Name[sv]=Horisontella staplar Name[sv]=Horisontella staplar
...@@ -16,6 +16,7 @@ Name[nl]=Lijngrafiek ...@@ -16,6 +16,7 @@ Name[nl]=Lijngrafiek
Name[pt]=Gráfico de Linhas Name[pt]=Gráfico de Linhas
Name[pt_BR]=Gráfico de linhas Name[pt_BR]=Gráfico de linhas
Name[ro]=Diagramă liniară Name[ro]=Diagramă liniară
Name[sk]=Čiarový graf Name[sk]=Čiarový graf
Name[sl]=Črtni grafikon Name[sl]=Črtni grafikon
Name[sv]=Linjediagram Name[sv]=Linjediagram
...@@ -16,6 +16,7 @@ Name[nl]=Taartgrafiek ...@@ -16,6 +16,7 @@ Name[nl]=Taartgrafiek
Name[pt]=Gráfico Circular Name[pt]=Gráfico Circular
Name[pt_BR]=Gráfico de setores Name[pt_BR]=Gráfico de setores
Name[ro]=Diagramă circulară Name[ro]=Diagramă circulară
Name[ru]=Круговая диаграмма
Name[sk]=Koláčový graf Name[sk]=Koláčový graf
Name[sl]=Krožni grafikon Name[sl]=Krožni grafikon
Name[sv]=Cirkeldiagram Name[sv]=Cirkeldiagram
...@@ -16,6 +16,7 @@ Name[nl]=Alleen tekst ...@@ -16,6 +16,7 @@ Name[nl]=Alleen tekst
Name[pt]=Apenas o Texto Name[pt]=Apenas o Texto
Name[pt_BR]=Apenas texto Name[pt_BR]=Apenas texto
Name[ro]=Numai text Name[ro]=Numai text
Name[ru]=Только текст
Name[sk]=Iba text Name[sk]=Iba text
Name[sl]=Samo besedilo Name[sl]=Samo besedilo
Name[sv]=Enbart text Name[sv]=Enbart text
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
"Name[pt]": "Marco Martin", "Name[pt]": "Marco Martin",
"Name[pt_BR]": "Marco Martin", "Name[pt_BR]": "Marco Martin",
"Name[ro]": "Marco Martin", "Name[ro]": "Marco Martin",
"Name[ru]": "Marco Martin",
"Name[sk]": "Marco Martin", "Name[sk]": "Marco Martin",
"Name[sl]": "Marco Martin", "Name[sl]": "Marco Martin",
"Name[sv]": "Marco Martin", "Name[sv]": "Marco Martin",
...@@ -46,6 +47,7 @@ ...@@ -46,6 +47,7 @@
"Name[pt]": "Aaron Seigo", "Name[pt]": "Aaron Seigo",
"Name[pt_BR]": "Aaron Seigo", "Name[pt_BR]": "Aaron Seigo",
"Name[ro]": "Aaron Seigo", "Name[ro]": "Aaron Seigo",
"Name[ru]": "Aaron Seigo",
"Name[sk]": "Aaron Seigo", "Name[sk]": "Aaron Seigo",
"Name[sl]": "Aaron Seigo", "Name[sl]": "Aaron Seigo",
"Name[sv]": "Aaron Seigo", "Name[sv]": "Aaron Seigo",
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment