Commit a890db0f 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 ec8edb44
......@@ -8,6 +8,7 @@
"Name[de]": "Méven Car",
"Name[en_GB]": "Méven Car",
"Name[es]": "Méven Car",
"Name[et]": "Méven Car",
"Name[eu]": "Méven Car",
"Name[fi]": "Méven Car",
"Name[fr]": "Méven Car",
......@@ -37,6 +38,7 @@
"Description[de]": "Sammelt Ereignisse von Anwendungen, die GtkFileChooser and GtkRecentManager nach der Spezifikation von verwenden.",
"Description[en_GB]": "Collects events from applications that use GtkFileChooser and GtkRecentManager as specified by",
"Description[es]": "Recolecta eventos de aplicaciones que usan GtkFileChooser y GtkRecentManager como se indica en",
"Description[et]": "Sündmuste kogumine rakendustelt, mis kasutavad GtkFileChooser'it ja GtkRecentManager'i, nagu see on määratud spetsifikatsioonis",
"Description[eu]": "GtkFileChooser eta GtkRecentManager erabiltzen duten aplikazioen gertaerak biltzen ditu zehaztu bezala",
"Description[fi]": "Kerää tapahtumat GtkFileChooseria ja GtkRecentManageriä käyttävistä sovelluksista siten kuin määrittää",
"Description[fr]": "Collecte les évènements d'applications utilisant GtkFileChooser et GtkRecentManager tel que spécifié par",
......@@ -67,6 +69,7 @@
"Name[de]": "GTK-Ereignisspion",
"Name[en_GB]": "Gtk Event Spy",
"Name[es]": "Espía de eventos de Gtk",
"Name[et]": "Gtk sündmusevalvur",
"Name[eu]": "Gtk gertaeren espioia",
"Name[fi]": "Gtk-tapahtumavakooja",
"Name[fr]": "Espion d'évènements Gtk",
Supports Markdown
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