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"
This commit is contained in:
parent
2e5a62cc66
commit
f31dc37481
2 changed files with 10 additions and 1 deletions
|
@ -6,6 +6,9 @@
|
|||
"Name": "Aditya Mehra",
|
||||
"Name[ca]": "Aditya Mehra",
|
||||
"Name[cs]": "Aditya Mehra",
|
||||
"Name[et]": "Aditya Mehra",
|
||||
"Name[fr]": "Aditya Mehra",
|
||||
"Name[it]": "Aditya Mehra",
|
||||
"Name[lt]": "Aditya Mehra",
|
||||
"Name[nl]": "Aditya Mehra",
|
||||
"Name[pt]": "Aditya Mehra",
|
||||
|
@ -17,6 +20,9 @@
|
|||
"Description": "Bigscreen Plugin",
|
||||
"Description[ca]": "Connector de la Bigscreen",
|
||||
"Description[cs]": "Modul pro velkou obrazovku",
|
||||
"Description[et]": "Suurekraani plugin",
|
||||
"Description[fr]": "Module externe « Bigscreen »",
|
||||
"Description[it]": "Estensione Bigscreen",
|
||||
"Description[lt]": "Bigscreen papildinys",
|
||||
"Description[nl]": "Bigscreen plug-in",
|
||||
"Description[pt]": "'Plugin' de Ecrã Grande",
|
||||
|
@ -29,6 +35,9 @@
|
|||
"Name": "Bigscreen",
|
||||
"Name[ca]": "Bigscreen",
|
||||
"Name[cs]": "Velká obrazovka",
|
||||
"Name[et]": "Suurekraan",
|
||||
"Name[fr]": "Bigscreen",
|
||||
"Name[it]": "Bigscreen",
|
||||
"Name[lt]": "Bigscreen",
|
||||
"Name[nl]": "Bigscreen",
|
||||
"Name[pt]": "Ecrã grande",
|
||||
|
|
|
@ -53,7 +53,7 @@
|
|||
"Description[et]": "Oma mobiilseadme kasutamine asjadele osutamiseks ekraanil",
|
||||
"Description[eu]": "Erabili zure gailu mugikorra pantailako gauzak seinalatzeko",
|
||||
"Description[fi]": "Osoita mobiililaitteellasi asioita näytöllä",
|
||||
"Description[fr]": "Utilisez votre appareil mobile pour montrer des choses à l'écran",
|
||||
"Description[fr]": "Utilisez votre appareil mobile pour afficher des choses à l'écran",
|
||||
"Description[gl]": "Use o seu dispositivo móbil para apuntar a cousas na pantalla",
|
||||
"Description[it]": "Usa il tuo dispositivo mobile per indicare gli oggetti sullo schermo",
|
||||
"Description[ko]": "모바일 장치로 화면의 항목 가리키기",
|
||||
|
|
Loading…
Reference in a new issue