Commit 1bcb66fb 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 6372653a
......@@ -7,6 +7,7 @@ Name[en_GB]=Bar Chart
Name[es]=Gráfico de barras
Name[et]=Tulpdiagramm
Name[eu]=Barra-diagrama
Name[fi]=Pylväskaavio
Name[fr]=Histogramme
Name[it]=Grafico a barre
Name[ko]=막대형 차트
......
......@@ -2,6 +2,7 @@
Name=Horizontal Bars
Name[ca]=Barres horitzontals
Name[es]=Barras horizontales
Name[fi]=Vaakapylväät
Name[fr]=Barres horizontales
Name[nl]=Horizontale balken
Name[pt]=Barras Horizontais
......
......@@ -7,6 +7,7 @@ Name[en_GB]=Line Chart
Name[es]=Gráfico de líneas
Name[et]=Joondiagramm
Name[eu]=Lerro-diagrama
Name[fi]=Viivakaavio
Name[fr]=Diagramme en ligne
Name[it]=Grafico lineare
Name[ko]=꺾은선형 차트
......
......@@ -7,6 +7,7 @@ Name[en_GB]=Pie Chart
Name[es]=Gráfico de tarta
Name[et]=Sektordiagramm
Name[eu]=Diagrama zirkularra
Name[fi]=Piirakkakaavio
Name[fr]=Diagramme en secteur
Name[it]=Grafico a torta
Name[ko]=원형 차트
......
......@@ -7,6 +7,7 @@ Name[en_GB]=Text Only
Name[es]=Solo texto
Name[et]=Ainult tekst
Name[eu]=Testua soilik
Name[fi]=Vain teksti
Name[fr]=Texte seul
Name[it]=Solo testo
Name[ko]=텍스트만
......
......@@ -10,6 +10,7 @@
"Name[es]": "Marco Martin",
"Name[et]": "Marco Martin",
"Name[eu]": "Marco Martin",
"Name[fi]": "Marco Martin",
"Name[fr]": "Marco Martin",
"Name[it]": "Marco Martin",
"Name[ko]": "Marco Martin",
......@@ -32,6 +33,7 @@
"Name[es]": "Aaron Seigo",
"Name[et]": "Aaron Seigo",
"Name[eu]": "Aaron Seigo",
"Name[fi]": "Aaron Seigo",
"Name[fr]": "Aaron Seigo",
"Name[it]": "Aaron Seigo",
"Name[ko]": "Aaron Seigo",
......
......@@ -6,6 +6,7 @@ Name[en_GB]=System monitor Sensor Display Styles
Name[es]=Estilos de visor del sensor del monitor del sistema
Name[et]=Süsteemi jälgija sensori esitusstiilid
Name[eu]=Sistema gainbegiratzeko sentsorea azaltzeko estiloa
Name[fi]=Järjestelmänvalvonnan anturien näyttötyylit
Name[fr]=Styles d'affichage pour le senseur de surveillance du système
Name[it]=Stili di visualizzazione dei sensori di monitoraggio del sistema
Name[ko]=시스템 모니터 센서 표시 스타일
......
......@@ -6,6 +6,7 @@ Name[en_GB]=System monitor Sensor Presets
Name[es]=Ajustes automáticos del sensor del monitor del sistema
Name[et]=Süsteemi jälgija sensori valmisvalikud
Name[eu]=Sistema gainbegiratzeko sentsorearen aurre-zarpenak
Name[fi]=Järjestelmänvalvonnan anturien esiasetukset
Name[fr]=Préréglages du senseur de surveillance du système
Name[it]=Preimpostazioni dei sensori di monitoraggio del sistema
Name[ko]=시스템 모니터 센서 사전 설정
......
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