mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-14 01:22:33 +00:00
nn.po: backport from trunk.
status.16x: update. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@36473 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
48878c1ce1
commit
0fe2c7a9fa
47
po/nn.po
47
po/nn.po
@ -5,13 +5,14 @@
|
|||||||
# Ingar Pareliussen <ingar_ved_samfundet.no>, 2003,2005,2006.
|
# Ingar Pareliussen <ingar_ved_samfundet.no>, 2003,2005,2006.
|
||||||
# Ingar Pareliussen <ingarp_ved_samfundet.no>, 2006, 2007.
|
# Ingar Pareliussen <ingarp_ved_samfundet.no>, 2006, 2007.
|
||||||
# Ingar Pareliussen <ingar.pareliussen@_dmmh_no>, 2010.
|
# Ingar Pareliussen <ingar.pareliussen@_dmmh_no>, 2010.
|
||||||
|
# Jürgen Spitzmüller <spitz@lyx.org>, 2010.
|
||||||
msgid ""
|
msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: nn\n"
|
"Project-Id-Version: nn\n"
|
||||||
"Report-Msgid-Bugs-To: lyx-devel@lists.lyx.org\n"
|
"Report-Msgid-Bugs-To: lyx-devel@lists.lyx.org\n"
|
||||||
"POT-Creation-Date: 2010-11-24 22:04+0100\n"
|
"POT-Creation-Date: 2010-11-24 22:04+0100\n"
|
||||||
"PO-Revision-Date: 2010-11-21 10:39+0100\n"
|
"PO-Revision-Date: 2010-11-25 10:53+0100\n"
|
||||||
"Last-Translator: Ingar Pareliussen <ingar.pareliussen@_dmmh_no>\n"
|
"Last-Translator: Jürgen Spitzmüller <spitz@lyx.org>\n"
|
||||||
"Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
|
"Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
|
||||||
"MIME-Version: 1.0\n"
|
"MIME-Version: 1.0\n"
|
||||||
"Content-Type: text/plain; charset=UTF-8\n"
|
"Content-Type: text/plain; charset=UTF-8\n"
|
||||||
@ -17622,42 +17623,40 @@ msgid ""
|
|||||||
msgstr "Vi fekk ein feil når vi køyrde %1$s"
|
msgstr "Vi fekk ein feil når vi køyrde %1$s"
|
||||||
|
|
||||||
#: src/VCBackend.cpp:382
|
#: src/VCBackend.cpp:382
|
||||||
#, fuzzy
|
|
||||||
msgid "Up-to-date"
|
msgid "Up-to-date"
|
||||||
msgstr "&Oppdater"
|
msgstr "Oppdatert"
|
||||||
|
|
||||||
#: src/VCBackend.cpp:384
|
#: src/VCBackend.cpp:384
|
||||||
#, fuzzy
|
|
||||||
msgid "Locally Modified"
|
msgid "Locally Modified"
|
||||||
msgstr "lokal stilfil"
|
msgstr "endra lokalt"
|
||||||
|
|
||||||
#: src/VCBackend.cpp:386
|
#: src/VCBackend.cpp:386
|
||||||
#, fuzzy
|
|
||||||
msgid "Locally Added"
|
msgid "Locally Added"
|
||||||
msgstr "lokal stilfil"
|
msgstr "Lagt til lokalt"
|
||||||
|
|
||||||
#: src/VCBackend.cpp:388
|
#: src/VCBackend.cpp:388
|
||||||
msgid "Needs Merge"
|
msgid "Needs Merge"
|
||||||
msgstr ""
|
msgstr "Treng å smelte saman"
|
||||||
|
|
||||||
#: src/VCBackend.cpp:390
|
#: src/VCBackend.cpp:390
|
||||||
msgid "Needs Checkout"
|
msgid "Needs Checkout"
|
||||||
msgstr ""
|
msgstr "Treng å bli sjekka ut"
|
||||||
|
|
||||||
#: src/VCBackend.cpp:392
|
#: src/VCBackend.cpp:392
|
||||||
#, fuzzy
|
|
||||||
msgid "No CVS file"
|
msgid "No CVS file"
|
||||||
msgstr "Utskrift til &fil:"
|
msgstr "Inga CVS-fil"
|
||||||
|
|
||||||
#: src/VCBackend.cpp:394
|
#: src/VCBackend.cpp:394
|
||||||
msgid "Cannot retrieve CVS status"
|
msgid "Cannot retrieve CVS status"
|
||||||
msgstr ""
|
msgstr "Kan ikkje hente CVS status"
|
||||||
|
|
||||||
#: src/VCBackend.cpp:521
|
#: src/VCBackend.cpp:521
|
||||||
msgid ""
|
msgid ""
|
||||||
"The repository version is newer then the current check out.\n"
|
"The repository version is newer then the current check out.\n"
|
||||||
"You have to update from repository first or revert your changes."
|
"You have to update from repository first or revert your changes."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
"Versjonen i kjeldebrønnen er nyare enn den du har sjekka ut.\n"
|
||||||
|
"Du må hente ut frå kjeldebrønnen først eller fjerne endringane dine."
|
||||||
|
|
||||||
#: src/VCBackend.cpp:526
|
#: src/VCBackend.cpp:526
|
||||||
#, c-format
|
#, c-format
|
||||||
@ -17667,9 +17666,13 @@ msgid ""
|
|||||||
"'%1$s'\n"
|
"'%1$s'\n"
|
||||||
"\n"
|
"\n"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
"Dårleg status når vi sjekka inn endringane\n"
|
||||||
|
"\n"
|
||||||
|
"'%1$s'\n"
|
||||||
|
"\n"
|
||||||
|
|
||||||
#: src/VCBackend.cpp:567
|
#: src/VCBackend.cpp:567
|
||||||
#, fuzzy, c-format
|
#, c-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"Error when updating from repository.\n"
|
"Error when updating from repository.\n"
|
||||||
"You have to manually resolve the conflicts NOW!\n"
|
"You have to manually resolve the conflicts NOW!\n"
|
||||||
@ -17683,7 +17686,7 @@ msgstr ""
|
|||||||
"Etter du trykkjer OK vil LyX opne dokumentet på nytt."
|
"Etter du trykkjer OK vil LyX opne dokumentet på nytt."
|
||||||
|
|
||||||
#: src/VCBackend.cpp:599
|
#: src/VCBackend.cpp:599
|
||||||
#, fuzzy, c-format
|
#, c-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"There were detected changes in the working directory:\n"
|
"There were detected changes in the working directory:\n"
|
||||||
"%1$s\n"
|
"%1$s\n"
|
||||||
@ -17694,8 +17697,8 @@ msgstr ""
|
|||||||
"Det er oppdaga endringar i arbeidskatalogen\n"
|
"Det er oppdaga endringar i arbeidskatalogen\n"
|
||||||
"%1$s\n"
|
"%1$s\n"
|
||||||
"\n"
|
"\n"
|
||||||
"Dersom det er forskjell i versjonane den lokale versjonen vil bli brukt.\n"
|
"Dersom det er filkonflikt å du ordne opp i det og så gå tilbake til "
|
||||||
"Skal vi halde fram?"
|
"versjonen i kjeldebrønnen."
|
||||||
|
|
||||||
#: src/VCBackend.cpp:603 src/VCBackend.cpp:607 src/VCBackend.cpp:970
|
#: src/VCBackend.cpp:603 src/VCBackend.cpp:607 src/VCBackend.cpp:970
|
||||||
#: src/VCBackend.cpp:974
|
#: src/VCBackend.cpp:974
|
||||||
@ -17703,14 +17706,12 @@ msgid "Changes detected"
|
|||||||
msgstr "Endringar oppdaga"
|
msgstr "Endringar oppdaga"
|
||||||
|
|
||||||
#: src/VCBackend.cpp:604 src/VCBackend.cpp:608
|
#: src/VCBackend.cpp:604 src/VCBackend.cpp:608
|
||||||
#, fuzzy
|
|
||||||
msgid "&Continue"
|
msgid "&Continue"
|
||||||
msgstr "Framhald"
|
msgstr "Fortsett"
|
||||||
|
|
||||||
#: src/VCBackend.cpp:604 src/VCBackend.cpp:608
|
#: src/VCBackend.cpp:604 src/VCBackend.cpp:608
|
||||||
#, fuzzy
|
|
||||||
msgid "&Abort"
|
msgid "&Abort"
|
||||||
msgstr "&Sorter"
|
msgstr "&Avbryt"
|
||||||
|
|
||||||
#: src/VCBackend.cpp:604 src/VCBackend.cpp:971
|
#: src/VCBackend.cpp:604 src/VCBackend.cpp:971
|
||||||
msgid "View &Log ..."
|
msgid "View &Log ..."
|
||||||
@ -17722,6 +17723,8 @@ msgid ""
|
|||||||
"The document %1$s is not in repository.\n"
|
"The document %1$s is not in repository.\n"
|
||||||
"You have to check in the first revision before you can revert."
|
"You have to check in the first revision before you can revert."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
"Dokumentet %1$s er ikkje i kjeldebrønnen.\n"
|
||||||
|
"Du må sjekke inn før du kan gå tilbake til førre."
|
||||||
|
|
||||||
#: src/VCBackend.cpp:675
|
#: src/VCBackend.cpp:675
|
||||||
#, c-format
|
#, c-format
|
||||||
@ -17729,6 +17732,8 @@ msgid ""
|
|||||||
"Cannot revert document %1$s to repository version.\n"
|
"Cannot revert document %1$s to repository version.\n"
|
||||||
"The status '%2$s' is unexpected."
|
"The status '%2$s' is unexpected."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
"Klarte ikkje gå tilbake til førre dokumentet %1$s i kjeldebrønn versjonen.\n"
|
||||||
|
"Statusen '%2$s' er uventa."
|
||||||
|
|
||||||
#: src/VCBackend.cpp:776 src/VCBackend.cpp:823 src/VCBackend.cpp:918
|
#: src/VCBackend.cpp:776 src/VCBackend.cpp:823 src/VCBackend.cpp:918
|
||||||
#: src/VCBackend.cpp:955 src/VCBackend.cpp:1011
|
#: src/VCBackend.cpp:955 src/VCBackend.cpp:1011
|
||||||
|
@ -38,7 +38,7 @@ What's new
|
|||||||
|
|
||||||
* DOCUMENTATION AND LOCALIZATION
|
* DOCUMENTATION AND LOCALIZATION
|
||||||
|
|
||||||
- Updated Nynorsk and Serbian (Latin) User Interface localizations.
|
- Updated German, Nynorsk and Serbian (Latin) User Interface localizations.
|
||||||
|
|
||||||
|
|
||||||
* BUILD/INSTALLATION
|
* BUILD/INSTALLATION
|
||||||
|
Loading…
Reference in New Issue
Block a user