Commit 65187087 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 7af241ba
......@@ -21,6 +21,7 @@
"Description[nn]": "Tek automatisk i bruk innstillingane på GNOME-/GTK-program",
"Description[pt]": "Aplica automaticamente as configurações nas aplicações do GNOME/GTK",
"Description[pt_BR]": "Aplica automaticamente as configurações aos aplicativos GNOME/GTK",
"Description[ro]": "Aplică automat configurări pentru aplicații GNOME/GTK",
"Description[ru]": "Автоматическое применение изменений для приложений GNOME/GTK",
"Description[sk]": "Automaticky použije nastavenia pre GNOME/GTK aplikácie",
"Description[sl]": "Samodejno uveljavi nastavitve za vse programe GNOME/GTK",
......@@ -51,6 +52,7 @@
"Name[nn]": "GNOME/GTK-oppsettsynkronisering",
"Name[pt]": "Serviço de Sincronização das Configurações do GNOME/GTK",
"Name[pt_BR]": "Configuração do serviço de sincronização GNOME/GTK",
"Name[ro]": "Serviciu de sincronizare configurări GNOME/GTK",
"Name[ru]": "Служба синхронизации параметров GNOME/GTK",
"Name[sk]": "Služba na synchronizáciu nastavení GNOME/GTK",
"Name[sl]": "Nastavitve storitve sinhronizacije GNOME/GTK",
......
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