Commit 40122131 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 8ca2e01f
......@@ -10,10 +10,13 @@
"Name[ca]": "Menú d'accions del «Google Drive»",
"Name[cs]": "Nabídka činností 'Google Drive'",
"Name[el]": "Μενού ενεργειών 'Google Drive'",
"Name[en_GB]": "'Google Drive' actions menu",
"Name[es]": "Menú de acciones de «Google Drive»",
"Name[fr]": "Menu d'actions « Google Drive »",
"Name[it]": "Menu azioni di «Google Drive»",
"Name[ko]": "'Google 드라이브' 동작 메뉴",
"Name[nl]": "Actiemenu van Google Drive",
"Name[nn]": "«Google Drive»-handlingsmeny",
"Name[pt]": "Menu de acções do 'Google Drive'",
"Name[pt_BR]": "Menu de ação do Google Drive",
"Name[ro]": "Meniu de acțiuni Google Drive",
......
......@@ -4,10 +4,13 @@
"Description[ca@valencia]": "Pàgina de propietats que mostra informació addicional relativa a un element del Google Drive",
"Description[ca]": "Pàgina de propietats que mostra informació addicional relativa a un element del Google Drive",
"Description[el]": "Η σελίδα ιδιοτήτων εμφανίζει πρόσθετες πληροφορίες σχετικά με ένα αντικείμενο του Google Drive",
"Description[en_GB]": "Properties page showing additional information regarding a Google Drive item",
"Description[es]": "Página de propiedades que muestra información adicional sobre el elemento de Google Drive",
"Description[fr]": "Affichage dans la page de propriétés d'informations supplémentaires concernant un élément « Google Drive »",
"Description[it]": "Pagina delle proprietà che mostra informazioni aggiuntive relative a un elemento di Google Drive",
"Description[ko]": "Google 드라이브 항목의 추가 정보를 표시하는 속성 페이지",
"Description[nl]": "Eigenschappenpagina die extra informatie over een Google Drive-item toont",
"Description[nn]": "Eigenskapssida viser tilleggs­informasjon om eit Google Drive-element",
"Description[pt]": "Página de propriedades que mostra informações adicionais respeitantes a um item do Google Drive",
"Description[pt_BR]": "Página de propriedades mostrando informações adicionais relativas ao item do Google Drive",
"Description[ro]": "Pagină de proprietăți arătând informații suplimentare referitoare la un element din Google Drive",
......@@ -26,10 +29,13 @@
"Name[ca]": "Pàgina de propietats del Google Drive",
"Name[cs]": "Stránka vlastností 'Google Drive'",
"Name[el]": "Σελίδα ιδιοτήτων Google Drive",
"Name[en_GB]": "Google Drive Properties Page",
"Name[es]": "Página de propiedades de Google Drive",
"Name[fr]": "Page de propriétés de « Google Drive »",
"Name[it]": "Pagina delle proprietà di Google Drive",
"Name[ko]": "Google 드라이브 속성 페이지",
"Name[nl]": "Pagina van eigenschappen van Google Drive",
"Name[nn]": "Google Drive-eigenskapsside",
"Name[pt]": "Página de Propriedades do Google Drive",
"Name[pt_BR]": "Página de propriedades do Google Drive",
"Name[ro]": "Pagină de proprietăți Google Drive",
......
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