Commit fd5ce3be authored by Script Kiddy's avatar Script Kiddy
Browse files

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 7fff00f4
......@@ -17,6 +17,7 @@ Name[ca]=Dreceres
Name[de]=Kurzbefehle
Name[es]=Accesos rápidos
Name[eu]=Lasterbideak
Name[fi]=Pikanäppäimet
Name[fr]=Raccourcis
Name[it]=Scorciatoie
Name[nl]=Sneltoetsen
......@@ -34,6 +35,7 @@ Comment[ca]=Configura les dreceres de teclat
Comment[de]=Tastatur-Kurzbefehle einrichten
Comment[es]=Configurar los accesos rápidos de teclado
Comment[eu]=Konfiguratu teklatuko lasterbideak
Comment[fi]=Pikanäppäinasetukset
Comment[fr]=Configurer les raccourcis de clavier
Comment[it]=Configura le scorciatoie della tastiera
Comment[nl]=Sneltoetsen configureren
......
......@@ -5,6 +5,7 @@ Name[ca]=Dreceres
Name[de]=Kurzbefehle
Name[es]=Accesos rápidos
Name[eu]=Lasterbideak
Name[fi]=Pikanäppäimet
Name[fr]=Raccourcis
Name[it]=Scorciatoie
Name[nl]=Sneltoetsen
......@@ -22,6 +23,7 @@ Comment[ca]=Configura les dreceres de teclat
Comment[de]=Tastatur-Kurzbefehle einrichten
Comment[es]=Configurar los accesos rápidos de teclado
Comment[eu]=Konfiguratu teklatuko lasterbideak
Comment[fi]=Pikanäppäinasetukset
Comment[fr]=Configurer les raccourcis de clavier
Comment[it]=Configura le scorciatoie della tastiera
Comment[nl]=Sneltoetsen configureren
......
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