Commit 475af42e 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 b437a6cb
......@@ -11,7 +11,7 @@ Name[es]=Cambiador de ventanas de KWin
Name[eu]=KWin leiho-aldatzailea
Name[fi]=KWin-ikkunanvalitsin
Name[fr]=Sélecteur de fenêtres de KWin
Name[gl]=Selector de xanela do KWin
Name[gl]=Selector de xanela de KWin
Name[hu]=KWin ablakváltó
Name[ia]=Commutator de fenestra de KWin
Name[it]=Scambiafinestre di KWin
......
......@@ -17,7 +17,7 @@ Comment[eu]=KWin scripta
Comment[fi]=KWin-skripti
Comment[fr]=Script KWin
Comment[ga]=Script KWin
Comment[gl]=Script do KWin
Comment[gl]=Script de KWin
Comment[he]=תוספים של KWin
Comment[hu]=KWin parancsfájl
Comment[ia]=Script de kwin
......
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