Commit f87cb29c 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 9463bdce
......@@ -14,7 +14,6 @@ Name[fi]=Emoji-valitsin
Name[fr]=Sélecteur d'Emoji
Name[gl]=Selector de cariñas
Name[hu]=Emodzsiválasztó
Name[ia]=Selector de Emoji
Name[id]=Pemilih Emoji
Name[it]=Selettore di emoji
Name[ko]=에모지 선택기
......
......@@ -60,7 +60,6 @@ Keywords[fr]=Pavé tactile
Keywords[gl]=Área táctil
Keywords[he]=לוח מגע
Keywords[hu]=Érintőtábla
Keywords[ia]=Touchpad
Keywords[id]=Touchpad
Keywords[is]=Snertiplatti
Keywords[it]=Touchpad
......@@ -105,7 +104,6 @@ Name[fr]=Pavé tactile
Name[gl]=Área táctil
Name[he]=לוח מגע
Name[hu]=Érintőtábla
Name[ia]=Touchpad
Name[id]=Touchpad
Name[is]=Snertiplatti
Name[it]=Touchpad
......
......@@ -31,7 +31,6 @@ Name[fr]=Pavé tactile
Name[gl]=Área táctil
Name[he]=לוח מגע
Name[hu]=Érintőtábla
Name[ia]=Touchpad
Name[id]=Touchpad
Name[is]=Snertiplatti
Name[it]=Touchpad
......
......@@ -17,7 +17,6 @@ Name[fr]=Pavé tactile
Name[gl]=Área táctil
Name[he]=לוח מגע
Name[hu]=Érintőtábla
Name[ia]=Touchpad
Name[id]=Touchpad
Name[is]=Snertiplatti
Name[it]=Touchpad
......@@ -63,7 +62,6 @@ Comment[fr]=Pavé tactile
Comment[gl]=Área táctil
Comment[he]=לוח מגע
Comment[hu]=Érintőtábla
Comment[ia]=Touchpad
Comment[id]=Touchpad
Comment[is]=Snertiplatti
Comment[it]=Touchpad
......
......@@ -24,7 +24,6 @@ Name[fr]=Pavé tactile
Name[gl]=Área táctil
Name[he]=לוח מגע
Name[hu]=Érintőtábla
Name[ia]=Touchpad
Name[id]=Touchpad
Name[is]=Snertiplatti
Name[it]=Touchpad
......
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