Commit 87e8bdbb authored by Script Kiddy's avatar Script Kiddy

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 0d7f00c6
......@@ -29,6 +29,7 @@ Name[mr]=के-एल्जिब्रा मोबाईल
Name[nb]=KAlgebra mobil
Name[nds]=KAlgebra för Mobilreedschappen
Name[nl]=KAlgebra-mobiel
Name[nn]=KAlgebra mobil
Name[pa]=ਕੇ-ਐਲਜਬਰਾ ਮੋਬਾਇਲ
Name[pl]=Mobilna KAlgebra
Name[pt]=KAlgebra Móvel
......@@ -74,6 +75,7 @@ GenericName[mr]=पाकिट आलेख गणकयंत्र
GenericName[nb]=Grafikk-lommekalkulator
GenericName[nds]=Taschenreekner för Diagrammen
GenericName[nl]=Zakrekenmachine met grafieken
GenericName[nn]=Grafisk lommereknar
GenericName[pa]=ਪਾਕਟ ਗਰਾਫ਼ ਕੈਲਕੂਲੇਟਰ
GenericName[pl]=Kieszonkowy kalkulator graficzny
GenericName[pt]=Calculadora Gráfica Portátil
......
......@@ -95,7 +95,7 @@ Comment[mr]=गणकयंत्र
Comment[nb]=En kalkulator
Comment[nds]=En Rekenprogramm
Comment[nl]=Een rekenmachine
Comment[nn]=Tekstbasert kalkulator
Comment[nn]=Kalkulator
Comment[pa]=ਇੱਕ ਕੈਲਕੂਲੇਟਰ
Comment[pl]=Kalkulator
Comment[pt]=Uma Calculadora
......
......@@ -26,6 +26,7 @@ Name[lt]=2D grafikai
Name[nb]=2D-plott
Name[nds]=2D-Plots
Name[nl]=2d-plots
Name[nn]=2D-plott
Name[pa]=2ਡੀ ਪਲਾਟ
Name[pl]=Wykresy 2D
Name[pt]=Gráficos 2D
......
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