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
31498778ad
commit
8f456757b3
1 changed files with 3 additions and 0 deletions
|
@ -9,6 +9,7 @@
|
|||
"Name[ca]": "David Shlemayev",
|
||||
"Name[cs]": "David Shlemayev",
|
||||
"Name[de]": "David Shlemayev",
|
||||
"Name[el]": "David Shlemayev",
|
||||
"Name[en_GB]": "David Shlemayev",
|
||||
"Name[es]": "David Shlemayev",
|
||||
"Name[eu]": "David Shlemayev",
|
||||
|
@ -39,6 +40,7 @@
|
|||
"Description[ca]": "Mostra la intensitat del senyal de xarxa del vostre telèfon",
|
||||
"Description[cs]": "Zobrazit sílu signálu telefonu",
|
||||
"Description[de]": "Signalstärke des Mobiltelefons anzeigen",
|
||||
"Description[el]": "Εμφάνιση της ισχύος του δικτυακού σήματος",
|
||||
"Description[en_GB]": "Show your phone's network signal strength",
|
||||
"Description[es]": "Muestra la fuerza de la señal de red de su teléfono",
|
||||
"Description[eu]": "Erakutsi zure telefonoaren sare-seinalearen sendotasuna",
|
||||
|
@ -70,6 +72,7 @@
|
|||
"Name[ca]": "Monitor de la connectivitat",
|
||||
"Name[cs]": "Monitor spojení",
|
||||
"Name[de]": "Verbindungs-Überwachung",
|
||||
"Name[el]": "Παρακολούθηση συνδεσιμότητας",
|
||||
"Name[en_GB]": "Connectivity monitor",
|
||||
"Name[es]": "Monitor de conectividad",
|
||||
"Name[eu]": "Konektagarritasun begiralea",
|
||||
|
|
Loading…
Reference in a new issue