Commit 1cbd78de 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 0bea4e6e
......@@ -22,6 +22,7 @@
"Description[nl]": "Automatisch toegepaste instellingen op GNOME/GTK toepassingen",
"Description[nn]": "Tek automatisk i bruk innstillingane på GNOME-/GTK-program",
"Description[pa]": "ਗਨੋਮ//GTK ਐਪਲੀਕੇਸ਼ਨਾਂ ਲਈ ਸੈਟਿੰਗਾਂ ਆਪਣੇ-ਆਪ ਲਾਗੂ ਹੁੰਦੀਆਂ ਹਨ",
"Description[pl]": "Sama nakłada ustawienia na aplikacje GNOME/GTK",
"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",
......@@ -56,6 +57,7 @@
"Name[nl]": "GNOME/GTK instellingen synchronisatieservice",
"Name[nn]": "GNOME/GTK-oppsettsynkronisering",
"Name[pa]": "ਗਨੋਮ/GTK ਸੈਟਿੰਗਾਂ ਸੈਕਰੋਨਾਈਜ਼ੇਸ਼ਨ ਸੇਵਾ",
"Name[pl]": "Usługa synchronizacji ustawień GNOME/GTK",
"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",
......
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