Commit 88d97c3f 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 411dc860
......@@ -13,7 +13,7 @@ Name[en_GB]=Last Documents Docker
Name[es]=Panel de últimos documentos
Name[gl]=Doca dos últimos documentos
Name[it]=Area di aggancio Ultimi documenti
Name[nl]=Vastzetter van laatste documenten
Name[nl]=Laatste documenten verankering
Name[pl]=Dok ostatnich dokumentów
Name[pt]=Área dos Últimos Documentos
Name[sv]=Dockningsfönster för senaste dokument
......
......@@ -14,7 +14,7 @@ Name[en_GB]=Quick Settings Docker
Name[es]=Panel de ajustes rápidos
Name[gl]=Doca de configuración rápida
Name[it]=Area di aggancio delle impostazioni rapide
Name[nl]=Docker voor snelle instellingen
Name[nl]=Verankering voor snelle instellingen
Name[pl]=Dok szybkich ustawień
Name[pt]=Área de Configuração Rápida
Name[sv]=Dockningspanel med snabbinställningar
......
......@@ -13,7 +13,7 @@ Name[en_GB]=Script Docker
Name[es]=Panel de guiones
Name[gl]=Doca de scripts
Name[it]=Area di aggancio degli script
Name[nl]=Vastzetten van scripts
Name[nl]=Verankering van scripts
Name[pl]=Dok skryptów
Name[pt]=Área de Programas
Name[sv]=Dockningsfönster för skript
......
......@@ -13,7 +13,7 @@ Name[en_GB]=Scripter
Name[es]=Guionador
Name[gl]=Executor de scripts
Name[it]=Scripter
Name[nl]=Scriptschrijver
Name[nl]=Scriptmaker
Name[pl]=Skrypter
Name[pt]=Programador
Name[sv]=Skriptgenerator
......
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