Commit bbf4ee26 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 8fa8ca1d
......@@ -93,6 +93,7 @@ Name[ca@valencia]=Honeycomb
Name[de]=Honigwabe
Name[es]=Panal
Name[gl]=Tarro de mel
Name[id]=Honeycomb
Name[it]=Alveare
Name[nl]=Honingraat
Name[pt]=Favo de Mel
......
......@@ -94,6 +94,7 @@ Name[de]=Norwegen
Name[es]=Noruega
Name[fr]=Norvège
Name[gl]=Noruega
Name[id]=Norway
Name[it]=Norvegia
Name[nl]=Noorwegen
Name[pt]=Noruega
......
......@@ -92,6 +92,7 @@ Name[ca@valencia]=Obsidian Coast
Name[de]=Obsidian-Küste
Name[es]=Costa de obsidiana
Name[gl]=Costa obsidiana
Name[id]=Obsidian Coast
Name[it]=Costa dell'ossidiana
Name[nl]=Obsidian Coast
Name[pt]=Costa Obsidiana
......
......@@ -111,6 +111,7 @@ Name[de]=Oxygen
Name[es]=Oxígeno
Name[fr]=Oxygen
Name[gl]=Osíxeno
Name[id]=Oxygen
Name[it]=Oxygen
Name[nl]=Oxygen
Name[pt]=Oxygen
......
......@@ -106,6 +106,7 @@ Name[ca@valencia]=Oxygen Cold
Name[de]=Oxygen-Kalt
Name[es]=Oxígeno frío
Name[gl]=Osíxeno frío
Name[id]=Oxygen Cold
Name[it]=Oxygen freddo
Name[nl]=Oxygen Cold
Name[pt]=Oxygen Frio
......
......@@ -92,6 +92,7 @@ Name[ca@valencia]=Steel
Name[de]=Stahl
Name[es]=Acero
Name[gl]=Ferro
Name[id]=Steel
Name[it]=Acciaio
Name[nl]=Steel
Name[pt]=Aço
......
......@@ -91,6 +91,7 @@ Name[ca@valencia]=Wonton Soup
Name[de]=Wonton-Suppe
Name[es]=Sopa wantán
Name[gl]=Sopa de Wonton
Name[id]=Wonton Soup
Name[it]=Zuppa di Wonton
Name[nl]=Wonton Soup
Name[pt]=Sopa Wonton
......
......@@ -93,6 +93,7 @@ Name[ca@valencia]=Zion
Name[de]=Zion
Name[es]=Sion
Name[gl]=Sion
Name[id]=Zion
Name[it]=Sion
Name[nl]=Zion
Name[pt]=Zion
......
......@@ -93,6 +93,7 @@ Name[ca@valencia]=Zion (invertit)
Name[de]=Zion (Invertiert)
Name[es]=Sion (invertido)
Name[gl]=Sion (invertido)
Name[id]=Zion (Reversed)
Name[it]=Sion (invertito)
Name[nl]=Zion (omgekeerd)
Name[pt]=Zion (Invertido)
......
......@@ -46,7 +46,7 @@ Name[hr]=Zadane aplikacije
Name[hsb]=Standardne aplikacije
Name[hu]=Alapértelmezett alkalmazások
Name[ia]=Applicationes predefinite
Name[id]=Aplikasi Default
Name[id]=Default Applications
Name[is]=Sjálfgefin forrit
Name[it]=Applicazioni predefinite
Name[ja]=デフォルトのアプリケーション
......
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